feat(Auth): Updating the Sign In resolver to add new cases (#3104)

Author: harsh62

.gitignore

@@ -86,4 +86,5 @@ GraphQLModelBasedTests-amplifyconfiguration.json
 GraphQLWithIAMIntegrationTests-amplifyconfiguration.json
 GraphQLWithIAMIntegrationTests-credentials.json
 
-AWSDataStoreCategoryPluginIntegrationTests-amplifyconfiguration.json
+AWSDataStoreCategoryPluginIntegrationTests-amplifyconfiguration.json
+*.code-workspace

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Service/ErrorMapping/RespondToAuthChallengeOutputError+AuthError.swift

@@ -49,11 +49,11 @@ extension RespondToAuthChallengeOutputError: AuthErrorConvertible {
                                      AWSCognitoAuthError.invalidParameter)
         case .invalidSmsRoleAccessPolicyException(let exception):
             return AuthError.service(exception.message ?? "Invalid SMS Role Access Policy error",
-                                     AuthPluginErrorConstants.invalidParameterError,
+                                     AuthPluginErrorConstants.invalidSMSRoleError,
                                      AWSCognitoAuthError.smsRole)
         case .invalidSmsRoleTrustRelationshipException(let exception):
             return AuthError.service(exception.message ?? "Invalid SMS Role Trust Relationship error",
-                                     AuthPluginErrorConstants.invalidParameterError,
+                                     AuthPluginErrorConstants.invalidSMSRoleError,
                                      AWSCognitoAuthError.smsRole)
         case .invalidUserPoolConfigurationException(let exception):
             return AuthError.configuration(exception.message ?? "Invalid UserPool Configuration error",

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Service/ErrorMapping/VerifySoftwareTokenOutputError+AuthError.swift

@@ -19,7 +19,7 @@ extension VerifySoftwareTokenOutputError: AuthErrorConvertible {
         case .enableSoftwareTokenMFAException(let exception):
             return AuthError.service(
                 exception.message ?? "Unable to enable software token MFA",
-                AuthPluginErrorConstants.serviceError,
+                AuthPluginErrorConstants.softwareTokenNotFoundError,
                 AWSCognitoAuthError.softwareTokenMFANotEnabled)
         case .forbiddenException(let forbiddenException):
             return .service(

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/SignIn/SignInState+Resolver.swift

@@ -142,6 +142,14 @@ extension SignInState {
                                  actions: [action])
                 }
 
+                if let signInEvent = event as? SignInEvent,
+                   case .initiateTOTPSetup(_, let challengeResponse) = signInEvent.eventType {
+                    let action = InitializeTOTPSetup(
+                        authResponse: challengeResponse)
+                    return .init(newState: .resolvingTOTPSetup(.notStarted, signInEventData),
+                                 actions: [action])
+                }
+
                 let resolution = CustomSignInState.Resolver().resolve(
                     oldState: customSignInState, byApplying: event)
                 let signingInWithCustom = SignInState.signingInWithCustom(
@@ -178,6 +186,14 @@ extension SignInState {
                                  actions: [action])
                 }
 
+                if let signInEvent = event as? SignInEvent,
+                   case .initiateTOTPSetup(_, let challengeResponse) = signInEvent.eventType {
+                    let action = InitializeTOTPSetup(
+                        authResponse: challengeResponse)
+                    return .init(newState: .resolvingTOTPSetup(.notStarted, signInEventData),
+                                 actions: [action])
+                }
+
                 let resolution = MigrateSignInState.Resolver().resolve(
                     oldState: migrateSignInState, byApplying: event)
                 let signingInWithMigration = SignInState.signingInViaMigrateAuth(
@@ -215,6 +231,19 @@ extension SignInState {
                         signInMethod), actions: [action])
                 }
 
+                if let signInEvent = event as? SignInEvent,
+                   case .initiateTOTPSetup(let username, let challengeResponse) = signInEvent.eventType {
+                    let action = InitializeTOTPSetup(
+                        authResponse: challengeResponse)
+                    return .init(
+                        newState: .resolvingTOTPSetup(
+                            .notStarted,
+                            .init(username: username,
+                                  password: nil,
+                                  signInMethod: signInMethod)),
+                        actions: [action])
+                }
+
                 let resolution = SignInChallengeState.Resolver().resolve(
                     oldState: challengeState,
                     byApplying: event)
@@ -246,6 +275,14 @@ extension SignInState {
                                  actions: [action])
                 }
 
+                if let signInEvent = event as? SignInEvent,
+                   case .initiateTOTPSetup(_, let challengeResponse) = signInEvent.eventType {
+                    let action = InitializeTOTPSetup(
+                        authResponse: challengeResponse)
+                    return .init(newState: .resolvingTOTPSetup(.notStarted, signInEventData),
+                                 actions: [action])
+                }
+
                 if let signInEvent = event as? SignInEvent,
                    case .confirmDevice(let signedInData) = signInEvent.eventType {
                     let action = ConfirmDevice(signedInData: signedInData)
@@ -318,6 +355,19 @@ extension SignInState {
                         signInMethod), actions: [action])
                 }
 
+                if let signInEvent = event as? SignInEvent,
+                   case .initiateTOTPSetup(let username, let challengeResponse) = signInEvent.eventType {
+                    let action = InitializeTOTPSetup(
+                        authResponse: challengeResponse)
+                    return .init(newState:
+                            .resolvingTOTPSetup(
+                                .notStarted,
+                                .init(username: username,
+                                      password: nil,
+                                      signInMethod: signInMethod)),
+                                 actions: [action])
+                }
+
                 let resolution = DeviceSRPState.Resolver().resolve(oldState: deviceSrpState,
                                                                    byApplying: event)
                 let resolvingDeviceSrpa = SignInState.resolvingDeviceSrpa(resolution.newState)

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/FetchMFAPreferenceTask.swift

@@ -11,7 +11,7 @@ import AWSPluginsCore
 import ClientRuntime
 import AWSCognitoIdentityProvider
 
-protocol AuthFetchMFAPreferenceTask: AmplifyAuthTask where Request == Void,
+protocol AuthFetchMFAPreferenceTask: AmplifyAuthTask where Request == Never,
                                                            Success == UserMFAPreference,
                                                            Failure == AuthError {}
 

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/Protocols/AuthDeleteUserTask.swift

@@ -7,7 +7,7 @@
 import Foundation
 import Amplify
 
-protocol AuthDeleteUserTask: AmplifyAuthTask where Request == Void, Success == Void, Failure == AuthError { }
+protocol AuthDeleteUserTask: AmplifyAuthTask where Request == Never, Success == Void, Failure == AuthError { }
 
 public extension HubPayload.EventName.Auth {
 

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/Protocols/AuthSetUpTOTPTask.swift

@@ -8,7 +8,7 @@
 import Foundation
 import Amplify
 
-protocol AuthSetUpTOTPTask: AmplifyAuthTask where Request == Void, Success == TOTPSetupDetails, Failure == AuthError {}
+protocol AuthSetUpTOTPTask: AmplifyAuthTask where Request == Never, Success == TOTPSetupDetails, Failure == AuthError {}
 
 public extension HubPayload.EventName.Auth {
 

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/UpdateMFAPreferenceTask.swift

@@ -11,7 +11,7 @@ import AWSPluginsCore
 import ClientRuntime
 import AWSCognitoIdentityProvider
 
-protocol AuthUpdateMFAPreferenceTask: AmplifyAuthTask where Request == Void,
+protocol AuthUpdateMFAPreferenceTask: AmplifyAuthTask where Request == Never,
                                                             Success == Void,
                                                             Failure == AuthError {}