fix: update sdk error handling in AWSCognitoAuthPlugin (#3251)

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/AWSCognitoAuthPlugin+Configure.swift

@@ -86,10 +86,10 @@ extension AWSCognitoAuthPlugin {
  private func makeUserPool() throws -> CognitoUserPoolBehavior {
  switch authConfiguration {
  case .userPools(let userPoolConfig), .userPoolsAndIdentityPools(let userPoolConfig, _):
+ // TODO: FrameworkMetadata Replacement
  let configuration = try CognitoIdentityProviderClient.CognitoIdentityProviderClientConfiguration(
- endpointResolver: userPoolConfig.endpoint?.resolver,
- frameworkMetadata: AmplifyAWSServiceConfiguration.frameworkMetaData(),
- region: userPoolConfig.region
+ region: userPoolConfig.region,
+ serviceSpecific: .init(endpointResolver: userPoolConfig.endpoint?.resolver)
  )
 
  if var httpClientEngineProxy = httpClientEngineProxy {
@@ -121,8 +121,8 @@ extension AWSCognitoAuthPlugin {
  private func makeIdentityClient() throws -> CognitoIdentityBehavior {
  switch authConfiguration {
  case .identityPools(let identityPoolConfig), .userPoolsAndIdentityPools(_, let identityPoolConfig):
+ // TODO: FrameworkMetadata Replacement
  let configuration = try CognitoIdentityClient.CognitoIdentityClientConfiguration(
- frameworkMetadata: AmplifyAWSServiceConfiguration.frameworkMetaData(),
  region: identityPoolConfig.region
  )
 

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/FetchAuthorizationSession/FetchIdentity/FetchAuthIdentityId.swift

@@ -65,12 +65,7 @@ struct FetchAuthIdentityId: Action {
  }
 
  func isNotAuthorizedError(_ error: Error) -> Bool {
-
- if let getIdError: GetIdOutputError = error.internalAWSServiceError(),
- case .notAuthorizedException = getIdError {
- return true
- }
- return false
+ error is AWSCognitoIdentity.NotAuthorizedException
  }
 }
 

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Actions/FetchAuthorizationSession/InformSessionError.swift

@@ -37,17 +37,8 @@ struct InformSessionError: Action {
  }
 
  func isNotAuthorizedError(_ error: Error) -> Bool {
-
-
- if let serviceError: GetCredentialsForIdentityOutputError = error.internalAWSServiceError(),
- case .notAuthorizedException = serviceError {
- return true
- }
- if let serviceError: InitiateAuthOutputError = error.internalAWSServiceError(),
- case .notAuthorizedException = serviceError {
- return true
- }
- return false
+ error is AWSCognitoIdentity.NotAuthorizedException
+ || error is AWSCognitoIdentityProvider.NotAuthorizedException
  }
 }
 

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

@@ -110,11 +110,7 @@ struct VerifyPasswordSRP: Action {
  return false
  }
 
- if let serviceError: RespondToAuthChallengeOutputError = error.internalAWSServiceError(),
- case .resourceNotFoundException = serviceError {
- return true
- }
- return false
+ return error is AWSCognitoIdentityProvider.ResourceNotFoundException
  }
 }
 

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

@@ -89,11 +89,7 @@ struct VerifySignInChallenge: Action {
  return false
  }
 
- if let serviceError: RespondToAuthChallengeOutputError = error.internalAWSServiceError(),
- case .resourceNotFoundException = serviceError {
- return true
- }
- return false
+ return error is AWSCognitoIdentityProvider.ResourceNotFoundException
  }
 
 }

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Service/ErrorMapping/AWSCognitoIdentity+AuthErrorConvertible.swift

@@ -0,0 +1,116 @@
+//
+// Copyright Amazon.com Inc. or its affiliates.
+// All Rights Reserved.
+//
+// SPDX-License-Identifier: Apache-2.0
+//
+
+import Foundation
+import Amplify
+import AWSCognitoIdentity
+import AWSClientRuntime
+
+// AWSCognitoIdentity
+extension AWSCognitoIdentity.ExternalServiceException: AuthErrorConvertible {
+ var fallbackDescription: String { "External service threw error." }
+
+ var authError: AuthError {
+ .service(
+ properties.message ?? fallbackDescription,
+ AuthPluginErrorConstants.externalServiceException,
+ AWSCognitoAuthError.externalServiceException
+ )
+ }
+}
+
+extension AWSCognitoIdentity.InternalErrorException: AuthErrorConvertible {
+ var fallbackDescription: String { "Internal exception occurred" }
+
+ var authError: AuthError {
+ .unknown(properties.message ?? fallbackDescription)
+ }
+}
+
+// AWSCognitoIdentity
+extension AWSCognitoIdentity.InvalidIdentityPoolConfigurationException: AuthErrorConvertible {
+ var fallbackDescription: String { "Invalid IdentityPool Configuration error." }
+
+ var authError: AuthError {
+ .configuration(
+ properties.message ?? fallbackDescription,
+ AuthPluginErrorConstants.configurationError
+ )
+ }
+}
+
+extension AWSCognitoIdentity.InvalidParameterException: AuthErrorConvertible {
+ var fallbackDescription: String { "Invalid parameter error" }
+
+ var authError: AuthError {
+ .service(
+ properties.message ?? fallbackDescription,
+ AuthPluginErrorConstants.invalidParameterError,
+ AWSCognitoAuthError.invalidParameter
+ )
+ }
+}
+
+extension AWSCognitoIdentity.NotAuthorizedException: AuthErrorConvertible {
+ var fallbackDescription: String { "Not authorized error." }
+
+ var authError: AuthError {
+ .notAuthorized(
+ properties.message ?? fallbackDescription,
+ AuthPluginErrorConstants.notAuthorizedError
+ )
+ }
+}
+
+extension AWSCognitoIdentity.ResourceConflictException: AuthErrorConvertible {
+ var fallbackDescription: String { "Resource conflict error." }
+
+ var authError: AuthError {
+ .service(
+ properties.message ?? fallbackDescription,
+ AuthPluginErrorConstants.resourceConflictException,
+ AWSCognitoAuthError.resourceConflictException
+ )
+ }
+}
+
+extension AWSCognitoIdentity.ResourceNotFoundException: AuthErrorConvertible {
+ var fallbackDescription: String { "Resource not found error." }
+
+ var authError: AuthError {
+ .service(
+ properties.message ?? fallbackDescription,
+ AuthPluginErrorConstants.resourceNotFoundError,
+ AWSCognitoAuthError.resourceNotFound
+ )
+ }
+}
+
+extension AWSCognitoIdentity.TooManyRequestsException: AuthErrorConvertible {
+ var fallbackDescription: String { "Too many requests error." }
+
+ var authError: AuthError {
+ .service(
+ properties.message ?? fallbackDescription,
+ AuthPluginErrorConstants.tooManyRequestError,
+ AWSCognitoAuthError.requestLimitExceeded
+ )
+ }
+}
+
+
+extension AWSCognitoIdentity.LimitExceededException: AuthErrorConvertible {
+ var fallbackDescription: String { "Too many requests error." }
+
+ var authError: AuthError {
+ .service(
+ properties.message ?? fallbackDescription,
+ AuthPluginErrorConstants.limitExceededException,
+ AWSCognitoAuthError.limitExceededException
+ )
+ }
+}