chore: kickoff release

Author: royjit

Amplify/Categories/Auth/Error/AuthError.swift

@@ -77,7 +77,7 @@ extension AuthError: AmplifyError {
              .invalidState(_, let recoverySuggestion, _):
             return recoverySuggestion
         case .unknown:
-            return AmplifyErrorMessages.shouldNotHappenReportBugToAWS()
+            return AmplifyErrorMessages.shouldNotHappenReportBugToAWSWithoutLineInfo()
         }
     }
 

Amplify/Core/Support/AmplifyErrorMessages.swift

@@ -27,4 +27,13 @@ public struct AmplifyErrorMessages {
         "This should not happen. \(reportBugToAWS(file: file, function: function, line: line))"
     }
 
+    public static func shouldNotHappenReportBugToAWSWithoutLineInfo() -> String {
+        """
+        This should not happen. There is a possibility that there is a bug if this error persists. \
+        Please take a look at https://github.com/aws-amplify/amplify-swift/issues to see if there \
+        are any existing issues that match your scenario, and file an issue with the details of \
+        the bug if there isn't.
+        """
+    }
+
 }

AmplifyPlugins/API/Sources/AWSAPIPlugin/Operation/AWSGraphQLSubscriptionTaskRunner.swift

@@ -151,9 +151,10 @@ public class AWSGraphQLSubscriptionTaskRunner<R: Decodable>: InternalTaskRunner,
         } catch let error as APIError {
             fail(error)
         } catch {
-            // TODO: Verify with the team that terminating a subscription after failing to decode/cast one
+            // Verify with the team that terminating a subscription after failing to decode/cast one
             // payload is the right thing to do. Another option would be to propagate a GraphQL error, but
             // leave the subscription alive.
+            // see https://github.com/aws-amplify/amplify-swift/issues/2577
 
             fail(APIError.operationError("Failed to deserialize", "", error))
         }
@@ -185,7 +186,7 @@ public class AWSGraphQLSubscriptionTaskRunner<R: Decodable>: InternalTaskRunner,
     }
 }
 
-// TODO: Remove this code, it has replaced been with AWSGraphQLSubscriptionTaskRunner above.
+// Class is still necessary. See https://github.com/aws-amplify/amplify-swift/issues/2252
 final public class AWSGraphQLSubscriptionOperation<R: Decodable>: GraphQLSubscriptionOperation<R> {
 
     let pluginConfig: AWSAPICategoryPluginConfiguration
@@ -342,9 +343,11 @@ final public class AWSGraphQLSubscriptionOperation<R: Decodable>: GraphQLSubscri
             dispatch(result: .failure(error))
             finish()
         } catch {
-            // TODO: Verify with the team that terminating a subscription after failing to decode/cast one
+            // Verify with the team that terminating a subscription after failing to decode/cast one
             // payload is the right thing to do. Another option would be to propagate a GraphQL error, but
             // leave the subscription alive.
+            // see https://github.com/aws-amplify/amplify-swift/issues/2577
+
             dispatch(result: .failure(APIError.operationError("Failed to deserialize", "", error)))
             finish()
         }

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

@@ -89,7 +89,9 @@ extension AWSCognitoAuthPlugin: AuthCategoryBehavior {
         let options = options ?? AuthConfirmSignInRequest.Options()
         let request = AuthConfirmSignInRequest(challengeResponse: challengeResponse,
                                                options: options)
-        let task = AWSAuthConfirmSignInTask(request, stateMachine: authStateMachine)
+        let task = AWSAuthConfirmSignInTask(request,
+                                            stateMachine: authStateMachine,
+                                            configuration: authConfiguration)
         return try await taskQueue.sync {
             return try await task.value
         } as! AuthSignInResult

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Operations/Helpers/HostedUISignInHelper.swift

@@ -26,7 +26,6 @@ struct HostedUISignInHelper {
 
     func initiateSignIn() async throws -> AuthSignInResult {
         try await isValidState()
-        await prepareForSignIn()
         return try await doSignIn()
     }
 
@@ -38,38 +37,19 @@ struct HostedUISignInHelper {
             }
             switch authenticationState {
             case .signingIn:
-                continue
+                await sendCancelSignInEvent()
             case .signedIn:
                 throw AuthError.invalidState(
                     "There is already a user in signedIn state. SignOut the user first before calling signIn",
                     AuthPluginErrorConstants.invalidStateError, nil)
-            default:
-                return
-            }
-        }
-    }
-
-    private func prepareForSignIn() async {
-
-        let stateSequences = await authStateMachine.listen()
-
-        for await state in stateSequences {
-            guard case .configured(let authNState, _) = state else { continue }
-
-            switch authNState {
             case .signedOut:
                 return
-
-            case .signingIn:
-                Task {
-                    await sendCancelSignInEvent()
-                }
-            default:
-                continue
+            default: continue
             }
         }
     }
 
+
     private func doSignIn() async throws -> AuthSignInResult {
 
         let oauthConfiguration: OAuthConfigurationData
@@ -101,13 +81,19 @@ struct HostedUISignInHelper {
                 }
 
             case .error(let error):
-                throw AuthError.unknown("Sign in reached an error state", error)
+                await waitForSignInCancel()
+                throw error.authError
 
             case .signingIn(let signInState):
-                guard let result = try UserPoolSignInHelper.checkNextStep(signInState) else {
-                    continue
+                do {
+                    guard let result = try UserPoolSignInHelper.checkNextStep(signInState) else {
+                        continue
+                    }
+                    return result
+                } catch {
+                    await waitForSignInCancel()
+                    throw error
                 }
-                return result
             default:
                 continue
             }
@@ -141,4 +127,19 @@ struct HostedUISignInHelper {
         await authStateMachine.send(event)
     }
 
+    private func waitForSignInCancel() async {
+        await sendCancelSignInEvent()
+        let stateSequences = await authStateMachine.listen()
+        for await state in stateSequences {
+            guard case .configured(let authenticationState, _) = state else {
+                continue
+            }
+
+            switch authenticationState {
+            case .signedOut:
+                return
+            default: continue
+            }
+        }
+    }
 }

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

@@ -58,8 +58,6 @@ extension ChangePasswordOutputError: AuthErrorConvertible {
         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

@@ -76,8 +76,6 @@ extension ConfirmForgotPasswordOutputError: AuthErrorConvertible {
         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

@@ -115,8 +115,6 @@ extension ConfirmSignUpOutputError: AuthErrorConvertible {
         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

@@ -50,8 +50,6 @@ extension DeleteUserOutputError: AuthErrorConvertible {
         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

@@ -53,8 +53,6 @@ extension ForgetDeviceOutputError: AuthErrorConvertible {
         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")
         }
     }
 }