chore: Update aws-swift-sdk to 0.5.0 (#2560)

* chore: Updating aws-swift-sdk to 0.4.0

* fix(auth): custom endpoint resolver (#2552)

* chore: Updating aws-swift-sdk to 0.5.0 and fixing s3 configuration issues (#2556)

* Update MockAWSClientConfiguration.swift

* chore: Fixing build errors in Geo and Analytics (#2558)

* chore: Fixing build errors in Geo and Analytics

* Update Date+Formatting.swift

* Update MockAWSClientConfiguration.swift

* chore: Update error mapping for Auth to introduce ForbiddenException

* fix: adding customized logic for creating presignedURL

* fix: adding unknown default to error enums

Co-authored-by: Ian Saultz <[email protected]>

Author: harsh62

AmplifyPlugins/Analytics/Sources/AWSPinpointAnalyticsPlugin/Support/Extensions/Date+Formatting.swift

@@ -15,6 +15,14 @@ extension DateFormatter {
         formatter.locale = Locale(identifier: "en_US_POSIX")
         return formatter
     }()
+
+    static let iso8601DateFormatterWithFractionalSeconds: DateFormatter = {
+        let formatter = DateFormatter()
+        formatter.dateFormat = "yyyy-MM-dd'T'HH:mm:ss.SSSZZZZZ"
+        formatter.timeZone = TimeZone(secondsFromGMT: 0)
+        formatter.locale = Locale(identifier: "en_US_POSIX")
+        return formatter
+    }()
 }
 
 extension Date {

AmplifyPlugins/Analytics/Sources/AWSPinpointAnalyticsPlugin/Support/Extensions/PinpointClient+CredentialsProvider.swift

@@ -12,9 +12,9 @@ import AWSPinpoint
 extension PinpointClient {
     convenience init(region: String, credentialsProvider: CredentialsProvider) throws {
         let configuration = try PinpointClientConfiguration(
-            region: region,
             credentialsProvider: credentialsProvider,
-            frameworkMetadata: AmplifyAWSServiceConfiguration.frameworkMetaData()
+            frameworkMetadata: AmplifyAWSServiceConfiguration.frameworkMetaData(),
+            region: region
         )
 
         self.init(config: configuration)

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

@@ -84,21 +84,12 @@ extension AWSCognitoAuthPlugin {
     private func makeUserPool() throws -> CognitoUserPoolBehavior {
         switch authConfiguration {
         case .userPools(let userPoolConfig), .userPoolsAndIdentityPools(let userPoolConfig, _):
-
-            let configuration: CognitoIdentityProviderClient.CognitoIdentityProviderClientConfiguration
-            if let customEndpoint = userPoolConfig.endpoint {
-                configuration = try .init(
-                    region: userPoolConfig.region,
-                    endpointResolver: customEndpoint.resolver,
-                    frameworkMetadata: AmplifyAWSServiceConfiguration.frameworkMetaData()
-                )
-            } else {
-                configuration = try CognitoIdentityProviderClient.CognitoIdentityProviderClientConfiguration(
-                    region: userPoolConfig.region, frameworkMetadata: AmplifyAWSServiceConfiguration.frameworkMetaData())
-            }
-
+            let configuration = try CognitoIdentityProviderClient.CognitoIdentityProviderClientConfiguration(
+                endpointResolver: userPoolConfig.endpoint?.resolver,
+                frameworkMetadata: AmplifyAWSServiceConfiguration.frameworkMetaData(),
+                region: userPoolConfig.region
+            )
             return CognitoIdentityProviderClient(config: configuration)
-
         default:
             fatalError()
         }
@@ -108,7 +99,9 @@ extension AWSCognitoAuthPlugin {
         switch authConfiguration {
         case .identityPools(let identityPoolConfig), .userPoolsAndIdentityPools(_, let identityPoolConfig):
             let configuration = try CognitoIdentityClient.CognitoIdentityClientConfiguration(
-                region: identityPoolConfig.region, frameworkMetadata: AmplifyAWSServiceConfiguration.frameworkMetaData())
+                frameworkMetadata: AmplifyAWSServiceConfiguration.frameworkMetaData(),
+                region: identityPoolConfig.region
+            )
             return CognitoIdentityClient(config: configuration)
         default:
             fatalError()

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Service/ErrorMapping/ChangePasswordOutputError+AuthError.swift

@@ -55,6 +55,11 @@ extension ChangePasswordOutputError: AuthErrorConvertible {
             return .service(limitExceededException.message ?? "Limit exceeded error",
                             AuthPluginErrorConstants.limitExceededError,
                             AWSCognitoAuthError.limitExceeded)
+        case .forbiddenException(let forbiddenException):
+            return .service(forbiddenException.message ?? "Access to the requested resource is forbidden",
+                            AuthPluginErrorConstants.forbiddenError)
+        @unknown default:
+            return .unknown("Unknown service error occurred")
         }
     }
 }

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Service/ErrorMapping/ConfirmForgotPasswordOutputError+AuthError.swift

@@ -73,6 +73,11 @@ extension ConfirmForgotPasswordOutputError: AuthErrorConvertible {
             let statusCode = serviceError._statusCode?.rawValue ?? -1
             let message = serviceError._message ?? ""
             return .unknown("Unknown service error occurred with status \(statusCode) \(message)")
+        case .forbiddenException(let forbiddenException):
+            return .service(forbiddenException.message ?? "Access to the requested resource is forbidden",
+                            AuthPluginErrorConstants.forbiddenError)
+        @unknown default:
+            return .unknown("Unknown service error occurred")
         }
     }
 }

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Service/ErrorMapping/ConfirmSignUpOutputError+AuthError.swift

@@ -111,7 +111,12 @@ extension ConfirmSignUpOutputError: AuthErrorConvertible {
             let statusCode = serviceError._statusCode?.rawValue ?? -1
             let message = serviceError._message ?? ""
             return .unknown("Unknown service error occurred with status \(statusCode) \(message)")
-
+            
+        case .forbiddenException(let forbiddenException):
+            return .service(forbiddenException.message ?? "Access to the requested resource is forbidden",
+                            AuthPluginErrorConstants.forbiddenError)
+        @unknown default:
+            return .unknown("Unknown service error occurred")
         }
     }
 

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Service/ErrorMapping/DeleteUserOutputError+AuthError.swift

@@ -46,6 +46,12 @@ extension DeleteUserOutputError: AuthErrorConvertible {
             let statusCode = serviceError._statusCode?.rawValue ?? -1
             let message = serviceError._message ?? ""
             return .unknown("Unknown service error occurred with status \(statusCode) \(message)")
+            
+        case .forbiddenException(let forbiddenException):
+            return .service(forbiddenException.message ?? "Access to the requested resource is forbidden",
+                            AuthPluginErrorConstants.forbiddenError)
+        @unknown default:
+            return .unknown("Unknown service error occurred")
         }
     }
 }

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Service/ErrorMapping/ForgetDeviceOutputError+AuthError.swift

@@ -49,6 +49,12 @@ extension ForgetDeviceOutputError: AuthErrorConvertible {
             let statusCode = serviceError._statusCode?.rawValue ?? -1
             let message = serviceError._message ?? ""
             return .unknown("Unknown service error occurred with status \(statusCode) \(message)")
+            
+        case .forbiddenException(let forbiddenException):
+            return .service(forbiddenException.message ?? "Access to the requested resource is forbidden",
+                            AuthPluginErrorConstants.forbiddenError)
+        @unknown default:
+            return .unknown("Unknown service error occurred")
         }
     }
 }

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Service/ErrorMapping/ForgotPasswordOutputError+AuthError.swift

@@ -81,6 +81,12 @@ extension ForgotPasswordOutputError: AuthErrorConvertible {
             let statusCode = serviceError._statusCode?.rawValue ?? -1
             let message = serviceError._message ?? ""
             return .unknown("Unknown service error occurred with status \(statusCode) \(message)")
+            
+        case .forbiddenException(let forbiddenException):
+            return .service(forbiddenException.message ?? "Access to the requested resource is forbidden",
+                            AuthPluginErrorConstants.forbiddenError)
+        @unknown default:
+            return .unknown("Unknown service error occurred")
         }
     }
 }

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Service/ErrorMapping/GetCredentialsForIdentityOutputError+AuthError.swift

@@ -45,6 +45,8 @@ extension GetCredentialsForIdentityOutputError: AuthErrorConvertible {
             let statusCode = unknownAWSHttpServiceError._statusCode?.rawValue ?? -1
             let message = unknownAWSHttpServiceError._message ?? ""
             return .unknown("Unknown service error occurred with status \(statusCode) \(message)")
+        @unknown default:
+            return .unknown("Unknown service error occurred")
         }
     }
 }