Bug + Refactor : Auth Module

feature/auth/build.gradle.kts

@@ -1,3 +1,12 @@
+/*
+ * 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/android-client/blob/master/LICENSE.md
+ */
 plugins {
     alias(libs.plugins.mifos.android.feature)
     alias(libs.plugins.mifos.android.library.compose)

feature/auth/src/androidTest/java/com/mifos/feature/auth/ExampleInstrumentedTest.kt

@@ -1,13 +1,20 @@
+/*
+ * 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/android-client/blob/master/LICENSE.md
+ */
 package com.mifos.feature.auth
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
@@ -21,4 +28,4 @@ class ExampleInstrumentedTest {
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         assertEquals("com.mifos.feature.auth.test", appContext.packageName)
     }
-}
+}

feature/auth/src/main/AndroidManifest.xml

@@ -1,4 +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/android-client/blob/master/LICENSE.md
+-->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
 </manifest>

feature/auth/src/main/java/com/mifos/feature/auth/login/LoginScreen.kt

@@ -1,3 +1,12 @@
+/*
+ * 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/android-client/blob/master/LICENSE.md
+ */
 package com.mifos.feature.auth.login
 
 import androidx.compose.foundation.isSystemInDarkTheme
@@ -75,9 +84,11 @@ fun LoginScreen(
     homeIntent: () -> Unit,
     passcodeIntent: () -> Unit,
     onClickToUpdateServerConfig: () -> Unit,
+    onSuccessNavigate: () -> Unit,
+    modifier: Modifier = Modifier,
+    loginViewModel: LoginViewModel = hiltViewModel(),
 ) {
 
-    val loginViewModel: LoginViewModel = hiltViewModel()
     val state = loginViewModel.loginUiState.collectAsState().value
     val context = LocalContext.current
 
@@ -87,12 +98,12 @@ fun LoginScreen(
 
     var userName by rememberSaveable(stateSaver = TextFieldValue.Saver) {
         mutableStateOf(
-            TextFieldValue("")
+            TextFieldValue(""),
         )
     }
     var password by rememberSaveable(stateSaver = TextFieldValue.Saver) {
         mutableStateOf(
-            TextFieldValue("")
+            TextFieldValue(""),
         )
     }
     var passwordVisibility: Boolean by remember { mutableStateOf(false) }
@@ -128,47 +139,50 @@ fun LoginScreen(
             showDialog.value = false
             passcodeIntent()
         }
+        LoginUiState.NavigateToHome -> {
+            showDialog.value = false
+            onSuccessNavigate()
+        }
     }
 
-
     Scaffold(
-        modifier = Modifier
+        modifier = modifier
             .fillMaxSize()
             .padding(16.dp),
         containerColor = Color.White,
         snackbarHost = { SnackbarHost(snackbarHostState) },
         bottomBar = {
             Box(
                 modifier = Modifier.fillMaxWidth(),
-                contentAlignment = Alignment.Center
+                contentAlignment = Alignment.Center,
             ) {
                 FilledTonalButton(
                     onClick = onClickToUpdateServerConfig,
                     modifier = Modifier
                         .align(Alignment.Center),
                     colors = ButtonDefaults.filledTonalButtonColors(
                         containerColor = MaterialTheme.colorScheme.tertiaryContainer,
-                        contentColor = MaterialTheme.colorScheme.tertiary
-                    )
+                        contentColor = MaterialTheme.colorScheme.tertiary,
+                    ),
                 ) {
                     Text(text = "Update Server Configuration")
 
                     Spacer(modifier = Modifier.width(4.dp))
 
                     Icon(
                         imageVector = Icons.AutoMirrored.Filled.ArrowForward,
-                        contentDescription = "ArrowForward"
+                        contentDescription = "ArrowForward",
                     )
                 }
             }
-        }
+        },
     ) {
         Column(
             modifier = Modifier
                 .fillMaxWidth()
                 .padding(it)
                 .verticalScroll(rememberScrollState()),
-            horizontalAlignment = Alignment.CenterHorizontally
+            horizontalAlignment = Alignment.CenterHorizontally,
 
         ) {
             Spacer(modifier = Modifier.height(80.dp))
@@ -185,8 +199,8 @@ fun LoginScreen(
                     fontSize = 16.sp,
                     fontWeight = FontWeight.Bold,
                     fontStyle = FontStyle.Normal,
-                    color = DarkGray
-                )
+                    color = DarkGray,
+                ),
             )
 
             Spacer(modifier = Modifier.height(16.dp))
@@ -203,7 +217,7 @@ fun LoginScreen(
                     if (usernameError.value != null) {
                         Icon(imageVector = Icons.Filled.Error, contentDescription = null)
                     }
-                }
+                },
             )
 
             Spacer(modifier = Modifier.height(6.dp))
@@ -219,16 +233,18 @@ fun LoginScreen(
                 error = passwordError.value,
                 trailingIcon = {
                     if (passwordError.value == null) {
-                        val image = if (passwordVisibility)
+                        val image = if (passwordVisibility) {
                             Icons.Filled.Visibility
-                        else Icons.Filled.VisibilityOff
+                        } else {
+                            Icons.Filled.VisibilityOff
+                        }
                         IconButton(onClick = { passwordVisibility = !passwordVisibility }) {
                             Icon(imageVector = image, null)
                         }
                     } else {
                         Icon(imageVector = Icons.Filled.Error, contentDescription = null)
                     }
-                }
+                },
             )
 
             Spacer(modifier = Modifier.height(8.dp))
@@ -241,8 +257,8 @@ fun LoginScreen(
                     .padding(start = 16.dp, end = 16.dp),
                 contentPadding = PaddingValues(),
                 colors = ButtonDefaults.buttonColors(
-                    containerColor = if (isSystemInDarkTheme()) BluePrimaryDark else BluePrimary
-                )
+                    containerColor = if (isSystemInDarkTheme()) BluePrimaryDark else BluePrimary,
+                ),
             ) {
                 Text(text = "Login", fontSize = 16.sp)
             }
@@ -252,8 +268,8 @@ fun LoginScreen(
                 onDismissRequest = { showDialog.value },
                 properties = DialogProperties(
                     dismissOnBackPress = false,
-                    dismissOnClickOutside = false
-                )
+                    dismissOnClickOutside = false,
+                ),
             ) {
                 CircularProgressIndicator(color = White)
             }
@@ -263,6 +279,6 @@ fun LoginScreen(
 
 @Preview(showSystemUi = true, device = "id:pixel_7")
 @Composable
-fun LoginScreenPreview() {
-    LoginScreen({}, {}, {})
-}
+private fun LoginScreenPreview() {
+    LoginScreen({}, {}, {}, {})
+}

feature/auth/src/main/java/com/mifos/feature/auth/login/LoginUiState.kt

@@ -1,3 +1,12 @@
+/*
+ * 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/android-client/blob/master/LICENSE.md
+ */
 package com.mifos.feature.auth.login
 
 /**
@@ -19,4 +28,5 @@ sealed class LoginUiState {
 
     data object PassCodeActivityIntent : LoginUiState()
 
-}
+    data object NavigateToHome : LoginUiState()
+}

feature/auth/src/main/java/com/mifos/feature/auth/login/LoginViewModel.kt

@@ -1,3 +1,12 @@
+/*
+ * 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/android-client/blob/master/LICENSE.md
+ */
 package com.mifos.feature.auth.login
 
 import android.content.Context
@@ -31,16 +40,14 @@ class LoginViewModel @Inject constructor(
     private val usernameValidationUseCase: UsernameValidationUseCase,
     private val passwordValidationUseCase: PasswordValidationUseCase,
     private val baseApiManager: BaseApiManager,
-    private val loginUseCase: com.mifos.core.domain.use_cases.LoginUseCase
+    private val loginUseCase: com.mifos.core.domain.use_cases.LoginUseCase,
 ) :
     ViewModel() {
 
     private val _loginUiState = MutableStateFlow<LoginUiState>(LoginUiState.Empty)
     val loginUiState = _loginUiState.asStateFlow()
 
-
     fun validateUserInputs(username: String, password: String) {
-
         val usernameValidationResult = usernameValidationUseCase(username)
         val passwordValidationResult = passwordValidationUseCase(password)
 
@@ -50,7 +57,7 @@ class LoginViewModel @Inject constructor(
         if (hasError) {
             _loginUiState.value = LoginUiState.ShowValidationError(
                 usernameValidationResult.message,
-                passwordValidationResult.message
+                passwordValidationResult.message,
             )
             return
         }
@@ -66,7 +73,7 @@ class LoginViewModel @Inject constructor(
             password,
             prefManager.getServerConfig.getInstanceUrl(),
             prefManager.getServerConfig.tenant,
-            true
+            true,
         )
         if (Network.isOnline(context)) {
             login(username, password)
@@ -76,7 +83,6 @@ class LoginViewModel @Inject constructor(
         }
     }
 
-
     fun login(username: String, password: String) {
         viewModelScope.launch(Dispatchers.IO) {
             loginUseCase(username, password).collect { result ->
@@ -98,11 +104,10 @@ class LoginViewModel @Inject constructor(
         }
     }
 
-
     private fun onLoginSuccessful(
         user: PostAuthenticationResponse,
         username: String,
-        password: String
+        password: String,
     ) {
         // Saving username password
         prefManager.usernamePassword = Pair(username, password)
@@ -118,6 +123,6 @@ class LoginViewModel @Inject constructor(
         } else {
             _loginUiState.value = LoginUiState.PassCodeActivityIntent
         }
+        _loginUiState.value = LoginUiState.NavigateToHome
     }
-
-}
+}

feature/auth/src/main/java/com/mifos/feature/auth/navigation/AuthNavigation.kt

@@ -1,3 +1,12 @@
+/*
+ * 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/android-client/blob/master/LICENSE.md
+ */
 package com.mifos.feature.auth.navigation
 
 import androidx.navigation.NavController
@@ -9,37 +18,40 @@ import com.mifos.feature.auth.login.LoginScreen
 fun NavGraphBuilder.authNavGraph(
     navigateHome: () -> Unit,
     navigatePasscode: () -> Unit,
-    updateServerConfig: () -> Unit
+    updateServerConfig: () -> Unit,
+    onSuccessNavigate: () -> Unit,
 ) {
     navigation(
         startDestination = AuthScreens.LoginScreen.route,
-        route = AuthScreens.LoginScreenRoute.route
+        route = AuthScreens.LoginScreenRoute.route,
     ) {
         loginRoute(
             navigatePasscode = navigatePasscode,
             navigateHome = navigateHome,
-            updateServerConfig = updateServerConfig
+            updateServerConfig = updateServerConfig,
+            onSuccessNavigate = onSuccessNavigate,
         )
     }
-
 }
 
-fun NavGraphBuilder.loginRoute(
+private fun NavGraphBuilder.loginRoute(
     navigateHome: () -> Unit,
     navigatePasscode: () -> Unit,
-    updateServerConfig: () -> Unit
+    updateServerConfig: () -> Unit,
+    onSuccessNavigate: () -> Unit,
 ) {
     composable(
-        route = AuthScreens.LoginScreen.route
+        route = AuthScreens.LoginScreen.route,
     ) {
         LoginScreen(
             homeIntent = navigateHome,
             passcodeIntent = navigatePasscode,
-            onClickToUpdateServerConfig = updateServerConfig
+            onClickToUpdateServerConfig = updateServerConfig,
+            onSuccessNavigate = onSuccessNavigate,
         )
     }
 }
 
 fun NavController.navigateToLogin() {
     navigate(AuthScreens.LoginScreen.route)
-}
+}