fix(Auth): Fixing handling of service SdkError in Auth tasks (#2859)

Author: harsh62

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthChangePasswordTask.swift

@@ -39,8 +39,10 @@ class AWSAuthChangePasswordTask: AuthChangePasswordTask, DefaultLogger {
             let accessToken = try await taskHelper.getAccessToken()
             try await changePassword(with: accessToken)
             log.verbose("Received success")
-        } catch let error as ChangePasswordOutputError {
+        } catch let error as AuthErrorConvertible {
             throw error.authError
+        } catch let error as AuthError {
+            throw error
         } catch let error {
             throw AuthError.configuration("Unable to execute auth task", AuthPluginErrorConstants.configurationError, error)
         }

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthConfirmResetPasswordTask.swift

@@ -34,9 +34,7 @@ class AWSAuthConfirmResetPasswordTask: AuthConfirmResetPasswordTask, DefaultLogg
         do {
 
             try await confirmResetPassword()
-        } catch let error as ConfirmForgotPasswordOutputError {
-            throw error.authError
-        } catch let error as SdkError<ConfirmForgotPasswordOutputError> {
+        } catch let error as AuthErrorConvertible {
             throw error.authError
         } catch let error as AuthError {
             throw error

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthResendSignUpCodeTask.swift

@@ -36,9 +36,7 @@ class AWSAuthResendSignUpCodeTask: AuthResendSignUpCodeTask, DefaultLogger {
             let details = try await resendSignUpCode()
             log.verbose("Received result")
             return details
-        } catch let error as ResendConfirmationCodeOutputError {
-            throw error.authError
-        } catch let error as SdkError<ResendConfirmationCodeOutputError> {
+        } catch let error as AuthErrorConvertible {
             throw error.authError
         } catch let error as AuthError {
             throw error

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/AWSAuthResetPasswordTask.swift

@@ -36,9 +36,7 @@ class AWSAuthResetPasswordTask: AuthResetPasswordTask, DefaultLogger {
             let result = try await resetPassword()
             log.verbose("Received result")
             return result
-        } catch let error as ForgotPasswordOutputError {
-            throw error.authError
-        } catch let error as SdkError<ForgotPasswordOutputError> {
+        } catch let error as AuthErrorConvertible {
             throw error.authError
         } catch let error as AuthError {
             throw error

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/DeviceTasks/AWSAuthFetchDevicesTask.swift

@@ -36,9 +36,7 @@ class AWSAuthFetchDevicesTask: AuthFetchDevicesTask {
             let accessToken = try await taskHelper.getAccessToken()
             let devices = try await fetchDevices(with: accessToken)
             return devices
-        } catch let error as ListDevicesOutputError {
-            throw error.authError
-        } catch let error as SdkError<ListDevicesOutputError> {
+        } catch let error as AuthErrorConvertible {
             throw error.authError
         } catch let error as AuthError {
             throw error

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/DeviceTasks/AWSAuthForgetDeviceTask.swift

@@ -38,9 +38,7 @@ class AWSAuthForgetDeviceTask: AuthForgetDeviceTask {
             let accessToken = try await taskHelper.getAccessToken()
             let username = try await getCurrentUsername()
             try await forgetDevice(with: accessToken, username: username)
-        } catch let error as ForgetDeviceOutputError {
-            throw error.authError
-        } catch let error as SdkError<ForgetDeviceOutputError> {
+        } catch let error as AuthErrorConvertible {
             throw error.authError
         } catch let error as AuthError {
             throw error

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/DeviceTasks/AWSAuthRememberDeviceTask.swift

@@ -37,9 +37,7 @@ class AWSAuthRememberDeviceTask: AuthRememberDeviceTask {
             let accessToken = try await taskHelper.getAccessToken()
             let username = try await getCurrentUsername()
             try await rememberDevice(with: accessToken, username: username)
-        } catch let error as UpdateDeviceStatusOutputError {
-            throw error.authError
-        } catch let error as SdkError<UpdateDeviceStatusOutputError> {
+        } catch let error as AuthErrorConvertible {
             throw error.authError
         } catch let error as AuthError {
             throw error

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/UserTasks/AWSAuthAttributeResendConfirmationCodeTask.swift

@@ -35,7 +35,7 @@ class AWSAuthAttributeResendConfirmationCodeTask: AuthAttributeResendConfirmatio
             let accessToken = try await taskHelper.getAccessToken()
             let devices = try await initiateGettingVerificationCode(with: accessToken)
             return devices
-        } catch let error as GetUserAttributeVerificationCodeOutputError {
+        } catch let error as AuthErrorConvertible {
             throw error.authError
         } catch let error as AuthError {
             throw error

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/UserTasks/AWSAuthConfirmUserAttributeTask.swift

@@ -35,7 +35,7 @@ class AWSAuthConfirmUserAttributeTask: AuthConfirmUserAttributeTask {
             await taskHelper.didStateMachineConfigured()
             let accessToken = try await taskHelper.getAccessToken()
             try await confirmUserAttribute(with: accessToken)
-        } catch let error as VerifyUserAttributeOutputError {
+        } catch let error as AuthErrorConvertible {
             throw error.authError
         } catch let error as AuthError {
             throw error

AmplifyPlugins/Auth/Sources/AWSCognitoAuthPlugin/Task/UserTasks/AWSAuthFetchUserAttributeTask.swift

@@ -35,7 +35,7 @@ class AWSAuthFetchUserAttributeTask: AuthFetchUserAttributeTask {
             await taskHelper.didStateMachineConfigured()
             let accessToken = try await taskHelper.getAccessToken()
             return try await getUserAttributes(with: accessToken)
-        } catch let error as GetUserOutputError {
+        } catch let error as AuthErrorConvertible {
             throw error.authError
         } catch let error as AuthError {
             throw error