feat(feature:auth): Migrated to CMP (#2772)

Nagarjuna0033 · web-flow · commit e596618f383f · 2025-02-13T10:13:03.000+05:30
diff --git a/cmp-android/dependencies/demoDebugRuntimeClasspath.txt b/cmp-android/dependencies/demoDebugRuntimeClasspath.txt
@@ -302,6 +302,7 @@ org.jetbrains.compose.ui:ui-util:1.7.0-rc01
 org.jetbrains.compose.ui:ui:1.7.0-rc01
 org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
 org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
+org.jetbrains.kotlin:kotlin-reflect:2.1.0
 org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20
diff --git a/cmp-android/dependencies/demoReleaseRuntimeClasspath.txt b/cmp-android/dependencies/demoReleaseRuntimeClasspath.txt
@@ -298,6 +298,7 @@ org.jetbrains.compose.ui:ui-util:1.7.0-rc01
 org.jetbrains.compose.ui:ui:1.7.0-rc01
 org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
 org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
+org.jetbrains.kotlin:kotlin-reflect:2.1.0
 org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20
diff --git a/cmp-android/dependencies/prodDebugRuntimeClasspath.txt b/cmp-android/dependencies/prodDebugRuntimeClasspath.txt
@@ -302,6 +302,7 @@ org.jetbrains.compose.ui:ui-util:1.7.0-rc01
 org.jetbrains.compose.ui:ui:1.7.0-rc01
 org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
 org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
+org.jetbrains.kotlin:kotlin-reflect:2.1.0
 org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20
diff --git a/cmp-android/dependencies/prodReleaseRuntimeClasspath.txt b/cmp-android/dependencies/prodReleaseRuntimeClasspath.txt
@@ -298,6 +298,7 @@ org.jetbrains.compose.ui:ui-util:1.7.0-rc01
 org.jetbrains.compose.ui:ui:1.7.0-rc01
 org.jetbrains.kotlin:kotlin-android-extensions-runtime:2.1.0
 org.jetbrains.kotlin:kotlin-parcelize-runtime:2.1.0
+org.jetbrains.kotlin:kotlin-reflect:2.1.0
 org.jetbrains.kotlin:kotlin-stdlib-common:2.1.0
 org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.9.20
 org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.9.20
diff --git a/cmp-desktop/build.gradle.kts b/cmp-desktop/build.gradle.kts
@@ -33,6 +33,8 @@ kotlin {
             implementation(libs.kotlin.reflect)
 
             implementation(libs.koin.core)
+
+            implementation(compose.components.resources)
         }
     }
 }
diff --git a/cmp-desktop/src/jvmMain/kotlin/main.kt b/cmp-desktop/src/jvmMain/kotlin/main.kt
@@ -12,7 +12,10 @@ import androidx.compose.ui.window.Window
 import androidx.compose.ui.window.application
 import androidx.compose.ui.window.rememberWindowState
 import cmp.shared.SharedApp
+import cmp.shared.generated.resources.Res
+import cmp.shared.generated.resources.application_title
 import cmp.shared.utils.initKoin
+import org.jetbrains.compose.resources.stringResource
 
 /**
  * Main function.
@@ -40,7 +43,7 @@ fun main() {
         Window(
             onCloseRequest = ::exitApplication,
             state = windowState,
-            title = "DesktopApp",
+            title = stringResource(Res.string.application_title),
         ) {
             // Sets the content of the window.
             SharedApp()
diff --git a/cmp-navigation/build.gradle.kts b/cmp-navigation/build.gradle.kts
@@ -17,6 +17,9 @@ plugins {
 kotlin {
     sourceSets {
         commonMain.dependencies {
+
+            implementation(projects.feature.auth)
+
             // Core Modules
             implementation(projects.core.data)
             implementation(projects.core.common)
diff --git a/cmp-navigation/src/commonMain/kotlin/cmp/navigation/ComposeApp.kt b/cmp-navigation/src/commonMain/kotlin/cmp/navigation/ComposeApp.kt
@@ -9,24 +9,54 @@
  */
 package cmp.navigation
 
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import androidx.navigation.compose.rememberNavController
+import cmp.navigation.navigation.NavGraphRoute.AUTH_GRAPH
+import cmp.navigation.navigation.NavGraphRoute.PASSCODE_GRAPH
 import cmp.navigation.navigation.RootNavGraph
 import org.koin.compose.koinInject
+import org.koin.compose.viewmodel.koinViewModel
 import org.mifos.mobile.core.data.util.NetworkMonitor
 import org.mifos.mobile.core.designsystem.theme.MifosMobileTheme
 
 @Composable
 fun ComposeApp(
     modifier: Modifier = Modifier,
     networkMonitor: NetworkMonitor = koinInject(),
+    viewModel: ComposeAppViewModel = koinViewModel(),
 ) {
+    val uiState by viewModel.uiState.collectAsStateWithLifecycle()
+    val navController = rememberNavController()
+
+    val navDestination = when (uiState) {
+        is MainUiState.Loading -> AUTH_GRAPH
+        is MainUiState.Success -> if ((uiState as MainUiState.Success).userData.isAuthenticated) {
+            PASSCODE_GRAPH
+        } else {
+            AUTH_GRAPH
+        }
+
+        else -> AUTH_GRAPH
+    }
+
     MifosMobileTheme {
         RootNavGraph(
+            modifier = modifier.fillMaxSize(),
             networkMonitor = networkMonitor,
-            navHostController = rememberNavController(),
-            modifier = modifier,
+            navHostController = navController,
+            startDestination = navDestination,
+//            onClickLogout = {
+//                viewModel.logOut()
+//                navController.navigate(AUTH_GRAPH) {
+//                    popUpTo(navController.graph.id) {
+//                        inclusive = true
+//                    }
+//                }
+//            },
         )
     }
 }
diff --git a/cmp-navigation/src/commonMain/kotlin/cmp/navigation/ComposeAppViewModel.kt b/cmp-navigation/src/commonMain/kotlin/cmp/navigation/ComposeAppViewModel.kt
@@ -0,0 +1,52 @@
+/*
+ * Copyright 2025 Mifos Initiative
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ *
+ * See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+ */
+package cmp.navigation
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import kotlinx.coroutines.flow.SharingStarted
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.flow.stateIn
+import kotlinx.coroutines.launch
+import org.mifos.mobile.core.common.DataState
+import org.mifos.mobile.core.data.repository.UserDataRepository
+import org.mifos.mobile.core.model.UserData
+
+class ComposeAppViewModel(
+    private val userDataRepository: UserDataRepository,
+//    private val passcodeManager: PasscodeManager,
+) : ViewModel() {
+
+    val uiState: StateFlow<MainUiState> = userDataRepository.userData.map { dataState ->
+        when (dataState) {
+            is DataState.Success -> MainUiState.Success(dataState.data)
+            is DataState.Error -> MainUiState.Error(dataState.exception.message ?: "Unknown error")
+            DataState.Loading -> MainUiState.Loading
+        }
+    }.stateIn(
+        scope = viewModelScope,
+        initialValue = MainUiState.Loading,
+        started = SharingStarted.WhileSubscribed(5_000),
+    )
+
+    fun logOut() {
+        viewModelScope.launch {
+            userDataRepository.logOut()
+//            passcodeManager.clearPasscode()
+        }
+    }
+}
+
+sealed interface MainUiState {
+    data object Loading : MainUiState
+    data class Error(val error: String) : MainUiState
+    data class Success(val userData: UserData) : MainUiState
+}
diff --git a/cmp-navigation/src/commonMain/kotlin/cmp/navigation/di/KoinModules.kt b/cmp-navigation/src/commonMain/kotlin/cmp/navigation/di/KoinModules.kt
@@ -9,11 +9,14 @@
  */
 package cmp.navigation.di
 
+import cmp.navigation.ComposeAppViewModel
+import org.koin.core.module.dsl.viewModelOf
 import org.koin.dsl.module
 import org.mifos.mobile.core.common.di.DispatchersModule
 import org.mifos.mobile.core.data.di.RepositoryModule
 import org.mifos.mobile.core.datastore.di.PreferencesModule
 import org.mifos.mobile.core.network.di.NetworkModule
+import org.mifos.mobile.feature.auth.di.AuthModule
 
 object KoinModules {
     private val commonModules = module {
@@ -28,14 +31,14 @@ object KoinModules {
     private val networkModules = module {
         includes(NetworkModule)
     }
-//    private val sharedModule = module {
-//        viewModelOf(::MifosMobileViewModel)
-//    }
-//    private val featureModules = module {
-//        includes(
-//            AuthModule,
-//        )
-//    }
+    private val sharedModule = module {
+        viewModelOf(::ComposeAppViewModel)
+    }
+    private val featureModules = module {
+        includes(
+            AuthModule,
+        )
+    }
 //    private val LibraryModule = module {
 //        includes(PasscodeModule)
 //    }
@@ -45,7 +48,7 @@ object KoinModules {
         dataModules,
         coreDataStoreModules,
         networkModules,
-//        featureModules,
-//        sharedModule,
+        featureModules,
+        sharedModule,
     )
 }
diff --git a/cmp-navigation/src/commonMain/kotlin/cmp/navigation/navigation/FeatureNavHost.kt b/cmp-navigation/src/commonMain/kotlin/cmp/navigation/navigation/FeatureNavHost.kt
@@ -46,9 +46,7 @@ fun NavGraphBuilder.homeScreen() {
 }
 
 @Composable
-fun WelcomeScreen(
-    modifier: Modifier = Modifier,
-) {
+fun WelcomeScreen(modifier: Modifier = Modifier) {
     Column(
         modifier = modifier.fillMaxSize(),
         verticalArrangement = Arrangement.Center,
diff --git a/cmp-navigation/src/commonMain/kotlin/cmp/navigation/navigation/RootNavGraph.kt b/cmp-navigation/src/commonMain/kotlin/cmp/navigation/navigation/RootNavGraph.kt
@@ -14,25 +14,36 @@ import androidx.compose.ui.Modifier
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
+import cmp.navigation.navigation.NavGraphRoute.AUTH_GRAPH
 import cmp.navigation.navigation.NavGraphRoute.MAIN_GRAPH
 import cmp.navigation.ui.App
 import org.mifos.mobile.core.data.util.NetworkMonitor
+import org.mifos.mobile.feature.auth.navigation.authenticationNavGraph
 
 @Composable
 fun RootNavGraph(
     networkMonitor: NetworkMonitor,
     navHostController: NavHostController,
+    startDestination: String,
     modifier: Modifier = Modifier,
+//    onClickLogout: () -> Unit,
 ) {
     NavHost(
         navController = navHostController,
-        startDestination = MAIN_GRAPH,
+        startDestination = startDestination,
         route = NavGraphRoute.ROOT_GRAPH,
-        modifier = modifier,
     ) {
+        authenticationNavGraph(
+            navController = navHostController,
+            route = AUTH_GRAPH,
+//            navigateToPasscodeScreen = navHostController::navigateToPasscodeScreen,
+            navigateToPasscodeScreen = { },
+        )
         composable(MAIN_GRAPH) {
             App(
+                modifier = modifier,
                 networkMonitor = networkMonitor,
+//                onClickLogout = onClickLogout,
             )
         }
     }
diff --git a/cmp-navigation/src/commonMain/kotlin/cmp/navigation/ui/App.kt b/cmp-navigation/src/commonMain/kotlin/cmp/navigation/ui/App.kt
@@ -38,6 +38,7 @@ import org.mifos.mobile.core.designsystem.theme.MifosBackground
 fun App(
     networkMonitor: NetworkMonitor,
     modifier: Modifier = Modifier,
+//    onClickLogout: () -> Unit,
 ) {
     MifosBackground(modifier) {
         val snackbarHostState = remember { SnackbarHostState() }
@@ -79,7 +80,7 @@ fun App(
             ) {
                 FeatureNavHost(
                     appState = appState,
-//                    onClickLogout = {},
+//                    onClickLogout = onClickLogout,
                     modifier = Modifier,
                 )
             }
diff --git a/cmp-shared/src/commonMain/composeResources/values/strings.xml b/cmp-shared/src/commonMain/composeResources/values/strings.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+    Copyright 2024 Mifos Initiative
+
+    This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0.
+    If a copy of the MPL was not distributed with this file,
+    You can obtain one at https://mozilla.org/MPL/2.0/.
+
+    See https://github.com/openMF/mobile-mobile/blob/master/LICENSE.md
+-->
+<resources>
+    <string name="application_title">Mifos Mobile</string>
+</resources>
diff --git a/cmp-web/src/wasmJsMain/kotlin/Main.kt b/cmp-web/src/wasmJsMain/kotlin/Main.kt
@@ -37,7 +37,7 @@ fun main() {
      * This window uses the canvas element with the ID "ComposeTarget" and has the title "WebApp".
      */
     CanvasBasedWindow(
-        title = "WebApp", // Window title
+        title = "Mifos Mobile", // Window title
         canvasElementId = "ComposeTarget", // The canvas element where the Compose UI will be rendered
     ) {
         /*
diff --git a/core/data/src/commonMain/kotlin/org/mifos/mobile/core/data/repositoryImpl/UserAuthRepositoryImp.kt b/core/data/src/commonMain/kotlin/org/mifos/mobile/core/data/repositoryImpl/UserAuthRepositoryImp.kt
@@ -9,6 +9,7 @@
  */
 package org.mifos.mobile.core.data.repositoryImpl
 
+import io.ktor.client.statement.bodyAsText
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.withContext
 import org.mifos.mobile.core.common.DataState
@@ -47,8 +48,12 @@ class UserAuthRepositoryImp(
         )
         return try {
             withContext(ioDispatcher) {
-                dataManager.registrationApi.registerUser(registerPayload)
-                DataState.Success("User registered Successfully")
+                val result = dataManager.registrationApi.registerUser(registerPayload)
+                val errorMessage = result.bodyAsText()
+                when (result.status.value) {
+                    200 -> DataState.Success("User registered Successfully")
+                    else -> DataState.Error(Exception("Error in registering user: $errorMessage"), null)
+                }
             }
         } catch (e: Exception) {
             DataState.Error(e, null)
@@ -63,7 +68,11 @@ class UserAuthRepositoryImp(
         return try {
             withContext(ioDispatcher) {
                 val user = dataManager.authenticationApi.authenticate(loginPayload)
-                DataState.Success(user)
+                if (user.base64EncodedAuthenticationKey != null) {
+                    DataState.Success(user)
+                } else {
+                    DataState.Error(Exception("Invalid Credentials"), null)
+                }
             }
         } catch (e: Exception) {
             DataState.Error(e, null)
@@ -80,9 +89,16 @@ class UserAuthRepositoryImp(
         )
         return try {
             withContext(ioDispatcher) {
-                dataManager.registrationApi.verifyUser(userVerify)
+                val result = dataManager.registrationApi.verifyUser(userVerify)
+                val errorMessage = result.bodyAsText()
+                when (result.status.value) {
+                    200 -> DataState.Success("User Verified Successfully")
+                    else -> DataState.Error(
+                        Exception("Error in verifying user: $errorMessage"),
+                        null,
+                    )
+                }
             }
-            DataState.Success("User Verified Successfully")
         } catch (e: Exception) {
             DataState.Error(e, null)
         }
@@ -98,7 +114,15 @@ class UserAuthRepositoryImp(
         )
         return try {
             withContext(ioDispatcher) {
-                dataManager.userDetailsApi.updateAccountPassword(payload)
+                val result = dataManager.userDetailsApi.updateAccountPassword(payload)
+                val errorMessage = result.bodyAsText()
+                when (result.status.value) {
+                    200 -> DataState.Success("User Verified Successfully")
+                    else -> DataState.Error(
+                        Exception("Error in verifying user: $errorMessage"),
+                        null,
+                    )
+                }
             }
             DataState.Success("Password Updated Successfully")
         } catch (e: Exception) {
diff --git a/core/qrcode/src/androidMain/kotlin/org/mifos/mobile/core/qr/QrCodeScanner.android.kt b/core/qrcode/src/androidMain/kotlin/org/mifos/mobile/core/qr/QrCodeScanner.android.kt
@@ -23,5 +23,5 @@ actual fun QrCodeScanner(
         QrCodeAnalyzer(types.toFormat(), onScanned)
     }
 
-    CameraView(modifier, analyzer)
+    CameraView(analyzer, modifier)
 }
diff --git a/feature/auth/src/commonMain/kotlin/org/mifos/mobile/feature/auth/login/LoginScreen.kt b/feature/auth/src/commonMain/kotlin/org/mifos/mobile/feature/auth/login/LoginScreen.kt
diff --git a/feature/auth/src/commonMain/kotlin/org/mifos/mobile/feature/auth/login/LoginViewModel.kt b/feature/auth/src/commonMain/kotlin/org/mifos/mobile/feature/auth/login/LoginViewModel.kt
diff --git a/feature/auth/src/commonMain/kotlin/org/mifos/mobile/feature/auth/navigation/AuthenticationNavGraph.kt b/feature/auth/src/commonMain/kotlin/org/mifos/mobile/feature/auth/navigation/AuthenticationNavGraph.kt
diff --git a/feature/auth/src/commonMain/kotlin/org/mifos/mobile/feature/auth/registration/RegistrationScreen.kt b/feature/auth/src/commonMain/kotlin/org/mifos/mobile/feature/auth/registration/RegistrationScreen.kt
diff --git a/feature/auth/src/commonMain/kotlin/org/mifos/mobile/feature/auth/registration/RegistrationVerificationScreen.kt b/feature/auth/src/commonMain/kotlin/org/mifos/mobile/feature/auth/registration/RegistrationVerificationScreen.kt
diff --git a/feature/auth/src/commonMain/kotlin/org/mifos/mobile/feature/auth/registration/RegistrationVerificationViewModel.kt b/feature/auth/src/commonMain/kotlin/org/mifos/mobile/feature/auth/registration/RegistrationVerificationViewModel.kt
diff --git a/feature/auth/src/commonMain/kotlin/org/mifos/mobile/feature/auth/registration/RegistrationViewModel.kt b/feature/auth/src/commonMain/kotlin/org/mifos/mobile/feature/auth/registration/RegistrationViewModel.kt
diff --git a/settings.gradle.kts b/settings.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -33,6 +33,8 @@ kotlin {`
`33`	`33`	`implementation(libs.kotlin.reflect)`
`34`	`34`
`35`	`35`	`implementation(libs.koin.core)`
	`36`	`+`
	`37`	`+ implementation(compose.components.resources)`
`36`	`38`	`}`
`37`	`39`	`}`
`38`	`40`	`}`