fix: resolve strict concurrency errors

Amplify/Core/Support/DeviceInfo.swift

@@ -28,6 +28,7 @@ import AppKit
 /// ```
 ///
 /// - Tag: DeviceInfo
+@MainActor
 public struct DeviceInfo {
 
  private init() {}

Amplify/DevMenu/Data/DeviceInfoHelper.swift

@@ -10,6 +10,7 @@ import Foundation
 import UIKit
 
 /// Helper class to fetch information for Device Information Screen
+@MainActor
 struct DeviceInfoHelper {
 
  static func getDeviceInformation() -> [DeviceInfoItem] {

Amplify/DevMenu/Data/IssueInfo.swift

@@ -9,6 +9,7 @@
 import Foundation
 
 /// Struct consisting of information required to report an issue
+@MainActor
 struct IssueInfo {
 
  private var includeEnvironmentInfo: Bool

Amplify/DevMenu/Data/IssueInfoHelper.swift

@@ -9,6 +9,7 @@
 import Foundation
 
 /// Helper class to generate markdown text for issue reporting
+@MainActor
 struct IssueInfoHelper {
 
  private static let issueDescTitle = "Issue Description"

Amplify/DevMenu/Trigger/LongPressGestureRecognizer.swift

@@ -47,13 +47,5 @@ class LongPressGestureRecognizer: NSObject, TriggerRecognizer, UIGestureRecogniz
  uiWindow?.addGestureRecognizer(recognizer)
  recognizer.delegate = self
  }
-
- deinit {
- if let window = uiWindow {
- window.removeGestureRecognizer(recognizer)
- }
- uiWindow = nil
- triggerDelegate = nil
- }
 }
 #endif

Amplify/DevMenu/View/IssueReporter.swift

@@ -95,36 +95,42 @@ struct IssueReporter: View {
 
  /// Open Amplify iOS issue logging screen on Github
  private func reportToGithub() {
- let issueDescriptionMarkdown =
- IssueInfoHelper.generateMarkdownForIssue(
- issue: IssueInfo(issueDescription: issueDescription,
- includeEnvInfo: includeEnvInfo,
- includeDeviceInfo: includeDeviceInfo))
-
- let urlString = amplifyIosNewIssueUrl + issueDescriptionMarkdown
- guard let url = urlString.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) else {
- showAlertIfInvalidURL = true
- return
- }
- guard let urlToOpen = URL(string: url) else {
- showAlertIfInvalidURL = true
- return
+ Task {
+ let issue = await IssueInfo(issueDescription: issueDescription,
+ includeEnvInfo: includeEnvInfo,
+ includeDeviceInfo: includeDeviceInfo)
+ let issueDescriptionMarkdown =
+ await IssueInfoHelper.generateMarkdownForIssue(
+ issue: issue)
+
+ let urlString = amplifyIosNewIssueUrl + issueDescriptionMarkdown
+ guard let url = urlString.addingPercentEncoding(withAllowedCharacters: .urlQueryAllowed) else {
+ showAlertIfInvalidURL = true
+ return
+ }
+ guard let urlToOpen = URL(string: url) else {
+ showAlertIfInvalidURL = true
+ return
+ }
+
+ await UIApplication.shared.open(urlToOpen)
  }
 
- UIApplication.shared.open(urlToOpen)
  }
 
  /// Copy issue as a markdown string to clipboard
  private func copyToClipboard() {
- let issue = IssueInfo(issueDescription: issueDescription,
- includeEnvInfo: includeEnvInfo,
- includeDeviceInfo: includeDeviceInfo)
- let value = IssueInfoHelper.generateMarkdownForIssue(issue: issue)
-#if os(iOS)
- UIPasteboard.general.string = value
-#elseif canImport(AppKit)
- NSPasteboard.general.setString(value, forType: .string)
-#endif
+ Task {
+ let issue = await IssueInfo(issueDescription: issueDescription,
+ includeEnvInfo: includeEnvInfo,
+ includeDeviceInfo: includeDeviceInfo)
+ let value = await IssueInfoHelper.generateMarkdownForIssue(issue: issue)
+ #if os(iOS)
+ UIPasteboard.general.string = value
+ #elseif canImport(AppKit)
+ NSPasteboard.general.setString(value, forType: .string)
+ #endif
+ }
  }
 }
 
@@ -166,6 +172,7 @@ final class MultilineTextField: UIViewRepresentable {
  return view
  }
 
+ @MainActor
  @objc func dismissKeyboard() {
  UIApplication.shared.sendAction(#selector(UIResponder.resignFirstResponder),
  to: nil, from: nil, for: nil)

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/ASF/ASFDeviceInfo.swift

@@ -8,6 +8,7 @@
 import Foundation
 import Amplify
 
+@MainActor
 struct ASFDeviceInfo: ASFDeviceBehavior {
 
  let id: String

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/ASF/AdvancedSecurityBehavior.swift

@@ -15,7 +15,7 @@ protocol AdvancedSecurityBehavior {
  configuration: UserPoolConfigurationData) throws -> String
 }
 
-protocol ASFDeviceBehavior {
+protocol ASFDeviceBehavior: Sendable {
 
  var id: String { get }
 

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/ASF/CognitoUserPoolASF+KeyChain.swift

@@ -32,8 +32,8 @@ extension CognitoUserPoolASF {
  static func encodedContext(username: String,
  asfDeviceId: String,
  asfClient: AdvancedSecurityBehavior,
- userPoolConfiguration: UserPoolConfigurationData) -> String? {
- let deviceInfo: ASFDeviceBehavior = ASFDeviceInfo(id: asfDeviceId)
+ userPoolConfiguration: UserPoolConfigurationData) async -> String? {
+ let deviceInfo: ASFDeviceBehavior = await ASFDeviceInfo(id: asfDeviceId)
  let appInfo: ASFAppInfoBehavior = ASFAppInfo()
 
  do {

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/RefreshAuthorizationSession/UserPool/RefreshUserPoolTokens.swift

@@ -41,7 +41,7 @@ struct RefreshUserPoolTokens: Action {
  for: existingSignedIndata.username,
  credentialStoreClient: authEnv.credentialsClient)
 
- let input = InitiateAuthInput.refreshAuthInput(
+ let input = await InitiateAuthInput.refreshAuthInput(
  username: existingSignedIndata.username,
  refreshToken: existingTokens.refreshToken,
  clientMetadata: [:],

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/ConfirmDevice.swift

@@ -36,7 +36,7 @@ struct ConfirmDevice: Action {
  deviceKey: deviceMetadata.deviceKey,
  password: deviceMetadata.deviceSecret)
 
- let deviceName = DeviceInfo.current.name
+ let deviceName = await DeviceInfo.current.name
 
  let base64EncodedVerifier = passwordVerifier.passwordVerifier.base64EncodedString()
  let base64EncodedSalt = passwordVerifier.salt.base64EncodedString()

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/CustomSignIn/InitiateCustomAuth.swift

@@ -33,7 +33,7 @@ struct InitiateCustomAuth: Action {
  let asfDeviceId = try await CognitoUserPoolASF.asfDeviceID(
  for: username,
  credentialStoreClient: authEnv.credentialsClient)
- let request = InitiateAuthInput.customAuth(
+ let request = await InitiateAuthInput.customAuth(
  username: username,
  clientMetadata: clientMetadata,
  asfDeviceId: asfDeviceId,

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/DeviceSRPAuth/InitiateAuthDeviceSRP.swift

@@ -45,7 +45,7 @@ struct InitiateAuthDeviceSRP: Action {
  srpKeyPair: srpKeyPair,
  clientTimestamp: Date())
 
- let request = RespondToAuthChallengeInput.deviceSRP(
+ let request = await RespondToAuthChallengeInput.deviceSRP(
  username: username,
  environment: userPoolEnv,
  deviceMetadata: deviceMetadata,

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/DeviceSRPAuth/VerifyDevicePasswordSRP.swift

@@ -59,7 +59,7 @@ struct VerifyDevicePasswordSRP: Action {
  serverPublicBHexString: serverPublicB,
  srpClient: srpClient)
 
- let request = RespondToAuthChallengeInput.devicePasswordVerifier(
+ let request = await RespondToAuthChallengeInput.devicePasswordVerifier(
  username: username,
  stateData: stateData,
  session: authResponse.session,

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/HostedUI/InitializeHostedUISignIn.swift

@@ -54,7 +54,7 @@ struct InitializeHostedUISignIn: Action {
  let asfDeviceId = try await CognitoUserPoolASF.asfDeviceID(
  for: username,
  credentialStoreClient: environment.credentialsClient)
- let encodedData = CognitoUserPoolASF.encodedContext(
+ let encodedData = await CognitoUserPoolASF.encodedContext(
  username: username,
  asfDeviceId: asfDeviceId,
  asfClient: environment.cognitoUserPoolASFFactory(),

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/MigrateAuth/InitiateMigrateAuth.swift

@@ -36,7 +36,7 @@ struct InitiateMigrateAuth: Action {
  let asfDeviceId = try await CognitoUserPoolASF.asfDeviceID(
  for: username,
  credentialStoreClient: authEnv.credentialsClient)
- let request = InitiateAuthInput.migrateAuth(
+ let request = await InitiateAuthInput.migrateAuth(
  username: username,
  password: password,
  clientMetadata: clientMetadata,

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/SRPAuth/InitiateAuthSRP.swift

@@ -56,7 +56,7 @@ struct InitiateAuthSRP: Action {
  for: username,
  credentialStoreClient: authEnv.credentialsClient)
 
- let request = InitiateAuthInput.srpInput(
+ let request = await InitiateAuthInput.srpInput(
  username: username,
  publicSRPAHexValue: srpKeyPair.publicKeyHexValue,
  authFlowType: authFlowType,

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/SRPAuth/VerifyPasswordSRP.swift

@@ -57,7 +57,7 @@ struct VerifyPasswordSRP: Action {
  serverPublicBHexString: serverPublicB,
  srpClient: srpClient,
  poolId: userPoolEnv.userPoolConfiguration.poolId)
- let request = RespondToAuthChallengeInput.passwordVerifier(
+ let request = await RespondToAuthChallengeInput.passwordVerifier(
  username: username,
  stateData: stateData,
  session: authResponse.session,

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/SoftwareTokenSetup/CompleteTOTPSetup.swift

@@ -53,7 +53,7 @@ struct CompleteTOTPSetup: Action {
  credentialStoreClient: authEnv.credentialsClient)
 
  var userContextData: CognitoIdentityProviderClientTypes.UserContextDataType?
- if let encodedData = CognitoUserPoolASF.encodedContext(
+ if let encodedData = await CognitoUserPoolASF.encodedContext(
  username: username,
  asfDeviceId: asfDeviceId,
  asfClient: userpoolEnv.cognitoUserPoolASFFactory(),

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/SignIn/VerifySignInChallenge.swift

@@ -39,7 +39,7 @@ struct VerifySignInChallenge: Action {
  for: username,
  with: environment)
 
- let input = RespondToAuthChallengeInput.verifyChallenge(
+ let input = await RespondToAuthChallengeInput.verifyChallenge(
  username: username,
  challengeType: challengeType,
  session: session,

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Support/HostedUI/HostedUIASWebAuthenticationSession.swift

@@ -110,6 +110,7 @@ class HostedUIASWebAuthenticationSession: NSObject, HostedUISessionBehavior {
 #if os(iOS) || os(macOS)
 extension HostedUIASWebAuthenticationSession: ASWebAuthenticationPresentationContextProviding {
 
+ @MainActor
  func presentationAnchor(for session: ASWebAuthenticationSession) -> ASPresentationAnchor {
  return webPresentation ?? ASPresentationAnchor()
  }

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Support/Utils/ConfirmSignUpInput+Amplify.swift

@@ -15,15 +15,15 @@ extension ConfirmSignUpInput {
  asfDeviceId: String?,
  forceAliasCreation: Bool?,
  environment: UserPoolEnvironment
- ) {
+ ) async {
 
  let configuration = environment.userPoolConfiguration
  let secretHash = ClientSecretHelper.calculateSecretHash(
  username: username,
  userPoolConfiguration: configuration)
  var userContextData: CognitoIdentityProviderClientTypes.UserContextDataType?
  if let asfDeviceId = asfDeviceId,
- let encodedData = CognitoUserPoolASF.encodedContext(
+ let encodedData = await CognitoUserPoolASF.encodedContext(
  username: username,
  asfDeviceId: asfDeviceId,
  asfClient: environment.cognitoUserPoolASFFactory(),

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Support/Utils/InitiateAuthInput+Amplify.swift

@@ -16,7 +16,7 @@ extension InitiateAuthInput {
  clientMetadata: [String: String],
  asfDeviceId: String,
  deviceMetadata: DeviceMetadata,
- environment: UserPoolEnvironment) -> InitiateAuthInput {
+ environment: UserPoolEnvironment) async -> InitiateAuthInput {
  var authParameters = [
  "USERNAME": username,
  "SRP_A": publicSRPAHexValue
@@ -28,7 +28,7 @@ extension InitiateAuthInput {
  authParameters["CHALLENGE_NAME"] = "SRP_A"
  }
 
- return buildInput(username: username,
+ return await buildInput(username: username,
  authFlowType: authFlowType.getClientFlowType(),
  authParameters: authParameters,
  clientMetadata: clientMetadata,
@@ -41,12 +41,12 @@ extension InitiateAuthInput {
  clientMetadata: [String: String],
  asfDeviceId: String,
  deviceMetadata: DeviceMetadata,
- environment: UserPoolEnvironment) -> InitiateAuthInput {
+ environment: UserPoolEnvironment) async -> InitiateAuthInput {
  let authParameters = [
  "USERNAME": username
  ]
 
- return buildInput(username: username,
+ return await buildInput(username: username,
  authFlowType: .customAuth,
  authParameters: authParameters,
  clientMetadata: clientMetadata,
@@ -60,13 +60,13 @@ extension InitiateAuthInput {
  clientMetadata: [String: String],
  asfDeviceId: String,
  deviceMetadata: DeviceMetadata,
- environment: UserPoolEnvironment) -> InitiateAuthInput {
+ environment: UserPoolEnvironment) async -> InitiateAuthInput {
  let authParameters = [
  "USERNAME": username,
  "PASSWORD": password
  ]
 
- return buildInput(username: username,
+ return await buildInput(username: username,
  authFlowType: .userPasswordAuth,
  authParameters: authParameters,
  clientMetadata: clientMetadata,
@@ -80,13 +80,13 @@ extension InitiateAuthInput {
  clientMetadata: [String: String],
  asfDeviceId: String,
  deviceMetadata: DeviceMetadata,
- environment: UserPoolEnvironment) -> InitiateAuthInput {
+ environment: UserPoolEnvironment) async -> InitiateAuthInput {
 
  let authParameters = [
  "REFRESH_TOKEN": refreshToken
  ]
 
- return buildInput(username: username,
+ return await buildInput(username: username,
  authFlowType: .refreshTokenAuth,
  authParameters: authParameters,
  clientMetadata: clientMetadata,
@@ -102,7 +102,7 @@ extension InitiateAuthInput {
  clientMetadata: [String: String],
  asfDeviceId: String?,
  deviceMetadata: DeviceMetadata,
- environment: UserPoolEnvironment) -> InitiateAuthInput {
+ environment: UserPoolEnvironment) async -> InitiateAuthInput {
 
  var authParameters = authParameters
  let configuration = environment.userPoolConfiguration
@@ -123,7 +123,7 @@ extension InitiateAuthInput {
 
  var userContextData: CognitoIdentityProviderClientTypes.UserContextDataType?
  if let asfDeviceId = asfDeviceId,
- let encodedData = CognitoUserPoolASF.encodedContext(
+ let encodedData = await CognitoUserPoolASF.encodedContext(
  username: username,
  asfDeviceId: asfDeviceId,
  asfClient: environment.cognitoUserPoolASFFactory(),