fix: automatically sign in after password reset succeeds (#162)

Author: phantumcode

authenticator/src/main/java/com/amplifyframework/ui/authenticator/AuthenticatorViewModel.kt

@@ -424,8 +424,8 @@ internal class AuthenticatorViewModel(
 
     //endregion
     //region Password Reset
-
-    private suspend fun resetPassword(username: String) {
+    @VisibleForTesting
+    suspend fun resetPassword(username: String) {
         viewModelScope.launch {
             logger.debug("Initiating reset password")
             when (val result = authProvider.resetPassword(username)) {
@@ -435,12 +435,13 @@ internal class AuthenticatorViewModel(
         }.join()
     }
 
-    private suspend fun confirmResetPassword(username: String, password: String, code: String) {
+    @VisibleForTesting
+    suspend fun confirmResetPassword(username: String, password: String, code: String) {
         viewModelScope.launch {
             logger.debug("Confirming password reset")
             when (val result = authProvider.confirmResetPassword(username, password, code)) {
                 is AmplifyResult.Error -> handleResetPasswordError(result.error)
-                is AmplifyResult.Success -> handlePasswordResetComplete()
+                is AmplifyResult.Success -> handlePasswordResetComplete(username, password)
             }
         }.join()
     }
@@ -467,12 +468,17 @@ internal class AuthenticatorViewModel(
         }
     }
 
-    private suspend fun handlePasswordResetComplete() {
+    private suspend fun handlePasswordResetComplete(username: String? = null, password: String? = null) {
         logger.debug("Password reset complete")
         sendMessage(PasswordResetMessage)
-        moveTo(
-            stateFactory.newSignInState(this::signIn)
-        )
+        if (username != null && password != null) {
+            when (val result = authProvider.signIn(username, password)) {
+                is AmplifyResult.Error -> moveTo(stateFactory.newSignInState(this::signIn))
+                is AmplifyResult.Success -> handleSignInSuccess(username, password, result.data)
+            }
+        } else {
+            moveTo(stateFactory.newSignInState(this::signIn))
+        }
     }
 
     private suspend fun handleResetPasswordError(error: AuthException) = handleAuthException(error)

authenticator/src/test/java/com/amplifyframework/ui/authenticator/AuthenticatorViewModelTest.kt

@@ -21,6 +21,9 @@ import com.amplifyframework.auth.AuthUserAttributeKey.email
 import com.amplifyframework.auth.AuthUserAttributeKey.emailVerified
 import com.amplifyframework.auth.MFAType
 import com.amplifyframework.auth.exceptions.UnknownException
+import com.amplifyframework.auth.result.AuthResetPasswordResult
+import com.amplifyframework.auth.result.step.AuthNextResetPasswordStep
+import com.amplifyframework.auth.result.step.AuthResetPasswordStep
 import com.amplifyframework.auth.result.step.AuthSignInStep
 import com.amplifyframework.ui.authenticator.auth.VerificationMechanism
 import com.amplifyframework.ui.authenticator.enums.AuthenticatorStep
@@ -353,6 +356,125 @@ class AuthenticatorViewModelTest {
     }
 
 //endregion
+//region password reset tests
+
+    @Test
+    fun `Sign in with temporary password requires password reset`() = runTest {
+        coEvery { authProvider.fetchAuthSession() } returns Success(mockAuthSession(isSignedIn = false))
+        coEvery { authProvider.signIn(any(), any()) } returns Success(
+            mockSignInResult(
+                signInStep = AuthSignInStep.RESET_PASSWORD
+            )
+        )
+
+        viewModel.start(mockAuthenticatorConfiguration(initialStep = AuthenticatorStep.SignIn))
+
+        viewModel.signIn("username", "password")
+        viewModel.currentStep shouldBe AuthenticatorStep.PasswordReset
+    }
+
+    @Test
+    fun `Password reset returns a result of DONE, state should be sign in`() = runTest {
+        coEvery { authProvider.fetchAuthSession() } returns Success(mockAuthSession(isSignedIn = false))
+        coEvery { authProvider.resetPassword(any()) } returns Success(
+            AuthResetPasswordResult(
+                true,
+                AuthNextResetPasswordStep(AuthResetPasswordStep.DONE, emptyMap(), null)
+            )
+        )
+        viewModel.start(mockAuthenticatorConfiguration(initialStep = AuthenticatorStep.PasswordReset))
+
+        viewModel.resetPassword("username")
+        viewModel.currentStep shouldBe AuthenticatorStep.SignIn
+    }
+
+    @Test
+    fun `Password reset fails with an error, state should stay in PasswordReset`() = runTest {
+        coEvery { authProvider.fetchAuthSession() } returns Success(mockAuthSession(isSignedIn = false))
+        coEvery { authProvider.resetPassword(any()) } returns Error(
+            mockk<UnknownException> {
+                every { cause } returns mockk<HttpException> {
+                    every { cause } returns mockk<UnknownHostException>()
+                }
+            }
+        )
+        viewModel.start(mockAuthenticatorConfiguration(initialStep = AuthenticatorStep.PasswordReset))
+
+        viewModel.resetPassword("username")
+        viewModel.currentStep shouldBe AuthenticatorStep.PasswordReset
+    }
+
+    @Test
+    fun `Password reset confirmation succeeds, sign in succeeds, state should be signed in`() = runTest {
+        coEvery { authProvider.fetchAuthSession() } returns Success(mockAuthSession(isSignedIn = false))
+        coEvery { authProvider.resetPassword(any()) } returns Success(
+            AuthResetPasswordResult(
+                true,
+                AuthNextResetPasswordStep(AuthResetPasswordStep.CONFIRM_RESET_PASSWORD_WITH_CODE, emptyMap(), null)
+            )
+        )
+
+        coEvery { authProvider.confirmResetPassword(any(), any(), any()) } returns Success(Unit)
+        coEvery { authProvider.signIn(any(), any()) } returns Success(mockSignInResult())
+
+        viewModel.start(mockAuthenticatorConfiguration(initialStep = AuthenticatorStep.PasswordReset))
+
+        viewModel.resetPassword("username")
+        viewModel.confirmResetPassword("username", "password", "code")
+        viewModel.currentStep shouldBe AuthenticatorStep.SignedIn
+    }
+
+    @Test
+    fun `Password reset confirmation fails, state should stay in PasswordResetConfirm`() = runTest {
+        coEvery { authProvider.fetchAuthSession() } returns Success(mockAuthSession(isSignedIn = false))
+        coEvery { authProvider.resetPassword(any()) } returns Success(
+            AuthResetPasswordResult(
+                true,
+                AuthNextResetPasswordStep(AuthResetPasswordStep.CONFIRM_RESET_PASSWORD_WITH_CODE, emptyMap(), null)
+            )
+        )
+
+        coEvery { authProvider.confirmResetPassword(any(), any(), any()) } returns Error(
+            mockk<UnknownException> {
+                every { cause } returns mockk<HttpException> {
+                    every { cause } returns mockk<UnknownHostException>()
+                }
+            }
+        )
+
+        viewModel.start(mockAuthenticatorConfiguration(initialStep = AuthenticatorStep.PasswordReset))
+
+        viewModel.resetPassword("username")
+        viewModel.confirmResetPassword("username", "password", "code")
+        viewModel.currentStep shouldBe AuthenticatorStep.PasswordResetConfirm
+    }
+
+    @Test
+    fun `Password reset confirmation succeeds, sign in fails, state should be sign in`() = runTest {
+        coEvery { authProvider.fetchAuthSession() } returns Success(mockAuthSession(isSignedIn = false))
+        coEvery { authProvider.resetPassword(any()) } returns Success(
+            AuthResetPasswordResult(
+                true,
+                AuthNextResetPasswordStep(AuthResetPasswordStep.CONFIRM_RESET_PASSWORD_WITH_CODE, emptyMap(), null)
+            )
+        )
+
+        coEvery { authProvider.confirmResetPassword(any(), any(), any()) } returns Success(Unit)
+        coEvery { authProvider.signIn(any(), any()) } returns Error(
+            mockk<UnknownException> {
+                every { cause } returns mockk<HttpException> {
+                    every { cause } returns mockk<UnknownHostException>()
+                }
+            }
+        )
+
+        viewModel.start(mockAuthenticatorConfiguration(initialStep = AuthenticatorStep.PasswordReset))
+
+        viewModel.resetPassword("username")
+        viewModel.confirmResetPassword("username", "password", "code")
+        viewModel.currentStep shouldBe AuthenticatorStep.SignIn
+    }
+//endregion
 //region helpers
     private val AuthenticatorViewModel.currentStep: AuthenticatorStep
         get() = stepState.value.step