Skip to content

feat(auth): Provide a clear message during getTokens that there are no valid tokens on device #3518

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 26, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@
import com.amazonaws.mobileconnectors.cognitoidentityprovider.continuations.ForgotPasswordContinuation;
import com.amazonaws.mobileconnectors.cognitoidentityprovider.continuations.MultiFactorAuthenticationContinuation;
import com.amazonaws.mobileconnectors.cognitoidentityprovider.continuations.NewPasswordContinuation;
import com.amazonaws.mobileconnectors.cognitoidentityprovider.exceptions.CognitoNotAuthorizedException;
import com.amazonaws.mobileconnectors.cognitoidentityprovider.handlers.AuthenticationHandler;
import com.amazonaws.mobileconnectors.cognitoidentityprovider.handlers.ForgotPasswordHandler;
import com.amazonaws.mobileconnectors.cognitoidentityprovider.handlers.GenericHandler;
Expand Down Expand Up @@ -2045,17 +2046,21 @@ public void onSuccess(CognitoUserSession userSession, CognitoDevice newDevice) {

@Override
public void getAuthenticationDetails(AuthenticationContinuation authenticationContinuation, String userId) {
signalTokensNotAvailable(null);
signalTokensNotAvailable(new CognitoNotAuthorizedException("No valid tokens on device."));
}

@Override
public void getMFACode(MultiFactorAuthenticationContinuation continuation) {
signalTokensNotAvailable(null);
signalTokensNotAvailable(
new Exception("MFA code requested during token refresh.")
);
}

@Override
public void authenticationChallenge(ChallengeContinuation continuation) {
signalTokensNotAvailable(null);
signalTokensNotAvailable(
new Exception("Authentication challenge requested during token refresh.")
);
}

@Override
Expand All @@ -2064,8 +2069,14 @@ public void onFailure(Exception exception) {
}

private void signalTokensNotAvailable(final Exception e) {
Exception exception;
if (e == null) {
exception = new Exception(("Unknown error occurred during token refresh."));
} else {
exception = e;
}
Log.w(TAG, "signalTokensNotAvailable");
callback.onError(new Exception("No cached session.", e));
callback.onError(new Exception("No cached session.", exception));
}
}
);
Expand Down