Add userAttributes to confirmSignIn call

aws-amplify · Nov 17, 2023 · 58d6823 · 58d6823
1 parent 644be2d
commit 58d6823
Show file tree

Hide file tree

Showing 7 changed files with 44 additions and 11 deletions.
diff --git a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/RealAWSCognitoAuthPlugin.kt b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/RealAWSCognitoAuthPlugin.kt
@@ -785,12 +785,15 @@ internal class RealAWSCognitoAuthPlugin(
             },
             {
                 val awsCognitoConfirmSignInOptions = options as? AWSCognitoAuthConfirmSignInOptions
+                val metadata = awsCognitoConfirmSignInOptions?.metadata ?: emptyMap()
+                val userAttributes = awsCognitoConfirmSignInOptions?.userAttributes ?: emptyList()
                 when (signInState) {
                     is SignInState.ResolvingChallenge -> {
                         val event = SignInChallengeEvent(
                             SignInChallengeEvent.EventType.VerifyChallengeAnswer(
                                 challengeResponse,
-                                awsCognitoConfirmSignInOptions?.metadata ?: mapOf()
+                                metadata,
+                                userAttributes
                             )
                         )
                         authStateMachine.send(event)

diff --git a/.../src/main/java/com/amplifyframework/auth/cognito/actions/SignInChallengeCognitoActions.kt b/.../src/main/java/com/amplifyframework/auth/cognito/actions/SignInChallengeCognitoActions.kt
@@ -18,6 +18,7 @@ package com.amplifyframework.auth.cognito.actions
 import aws.sdk.kotlin.services.cognitoidentityprovider.model.ChallengeNameType
 import aws.sdk.kotlin.services.cognitoidentityprovider.model.ResourceNotFoundException
 import aws.sdk.kotlin.services.cognitoidentityprovider.respondToAuthChallenge
+import com.amplifyframework.auth.AuthUserAttribute
 import com.amplifyframework.auth.cognito.AuthEnvironment
 import com.amplifyframework.auth.cognito.helpers.AuthHelper
 import com.amplifyframework.auth.cognito.helpers.SignInChallengeHelper
@@ -32,9 +33,11 @@ import com.amplifyframework.statemachine.codegen.events.SignInChallengeEvent
 internal object SignInChallengeCognitoActions : SignInChallengeActions {
     private const val KEY_SECRET_HASH = "SECRET_HASH"
     private const val KEY_USERNAME = "USERNAME"
+    private const val KEY_PREFIX_USER_ATTRIBUTE = "userAttributes."
     override fun verifyChallengeAuthAction(
         answer: String,
         metadata: Map<String, String>,
+        attributes: List<AuthUserAttribute>,
         challenge: AuthChallenge
     ): Action = Action<AuthEnvironment>("VerifySignInChallenge") { id, dispatcher ->
         logger.verbose("$id Starting execution")
@@ -50,6 +53,12 @@ internal object SignInChallengeCognitoActions : SignInChallengeActions {
                 challengeResponses[responseKey] = answer
             }
 
+            challengeResponses.putAll(
+                attributes.map {
+                    Pair("${KEY_PREFIX_USER_ATTRIBUTE}${it.key.keyString}", it.value)
+                }
+            )
+
             val secretHash = AuthHelper.getSecretHash(
                 username,
                 configuration.userPool?.appClient,
@@ -90,6 +99,7 @@ internal object SignInChallengeCognitoActions : SignInChallengeActions {
                     SignInChallengeEvent.EventType.RetryVerifyChallengeAnswer(
                         answer,
                         metadata,
+                        attributes,
                         challenge
                     )
                 )

diff --git a/...src/main/java/com/amplifyframework/statemachine/codegen/actions/SignInChallengeActions.kt b/...src/main/java/com/amplifyframework/statemachine/codegen/actions/SignInChallengeActions.kt
@@ -15,13 +15,15 @@
 
 package com.amplifyframework.statemachine.codegen.actions
 
+import com.amplifyframework.auth.AuthUserAttribute
 import com.amplifyframework.statemachine.Action
 import com.amplifyframework.statemachine.codegen.data.AuthChallenge
 
 internal interface SignInChallengeActions {
     fun verifyChallengeAuthAction(
         answer: String,
         metadata: Map<String, String>,
+        userAttributes: List<AuthUserAttribute>,
         challenge: AuthChallenge
     ): Action
 }
diff --git a/...to/src/main/java/com/amplifyframework/statemachine/codegen/events/SignInChallengeEvent.kt b/...to/src/main/java/com/amplifyframework/statemachine/codegen/events/SignInChallengeEvent.kt
@@ -15,18 +15,24 @@
 
 package com.amplifyframework.statemachine.codegen.events
 
+import com.amplifyframework.auth.AuthUserAttribute
 import com.amplifyframework.statemachine.StateMachineEvent
 import com.amplifyframework.statemachine.codegen.data.AuthChallenge
 import java.util.Date
 
 internal class SignInChallengeEvent(val eventType: EventType, override val time: Date? = null) : StateMachineEvent {
     sealed class EventType {
         data class WaitForAnswer(val challenge: AuthChallenge, val hasNewResponse: Boolean = false) : EventType()
-        data class VerifyChallengeAnswer(val answer: String, val metadata: Map<String, String>) : EventType()
+        data class VerifyChallengeAnswer(
+            val answer: String,
+            val metadata: Map<String, String>,
+            val userAttributes: List<AuthUserAttribute>
+        ) : EventType()
 
         data class RetryVerifyChallengeAnswer(
             val answer: String,
             val metadata: Map<String, String>,
+            val userAttributes: List<AuthUserAttribute>,
             val authChallenge: AuthChallenge
         ) : EventType()
         data class FinalizeSignIn(val accessToken: String) : EventType()

diff --git a/...to/src/main/java/com/amplifyframework/statemachine/codegen/states/SignInChallengeState.kt b/...to/src/main/java/com/amplifyframework/statemachine/codegen/states/SignInChallengeState.kt
@@ -60,7 +60,10 @@ internal sealed class SignInChallengeState : State {
                 is WaitingForAnswer -> when (challengeEvent) {
                     is SignInChallengeEvent.EventType.VerifyChallengeAnswer -> {
                         val action = challengeActions.verifyChallengeAuthAction(
-                            challengeEvent.answer, challengeEvent.metadata, oldState.challenge
+                            challengeEvent.answer,
+                            challengeEvent.metadata,
+                            challengeEvent.userAttributes,
+                            oldState.challenge
                         )
                         StateResolution(Verifying(oldState.challenge.challengeName), listOf(action))
                     }
@@ -78,7 +81,10 @@ internal sealed class SignInChallengeState : State {
                     }
                     is SignInChallengeEvent.EventType.RetryVerifyChallengeAnswer -> {
                         val action = challengeActions.verifyChallengeAuthAction(
-                            challengeEvent.answer, challengeEvent.metadata, challengeEvent.authChallenge
+                            challengeEvent.answer,
+                            challengeEvent.metadata,
+                            challengeEvent.userAttributes,
+                            challengeEvent.authChallenge,
                         )
                         StateResolution(Verifying(challengeEvent.authChallenge.challengeName), listOf(action))
                     }
@@ -92,7 +98,10 @@ internal sealed class SignInChallengeState : State {
                     when (challengeEvent) {
                         is SignInChallengeEvent.EventType.VerifyChallengeAnswer -> {
                             val action = challengeActions.verifyChallengeAuthAction(
-                                challengeEvent.answer, challengeEvent.metadata, oldState.challenge
+                                challengeEvent.answer,
+                                challengeEvent.metadata,
+                                challengeEvent.userAttributes,
+                                oldState.challenge,
                             )
                             StateResolution(Verifying(oldState.challenge.challengeName), listOf(action))
                         }

diff --git a/aws-auth-cognito/src/test/java/com/amplifyframework/auth/cognito/StateTransitionTestBase.kt b/aws-auth-cognito/src/test/java/com/amplifyframework/auth/cognito/StateTransitionTestBase.kt
@@ -329,8 +329,9 @@ open class StateTransitionTestBase {
             mockSignInChallengeActions.verifyChallengeAuthAction(
                 MockitoHelper.anyObject(),
                 MockitoHelper.anyObject(),
-                MockitoHelper.anyObject()
-            )
+                MockitoHelper.anyObject(),
+                MockitoHelper.anyObject(),
+                )
         )
             .thenReturn(
                 Action { dispatcher, _ ->

diff --git a/aws-auth-cognito/src/test/java/com/amplifyframework/auth/cognito/StateTransitionTests.kt b/aws-auth-cognito/src/test/java/com/amplifyframework/auth/cognito/StateTransitionTests.kt
@@ -387,12 +387,13 @@ class StateTransitionTests : StateTransitionTestBase() {
                         SignInChallengeEvent(
                             SignInChallengeEvent.EventType.RetryVerifyChallengeAnswer(
                                 "test",
-                                mapOf(),
+                                emptyMap(),
+                                emptyList(),
                                 AuthChallenge(
                                     ChallengeNameType.CustomChallenge.toString(),
                                     "Test",
                                     "session_mock_value",
-                                    mapOf()
+                                    emptyMap(),
                                 )
                             )
                         )
@@ -401,7 +402,8 @@ class StateTransitionTests : StateTransitionTestBase() {
                         SignInChallengeEvent(
                             SignInChallengeEvent.EventType.VerifyChallengeAnswer(
                                 "test",
-                                mapOf()
+                                emptyMap(),
+                                emptyList()
                             )
                         )
                     )
@@ -481,7 +483,7 @@ class StateTransitionTests : StateTransitionTestBase() {
                 challengeState?.apply {
                     stateMachine.send(
                         SignInChallengeEvent(
-                            SignInChallengeEvent.EventType.VerifyChallengeAnswer("test", mapOf())
+                            SignInChallengeEvent.EventType.VerifyChallengeAnswer("test", emptyMap(), emptyList())
                         )
                     )
                 }