Update signInMethod

aws-amplify · Nov 26, 2024 · c7bd1dd · c7bd1dd
1 parent 58429a9
commit c7bd1dd
Show file tree

Hide file tree

Showing 13 changed files with 62 additions and 21 deletions.
diff --git a/...auth-cognito/src/main/java/com/amplifyframework/auth/cognito/actions/SRPCognitoActions.kt b/...auth-cognito/src/main/java/com/amplifyframework/auth/cognito/actions/SRPCognitoActions.kt
@@ -246,7 +246,8 @@ internal object SRPCognitoActions : SRPActions {
     override fun verifyPasswordSRPAction(
         challengeParameters: Map<String, String>,
         metadata: Map<String, String>,
-        session: String?
+        session: String?,
+        signInMethod: SignInMethod
     ) =
         Action<AuthEnvironment>("VerifyPasswordSRP") { id, dispatcher ->
             logger.verbose("$id Starting execution")
@@ -294,7 +295,7 @@ internal object SRPCognitoActions : SRPActions {
                         session = response.session,
                         challengeParameters = response.challengeParameters,
                         authenticationResult = response.authenticationResult,
-                        signInMethod = SignInMethod.ApiBased(SignInMethod.ApiBased.AuthType.USER_SRP_AUTH)
+                        signInMethod = signInMethod
                     )
                 } else {
                     throw ServiceException(
@@ -313,7 +314,7 @@ internal object SRPCognitoActions : SRPActions {
                             )
                         )
                     )
-                    SRPEvent(SRPEvent.EventType.RetryRespondPasswordVerifier(challengeParams, metadata, session))
+                    SRPEvent(SRPEvent.EventType.RetryRespondPasswordVerifier(challengeParams, metadata, session, signInMethod))
                 } else {
                     val errorEvent = SRPEvent(SRPEvent.EventType.ThrowPasswordVerifierError(e))
                     logger.verbose("$id Sending event ${errorEvent.type}")

diff --git a/...ognito/src/main/java/com/amplifyframework/auth/cognito/actions/SetupTOTPCognitoActions.kt b/...ognito/src/main/java/com/amplifyframework/auth/cognito/actions/SetupTOTPCognitoActions.kt
@@ -172,7 +172,9 @@ internal object SetupTOTPCognitoActions : SetupTOTPActions {
                 )
             } catch (exception: Exception) {
                 SetupTOTPEvent(
-                    SetupTOTPEvent.EventType.ThrowAuthError(exception, eventType.username, eventType.session, eventType.signInMethod)
+                    SetupTOTPEvent.EventType.ThrowAuthError(
+                        exception, eventType.username, eventType.session, eventType.signInMethod
+                    )
                 )
             }
             dispatcher.send(evt)

diff --git a/...h-cognito/src/main/java/com/amplifyframework/auth/cognito/actions/SignInCognitoActions.kt b/...h-cognito/src/main/java/com/amplifyframework/auth/cognito/actions/SignInCognitoActions.kt
@@ -108,7 +108,9 @@ internal object SignInCognitoActions : SignInActions {
     override fun initResolveChallenge(event: SignInEvent.EventType.ReceivedChallenge) =
         Action<AuthEnvironment>("InitResolveChallenge") { id, dispatcher ->
             logger.verbose("$id Starting execution")
-            val evt = SignInChallengeEvent(SignInChallengeEvent.EventType.WaitForAnswer(event.challenge, event.signInMethod, true))
+            val evt = SignInChallengeEvent(
+                SignInChallengeEvent.EventType.WaitForAnswer(event.challenge, event.signInMethod, true)
+            )
             logger.verbose("$id Sending event ${evt.type}")
             dispatcher.send(evt)
         }

diff --git a/...uth-cognito/src/main/java/com/amplifyframework/auth/cognito/helpers/AuthFlowTypeHelper.kt b/...uth-cognito/src/main/java/com/amplifyframework/auth/cognito/helpers/AuthFlowTypeHelper.kt
@@ -16,6 +16,7 @@ package com.amplifyframework.auth.cognito.helpers
 
 import aws.sdk.kotlin.services.cognitoidentityprovider.model.AuthFlowType as CognitoAuthFlowType
 import com.amplifyframework.auth.cognito.options.AuthFlowType
+import com.amplifyframework.statemachine.codegen.data.SignInMethod
 
 internal fun AuthFlowType.toCognitoType() = when (this) {
     AuthFlowType.USER_SRP_AUTH -> CognitoAuthFlowType.UserSrpAuth
@@ -25,3 +26,12 @@ internal fun AuthFlowType.toCognitoType() = when (this) {
     AuthFlowType.USER_PASSWORD_AUTH -> CognitoAuthFlowType.UserPasswordAuth
     AuthFlowType.USER_AUTH -> CognitoAuthFlowType.UserAuth
 }
+
+internal fun AuthFlowType.toSignInMethod() = when (this) {
+    AuthFlowType.USER_SRP_AUTH -> SignInMethod.ApiBased(SignInMethod.ApiBased.AuthType.USER_SRP_AUTH)
+    AuthFlowType.CUSTOM_AUTH -> SignInMethod.ApiBased(SignInMethod.ApiBased.AuthType.CUSTOM_AUTH)
+    AuthFlowType.CUSTOM_AUTH_WITH_SRP -> SignInMethod.ApiBased(SignInMethod.ApiBased.AuthType.CUSTOM_AUTH)
+    AuthFlowType.CUSTOM_AUTH_WITHOUT_SRP -> SignInMethod.ApiBased(SignInMethod.ApiBased.AuthType.CUSTOM_AUTH)
+    AuthFlowType.USER_PASSWORD_AUTH -> SignInMethod.ApiBased(SignInMethod.ApiBased.AuthType.USER_PASSWORD_AUTH)
+    AuthFlowType.USER_AUTH -> SignInMethod.ApiBased(SignInMethod.ApiBased.AuthType.USER_AUTH)
+}
diff --git a/...uth-cognito/src/main/java/com/amplifyframework/statemachine/codegen/actions/SRPActions.kt b/...uth-cognito/src/main/java/com/amplifyframework/statemachine/codegen/actions/SRPActions.kt
@@ -16,6 +16,7 @@
 package com.amplifyframework.statemachine.codegen.actions
 
 import com.amplifyframework.statemachine.Action
+import com.amplifyframework.statemachine.codegen.data.SignInMethod
 import com.amplifyframework.statemachine.codegen.events.SRPEvent
 
 internal interface SRPActions {
@@ -24,6 +25,7 @@ internal interface SRPActions {
     fun verifyPasswordSRPAction(
         challengeParameters: Map<String, String>,
         metadata: Map<String, String>,
-        session: String?
+        session: String?,
+        signInMethod: SignInMethod
     ): Action
 }
diff --git a/aws-auth-cognito/src/main/java/com/amplifyframework/statemachine/codegen/events/SRPEvent.kt b/aws-auth-cognito/src/main/java/com/amplifyframework/statemachine/codegen/events/SRPEvent.kt
@@ -18,6 +18,7 @@ package com.amplifyframework.statemachine.codegen.events
 import com.amplifyframework.auth.cognito.options.AuthFlowType
 import com.amplifyframework.statemachine.StateMachineEvent
 import com.amplifyframework.statemachine.codegen.data.AuthChallenge
+import com.amplifyframework.statemachine.codegen.data.SignInMethod
 import java.util.Date
 
 internal class SRPEvent(val eventType: EventType, override val time: Date? = null) :
@@ -44,7 +45,8 @@ internal class SRPEvent(val eventType: EventType, override val time: Date? = nul
         data class RetryRespondPasswordVerifier(
             val challengeParameters: Map<String, String>,
             val metadata: Map<String, String>,
-            val session: String?
+            val session: String?,
+            val signInMethod: SignInMethod
         ) : EventType()
 
         data class ThrowAuthError(val exception: Exception) : EventType()

diff --git a/...-cognito/src/main/java/com/amplifyframework/statemachine/codegen/events/SetupTOTPEvent.kt b/...-cognito/src/main/java/com/amplifyframework/statemachine/codegen/events/SetupTOTPEvent.kt
@@ -33,7 +33,12 @@ internal class SetupTOTPEvent(val eventType: EventType, override val time: Date?
             val challengeParams: Map<String, String>?,
             val signInMethod: SignInMethod
         ) : EventType()
-        data class ThrowAuthError(val exception: Exception, val username: String, val session: String?, val signInMethod: SignInMethod) : EventType()
+        data class ThrowAuthError(
+            val exception: Exception,
+            val username: String,
+            val session: String?,
+            val signInMethod: SignInMethod
+        ) : EventType()
         data class VerifyChallengeAnswer(
             val answer: String,
             val username: String,
@@ -43,7 +48,11 @@ internal class SetupTOTPEvent(val eventType: EventType, override val time: Date?
         ) :
             EventType()
 
-        data class RespondToAuthChallenge(val username: String, val session: String?, val signInMethod: SignInMethod) : EventType()
+        data class RespondToAuthChallenge(
+            val username: String,
+            val session: String?,
+            val signInMethod: SignInMethod
+        ) : EventType()
         data class Verified(val id: String = "") : EventType()
     }
 

diff --git a/...-cognito/src/main/java/com/amplifyframework/statemachine/codegen/states/SRPSignInState.kt b/...-cognito/src/main/java/com/amplifyframework/statemachine/codegen/states/SRPSignInState.kt
@@ -15,16 +15,18 @@
 
 package com.amplifyframework.statemachine.codegen.states
 
+import com.amplifyframework.auth.cognito.helpers.toSignInMethod
 import com.amplifyframework.statemachine.State
 import com.amplifyframework.statemachine.StateMachineEvent
 import com.amplifyframework.statemachine.StateMachineResolver
 import com.amplifyframework.statemachine.StateResolution
 import com.amplifyframework.statemachine.codegen.actions.SRPActions
+import com.amplifyframework.statemachine.codegen.data.SignInMethod
 import com.amplifyframework.statemachine.codegen.events.SRPEvent
 
 internal sealed class SRPSignInState : State {
     data class NotStarted(val id: String = "") : SRPSignInState()
-    data class InitiatingSRPA(val id: String = "") : SRPSignInState()
+    data class InitiatingSRPA(val signInMethod: SignInMethod) : SRPSignInState()
     data class RespondingPasswordVerifier(val id: String = "") : SRPSignInState()
     data class SignedIn(val id: String = "") : SRPSignInState()
     data class Cancelling(val id: String = "") : SRPSignInState()
@@ -44,18 +46,18 @@ internal sealed class SRPSignInState : State {
                 is NotStarted -> when (srpEvent) {
                     is SRPEvent.EventType.InitiateSRP -> {
                         val action = srpActions.initiateSRPAuthAction(srpEvent)
-                        StateResolution(InitiatingSRPA(), listOf(action))
+                        StateResolution(InitiatingSRPA(srpEvent.authFlowType.toSignInMethod()), listOf(action))
                     }
                     is SRPEvent.EventType.InitiateSRPWithCustom -> {
                         val action = srpActions.initiateSRPWithCustomAuthAction(srpEvent)
-                        StateResolution(InitiatingSRPA(), listOf(action))
+                        StateResolution(InitiatingSRPA(SignInMethod.ApiBased(SignInMethod.ApiBased.AuthType.CUSTOM_AUTH)), listOf(action))
                     }
                     else -> defaultResolution
                 }
                 is InitiatingSRPA -> when (srpEvent) {
                     is SRPEvent.EventType.RespondPasswordVerifier -> {
                         val action = srpActions.verifyPasswordSRPAction(
-                            srpEvent.challengeParameters, srpEvent.metadata, srpEvent.session
+                            srpEvent.challengeParameters, srpEvent.metadata, srpEvent.session, oldState.signInMethod
                         )
                         StateResolution(RespondingPasswordVerifier(), listOf(action))
                     }
@@ -66,7 +68,7 @@ internal sealed class SRPSignInState : State {
                 is RespondingPasswordVerifier -> when (srpEvent) {
                     is SRPEvent.EventType.RetryRespondPasswordVerifier -> {
                         val action = srpActions.verifyPasswordSRPAction(
-                            srpEvent.challengeParameters, srpEvent.metadata, srpEvent.session
+                            srpEvent.challengeParameters, srpEvent.metadata, srpEvent.session, srpEvent.signInMethod
                         )
                         StateResolution(RespondingPasswordVerifier(), listOf(action))
                     }

diff --git a/...to/src/test/java/com/amplifyframework/auth/cognito/actions/SetupTOTPCognitoActionsTest.kt b/...to/src/test/java/com/amplifyframework/auth/cognito/actions/SetupTOTPCognitoActionsTest.kt
@@ -139,7 +139,11 @@ class SetupTOTPCognitoActionsTest {
         initiateAction.execute(dispatcher, authEnvironment)
 
         val expectedEvent = SetupTOTPEvent(
-            SetupTOTPEvent.EventType.ThrowAuthError(serviceException, "USERNAME", "SESSION", SignInMethod.ApiBased(SignInMethod.ApiBased.AuthType.USER_SRP_AUTH)
+            SetupTOTPEvent.EventType.ThrowAuthError(
+                serviceException,
+                "USERNAME",
+                "SESSION",
+                SignInMethod.ApiBased(SignInMethod.ApiBased.AuthType.USER_SRP_AUTH)
             )
         )
         assertEquals(
@@ -171,7 +175,9 @@ class SetupTOTPCognitoActionsTest {
             }
         }
         val expectedEvent = SetupTOTPEvent(
-            SetupTOTPEvent.EventType.RespondToAuthChallenge(username, session, SignInMethod.ApiBased(SignInMethod.ApiBased.AuthType.USER_SRP_AUTH))
+            SetupTOTPEvent.EventType.RespondToAuthChallenge(
+                username, session, SignInMethod.ApiBased(SignInMethod.ApiBased.AuthType.USER_SRP_AUTH)
+            )
         )
 
         val verifyChallengeAnswerAction = SetupTOTPCognitoActions.verifyChallengeAnswer(
@@ -268,7 +274,12 @@ class SetupTOTPCognitoActionsTest {
             throw serviceException
         }
         val expectedEvent = SetupTOTPEvent(
-            SetupTOTPEvent.EventType.ThrowAuthError(serviceException, "USERNAME", "SESSION", SignInMethod.ApiBased(SignInMethod.ApiBased.AuthType.USER_SRP_AUTH))
+            SetupTOTPEvent.EventType.ThrowAuthError(
+                serviceException,
+                "USERNAME",
+                "SESSION",
+                SignInMethod.ApiBased(SignInMethod.ApiBased.AuthType.USER_SRP_AUTH)
+            )
         )
 
         val verifyChallengeAnswerAction = SetupTOTPCognitoActions.verifyChallengeAnswer(

diff --git a/...amework/auth/cognito/featuretest/generators/authstategenerators/AuthStateJsonGenerator.kt b/...amework/auth/cognito/featuretest/generators/authstategenerators/AuthStateJsonGenerator.kt
@@ -107,7 +107,7 @@ object AuthStateJsonGenerator : SerializableProvider {
                             "CODE_DELIVERY_DESTINATION" to "+12345678900"
                         ),
                     ),
-                    SignInMethod.ApiBased(SignInMethod.ApiBased.AuthType.CUSTOM_AUTH)
+                    SignInMethod.ApiBased(SignInMethod.ApiBased.AuthType.USER_SRP_AUTH)
                 )
             )
         ),

diff --git a/...amework/auth/cognito/featuretest/generators/testcasegenerators/SignInTestCaseGenerator.kt b/...amework/auth/cognito/featuretest/generators/testcasegenerators/SignInTestCaseGenerator.kt
@@ -560,7 +560,7 @@ object SignInTestCaseGenerator : SerializableProvider {
         ),
         validations = listOf(
             mockedSignInSuccessExpectation,
-            ExpectationShapes.State("SignedIn_SessionEstablished.json")
+            ExpectationShapes.State("SignedIn_SessionEstablished_User_Auth.json")
         )
     )
 

diff --git a/.../Test_that_confirmsignin_secondary_challenge_processes_the_custom_challenge_returned.json b/.../Test_that_confirmsignin_secondary_challenge_processes_the_custom_challenge_returned.json
@@ -2,7 +2,7 @@
     "description": "Test that confirmsignin secondary challenge processes the custom challenge returned",
     "preConditions": {
         "amplify-configuration": "authconfiguration.json",
-        "state": "SigningIn_SigningIn.json",
+        "state": "SigningIn_SigningIn_Custom.json",
         "mockedResponses": [
             {
                 "type": "cognitoIdentityProvider",

diff --git a/...t/testsuites/signIn/Test_that_USER_AUTH_signIn_with_PASSWORD_SRP_preference_succeeds.json b/...t/testsuites/signIn/Test_that_USER_AUTH_signIn_with_PASSWORD_SRP_preference_succeeds.json
@@ -83,7 +83,7 @@
         },
         {
             "type": "state",
-            "expectedState": "SignedIn_SessionEstablished.json"
+            "expectedState": "SignedIn_SessionEstablished_User_Auth.json"
         }
     ]
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -107,7 +107,7 @@ object AuthStateJsonGenerator : SerializableProvider { @@
                                 "CODE_DELIVERY_DESTINATION" to "+12345678900"
                             ),
                         ),
-                        SignInMethod.ApiBased(SignInMethod.ApiBased.AuthType.CUSTOM_AUTH)
+                        SignInMethod.ApiBased(SignInMethod.ApiBased.AuthType.USER_SRP_AUTH)
                     )
                 )
             ),
@@ Expand Down @@