initial commit

harsh62 · harsh62 · commit d2e936696d22 · 2025-06-11T23:56:11.000-04:00
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/ASF/ASFDeviceInfo.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/ASF/ASFDeviceInfo.swift
@@ -8,7 +8,6 @@
 import Foundation
 import Amplify
 
-@MainActor
 struct ASFDeviceInfo: ASFDeviceBehavior {
 
     let id: String
@@ -18,46 +17,69 @@ struct ASFDeviceInfo: ASFDeviceBehavior {
     }
 
     var model: String {
-        DeviceInfo.current.model
+        get async {
+            await MainActor.run { DeviceInfo.current.model }
+        }
     }
 
     var name: String {
-        DeviceInfo.current.name
+        get async {
+            await MainActor.run { DeviceInfo.current.name }
+        }
     }
 
     var type: String {
-        var systemInfo = utsname()
-        uname(&systemInfo)
-        return String(bytes: Data(bytes: &systemInfo.machine,
-                                  count: Int(_SYS_NAMELEN)),
-                      encoding: .utf8) ?? DeviceInfo.current.hostName
+        get async {
+            await MainActor.run {
+                var systemInfo = utsname()
+                uname(&systemInfo)
+                return String(bytes: Data(bytes: &systemInfo.machine,
+                                          count: Int(_SYS_NAMELEN)),
+                              encoding: .utf8) ?? DeviceInfo.current.hostName
+            }
+        }
     }
 
     var platform: String {
-        DeviceInfo.current.operatingSystem.name
+        get async {
+            await MainActor.run { DeviceInfo.current.operatingSystem.name }
+        }
     }
 
     var version: String {
-        DeviceInfo.current.operatingSystem.version
+        get async {
+            await MainActor.run { DeviceInfo.current.operatingSystem.version }
+        }
     }
 
     var thirdPartyId: String? {
-        DeviceInfo.current.identifierForVendor?.uuidString
+        get async {
+            await MainActor.run { DeviceInfo.current.identifierForVendor?.uuidString }
+        }
     }
 
     var height: String {
-        String(format: "%.0f", DeviceInfo.current.screenBounds.height)
+        get async {
+            await MainActor.run { String(format: "%.0f", DeviceInfo.current.screenBounds.height) }
+        }
     }
 
     var width: String {
-        String(format: "%.0f", DeviceInfo.current.screenBounds.width)
+        get async {
+            await MainActor.run { String(format: "%.0f", DeviceInfo.current.screenBounds.width) }
+        }
     }
 
     var locale: String {
-        return Locale.preferredLanguages[0]
+        get async {
+            await MainActor.run { Locale.preferredLanguages[0] }
+        }
     }
 
-    func deviceInfo() -> String {
+    func deviceInfo() async -> String {
+        let model = await self.model
+        let type = await self.type
+        let version = await self.version
         var build = "release"
 #if DEBUG
         build = "debug"
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/ASF/AdvancedSecurityBehavior.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/ASF/AdvancedSecurityBehavior.swift
@@ -12,32 +12,32 @@ protocol AdvancedSecurityBehavior {
     func userContextData(for username: String,
                          deviceInfo: ASFDeviceBehavior,
                          appInfo: ASFAppInfoBehavior,
-                         configuration: UserPoolConfigurationData) throws -> String
+                         configuration: UserPoolConfigurationData) async throws -> String
 }
 
 protocol ASFDeviceBehavior: Sendable {
 
     var id: String { get }
 
-    var model: String { get }
+    var model: String { get async }
 
-    var name: String { get }
+    var name: String { get async }
 
-    var platform: String { get }
+    var platform: String { get async }
 
-    var version: String { get }
+    var version: String { get async }
 
-    var thirdPartyId: String? { get }
+    var thirdPartyId: String? { get async }
 
-    var height: String { get }
+    var height: String { get async }
 
-    var width: String { get }
+    var width: String { get async }
 
-    var locale: String { get }
+    var locale: String { get async }
 
-    var type: String { get }
+    var type: String { get async }
 
-    func deviceInfo() -> String
+    func deviceInfo() async -> String
 }
 
 protocol ASFAppInfoBehavior {
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/ASF/CognitoUserPoolASF+KeyChain.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/ASF/CognitoUserPoolASF+KeyChain.swift
@@ -37,7 +37,7 @@ extension CognitoUserPoolASF {
         let appInfo: ASFAppInfoBehavior = ASFAppInfo()
 
         do {
-            return try asfClient.userContextData(
+            return try await asfClient.userContextData(
                 for: username,
                 deviceInfo: deviceInfo,
                 appInfo: appInfo,
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/ASF/CognitoUserPoolASF.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/ASF/CognitoUserPoolASF.swift
@@ -30,9 +30,9 @@ struct CognitoUserPoolASF: AdvancedSecurityBehavior {
     func userContextData(for username: String = "unknown",
                          deviceInfo: ASFDeviceBehavior,
                          appInfo: ASFAppInfoBehavior,
-                         configuration: UserPoolConfigurationData) throws -> String {
+                         configuration: UserPoolConfigurationData) async throws -> String {
 
-        let contextData = prepareUserContextData(deviceInfo: deviceInfo, appInfo: appInfo)
+        let contextData = await prepareUserContextData(deviceInfo: deviceInfo, appInfo: appInfo)
         let payload = try prepareJsonPayload(username: username,
                                              contextData: contextData,
                                              userPoolId: configuration.poolId)
@@ -43,31 +43,31 @@ struct CognitoUserPoolASF: AdvancedSecurityBehavior {
     }
 
     func prepareUserContextData(deviceInfo: ASFDeviceBehavior,
-                                appInfo: ASFAppInfoBehavior) -> [String: String] {
+                                appInfo: ASFAppInfoBehavior) async -> [String: String] {
         var build = "release"
 #if DEBUG
         build = "debug"
 #endif
-        let fingerPrint = deviceInfo.deviceInfo()
+        let fingerPrint = await deviceInfo.deviceInfo()
         var contextData: [String: String] = [
             Self.targetSDKKey: appInfo.targetSDK,
             Self.appVersionKey: appInfo.version,
-            Self.deviceNameKey: deviceInfo.name,
-            Self.phoneTypeKey: deviceInfo.type,
+            Self.deviceNameKey: await deviceInfo.name,
+            Self.phoneTypeKey: await deviceInfo.type,
             Self.deviceIdKey: deviceInfo.id,
-            Self.releaseVersionKey: deviceInfo.version,
-            Self.platformKey: deviceInfo.platform,
+            Self.releaseVersionKey: await deviceInfo.version,
+            Self.platformKey: await deviceInfo.platform,
             Self.buildTypeKey: build,
             Self.timezoneKey: timeZoneOffet(),
-            Self.deviceHeightKey: deviceInfo.height,
-            Self.deviceWidthKey: deviceInfo.width,
-            Self.deviceLanguageKey: deviceInfo.locale,
+            Self.deviceHeightKey: await deviceInfo.height,
+            Self.deviceWidthKey: await deviceInfo.width,
+            Self.deviceLanguageKey: await deviceInfo.locale,
             Self.deviceFingerPrintKey: fingerPrint
         ]
         if let appName = appInfo.name {
             contextData[Self.appNameKey] = appName
         }
-        if let thirdPartyDeviceIdKey = deviceInfo.thirdPartyId {
+        if let thirdPartyDeviceIdKey = await deviceInfo.thirdPartyId {
             contextData[Self.thirdPartyDeviceIdKey] = thirdPartyDeviceIdKey
         }
         return contextData
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/CustomSignIn/InitiateCustomAuth.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/CustomSignIn/InitiateCustomAuth.swift
@@ -67,9 +67,9 @@ struct InitiateCustomAuth: Action {
         logVerbose("\(#fileID) Starting execution", environment: environment)
 
         let response = try await cognitoClient.initiateAuth(input: request)
-        return try UserPoolSignInHelper.parseResponse(response,
-                                                      for: username,
-                                                      signInMethod: .apiBased(.customWithoutSRP))
+        return UserPoolSignInHelper.parseResponse(response,
+                                                  for: username,
+                                                  signInMethod: .apiBased(.customWithoutSRP))
     }
 
 }
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignUp/ConfirmSignUp.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignUp/ConfirmSignUp.swift
@@ -66,7 +66,7 @@ extension ConfirmSignUp: CustomDebugDictionaryConvertible {
             "identifier": identifier,
             "signUpEventData": data.debugDictionary,
             "confirmationCode": confirmationCode.masked(),
-            "forceAliasCreation": forceAliasCreation
+            "forceAliasCreation": forceAliasCreation as Any
         ]
     }
 }
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignUp/InitiateSignUp.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignUp/InitiateSignUp.swift
@@ -82,7 +82,7 @@ extension InitiateSignUp: CustomDebugDictionaryConvertible {
         [
             "identifier": identifier,
             "signUpEventData": data.debugDictionary,
-            "attributes": attributes
+            "attributes": attributes as Any
         ]
     }
 }
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Models/AWSAuthCognitoSession.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Models/AWSAuthCognitoSession.swift
@@ -64,12 +64,7 @@ public struct AWSAuthCognitoSession: AuthSession,
             return .failure(AuthError.signedOut(
                             AuthPluginErrorConstants.userSubSignOutError.errorDescription,
                             AuthPluginErrorConstants.userSubSignOutError.recoverySuggestion))
-        } catch let error as AuthError {
-            return .failure(error)
         } catch {
-            let error = AuthError.unknown("""
-                            Could not retreive user sub from the fetched Cognito tokens.
-                            """)
             return .failure(error)
         }
     }
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Operations/AuthConfigureOperation.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Operations/AuthConfigureOperation.swift
@@ -16,7 +16,7 @@ typealias ConfigureOperation = AmplifyOperation<
     Void,
     AuthError>
 
-class AuthConfigureOperation: ConfigureOperation {
+class AuthConfigureOperation: ConfigureOperation, @unchecked Sendable {
 
     let authConfiguration: AuthConfiguration
     let authStateMachine: AuthStateMachine
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/SRP/SRPSignInState+Resolver.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/StateMachine/Resolvers/SRP/SRPSignInState+Resolver.swift
@@ -32,7 +32,7 @@ extension SRPSignInState {
             switch oldState {
             case .notStarted:
                 return resolveNotStarted(byApplying: srpSignInEvent)
-            case .initiatingSRPA(let signInEventData):
+            case .initiatingSRPA(_):
                 return resolveInitiatingSRPA(
                     byApplying: srpSignInEvent,
                     from: oldState)
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Support/HostedUI/HostedUIASWebAuthenticationSession.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Support/HostedUI/HostedUIASWebAuthenticationSession.swift
@@ -8,7 +8,7 @@
 import Foundation
 import Amplify
 #if os(iOS) || os(macOS) || os(visionOS)
-import AuthenticationServices
+@preconcurrency import AuthenticationServices
 #endif
 
 class HostedUIASWebAuthenticationSession: NSObject, HostedUISessionBehavior {
diff --git a/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/Helpers/AWSAuthTaskHelper.swift b/AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/Helpers/AWSAuthTaskHelper.swift
@@ -72,14 +72,8 @@ class AWSAuthTaskHelper: DefaultLogger {
             throw AuthError.unknown("Unable to fetch auth session", nil)
         }
 
-        do {
-            let tokens = try cognitoTokenProvider.getCognitoTokens().get()
-            return tokens.accessToken
-        } catch let error as AuthError {
-            throw error
-        } catch {
-            throw AuthError.unknown("Unable to fetch auth session", error)
-        }
+        let tokens = try cognitoTokenProvider.getCognitoTokens().get()
+        return tokens.accessToken
     }
 
     func getCurrentUser() async throws -> AuthUser {
diff --git a/AmplifyPlugins/Core/AWSPluginsCore/WebSocket/WebSocketClient.swift b/AmplifyPlugins/Core/AWSPluginsCore/WebSocket/WebSocketClient.swift
@@ -28,7 +28,7 @@ public final actor WebSocketClient: NSObject {
     /// Interceptor for appending additional info before makeing the connection
     private var interceptor: WebSocketInterceptor?
     /// Internal wriable WebSocketEvent data stream
-    private let subject = PassthroughSubject<WebSocketEvent, Never>()
+    nonisolated private let subject = PassthroughSubject<WebSocketEvent, Never>()
 
     private let retryWithJitter = RetryWithJitter()
 

Original file line number	Diff line number	Diff line change
`@@ -67,9 +67,9 @@ struct InitiateCustomAuth: Action {`
`67`	`67`	`logVerbose("\(#fileID) Starting execution", environment: environment)`
`68`	`68`
`69`	`69`	`let response = try await cognitoClient.initiateAuth(input: request)`
`70`		`- return try UserPoolSignInHelper.parseResponse(response,`
`71`		`- for: username,`
`72`		`- signInMethod: .apiBased(.customWithoutSRP))`
	`70`	`+ return UserPoolSignInHelper.parseResponse(response,`
	`71`	`+ for: username,`
	`72`	`+ signInMethod: .apiBased(.customWithoutSRP))`
`73`	`73`	`}`
`74`	`74`
`75`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ extension ConfirmSignUp: CustomDebugDictionaryConvertible {`
`66`	`66`	`"identifier": identifier,`
`67`	`67`	`"signUpEventData": data.debugDictionary,`
`68`	`68`	`"confirmationCode": confirmationCode.masked(),`
`69`		`- "forceAliasCreation": forceAliasCreation`
	`69`	`+ "forceAliasCreation": forceAliasCreation as Any`
`70`	`70`	`]`
`71`	`71`	`}`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ extension InitiateSignUp: CustomDebugDictionaryConvertible {`
`82`	`82`	`[`
`83`	`83`	`"identifier": identifier,`
`84`	`84`	`"signUpEventData": data.debugDictionary,`
`85`		`- "attributes": attributes`
	`85`	`+ "attributes": attributes as Any`
`86`	`86`	`]`
`87`	`87`	`}`
`88`	`88`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,12 +64,7 @@ public struct AWSAuthCognitoSession: AuthSession,`
`64`	`64`	`return .failure(AuthError.signedOut(`
`65`	`65`	`AuthPluginErrorConstants.userSubSignOutError.errorDescription,`
`66`	`66`	`AuthPluginErrorConstants.userSubSignOutError.recoverySuggestion))`
`67`		`- } catch let error as AuthError {`
`68`		`- return .failure(error)`
`69`	`67`	`} catch {`
`70`		`- let error = AuthError.unknown("""`
`71`		`- Could not retreive user sub from the fetched Cognito tokens.`
`72`		`- """)`
`73`	`68`	`return .failure(error)`
`74`	`69`	`}`
`75`	`70`	`}`