feat: Adding visionOS support to the WebAuthn APIs (#171)

sebaland · web-flow · commit d1263a0cabec · 2024-11-14T20:46:30.000-05:00
diff --git a/Amplify/Categories/Auth/AuthCategory+WebAuthnBehaviour.swift b/Amplify/Categories/Auth/AuthCategory+WebAuthnBehaviour.swift
@@ -19,6 +19,16 @@ extension AuthCategory: AuthCategoryWebAuthnBehaviour {
             options: options
         )
     }
+#elseif os(visionOS)
+    public func associateWebAuthnCredential(
+        presentationAnchor: AuthUIPresentationAnchor,
+        options: AuthAssociateWebAuthnCredentialRequest.Options? = nil
+    ) async throws {
+        try await plugin.associateWebAuthnCredential(
+            presentationAnchor:presentationAnchor,
+            options: options
+        )
+    }
 #endif
 
     public func listWebAuthnCredentials(
diff --git a/Amplify/Categories/Auth/AuthCategoryWebAuthnBehaviour.swift b/Amplify/Categories/Auth/AuthCategoryWebAuthnBehaviour.swift
@@ -15,6 +15,11 @@ public protocol AuthCategoryWebAuthnBehaviour: AnyObject {
         presentationAnchor: AuthUIPresentationAnchor?,
         options: AuthAssociateWebAuthnCredentialRequest.Options?
     ) async throws
+#elseif os(visionOS)
+    func associateWebAuthnCredential(
+        presentationAnchor: AuthUIPresentationAnchor,
+        options: AuthAssociateWebAuthnCredentialRequest.Options?
+    ) async throws
 #endif
 
     /// - Tag: AuthCategoryWebAuthnBehaviour.list
diff --git a/Amplify/Categories/Auth/Models/AuthFactorType.swift b/Amplify/Categories/Auth/Models/AuthFactorType.swift
@@ -19,9 +19,9 @@ public enum AuthFactorType: String {
     /// An auth factor that uses Email OTP
     case emailOTP
 
-#if os(iOS) || os(macOS)
+#if os(iOS) || os(macOS) || os(visionOS)
     /// An auth factor that uses WebAuthn
-    @available(iOS 17.4, macOS 13.5, *)
+    @available(iOS 17.4, macOS 13.5, visionOS 1.0, *)
     case webAuthn
 #endif
 }
diff --git a/Amplify/Categories/Auth/Request/AuthAssociateWebAuthnCredentialRequest.swift b/Amplify/Categories/Auth/Request/AuthAssociateWebAuthnCredentialRequest.swift
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#if os(iOS) || os(macOS)
+#if os(iOS) || os(macOS) || os(visionOS)
 import Foundation
 
 /// Request for creating a new WebAuthn Credential and associating it with the signed in user
diff --git a/Amplify/Categories/Auth/Request/AuthConfirmSignInRequest.swift b/Amplify/Categories/Auth/Request/AuthConfirmSignInRequest.swift
@@ -33,7 +33,7 @@ public extension AuthConfirmSignInRequest {
         /// key/values
         public let pluginOptions: Any?
 
-#if os(iOS) || os(macOS)
+#if os(iOS) || os(macOS) || os(visionOS)
         /// Provide a presentation anchor if you are confirming sign in with WebAuthn. The WebAuthn assertion will be presented
         /// in the presentation anchor provided.
         public let presentationAnchorForWebAuthn: AuthUIPresentationAnchor?
diff --git a/Amplify/Categories/Auth/Request/AuthSignInRequest.swift b/Amplify/Categories/Auth/Request/AuthSignInRequest.swift
@@ -35,7 +35,7 @@ public extension AuthSignInRequest {
         /// key/values
         public let pluginOptions: Any?
 
-#if os(iOS) || os(macOS)
+#if os(iOS) || os(macOS) || os(visionOS)
         /// Provide a presentation anchor if you are signing in with WebAuthn. The WebAuthn assertion will be presented
         /// in the presentation anchor provided.
         public let presentationAnchorForWebAuthn: AuthUIPresentationAnchor?
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/VerifySignInChallenge.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/VerifySignInChallenge.swift
@@ -230,7 +230,7 @@ struct VerifySignInChallenge: Action {
     }
 
     private func isWebAuthn(_ factorType: AuthFactorType?) -> Bool {
-    #if os(iOS) || os(macOS)
+    #if os(iOS) || os(macOS) || os(visionOS)
         if #available(iOS 17.4, macOS 13.5, *) {
             return .webAuthn == factorType
         }
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/WebAuthn/AssertWebAuthnCredentials.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/WebAuthn/AssertWebAuthnCredentials.swift
@@ -5,11 +5,11 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#if os(iOS) || os(macOS)
+#if os(iOS) || os(macOS) || os(visionOS)
 import Amplify
 import Foundation
 
-@available(iOS 17.4, macOS 13.5, *)
+@available(iOS 17.4, macOS 13.5, visionOS 1.0, *)
 struct AssertWebAuthnCredentials: Action {
     let identifier = "AssertWebAuthnCredentials"
     let username: String
@@ -75,10 +75,10 @@ struct AssertWebAuthnCredentials: Action {
     }
 }
 
-@available(iOS 17.4, macOS 13.5, *)
+@available(iOS 17.4, macOS 13.5, visionOS 1.0, *)
 extension AssertWebAuthnCredentials: DefaultLogger { }
 
-@available(iOS 17.4, macOS 13.5, *)
+@available(iOS 17.4, macOS 13.5, visionOS 1.0, *)
 extension AssertWebAuthnCredentials: CustomDebugDictionaryConvertible {
     var debugDictionary: [String: Any] {
         [
@@ -90,7 +90,7 @@ extension AssertWebAuthnCredentials: CustomDebugDictionaryConvertible {
     }
 }
 
-@available(iOS 17.4, macOS 13.5, *)
+@available(iOS 17.4, macOS 13.5, visionOS 1.0, *)
 extension AssertWebAuthnCredentials: CustomDebugStringConvertible {
     var debugDescription: String {
         debugDictionary.debugDescription
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/WebAuthn/FetchCredentialOptions.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/WebAuthn/FetchCredentialOptions.swift
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#if os(iOS) || os(macOS)
+#if os(iOS) || os(macOS) || os(visionOS)
 import Amplify
 import Foundation
 import AWSCognitoIdentityProvider
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/WebAuthn/InitializeWebAuthn.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/WebAuthn/InitializeWebAuthn.swift
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#if os(iOS) || os(macOS)
+#if os(iOS) || os(macOS) || os(visionOS)
 import Amplify
 import Foundation
 
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/WebAuthn/PlatformWebAuthnCredentials.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/WebAuthn/PlatformWebAuthnCredentials.swift
@@ -5,28 +5,27 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#if os(iOS) || os(macOS)
+#if os(iOS) || os(macOS) || os(visionOS)
 import Amplify
 import AuthenticationServices
 import Foundation
 
-@available(iOS 17.4, macOS 13.5, *)
 protocol WebAuthnCredentialsProtocol {
     var presentationAnchor: AuthUIPresentationAnchor? { get }
 }
 
-@available(iOS 17.4, macOS 13.5, *)
+@available(iOS 17.4, macOS 13.5, visionOS 1.0, *)
 protocol CredentialRegistrantProtocol: WebAuthnCredentialsProtocol {
     func create(with options: CredentialCreationOptions) async throws -> CredentialRegistrationPayload
 }
 
-@available(iOS 17.4, macOS 13.5, *)
+@available(iOS 17.4, macOS 13.5, visionOS 1.0, *)
 protocol CredentialAsserterProtocol: WebAuthnCredentialsProtocol {
     func assert(with options: CredentialAssertionOptions) async throws -> CredentialAssertionPayload
 }
 
 // - MARK: WebAuthnCredentialsProtocol
-@available(iOS 17.4, macOS 13.5, *)
+@available(iOS 17.4, macOS 13.5, visionOS 1.0, *)
 class PlatformWebAuthnCredentials: NSObject, WebAuthnCredentialsProtocol {
     private enum OperationType: String {
         case assert
@@ -43,7 +42,7 @@ class PlatformWebAuthnCredentials: NSObject, WebAuthnCredentialsProtocol {
 }
 
 // - MARK: CredentialAsserterProtocol
-@available(iOS 17.4, macOS 13.5, *)
+@available(iOS 17.4, macOS 13.5, visionOS 1.0, *)
 extension PlatformWebAuthnCredentials: CredentialAsserterProtocol{
     func assert(with options: CredentialAssertionOptions) async throws -> CredentialAssertionPayload {
         guard assertionContinuation == nil else {
@@ -96,7 +95,7 @@ extension PlatformWebAuthnCredentials: CredentialAsserterProtocol{
 }
 
 // - MARK: CredentialRegistrantProtocol
-@available(iOS 17.4, macOS 13.5, *)
+@available(iOS 17.4, macOS 13.5, visionOS 1.0, *)
 extension PlatformWebAuthnCredentials: CredentialRegistrantProtocol {
     func create(with options: CredentialCreationOptions) async throws -> CredentialRegistrationPayload {
         guard registrationContinuation == nil else {
@@ -130,11 +129,11 @@ extension PlatformWebAuthnCredentials: CredentialRegistrantProtocol {
     }
 }
 
-@available(iOS 17.4, macOS 13.5, *)
+@available(iOS 17.4, macOS 13.5, visionOS 1.0, *)
 extension PlatformWebAuthnCredentials: DefaultLogger {}
 
 // - MARK: ASAuthorizationControllerDelegate
-@available(iOS 17.4, macOS 13.5, *)
+@available(iOS 17.4, macOS 13.5, visionOS 1.0, *)
 extension PlatformWebAuthnCredentials: ASAuthorizationControllerDelegate {
     func authorizationController(
         controller: ASAuthorizationController,
@@ -230,7 +229,7 @@ extension PlatformWebAuthnCredentials: ASAuthorizationControllerDelegate {
 }
 
 // - MARK: ASAuthorizationControllerPresentationContextProviding
-@available(iOS 17.4, macOS 13.5, *)
+@available(iOS 17.4, macOS 13.5, visionOS 1.0, *)
 extension PlatformWebAuthnCredentials: ASAuthorizationControllerPresentationContextProviding {
     func presentationAnchor(for controller: ASAuthorizationController) -> ASPresentationAnchor {
         return presentationAnchor ?? ASPresentationAnchor()
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/WebAuthn/VerifyWebAuthnCredential.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/WebAuthn/VerifyWebAuthnCredential.swift
@@ -5,12 +5,12 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#if os(iOS) || os(macOS)
+#if os(iOS) || os(macOS) || os(visionOS)
 import Amplify
 import AWSCognitoIdentityProvider
 import Foundation
 
-@available(iOS 17.4, macOS 13.5, *)
+@available(iOS 17.4, macOS 13.5, visionOS 1.0, *)
 struct VerifyWebAuthnCredential: Action {
     let identifier = "VerifyWebAuthnCredential"
     let username: String
@@ -91,10 +91,10 @@ struct VerifyWebAuthnCredential: Action {
     }
 }
 
-@available(iOS 17.4, macOS 13.5, *)
+@available(iOS 17.4, macOS 13.5, visionOS 1.0, *)
 extension VerifyWebAuthnCredential: DefaultLogger { }
 
-@available(iOS 17.4, macOS 13.5, *)
+@available(iOS 17.4, macOS 13.5, visionOS 1.0, *)
 extension VerifyWebAuthnCredential: CustomDebugDictionaryConvertible {
     var debugDictionary: [String: Any] {
         [
@@ -106,7 +106,7 @@ extension VerifyWebAuthnCredential: CustomDebugDictionaryConvertible {
     }
 }
 
-@available(iOS 17.4, macOS 13.5, *)
+@available(iOS 17.4, macOS 13.5, visionOS 1.0, *)
 extension VerifyWebAuthnCredential: CustomDebugStringConvertible {
     var debugDescription: String {
         debugDictionary.debugDescription
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/ClientBehavior/AWSCognitoAuthPlugin+WebAuthnBehaviour.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/ClientBehavior/AWSCognitoAuthPlugin+WebAuthnBehaviour.swift
@@ -25,6 +25,25 @@ extension AWSCognitoAuthPlugin: AuthCategoryWebAuthnBehaviour {
             userPoolFactory: authEnvironment.cognitoUserPoolFactory
         )
 
+        _ = try await taskQueue.sync {
+            try await task.value
+        }
+    }
+#elseif os(visionOS)
+    public func associateWebAuthnCredential(
+        presentationAnchor: AuthUIPresentationAnchor,
+        options: AuthAssociateWebAuthnCredentialRequest.Options? = nil
+    ) async throws {
+        let request = AuthAssociateWebAuthnCredentialRequest(
+            presentationAnchor: presentationAnchor,
+            options: options ?? .init()
+        )
+        let task = AssociateWebAuthnCredentialTask(
+            request: request,
+            authStateMachine: authStateMachine,
+            userPoolFactory: authEnvironment.cognitoUserPoolFactory
+        )
+
         _ = try await taskQueue.sync {
             try await task.value
         }
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/HubEvents/AuthHubEventHandler.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/HubEvents/AuthHubEventHandler.swift
@@ -52,7 +52,7 @@ class AuthHubEventHandler: AuthHubEventBehavior {
                 }
                 self?.handleSignInEvent(result)
 
-        #if os(iOS) || os(macOS)
+        #if os(iOS) || os(macOS) || os(visionOS)
             case HubPayload.EventName.Auth.webUISignInAPI:
                 guard let event = payload.data as? AWSAuthWebUISignInTask.AmplifyAuthTaskResult,
                       case let .success(result) = event else {
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Models/AuthFactorTypeExtension.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Models/AuthFactorTypeExtension.swift
@@ -16,7 +16,7 @@ extension AuthFactorType: DefaultLogger {
         case "SMS_OTP": self = .smsOTP
         case "EMAIL_OTP": self = .emailOTP
         case "WEB_AUTHN":
-        #if os(iOS) || os(macOS)
+        #if os(iOS) || os(macOS) || os(visionOS)
             if #available(iOS 17.4, macOS 13.5, *) {
                 self = .webAuthn
             } else {
@@ -45,7 +45,7 @@ extension AuthFactorType: DefaultLogger {
         case .password: return "PASSWORD"
         case .smsOTP: return "SMS_OTP"
         case .emailOTP: return "EMAIL_OTP"
-    #if os(iOS) || os(macOS)
+    #if os(iOS) || os(macOS) || os(visionOS)
         case .webAuthn: return "WEB_AUTHN"
     #endif
         }
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/CodeGen/Data/ChallengeNameTypeExtension.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/CodeGen/Data/ChallengeNameTypeExtension.swift
@@ -20,7 +20,7 @@ extension CognitoIdentityProviderClientTypes.ChallengeNameType {
         case .smsOtp:
             return .smsOTP
         case .webAuthn:
-        #if os(iOS) || os(macOS)
+        #if os(iOS) || os(macOS) || os(visionOS)
             if #available(iOS 17.4, macOS 13.5, *) {
                 return .webAuthn
             }
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/CodeGen/Data/ConfirmSignInEventData.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/CodeGen/Data/ConfirmSignInEventData.swift
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#if os(iOS) || os(macOS)
+#if os(iOS) || os(macOS) || os(visionOS)
 import typealias Amplify.AuthUIPresentationAnchor
 #endif
 import Foundation
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/CodeGen/Data/SignInEventData.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/CodeGen/Data/SignInEventData.swift
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#if os(iOS) || os(macOS)
+#if os(iOS) || os(macOS) || os(visionOS)
 import typealias Amplify.AuthUIPresentationAnchor
 #endif
 
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/CodeGen/Data/WebAuthnSignInData.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/CodeGen/Data/WebAuthnSignInData.swift
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#if os(iOS) || os(macOS)
+#if os(iOS) || os(macOS) || os(visionOS)
 import typealias Amplify.AuthUIPresentationAnchor
 #endif
 import Foundation
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/CodeGen/Events/SignInEvent.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/CodeGen/Events/SignInEvent.swift
@@ -7,7 +7,7 @@
 
 import Foundation
 import AWSCognitoIdentityProvider
-#if os(iOS) || os(macOS)
+#if os(iOS) || os(macOS) || os(visionOS)
 import typealias Amplify.AuthUIPresentationAnchor
 #endif
 
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/CodeGen/Events/WebAuthnEvent.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/CodeGen/Events/WebAuthnEvent.swift
@@ -5,7 +5,7 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#if os(iOS) || os(macOS)
+#if os(iOS) || os(macOS) || os(visionOS)
 import Foundation
 import Amplify
 
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/SignIn/SignInState+Resolver.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/SignIn/SignInState+Resolver.swift
@@ -281,7 +281,7 @@ extension SignInState {
                         actions: [action])
                 }
 
-            #if os(iOS) || os(macOS)
+            #if os(iOS) || os(macOS) || os(visionOS)
                 if let signInEvent = event as? SignInEvent,
                    case .initiateWebAuthnSignIn(let data, let respondToAuthChallenge) = signInEvent.eventType {
                     let action = InitializeWebAuthn(
@@ -466,7 +466,7 @@ extension SignInState {
                     ), actions: [action])
                 }
 
-            #if os(iOS) || os(macOS)
+            #if os(iOS) || os(macOS) || os(visionOS)
                 if let signInEvent = event as? SignInEvent,
                    case .initiateWebAuthnSignIn(let data, let respondToAuthChallenge) = signInEvent.eventType {
                     let action = InitializeWebAuthn(
@@ -504,7 +504,7 @@ extension SignInState {
                 }
                 return .from(oldState)
             case .signingInWithWebAuthn(let webAuthnState):
-            #if os(iOS) || os(macOS)
+            #if os(iOS) || os(macOS) || os(visionOS)
                 if #available(iOS 17.4, macOS 13.5, *) {
                     if case .throwAuthError(let error) = event.isSignInEvent {
                         let action = ThrowSignInError(error: error)
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/SignIn/WebAuthnSignInState+Resolver.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/SignIn/WebAuthnSignInState+Resolver.swift
@@ -5,13 +5,13 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-#if os(iOS) || os(macOS)
+#if os(iOS) || os(macOS) || os(visionOS)
 import enum Amplify.AuthFactorType
 import Foundation
 
 extension WebAuthnSignInState {
 
-    @available(iOS 17.4, macOS 13.5, *)
+    @available(iOS 17.4, macOS 13.5, visionOS 1.0, *)
     struct Resolver: StateMachineResolver {
 
         typealias StateType = WebAuthnSignInState
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Support/StateMachineSupport/StateMachineEvent+Type.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Support/StateMachineSupport/StateMachineEvent+Type.swift
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthConfirmSignInTask.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthConfirmSignInTask.swift
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthSignInTask.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthSignInTask.swift
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AssociateWebAuthnCredentialTask.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AssociateWebAuthnCredentialTask.swift
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/Models/AWSWebAuthCredentialsModels.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/Models/AWSWebAuthCredentialsModels.swift
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/Protocols/AuthAssociateWebAuthnCredentialTask.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/Protocols/AuthAssociateWebAuthnCredentialTask.swift
diff --git a/AmplifyPlugins/Auth/Tests/AWSCognitoAuthPluginUnitTests/Mocks/MockCredentialRegistrant.swift b/AmplifyPlugins/Auth/Tests/AWSCognitoAuthPluginUnitTests/Mocks/MockCredentialRegistrant.swift
diff --git a/AmplifyPlugins/Auth/Tests/AWSCognitoAuthPluginUnitTests/TaskTests/WebAuthnBehaviourTests/AssociateWebAuthnCredentialTaskTests.swift b/AmplifyPlugins/Auth/Tests/AWSCognitoAuthPluginUnitTests/TaskTests/WebAuthnBehaviourTests/AssociateWebAuthnCredentialTaskTests.swift
diff --git a/AmplifyTestCommon/Mocks/MockAuthCategoryPlugin.swift b/AmplifyTestCommon/Mocks/MockAuthCategoryPlugin.swift

Original file line number	Diff line number	Diff line change
`@@ -230,7 +230,7 @@ struct VerifySignInChallenge: Action {`
`230`	`230`	`}`
`231`	`231`
`232`	`232`	`private func isWebAuthn(_ factorType: AuthFactorType?) -> Bool {`
`233`		`- #if os(iOS) \|\| os(macOS)`
	`233`	`+ #if os(iOS) \|\| os(macOS) \|\| os(visionOS)`
`234`	`234`	`if #available(iOS 17.4, macOS 13.5, *) {`
`235`	`235`	`return .webAuthn == factorType`
`236`	`236`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,11 +5,11 @@`
`5`	`5`	`// SPDX-License-Identifier: Apache-2.0`
`6`	`6`	`//`
`7`	`7`
`8`		`-#if os(iOS) \|\| os(macOS)`
	`8`	`+#if os(iOS) \|\| os(macOS) \|\| os(visionOS)`
`9`	`9`	`import Amplify`
`10`	`10`	`import Foundation`
`11`	`11`
`12`		`-@available(iOS 17.4, macOS 13.5, *)`
	`12`	`+@available(iOS 17.4, macOS 13.5, visionOS 1.0, *)`
`13`	`13`	`struct AssertWebAuthnCredentials: Action {`
`14`	`14`	`let identifier = "AssertWebAuthnCredentials"`
`15`	`15`	`let username: String`
`@@ -75,10 +75,10 @@ struct AssertWebAuthnCredentials: Action {`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
`78`		`-@available(iOS 17.4, macOS 13.5, *)`
	`78`	`+@available(iOS 17.4, macOS 13.5, visionOS 1.0, *)`
`79`	`79`	`extension AssertWebAuthnCredentials: DefaultLogger { }`
`80`	`80`
`81`		`-@available(iOS 17.4, macOS 13.5, *)`
	`81`	`+@available(iOS 17.4, macOS 13.5, visionOS 1.0, *)`
`82`	`82`	`extension AssertWebAuthnCredentials: CustomDebugDictionaryConvertible {`
`83`	`83`	`var debugDictionary: [String: Any] {`
`84`	`84`	`[`
`@@ -90,7 +90,7 @@ extension AssertWebAuthnCredentials: CustomDebugDictionaryConvertible {`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`
`93`		`-@available(iOS 17.4, macOS 13.5, *)`
	`93`	`+@available(iOS 17.4, macOS 13.5, visionOS 1.0, *)`
`94`	`94`	`extension AssertWebAuthnCredentials: CustomDebugStringConvertible {`
`95`	`95`	`var debugDescription: String {`
`96`	`96`	`debugDictionary.debugDescription`
Original file line number	Diff line number	Diff line change
`@@ -52,7 +52,7 @@ class AuthHubEventHandler: AuthHubEventBehavior {`
`52`	`52`	`}`
`53`	`53`	`self?.handleSignInEvent(result)`
`54`	`54`
`55`		`- #if os(iOS) \|\| os(macOS)`
	`55`	`+ #if os(iOS) \|\| os(macOS) \|\| os(visionOS)`
`56`	`56`	`case HubPayload.EventName.Auth.webUISignInAPI:`
`57`	`57`	`guard let event = payload.data as? AWSAuthWebUISignInTask.AmplifyAuthTaskResult,`
`58`	`58`	`case let .success(result) = event else {`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ extension CognitoIdentityProviderClientTypes.ChallengeNameType {`
`20`	`20`	`case .smsOtp:`
`21`	`21`	`return .smsOTP`
`22`	`22`	`case .webAuthn:`
`23`		`- #if os(iOS) \|\| os(macOS)`
	`23`	`+ #if os(iOS) \|\| os(macOS) \|\| os(visionOS)`
`24`	`24`	`if #available(iOS 17.4, macOS 13.5, *) {`
`25`	`25`	`return .webAuthn`
`26`	`26`	`}`