feat: set new password ui and viewModel (#2857)

Author: Nagarjuna0033

feature/auth/src/commonMain/composeResources/values/strings.xml

@@ -147,6 +147,22 @@
     <string name="feature_otp_required_error">OTP is required</string>
     <string name="feature_otp_invalid_error">Enter valid OTP</string>
 
+
+    <!--Set New Password-->
+
+    <string name="feature_set_new_password_title">Set Password</string>
+    <string name="feature_set_new_password_message">Set your new high security password now!</string>
+    <string name="feature_set_new_password_new_password_label">New Password</string>
+    <string name="feature_set_new_password_confirm_password_label">Confirm New Password</string>
+    <string name="feature_set_new_password_submit">Submit</string>
+    <string name="feature_set_new_password_tip">Remember your password?</string>
+    <string name="feature_set_new_password_action_tip">Log in</string>
+
+    <string name="feature_common_error_password_required_error">Password is Required</string>
+    <string name="feature_common_error_password_short">Password must be at least 6 characters</string>
+    <string name="feature_common_error_password_mismatch">Passwords do not match</string>
+
+
     <!--Recover Password-->
     <string name="feature_recover_now_title">Recover Now</string>
     <string name="feature_recover_now_message">Forgot your password, don’t worry!, we got you covered. Reset your password now!</string>

feature/auth/src/commonMain/kotlin/org/mifos/mobile/feature/auth/di/AuthModule.kt

@@ -15,12 +15,14 @@ import org.mifos.mobile.feature.auth.login.LoginViewModel
 import org.mifos.mobile.feature.auth.otpAuthentication.OtpAuthenticationViewModel
 import org.mifos.mobile.feature.auth.recoverPassword.RecoverPasswordViewModel
 import org.mifos.mobile.feature.auth.registration.RegistrationViewModel
+import org.mifos.mobile.feature.auth.setNewPassword.SetPasswordViewModel
 import org.mifos.mobile.feature.auth.uploadId.UploadIdViewModel
 
 val AuthModule = module {
     viewModelOf(::LoginViewModel)
     viewModelOf(::RegistrationViewModel)
     viewModelOf(::UploadIdViewModel)
     viewModelOf(::OtpAuthenticationViewModel)
+    viewModelOf(::SetPasswordViewModel)
     viewModelOf(::RecoverPasswordViewModel)
 }

feature/auth/src/commonMain/kotlin/org/mifos/mobile/feature/auth/navigation/AuthenticationNavGraph.kt

@@ -27,6 +27,8 @@ import org.mifos.mobile.feature.auth.recoverPassword.navigateToRecoverPasswordSc
 import org.mifos.mobile.feature.auth.recoverPassword.recoverPasswordDestination
 import org.mifos.mobile.feature.auth.registration.navigateToRegisterScreen
 import org.mifos.mobile.feature.auth.registration.registrationDestination
+import org.mifos.mobile.feature.auth.setNewPassword.navigateToSetPasswordScreen
+import org.mifos.mobile.feature.auth.setNewPassword.setPasswordDestination
 import org.mifos.mobile.feature.auth.status.navigateToStatusScreen
 import org.mifos.mobile.feature.auth.status.statusDestination
 import org.mifos.mobile.feature.auth.uploadId.navigateToUploadIdScreen
@@ -48,8 +50,7 @@ fun NavGraphBuilder.authenticationNavGraph(
         startDestination = LoginRoute,
     ) {
         loginDestination(
-//            navigateToRegisterScreen = navController::navigateToRegisterScreen,
-            navigateToRegisterScreen = navController::navigateToOtpAuthScreen,
+            navigateToRegisterScreen = navController::navigateToRegisterScreen,
             navigateToPasscodeScreen = navigateToPasscodeScreen,
             navigateToForgotPasswordScreen = navController::navigateToRecoverPasswordScreen,
         )
@@ -66,6 +67,7 @@ fun NavGraphBuilder.authenticationNavGraph(
 
         otpAuthenticationDestination(
             navigateToStatusScreen = navController::navigateToStatusScreen,
+            navigateToSetPasswordScreen = navController::navigateToSetPasswordScreen,
         )
 
         statusDestination(
@@ -78,5 +80,10 @@ fun NavGraphBuilder.authenticationNavGraph(
             navigateToLoginScreen = navController::navigateToLoginScreen,
             navigateToOtpAuthenticationScreen = navController::navigateToOtpAuthScreen,
         )
+
+        setPasswordDestination(
+            navigateToStatusScreen = navController::navigateToStatusScreen,
+            navigateToLoginScreen = navController::navigateToLoginScreen,
+        )
     }
 }

feature/auth/src/commonMain/kotlin/org/mifos/mobile/feature/auth/otpAuthentication/OtpAuthenticationNavigation.kt

@@ -14,22 +14,33 @@ package org.mifos.mobile.feature.auth.otpAuthentication
 import androidx.navigation.NavController
 import androidx.navigation.NavGraphBuilder
 import androidx.navigation.NavOptions
+import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
 import org.mifos.mobile.core.ui.composableWithStayTransitions
+import org.mifos.mobile.feature.auth.status.StatusNavigationRoute
 
+@OptIn(ExperimentalSerializationApi::class)
 @Serializable
-data object OtpAuthenticationRoute
+data class OtpAuthenticationRoute(
+    val nextRoute: String = StatusNavigationRoute.serializer().descriptor.serialName,
+)
 
-fun NavController.navigateToOtpAuthScreen(navOptions: NavOptions? = null) {
-    this.navigate(route = OtpAuthenticationRoute, navOptions = navOptions)
+@OptIn(ExperimentalSerializationApi::class)
+fun NavController.navigateToOtpAuthScreen(
+    nextRoute: String = StatusNavigationRoute.serializer().descriptor.serialName,
+    navOptions: NavOptions? = null,
+) {
+    this.navigate(OtpAuthenticationRoute(nextRoute), navOptions)
 }
 
 fun NavGraphBuilder.otpAuthenticationDestination(
     navigateToStatusScreen: (EventType, String) -> Unit,
+    navigateToSetPasswordScreen: () -> Unit,
 ) {
     composableWithStayTransitions<OtpAuthenticationRoute> {
         OtpAuthenticationScreen(
             navigateToStatusScreen = navigateToStatusScreen,
+            navigateToSetPasswordScreen = navigateToSetPasswordScreen,
         )
     }
 }

feature/auth/src/commonMain/kotlin/org/mifos/mobile/feature/auth/otpAuthentication/OtpAuthenticationScreen.kt

@@ -67,6 +67,7 @@ import org.mifos.mobile.core.ui.utils.EventsEffect
 @Composable
 internal fun OtpAuthenticationScreen(
     navigateToStatusScreen: (EventType, String) -> Unit,
+    navigateToSetPasswordScreen: () -> Unit,
     modifier: Modifier = Modifier,
     viewModel: OtpAuthenticationViewModel = koinViewModel(),
 ) {
@@ -80,6 +81,12 @@ internal fun OtpAuthenticationScreen(
                     event.eventDestination,
                 )
             }
+
+            is OtpAuthEvent.NavigateNext -> {
+                if (uiState.nextRoute == "set_password") {
+                    navigateToSetPasswordScreen.invoke()
+                }
+            }
         }
     }
 

feature/auth/src/commonMain/kotlin/org/mifos/mobile/feature/auth/otpAuthentication/OtpAuthenticationViewModel.kt

@@ -9,7 +9,9 @@
  */
 package org.mifos.mobile.feature.auth.otpAuthentication
 
+import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.viewModelScope
+import androidx.navigation.toRoute
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.flow.update
@@ -24,9 +26,22 @@ import org.jetbrains.compose.resources.StringResource
 import org.mifos.mobile.core.ui.utils.BaseViewModel
 import org.mifos.mobile.feature.auth.login.LoginRoute
 
-internal class OtpAuthenticationViewModel : BaseViewModel<OtpAuthState, OtpAuthEvent, OtpAuthAction>(
+internal class OtpAuthenticationViewModel(
+    savedStateHandle: SavedStateHandle,
+) : BaseViewModel<
+    OtpAuthState,
+    OtpAuthEvent,
+    OtpAuthAction,
+    >(
     initialState = OtpAuthState(dialogState = null),
 ) {
+    init {
+        val nextRoute = savedStateHandle.toRoute<OtpAuthenticationRoute>()
+
+        mutableStateFlow.update {
+            it.copy(nextRoute = nextRoute.nextRoute)
+        }
+    }
 
     private var validationJob: Job? = null
 
@@ -79,7 +94,24 @@ internal class OtpAuthenticationViewModel : BaseViewModel<OtpAuthState, OtpAuthE
         }
 
         if (otpError == null) {
-            registerUser()
+            when {
+                state.nextRoute == "set_password" -> handleRecoverPassword()
+                else -> registerUser()
+            }
+        }
+    }
+
+    @OptIn(InternalSerializationApi::class, ExperimentalSerializationApi::class)
+    private fun handleRecoverPassword() {
+        viewModelScope.launch {
+            mutableStateFlow.update {
+                it.copy(
+                    dialogState = OtpAuthState.DialogState.Loading,
+                )
+            }
+            delay(3000)
+            dismissDialog()
+            sendEvent(OtpAuthEvent.NavigateNext)
         }
     }
 
@@ -124,6 +156,9 @@ internal class OtpAuthenticationViewModel : BaseViewModel<OtpAuthState, OtpAuthE
 }
 
 internal data class OtpAuthState(
+
+    val nextRoute: String = "",
+
     val otp: String = "",
     val otpError: StringResource? = null,
 
@@ -151,6 +186,8 @@ internal sealed interface OtpAuthAction {
 }
 
 internal sealed interface OtpAuthEvent {
+    data object NavigateNext : OtpAuthEvent
+
     data class NavigateToStatus(
         val eventType: EventType,
         val eventDestination: String,

feature/auth/src/commonMain/kotlin/org/mifos/mobile/feature/auth/setNewPassword/SetPasswordNavigation.kt

@@ -0,0 +1,40 @@
+/*
+ * 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
+ */
+@file:Suppress("MatchingDeclarationName")
+
+package org.mifos.mobile.feature.auth.setNewPassword
+
+import androidx.navigation.NavController
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavOptions
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+import org.mifos.mobile.core.ui.composableWithSlideTransitions
+import org.mifos.mobile.feature.auth.otpAuthentication.EventType
+
+@Serializable
+@SerialName("set_password")
+data object SetPasswordRoute
+
+fun NavController.navigateToSetPasswordScreen(navOptions: NavOptions? = null) {
+    this.navigate(SetPasswordRoute, navOptions)
+}
+
+fun NavGraphBuilder.setPasswordDestination(
+    navigateToStatusScreen: (EventType, String) -> Unit,
+    navigateToLoginScreen: () -> Unit,
+) {
+    composableWithSlideTransitions<SetPasswordRoute> {
+        SetPasswordScreen(
+            navigateToStatusScreen = navigateToStatusScreen,
+            navigateToLoginScreen = navigateToLoginScreen,
+        )
+    }
+}