Skip to content

Commit 6efcaf9

Browse files
authored
fix(cognitoauth): forward lambda trigger exception for social sign in (#3002)
1 parent b8d4bf5 commit 6efcaf9

File tree

2 files changed

+14
-1
lines changed

2 files changed

+14
-1
lines changed

aws-android-sdk-cognitoauth/src/main/java/com/amazonaws/mobileconnectors/cognitoauth/AuthClient.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,11 @@ public class AuthClient {
9292
*/
9393
private static final long REDIRECT_TIMEOUT_SECONDS = 10;
9494

95+
/**
96+
* Message returned for a bad request.
97+
*/
98+
private static final String BAD_REQUEST_ERROR = "invalid_request";
99+
95100
/**
96101
* Android application context.
97102
*/
@@ -450,10 +455,17 @@ public void run() {
450455
uri.getQueryParameter(ClientConstants.DOMAIN_QUERY_PARAM_ERROR);
451456

452457
if (errorText != null) {
458+
final String errorDescription = uri.getQueryParameter(ClientConstants.DOMAIN_QUERY_PARAM_ERROR_DESCRIPTION);
459+
final String errorMessage;
460+
if (errorText.equals(BAD_REQUEST_ERROR) && errorDescription != null) {
461+
errorMessage = errorDescription.trim();
462+
} else {
463+
errorMessage = errorText;
464+
}
453465
returnCallback = new Runnable() {
454466
@Override
455467
public void run() {
456-
callback.onFailure(new AuthServiceException(errorText));
468+
callback.onFailure(new AuthServiceException(errorMessage));
457469
}
458470
};
459471
} else {

aws-android-sdk-cognitoauth/src/main/java/com/amazonaws/mobileconnectors/cognitoauth/util/ClientConstants.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public abstract class ClientConstants {
3838
public static final String DOMAIN_QUERY_PARAM_CODE_CHALLENGE_METHOD_SHA256 = "S256";
3939
public static final String DOMAIN_QUERY_PARAM_CODE_VERIFIER = "code_verifier";
4040
public static final String DOMAIN_QUERY_PARAM_ERROR = "error";
41+
public static final String DOMAIN_QUERY_PARAM_ERROR_DESCRIPTION = "error_description";
4142
public static final String DOMAIN_QUERY_PARAM_REDIRECT_URI = "redirect_uri";
4243
public static final String DOMAIN_QUERY_PARAM_LOGOUT_URI = "logout_uri";
4344
public static final String DOMAIN_QUERY_PARAM_RESPONSE_TYPE = "response_type";

0 commit comments

Comments
 (0)