fix(auth): Emit SIGNED_IN event after autoSignIn (#3068)

Author: mattcreaser

aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/usecases/AuthUseCaseFactory.kt

@@ -20,13 +20,11 @@ import com.amplifyframework.auth.cognito.AuthStateMachine
 import com.amplifyframework.auth.cognito.RealAWSCognitoAuthPlugin
 import com.amplifyframework.auth.cognito.helpers.WebAuthnHelper
 import com.amplifyframework.auth.cognito.requireIdentityProviderClient
-import com.amplifyframework.auth.plugins.core.AuthHubEventEmitter
 
 internal class AuthUseCaseFactory(
     private val plugin: RealAWSCognitoAuthPlugin,
     private val authEnvironment: AuthEnvironment,
-    private val stateMachine: AuthStateMachine,
-    private val hubEmitter: AuthHubEventEmitter = AuthHubEventEmitter()
+    private val stateMachine: AuthStateMachine
 ) {
 
     fun fetchAuthSession() = FetchAuthSessionUseCase(plugin)
@@ -143,8 +141,7 @@ internal class AuthUseCaseFactory(
     )
 
     fun autoSignIn() = AutoSignInUseCase(
-        stateMachine = stateMachine,
-        hubEmitter = hubEmitter
+        stateMachine = stateMachine
     )
 
     fun fetchMfaPreference() = FetchMfaPreferenceUseCase(

aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/usecases/AutoSignInUseCase.kt

@@ -33,12 +33,13 @@ import com.amplifyframework.statemachine.codegen.states.AuthorizationState
 import com.amplifyframework.statemachine.codegen.states.SignInState
 import com.amplifyframework.statemachine.codegen.states.SignUpState
 import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.mapNotNull
 import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.transformWhile
 
 internal class AutoSignInUseCase(
     private val stateMachine: AuthStateMachine,
-    private val hubEmitter: AuthHubEventEmitter
+    private val hubEmitter: AuthHubEventEmitter = AuthHubEventEmitter()
 ) {
     suspend fun execute(): AuthSignInResult {
         val authState = waitForSignedOutState()
@@ -88,7 +89,7 @@ internal class AutoSignInUseCase(
                 val event = AuthenticationEvent(AuthenticationEvent.EventType.SignInRequested(signInData))
                 stateMachine.send(event)
             }
-            .transformWhile { authState ->
+            .mapNotNull { authState ->
                 val authNState = authState.authNState
                 val authZState = authState.authZState
                 when {
@@ -97,7 +98,7 @@ internal class AutoSignInUseCase(
                         if (signInState is SignInState.Error) {
                             throw CognitoAuthExceptionConverter.lookup(signInState.exception, "Sign in failed.")
                         }
-                        true
+                        null
                     }
                     authNState is AuthenticationState.SignedIn &&
                         authZState is AuthorizationState.SessionEstablished -> {
@@ -114,11 +115,10 @@ internal class AutoSignInUseCase(
                                 null
                             )
                         )
-                        emit(authSignInResult)
                         hubEmitter.sendHubEvent(AuthChannelEventName.SIGNED_IN.toString())
-                        false
+                        authSignInResult
                     }
-                    else -> true
+                    else -> null
                 }
             }.first()
         return result

aws-auth-cognito/src/test/java/com/amplifyframework/auth/cognito/usecases/AutoSignInUseCaseTest.kt

@@ -15,6 +15,7 @@
 
 package com.amplifyframework.auth.cognito.usecases
 
+import com.amplifyframework.auth.AuthChannelEventName
 import com.amplifyframework.auth.cognito.AuthStateMachine
 import com.amplifyframework.auth.cognito.exceptions.configuration.InvalidUserPoolConfigurationException
 import com.amplifyframework.auth.cognito.testUtil.withAuthEvent
@@ -137,4 +138,29 @@ class AutoSignInUseCaseTest {
         result.isSignedIn shouldBe true
         result.nextStep.signInStep shouldBe AuthSignInStep.DONE
     }
+
+    @Test
+    fun `emits auth hub event`() = runTest {
+        stateFlow.value = authState(
+            AuthenticationState.SignedOut(mockk()),
+            authSignUpState = SignUpState.SignedUp(signUpData, mockk())
+        )
+
+        val deferred = backgroundScope.async { useCase.execute() }
+        runCurrent()
+
+        stateFlow.value = authState(AuthenticationState.SigningIn())
+        runCurrent()
+
+        stateFlow.value = authState(
+            AuthenticationState.SignedIn(mockk(), mockk()),
+            AuthorizationState.SessionEstablished(mockk())
+        )
+
+        deferred.await()
+
+        verify {
+            hubEmitter.sendHubEvent(AuthChannelEventName.SIGNED_IN.toString())
+        }
+    }
 }