fix(authenticator): fix signed in state when access token is expired (#…

…170) Co-authored-by: Matt Creaser <[email protected]>
aws-amplify · Aug 16, 2024 · 77fbc8a · 77fbc8a
1 parent 888460d
commit 77fbc8a
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 1 deletion.
diff --git a/authenticator/src/main/java/com/amplifyframework/ui/authenticator/AuthenticatorViewModel.kt b/authenticator/src/main/java/com/amplifyframework/ui/authenticator/AuthenticatorViewModel.kt
@@ -35,6 +35,7 @@ import com.amplifyframework.auth.cognito.exceptions.service.UserNotConfirmedExce
 import com.amplifyframework.auth.cognito.exceptions.service.UserNotFoundException
 import com.amplifyframework.auth.cognito.exceptions.service.UsernameExistsException
 import com.amplifyframework.auth.exceptions.NotAuthorizedException
+import com.amplifyframework.auth.exceptions.SessionExpiredException
 import com.amplifyframework.auth.exceptions.UnknownException
 import com.amplifyframework.auth.options.AuthSignUpOptions
 import com.amplifyframework.auth.result.AuthResetPasswordResult
@@ -573,7 +574,17 @@ internal class AuthenticatorViewModel(
     private suspend fun handleSignedIn() {
         logger.debug("Log in successful, getting current user")
         when (val result = authProvider.getCurrentUser()) {
-            is AmplifyResult.Error -> handleGeneralFailure(result.error)
+            is AmplifyResult.Error -> {
+                if (result.error is SessionExpiredException) {
+                    logger.error(result.error.toString())
+                    logger.error("Current signed in user session has expired, signing out.")
+                    signOut()
+                    moveTo(AuthenticatorStep.SignIn)
+                } else {
+                    handleGeneralFailure(result.error)
+                }
+            }
+
             is AmplifyResult.Success -> moveTo(stateFactory.newSignedInState(result.data, this::signOut))
         }
     }

diff --git a/...ticator/src/test/java/com/amplifyframework/ui/authenticator/AuthenticatorViewModelTest.kt b/...ticator/src/test/java/com/amplifyframework/ui/authenticator/AuthenticatorViewModelTest.kt
@@ -20,6 +20,7 @@ import aws.smithy.kotlin.runtime.http.HttpException
 import com.amplifyframework.auth.AuthUserAttributeKey.email
 import com.amplifyframework.auth.AuthUserAttributeKey.emailVerified
 import com.amplifyframework.auth.MFAType
+import com.amplifyframework.auth.exceptions.SessionExpiredException
 import com.amplifyframework.auth.exceptions.UnknownException
 import com.amplifyframework.auth.result.AuthResetPasswordResult
 import com.amplifyframework.auth.result.step.AuthNextResetPasswordStep
@@ -129,6 +130,21 @@ class AuthenticatorViewModelTest {
         viewModel.currentStep shouldBe AuthenticatorStep.Error
     }
 
+    @Test
+    fun `getCurrentUser error with session expired exception during start results in SignIn state`() = runTest {
+        coEvery { authProvider.fetchAuthSession() } returns Success(mockAuthSession(isSignedIn = true))
+        coEvery { authProvider.getCurrentUser() } returns AmplifyResult.Error(SessionExpiredException())
+
+        viewModel.start(mockAuthenticatorConfiguration())
+        advanceUntilIdle()
+
+        coVerify(exactly = 1) {
+            authProvider.fetchAuthSession()
+            authProvider.getCurrentUser()
+        }
+        viewModel.currentStep shouldBe AuthenticatorStep.SignIn
+    }
+
     @Test
     fun `when already signed in during start the initial state should be signed in`() = runTest {
         coEvery { authProvider.fetchAuthSession() } returns Success(mockAuthSession(isSignedIn = true))