From e88d3d0575f9f47a2a4a141159715af961309cde Mon Sep 17 00:00:00 2001 From: Divyesh Chitroda Date: Wed, 9 Jun 2021 19:22:26 -0700 Subject: [PATCH 01/12] fix(auth): #1102 throw correct auth exception for code mismatch --- .../auth/cognito/AWSCognitoAuthPlugin.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/AWSCognitoAuthPlugin.java b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/AWSCognitoAuthPlugin.java index 84d7e6a6b5..5621fb335d 100644 --- a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/AWSCognitoAuthPlugin.java +++ b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/AWSCognitoAuthPlugin.java @@ -725,11 +725,8 @@ public void onResult(ForgotPasswordResult result) { @Override public void onError(Exception error) { - onException.accept(new AuthException( - "An error occurred confirming password recovery code", - error, - "See attached exception for more details" - )); + onException.accept(CognitoAuthExceptionConverter.lookup( + error, "Confirm reset password failed.")); } } ); From a35f7df7ea8b92124a9346c1332a3f5d67dc9296 Mon Sep 17 00:00:00 2001 From: Divyesh Chitroda Date: Wed, 9 Jun 2021 19:28:40 -0700 Subject: [PATCH 02/12] Add multifactor not found auth exception with detailed messaging --- .../util/CognitoAuthExceptionConverter.java | 5 +++++ .../amplifyframework/auth/AuthException.java | 17 +++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java index 89bddcb072..932d3d3ba7 100644 --- a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java +++ b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java @@ -32,6 +32,7 @@ import com.amazonaws.services.cognitoidentityprovider.model.UserNotConfirmedException; import com.amazonaws.services.cognitoidentityprovider.model.UserNotFoundException; import com.amazonaws.services.cognitoidentityprovider.model.UsernameExistsException; +import com.amazonaws.services.cognitoidentityprovider.model.MFAMethodNotFoundException; /** * Convert AWS Cognito Exceptions to AuthExceptions. @@ -91,6 +92,10 @@ public static AuthException lookup(@NonNull Exception error, @NonNull String fal return new AuthException.LimitExceededException(error); } + if (error instanceof MFAMethodNotFoundException) { + return new AuthException.MFAMethodNotFoundException(error); + } + if (error instanceof ResourceNotFoundException) { return new AuthException.ResourceNotFoundException(error); } diff --git a/core/src/main/java/com/amplifyframework/auth/AuthException.java b/core/src/main/java/com/amplifyframework/auth/AuthException.java index 73fdb7bd2d..b409bc95de 100644 --- a/core/src/main/java/com/amplifyframework/auth/AuthException.java +++ b/core/src/main/java/com/amplifyframework/auth/AuthException.java @@ -396,6 +396,23 @@ public LimitExceededException(Throwable cause) { } } + /** + * Could not find multi-factor authentication (MFA) method in AWS Cognito. + */ + public static class MFAMethodNotFoundException extends AuthException { + private static final long serialVersionUID = 1L; + private static final String MESSAGE = "Could not find multi-factor authentication (MFA) method."; + private static final String RECOVERY_SUGGESTION = "Configure multi-factor authentication using Amplify CLI or AWS Cognito console."; + + /** + * Default message/recovery suggestion with a cause. + * @param cause The original error. + */ + public MFAMethodNotFoundException(Throwable cause) { + super(MESSAGE, cause, RECOVERY_SUGGESTION); + } + } + /** * Could not perform the action because password needs to be reset. */ From ff28bec33fc797147026ac146827d790ff7182ec Mon Sep 17 00:00:00 2001 From: Divyesh Chitroda Date: Thu, 10 Jun 2021 10:05:51 -0700 Subject: [PATCH 03/12] Update aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java Co-authored-by: Chang Xu <42978935+changxu0306@users.noreply.github.com> --- .../auth/cognito/util/CognitoAuthExceptionConverter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java index 932d3d3ba7..2919793db8 100644 --- a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java +++ b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java @@ -29,9 +29,9 @@ import com.amazonaws.services.cognitoidentityprovider.model.PasswordResetRequiredException; import com.amazonaws.services.cognitoidentityprovider.model.ResourceNotFoundException; import com.amazonaws.services.cognitoidentityprovider.model.TooManyFailedAttemptsException; +import com.amazonaws.services.cognitoidentityprovider.model.UsernameExistsException; import com.amazonaws.services.cognitoidentityprovider.model.UserNotConfirmedException; import com.amazonaws.services.cognitoidentityprovider.model.UserNotFoundException; -import com.amazonaws.services.cognitoidentityprovider.model.UsernameExistsException; import com.amazonaws.services.cognitoidentityprovider.model.MFAMethodNotFoundException; /** From 5ffdcd8c60a9d1658e58af4d3996ee3695bf00ea Mon Sep 17 00:00:00 2001 From: Divyesh Chitroda Date: Thu, 10 Jun 2021 10:08:06 -0700 Subject: [PATCH 04/12] move to fit import rule --- .../auth/cognito/util/CognitoAuthExceptionConverter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java index 2919793db8..be98157ae1 100644 --- a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java +++ b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java @@ -26,13 +26,13 @@ import com.amazonaws.services.cognitoidentityprovider.model.InvalidParameterException; import com.amazonaws.services.cognitoidentityprovider.model.InvalidPasswordException; import com.amazonaws.services.cognitoidentityprovider.model.LimitExceededException; +import com.amazonaws.services.cognitoidentityprovider.model.MFAMethodNotFoundException; import com.amazonaws.services.cognitoidentityprovider.model.PasswordResetRequiredException; import com.amazonaws.services.cognitoidentityprovider.model.ResourceNotFoundException; import com.amazonaws.services.cognitoidentityprovider.model.TooManyFailedAttemptsException; import com.amazonaws.services.cognitoidentityprovider.model.UsernameExistsException; import com.amazonaws.services.cognitoidentityprovider.model.UserNotConfirmedException; import com.amazonaws.services.cognitoidentityprovider.model.UserNotFoundException; -import com.amazonaws.services.cognitoidentityprovider.model.MFAMethodNotFoundException; /** * Convert AWS Cognito Exceptions to AuthExceptions. From 8aa5f193aff42da9d88a8d6d19f932a95c80b838 Mon Sep 17 00:00:00 2001 From: Divyesh Chitroda Date: Thu, 10 Jun 2021 15:12:01 -0700 Subject: [PATCH 05/12] float all generic errors to exception mapper --- .../auth/cognito/AWSCognitoAuthPlugin.java | 65 ++++++------------- 1 file changed, 19 insertions(+), 46 deletions(-) diff --git a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/AWSCognitoAuthPlugin.java b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/AWSCognitoAuthPlugin.java index 5621fb335d..d0342cdaf5 100644 --- a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/AWSCognitoAuthPlugin.java +++ b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/AWSCognitoAuthPlugin.java @@ -553,11 +553,8 @@ public void onResult(UserStateDetails result) { @Override public void onError(Exception exception) { - onException.accept(new AuthException( - "An error occurred while attempting to retrieve your user details", - exception, - "See attached exception for more details" - )); + onException.accept(CognitoAuthExceptionConverter.lookup( + exception, "Fetching authorization session failed.")); } }); } catch (Throwable exception) { @@ -582,11 +579,8 @@ public void onResult(Void result) { @Override public void onError(Exception exception) { - onException.accept(new AuthException( - "An error occurred while remembering a device", - exception, - "See attached exception for more details" - )); + onException.accept(CognitoAuthExceptionConverter.lookup( + exception, "Remember device failed.")); } }); } @@ -604,11 +598,8 @@ public void onResult(Void result) { @Override public void onError(Exception exception) { - onException.accept(new AuthException( - "An error occurred while forgetting a device", - exception, - "See attached exception for more details" - )); + onException.accept(CognitoAuthExceptionConverter.lookup( + exception, "Forget device failed.")); } }); } @@ -627,11 +618,8 @@ public void onResult(Void result) { @Override public void onError(Exception exception) { - onException.accept(new AuthException( - "An error occurred while forgetting a device", - exception, - "See attached exception for more details" - )); + onException.accept(CognitoAuthExceptionConverter.lookup( + exception, "Forget device failed.")); } }); } @@ -653,11 +641,8 @@ public void onResult(ListDevicesResult result) { @Override public void onError(Exception exception) { - onException.accept(new AuthException( - "An error occurred while fetching remembered devices.", - exception, - "See attached exception for more details" - )); + onException.accept(CognitoAuthExceptionConverter.lookup( + exception, "Fetching devices failed.")); } }); } @@ -690,11 +675,8 @@ public void onResult(ForgotPasswordResult result) { @Override public void onError(Exception exception) { - onException.accept(new AuthException( - "An error occurred triggering password recovery", - exception, - "See attached exception for more details" - )); + onException.accept(CognitoAuthExceptionConverter.lookup( + exception, "Reset password failed.")); } }); } @@ -746,12 +728,9 @@ public void onResult(Void result) { } @Override - public void onError(Exception error) { - onException.accept(new AuthException( - "Failed to change password", - error, - "See attached exception for more details" - )); + public void onError(Exception exception) { + onException.accept(CognitoAuthExceptionConverter.lookup( + exception, "Update password failed.")); } }); } @@ -774,11 +753,8 @@ public void onResult(Map result) { @Override public void onError(Exception error) { - onError.accept(new AuthException( - "Failed to fetch user attributes", - error, - "Ensure that you are logged in and online" - )); + onError.accept(CognitoAuthExceptionConverter.lookup( + error, "Fetching user attributes failed.")); } }); } @@ -929,11 +905,8 @@ public void onResult(Void result) { @Override public void onError(Exception error) { - onError.accept(new AuthException( - "An error occurred confirming user attribute", - error, - "See attached exception for more details" - )); + onError.accept(CognitoAuthExceptionConverter.lookup( + error, "Confirming user attributes failed.")); } }); } From 6e2e9a5c247ac853b2174d7f41d19a3922384949 Mon Sep 17 00:00:00 2001 From: Divyesh Chitroda Date: Thu, 10 Jun 2021 22:58:39 -0700 Subject: [PATCH 06/12] add software token mfa exception --- .../util/CognitoAuthExceptionConverter.java | 5 +++++ .../amplifyframework/auth/AuthException.java | 18 ++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java index be98157ae1..9f57d2a04c 100644 --- a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java +++ b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java @@ -29,6 +29,7 @@ import com.amazonaws.services.cognitoidentityprovider.model.MFAMethodNotFoundException; import com.amazonaws.services.cognitoidentityprovider.model.PasswordResetRequiredException; import com.amazonaws.services.cognitoidentityprovider.model.ResourceNotFoundException; +import com.amazonaws.services.cognitoidentityprovider.model.SoftwareTokenMFANotFoundException; import com.amazonaws.services.cognitoidentityprovider.model.TooManyFailedAttemptsException; import com.amazonaws.services.cognitoidentityprovider.model.UsernameExistsException; import com.amazonaws.services.cognitoidentityprovider.model.UserNotConfirmedException; @@ -100,6 +101,10 @@ public static AuthException lookup(@NonNull Exception error, @NonNull String fal return new AuthException.ResourceNotFoundException(error); } + if (error instanceof SoftwareTokenMFANotFoundException) { + return new AuthException.SoftwareTokenMFANotFoundException(error); + } + if (error instanceof TooManyFailedAttemptsException) { return new AuthException.FailedAttemptsLimitExceededException(error); } diff --git a/core/src/main/java/com/amplifyframework/auth/AuthException.java b/core/src/main/java/com/amplifyframework/auth/AuthException.java index b409bc95de..282f15a3e2 100644 --- a/core/src/main/java/com/amplifyframework/auth/AuthException.java +++ b/core/src/main/java/com/amplifyframework/auth/AuthException.java @@ -448,6 +448,24 @@ public ResourceNotFoundException(Throwable cause) { } } + /** + * Could not find software token MFA for the user. + */ + public static class SoftwareTokenMFANotFoundException extends AuthException { + private static final long serialVersionUID = 1L; + private static final String MESSAGE = "Could not find software token MFA."; + private static final String RECOVERY_SUGGESTION = + "Enable the software token MFA for the user."; + + /** + * Default message/recovery suggestion with a cause. + * @param cause The original error. + */ + public SoftwareTokenMFANotFoundException(Throwable cause) { + super(MESSAGE, cause, RECOVERY_SUGGESTION); + } + } + /** * Could not perform the action because user made too many failed attempts for a given action. */ From a83b3071ab8cb295cd9dc39f3517b723b9cff649 Mon Sep 17 00:00:00 2001 From: Divyesh Chitroda Date: Fri, 11 Jun 2021 12:11:51 -0700 Subject: [PATCH 07/12] add more missing exceptions --- .../util/CognitoAuthExceptionConverter.java | 10 ++++++ .../amplifyframework/auth/AuthException.java | 36 +++++++++++++++++++ 2 files changed, 46 insertions(+) diff --git a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java index 9f57d2a04c..23bca4b898 100644 --- a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java +++ b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java @@ -27,10 +27,12 @@ import com.amazonaws.services.cognitoidentityprovider.model.InvalidPasswordException; import com.amazonaws.services.cognitoidentityprovider.model.LimitExceededException; import com.amazonaws.services.cognitoidentityprovider.model.MFAMethodNotFoundException; +import com.amazonaws.services.cognitoidentityprovider.model.NotAuthorizedException; import com.amazonaws.services.cognitoidentityprovider.model.PasswordResetRequiredException; import com.amazonaws.services.cognitoidentityprovider.model.ResourceNotFoundException; import com.amazonaws.services.cognitoidentityprovider.model.SoftwareTokenMFANotFoundException; import com.amazonaws.services.cognitoidentityprovider.model.TooManyFailedAttemptsException; +import com.amazonaws.services.cognitoidentityprovider.model.TooManyRequestsException; import com.amazonaws.services.cognitoidentityprovider.model.UsernameExistsException; import com.amazonaws.services.cognitoidentityprovider.model.UserNotConfirmedException; import com.amazonaws.services.cognitoidentityprovider.model.UserNotFoundException; @@ -97,6 +99,10 @@ public static AuthException lookup(@NonNull Exception error, @NonNull String fal return new AuthException.MFAMethodNotFoundException(error); } + if (error instanceof NotAuthorizedException) { + return new AuthException.NotAuthorizedException(error); + } + if (error instanceof ResourceNotFoundException) { return new AuthException.ResourceNotFoundException(error); } @@ -109,6 +115,10 @@ public static AuthException lookup(@NonNull Exception error, @NonNull String fal return new AuthException.FailedAttemptsLimitExceededException(error); } + if (error instanceof TooManyRequestsException) { + return new AuthException.TooManyRequestsException(error); + } + if (error instanceof PasswordResetRequiredException) { return new AuthException.PasswordResetRequiredException(error); } diff --git a/core/src/main/java/com/amplifyframework/auth/AuthException.java b/core/src/main/java/com/amplifyframework/auth/AuthException.java index 282f15a3e2..832a1ef1a2 100644 --- a/core/src/main/java/com/amplifyframework/auth/AuthException.java +++ b/core/src/main/java/com/amplifyframework/auth/AuthException.java @@ -413,6 +413,24 @@ public MFAMethodNotFoundException(Throwable cause) { } } + /** + * + */ + public static class NotAuthorizedException extends AuthException { + private static final long serialVersionUID = 1L; + private static final String MESSAGE = ""; + private static final String RECOVERY_SUGGESTION = + "Check whether the given values are correct and the user is authorized to perform the operation."; + + /** + * Default message/recovery suggestion with a cause. + * @param cause The original error. + */ + public NotAuthorizedException(Throwable cause) { + super(MESSAGE, cause, RECOVERY_SUGGESTION); + } + } + /** * Could not perform the action because password needs to be reset. */ @@ -484,6 +502,24 @@ public FailedAttemptsLimitExceededException(Throwable cause) { } } + /** + * + */ + public static class TooManyRequestsException extends AuthException { + private static final long serialVersionUID = 1L; + private static final String MESSAGE = ""; + private static final String RECOVERY_SUGGESTION = + "Make sure the requests send are controlled and the errors are properly handled."; + + /** + * Default message/recovery suggestion with a cause. + * @param cause The original error. + */ + public TooManyRequestsException(Throwable cause) { + super(MESSAGE, cause, RECOVERY_SUGGESTION); + } + } + /** * Could not complete an action because it was cancelled by the user. */ From ea62a18eeaef819dfa4d2438466411eb419962eb Mon Sep 17 00:00:00 2001 From: Divyesh Chitroda Date: Fri, 11 Jun 2021 12:46:10 -0700 Subject: [PATCH 08/12] reorder imports as per checkstyle --- .../auth/cognito/util/CognitoAuthExceptionConverter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java index 23bca4b898..a0f8d2766b 100644 --- a/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java +++ b/aws-auth-cognito/src/main/java/com/amplifyframework/auth/cognito/util/CognitoAuthExceptionConverter.java @@ -33,9 +33,9 @@ import com.amazonaws.services.cognitoidentityprovider.model.SoftwareTokenMFANotFoundException; import com.amazonaws.services.cognitoidentityprovider.model.TooManyFailedAttemptsException; import com.amazonaws.services.cognitoidentityprovider.model.TooManyRequestsException; -import com.amazonaws.services.cognitoidentityprovider.model.UsernameExistsException; import com.amazonaws.services.cognitoidentityprovider.model.UserNotConfirmedException; import com.amazonaws.services.cognitoidentityprovider.model.UserNotFoundException; +import com.amazonaws.services.cognitoidentityprovider.model.UsernameExistsException; /** * Convert AWS Cognito Exceptions to AuthExceptions. From 035532c034b0817b31427817e2c29aae19bfe332 Mon Sep 17 00:00:00 2001 From: Divyesh Chitroda Date: Fri, 11 Jun 2021 13:05:45 -0700 Subject: [PATCH 09/12] Update core/src/main/java/com/amplifyframework/auth/AuthException.java Co-authored-by: Chang Xu <42978935+changxu0306@users.noreply.github.com> --- core/src/main/java/com/amplifyframework/auth/AuthException.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/com/amplifyframework/auth/AuthException.java b/core/src/main/java/com/amplifyframework/auth/AuthException.java index 832a1ef1a2..aeddc45724 100644 --- a/core/src/main/java/com/amplifyframework/auth/AuthException.java +++ b/core/src/main/java/com/amplifyframework/auth/AuthException.java @@ -418,7 +418,7 @@ public MFAMethodNotFoundException(Throwable cause) { */ public static class NotAuthorizedException extends AuthException { private static final long serialVersionUID = 1L; - private static final String MESSAGE = ""; + private static final String MESSAGE = "Failed since user is not authorized."; private static final String RECOVERY_SUGGESTION = "Check whether the given values are correct and the user is authorized to perform the operation."; From cb8c0fb0496fa85bcd1a5c94b7cffb3b7765e5dc Mon Sep 17 00:00:00 2001 From: Divyesh Chitroda Date: Fri, 11 Jun 2021 13:05:56 -0700 Subject: [PATCH 10/12] Update core/src/main/java/com/amplifyframework/auth/AuthException.java Co-authored-by: Chang Xu <42978935+changxu0306@users.noreply.github.com> --- core/src/main/java/com/amplifyframework/auth/AuthException.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/main/java/com/amplifyframework/auth/AuthException.java b/core/src/main/java/com/amplifyframework/auth/AuthException.java index aeddc45724..7adb8d0a52 100644 --- a/core/src/main/java/com/amplifyframework/auth/AuthException.java +++ b/core/src/main/java/com/amplifyframework/auth/AuthException.java @@ -507,7 +507,7 @@ public FailedAttemptsLimitExceededException(Throwable cause) { */ public static class TooManyRequestsException extends AuthException { private static final long serialVersionUID = 1L; - private static final String MESSAGE = ""; + private static final String MESSAGE = "Failed since the user made too many requests."; private static final String RECOVERY_SUGGESTION = "Make sure the requests send are controlled and the errors are properly handled."; From 6cd8ee7157fd9a7890d27841bfb04105bf18e4bb Mon Sep 17 00:00:00 2001 From: Divyesh Chitroda Date: Fri, 11 Jun 2021 13:15:11 -0700 Subject: [PATCH 11/12] fix documentation description --- .../main/java/com/amplifyframework/auth/AuthException.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/main/java/com/amplifyframework/auth/AuthException.java b/core/src/main/java/com/amplifyframework/auth/AuthException.java index 7adb8d0a52..feb859ddee 100644 --- a/core/src/main/java/com/amplifyframework/auth/AuthException.java +++ b/core/src/main/java/com/amplifyframework/auth/AuthException.java @@ -414,7 +414,7 @@ public MFAMethodNotFoundException(Throwable cause) { } /** - * + * Could not perform the operation since user is not authorized. */ public static class NotAuthorizedException extends AuthException { private static final long serialVersionUID = 1L; @@ -503,7 +503,7 @@ public FailedAttemptsLimitExceededException(Throwable cause) { } /** - * + * Could not perform the operation since user made too many requests. */ public static class TooManyRequestsException extends AuthException { private static final long serialVersionUID = 1L; From fe33e5541ffa537c521e62748bc0e466f5405a53 Mon Sep 17 00:00:00 2001 From: Divyesh Chitroda Date: Fri, 11 Jun 2021 13:33:04 -0700 Subject: [PATCH 12/12] fix checkstyle errors --- .../kotlin/datastore/KotlinDataStoreFacade.kt | 4 ++-- .../main/java/com/amplifyframework/auth/AuthException.java | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/core-kotlin/src/main/java/com/amplifyframework/kotlin/datastore/KotlinDataStoreFacade.kt b/core-kotlin/src/main/java/com/amplifyframework/kotlin/datastore/KotlinDataStoreFacade.kt index e60bf21645..21119a1f9e 100644 --- a/core-kotlin/src/main/java/com/amplifyframework/kotlin/datastore/KotlinDataStoreFacade.kt +++ b/core-kotlin/src/main/java/com/amplifyframework/kotlin/datastore/KotlinDataStoreFacade.kt @@ -67,10 +67,10 @@ class KotlinDataStoreFacade(private val delegate: Delegate = Amplify.DataStore) } @Throws(DataStoreException::class) - override suspend fun delete(itemClass: KClass, filter: QueryPredicate) { + override suspend fun delete(byClass: KClass, filter: QueryPredicate) { return suspendCoroutine { continuation -> delegate.delete( - itemClass.java, + byClass.java, filter, { continuation.resume(Unit) }, { continuation.resumeWithException(it) } diff --git a/core/src/main/java/com/amplifyframework/auth/AuthException.java b/core/src/main/java/com/amplifyframework/auth/AuthException.java index feb859ddee..72820dda6c 100644 --- a/core/src/main/java/com/amplifyframework/auth/AuthException.java +++ b/core/src/main/java/com/amplifyframework/auth/AuthException.java @@ -402,7 +402,8 @@ public LimitExceededException(Throwable cause) { public static class MFAMethodNotFoundException extends AuthException { private static final long serialVersionUID = 1L; private static final String MESSAGE = "Could not find multi-factor authentication (MFA) method."; - private static final String RECOVERY_SUGGESTION = "Configure multi-factor authentication using Amplify CLI or AWS Cognito console."; + private static final String RECOVERY_SUGGESTION = + "Configure multi-factor authentication using Amplify CLI or AWS Cognito console."; /** * Default message/recovery suggestion with a cause.