feat(Auth): Add Passwordless Sign In with OTP implementation

Amplify/Categories/Auth/Models/AuthPasswordlessDeliveryDestination.swift

@@ -9,7 +9,7 @@ import Foundation
 
 /// Delivery destination for the Auth Passwordless flows
 ///
-public enum AuthPasswordlessDeliveryDestination {
-   case sms
-   case email
+public enum AuthPasswordlessDeliveryDestination: String {
+   case sms = "SMS"
+   case email = "EMAIL"
 }

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Models/Options/AWSAuthConfirmSignInOptions.swift

@@ -11,6 +11,7 @@ public struct AWSAuthConfirmSignInOptions {
     /// User attributes to be passed in when confirming a sign with NEW_PASSWORD_REQUIRED challenge
     public let userAttributes: [AuthUserAttribute]?
 
+    /// A map of custom key-value pairs that you can provide as input for any custom workflows that this action triggers.
     public let metadata: [String: String]?
 
     /// Device name that would be provided to Cognito when setting up TOTP

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Models/Options/AWSAuthConfirmSignInWithMagicLinkOptions.swift

@@ -0,0 +1,17 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+import Amplify
+
+public struct AWSAuthConfirmSignInWithMagicLinkOptions {
+
+    /// A map of custom key-value pairs that you can provide as input for any custom workflows that this action triggers.
+    public let metadata: [String: String]?
+
+    public init(metadata: [String: String]? = nil) {
+        self.metadata = metadata
+    }
+}

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Models/Options/AWSAuthConfirmSignInWithOTPOptions.swift

@@ -0,0 +1,17 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+import Amplify
+
+public struct AWSAuthConfirmSignInWithOTPOptions {
+
+    /// A map of custom key-value pairs that you can provide as input for any custom workflows that this action triggers.
+    public let metadata: [String: String]?
+
+    public init(metadata: [String: String]? = nil) {
+        self.metadata = metadata
+    }
+}

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Models/PasswordlessCustomAuthNextStep.swift

@@ -0,0 +1,15 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+import Foundation
+
+enum PasswordlessCustomAuthNextStep: String {
+
+    case provideAuthParameters = "PROVIDE_AUTH_PARAMETERS"
+
+    case provideChallengeResponse = "PROVIDE_CHALLENGE_RESPONSE"
+}

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Models/PasswordlessCustomAuthRequest.swift

@@ -0,0 +1,47 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+import Amplify
+import Foundation
+
+enum PasswordlessCustomAuthSignInMethod: String {
+    case otp = "OTP"
+    case magicLink = "MAGIC_LINK"
+}
+
+enum PasswordlessCustomAuthRequestAction: String {
+    case request = "REQUEST"
+    case confirm = "CONFIRM"
+}
+
+struct PasswordlessCustomAuthRequest {
+
+    private let namespace = "Amplify.Passwordless"
+
+    let signInMethod: PasswordlessCustomAuthSignInMethod
+    let action: PasswordlessCustomAuthRequestAction
+    let deliveryMedium: AuthPasswordlessDeliveryDestination?
+
+    init(signInMethod: PasswordlessCustomAuthSignInMethod,
+         action: PasswordlessCustomAuthRequestAction,
+         deliveryMedium: AuthPasswordlessDeliveryDestination? = nil) {
+        self.signInMethod = signInMethod
+        self.action = action
+        self.deliveryMedium = deliveryMedium
+    }
+
+    func toDictionary() -> [String: String] {
+        var dictionary = [
+            namespace + ".signInMethod": signInMethod.rawValue,
+            namespace + ".action": action.rawValue
+        ]
+        if let deliveryMedium = deliveryMedium {
+            dictionary[namespace + ".deliveryMedium"] = deliveryMedium.rawValue
+        }
+        return dictionary
+    }
+}

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/CodeGen/Data/SignInEventData.swift

@@ -16,7 +16,7 @@ struct SignInEventData {
     let signInMethod: SignInMethod
 
     init(username: String?,
-         password: String?,
+         password: String? = nil,
          clientMetadata: [String: String] = [:],
          signInMethod: SignInMethod) {
         self.username = username

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

@@ -14,6 +14,7 @@ class AWSAuthConfirmSignInWithOTPTask: AuthConfirmSignInWithOTPTask, DefaultLogg
     private let authStateMachine: AuthStateMachine
     private let taskHelper: AWSAuthTaskHelper
     private let authConfiguration: AuthConfiguration
+    private let confirmSignInRequestMetadata: PasswordlessCustomAuthRequest
 
     var eventName: HubPayloadEventName {
         HubPayload.EventName.Auth.confirmSignInWithOTPAPI
@@ -26,21 +27,13 @@ class AWSAuthConfirmSignInWithOTPTask: AuthConfirmSignInWithOTPTask, DefaultLogg
         self.authStateMachine = stateMachine
         self.taskHelper = AWSAuthTaskHelper(authStateMachine: authStateMachine)
         self.authConfiguration = configuration
+        self.confirmSignInRequestMetadata = .init(signInMethod: .otp, action: .confirm)
     }
 
     func execute() async throws -> AuthSignInResult {
         log.verbose("Starting execution")
         await taskHelper.didStateMachineConfigured()
 
-        //Check if we have a user pool configuration
-        guard authConfiguration.getUserPoolConfiguration() != nil else {
-            let message = AuthPluginErrorConstants.configurationError
-            let authError = AuthError.configuration(
-                "Could not find user pool configuration",
-                message)
-            throw authError
-        }
-
         if let validationError = request.hasError() {
             throw validationError
         }
@@ -53,11 +46,6 @@ class AWSAuthConfirmSignInWithOTPTask: AuthConfirmSignInWithOTPTask, DefaultLogg
             throw invalidStateError
         }
 
-        // [HS] TODO: Following implementations need to be complete
-        // 1. Validate it is the correct state to confirm Sign In With OTP
-        // 2. Send event
-        // 3. Listent to events
-        // 4. Complete the task
         guard case .resolvingChallenge(let challengeState, _, _) = signInState else {
             throw invalidStateError
         }
@@ -70,7 +58,6 @@ class AWSAuthConfirmSignInWithOTPTask: AuthConfirmSignInWithOTPTask, DefaultLogg
             throw invalidStateError
         }
 
-
         let stateSequences = await authStateMachine.listen()
         log.verbose("Waiting for response")
         for await state in stateSequences {
@@ -110,14 +97,18 @@ class AWSAuthConfirmSignInWithOTPTask: AuthConfirmSignInWithOTPTask, DefaultLogg
     }
 
     private func createConfirmSignInEventData() -> ConfirmSignInEventData {
-
-        // [HS] TODO: Confirm if any metadata needs to be passed during confirm sign in
-        /*
-         * Attributes
-         * Metadata
-         * Device Name
-         */
+        var passwordlessMetadata = confirmSignInRequestMetadata.toDictionary()
+        if let customerMetadata = (request.options.pluginOptions as? AWSAuthConfirmSignInWithOTPOptions)?.metadata {
+            passwordlessMetadata.merge(customerMetadata, uniquingKeysWith: { passwordlessMetadata, customerMetadata in
+                // Ideally key collision won't happen, because passwordless has been namespaced
+                // if for some reason collision still happens,
+                // prioritizing passwordlessFlow keys for flow to continue without any issues.
+                passwordlessMetadata
+
+            })
+        }
         return ConfirmSignInEventData(
-            answer: self.request.challengeResponse)
+            answer: self.request.challengeResponse,
+            metadata: passwordlessMetadata)
     }
 }