fix(mobileclient): Honor auth flow setting from config #2499
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
raphkim
reviewed
Jun 8, 2021
| @@ -0,0 +1,197 @@ | |||
| package com.amazonaws.mobile.client; | |||
There was a problem hiding this comment.
copyright :)
this is great, though
Comment on lines
40
to
46
| CountDownLatch initLatch; | ||
| CountDownLatch signinLatch; | ||
| CountDownLatch continuationLatch; | ||
| AtomicBoolean initComplete; | ||
| AtomicBoolean signInComplete; | ||
| AtomicBoolean continuationComplete; | ||
| AWSMobileClient mobileClient; |
Comment on lines
+367
to
+370
| @VisibleForTesting | ||
| void setUserPool(CognitoUserPool userpool) { | ||
| this.userpool = userpool; | ||
| } |
There was a problem hiding this comment.
would it be possible to inject a mock userpool during initialization by adding something like
"CognitoUserPool": {
"Default": {
"PoolId": "<pool-id>",
"AppClientId": "<client-id>",
"Region": "<region>"
}
},
during config generation? That would be preferable to adding more @VisibleForTesting methods.
There was a problem hiding this comment.
It would be tricky because you actually have to inject the mock after the initialize method runs. It would probably require a lot more refactoring, so I'm not sure it would be worth it.
raphkim
approved these changes
Jun 8, 2021
div5yesh
added a commit
that referenced
this pull request
Jun 30, 2021
* feat(aws-android-sdk-cognitoidentityprovider): support custom endpoint * feat(aws-android-sdk-cognitoidentityprovider): support custom endpoint unit tests * feat(aws-android-sdk-cognitoidentityprovider): support custom endpoint unit tests * feat(aws-android-sdk-machinelearning): update models to latest (#2407) Co-authored-by: Richard McClellan <ricmccle@amazon.com> * feat(aws-android-sdk-iot): update models to latest (#2408) Co-authored-by: Richard McClellan <ricmccle@amazon.com> * feat(aws-android-sdk-comprehend): update models to latest (#2409) Co-authored-by: Richard McClellan <ricmccle@amazon.com> * feat(aws-android-sdk-transcribe): update models to latest (#2410) Co-authored-by: Richard McClellan <ricmccle@amazon.com> * feat(aws-android-sdk-lex): update models to latest (#2413) Co-authored-by: Richard McClellan <ricmccle@amazon.com> * chore(lex): update service name for lex runtime (#2424) * feat(aws-android-sdk-kinesisvideo-archivedmedia): update models to latest (#2422) * Revert "feat(aws-android-sdk-cognitoidentityprovider): support custom endpoint" (#2425) Co-authored-by: Richard McClellan <ricmccle@amazon.com> * release: 2.22.6 (#2426) * fix(mobile-client): missing optional dependency warning removed (#2427) * fix(mobile-client): missing optional dependency warning removed * make comment more descriptive * chore: add fastlane scripts for release automation (#2428) * fix: change protocol for github import (#2429) * fix(s3): remove eTag validation logic (#2419) * chore(build): use in-memory key in CI (#2449) * change the time offset precision from int to long (#2448) **Notes:** The clockskew auto-correct logic in the SDK relies on the `int` primitive type when calculating the offset. When the offset is converted from milliseconds to days, the ms represented as an `int` have the boundaries as -24 and +24 days. Changing it to long (64-bit precision) fixes the limit. * fix(s3): force upload part tasks to be serial (#2447) * feat(aws-android-sdk-core): update models to latest (#2445) Co-authored-by: Richard McClellan <ricmccle@amazon.com> * release: AWS SDK for Android 2.22.7 (#2451) * release: AWS SDK for Android 2.23.0 * Update CHANGELOG.md Co-authored-by: Richard McClellan <ricmccle@amazon.com> * Update CHANGELOG.md * Update gradle.properties * Update CHANGELOG.md * Update CHANGELOG.md Co-authored-by: awsmobilesdk-dev+ghops <awsmobilesdk-dev+ghops@amazon.com> Co-authored-by: Chang Xu <42978935+changxu0306@users.noreply.github.com> Co-authored-by: Richard McClellan <ricmccle@amazon.com> * "feat(aws-android-sdk-cognitoidentityprovider): support custom endpoint" (#2455) * fix(pinpoint): add campaign attributes to push events (#2458) * release: AWS SDK for Android 2.23.0 (#2459) * release: AWS SDK for Android 2.22.8 * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md * Update gradle.properties Co-authored-by: awsmobilesdk-dev+ghops <awsmobilesdk-dev+ghops@amazon.com> Co-authored-by: Chang Xu <42978935+changxu0306@users.noreply.github.com> * feat(aws-android-sdk-sns): update models to latest (#2461) * feat(aws-android-sdk-cognitoidentityprovider): update models to latest (#2456) Co-authored-by: Raphael Kim <52714340+raphkim@users.noreply.github.com> * chore(build): set region in circleci script (#2467) * fix: launch hosted-ui sign-out using custom tabs manager (#2472) * feat(mobile-client): hosted-ui auth response handler is now built into redirect activity (#2473) * feat(mobile-client): auth response handler is now built into redirect activity * add javadocs for redirect activities * add signout latch conditionally * add no history flag to auth signout flow * feat(aws-android-sdk-connect): update models to latest (#2469) Co-authored-by: Raphael Kim <52714340+raphkim@users.noreply.github.com> * feat(aws-android-sdk-transcribe): update models to latest (#2476) Co-authored-by: Raphael Kim <52714340+raphkim@users.noreply.github.com> * feat(aws-android-sdk-rekognition): update models to latest (#2487) Co-authored-by: Raphael Kim <52714340+raphkim@users.noreply.github.com> * feat(aws-android-sdk-iot): update models to latest (#2490) Co-authored-by: Raphael Kim <52714340+raphkim@users.noreply.github.com> Co-authored-by: Rafael Juliano <rjjulian@amazon.com> * feat(aws-android-sdk-location): update models to latest (#2494) Co-authored-by: Raphael Kim <52714340+raphkim@users.noreply.github.com> * feat(aws-android-sdk-sns): update models to latest (#2496) Co-authored-by: Raphael Kim <52714340+raphkim@users.noreply.github.com> * feat(aws-android-sdk-polly): update models to latest (#2497) Co-authored-by: Raphael Kim <52714340+raphkim@users.noreply.github.com> * chore(sts): add support for regionalizing sts client (#2493) * feat(sts): add support for regionalizing sts client * feat(aws-android-sdk-mobile-client): adds signature with user attributes in confirmSignIn (#2492) * feat(aws-android-sdk-mobile-client): adds signature with user attributes in confirmSignIn * code review suggestion Co-authored-by: Noyes <dnnoyes@f8ffc25e9e15.ant.amazon.com> * release: AWS SDK for Android 2.24.0 (#2500) * release: AWS SDK for Android 2.24.0 * Reword the changelog * include instruction for applying fix Co-authored-by: awsmobilesdk-dev+ghops <awsmobilesdk-dev+ghops@amazon.com> Co-authored-by: Raphael Kim <52714340+raphkim@users.noreply.github.com> * fix(aws-android-sdk-lex): prioritize custom lex signer for all regions (#2506) * fix(aws-android-sdk-lex): prioritize custom lex signer for all regions * add tests * fix(mobileclient): Honor auth flow setting from config (#2499) * fix(mobileclient): Honor auth flow setting from config * PR feedback * fix(aws-android-sdk-polly): use correct SignerConfig in all regions (#2505) Co-authored-by: Raphael Kim <52714340+raphkim@users.noreply.github.com> * feat(aws-android-sdk-cognitoidentityprovider): update models to latest (#2510) * release: AWS SDK for Android 2.25.0 (#2512) Co-authored-by: awsmobilesdk-dev+ghops <awsmobilesdk-dev+ghops@amazon.com> * chore(docs): releases not pushed to S3 anymore (#2514) * fix(aws-android-sdk-s3): implement retry mechanism for upload part (#2504) * implement retry mechanism for upload part * reduce backoff time and max attempts * lgtm warning * feat(aws-android-sdk-connect): update models to latest (#2516) * feat(aws-android-sdk-kms): update models to latest (#2518) * release: AWS SDK for Android 2.26.0 (#2525) Co-authored-by: awsmobilesdk-dev+ghops <awsmobilesdk-dev+ghops@amazon.com> * feat(aws-android-sdk-connect): update models to latest (#2526) Co-authored-by: Abhash Kumar Singh <abhashs@amazon.com> Co-authored-by: Abhash Kumar Singh <thisisabhash@gmail.com> Co-authored-by: Jameson Williams <jhwill@amazon.com> Co-authored-by: AWS Mobile SDK Team <46607340+awsmobilesdk@users.noreply.github.com> Co-authored-by: Richard McClellan <ricmccle@amazon.com> Co-authored-by: Raphael Kim <52714340+raphkim@users.noreply.github.com> Co-authored-by: Rafael Juliano <rjjulian@amazon.com> Co-authored-by: Daniel Rochetti <daniel.rochetti@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: awsmobilesdk-dev+ghops <awsmobilesdk-dev+ghops@amazon.com> Co-authored-by: Chang Xu <42978935+changxu0306@users.noreply.github.com> Co-authored-by: Dustin Noyes <dustin.noyes.dev@gmail.com> Co-authored-by: Noyes <dnnoyes@f8ffc25e9e15.ant.amazon.com> Co-authored-by: tllauda <85560392+tllauda@users.noreply.github.com>
div5yesh
added a commit
that referenced
this pull request
Jul 30, 2021
* feature: user pool token revocation model updates * feature: revoke tokens if invalidate tokens specified * Token revocation (#2532) * feat(aws-android-sdk-cognitoidentityprovider): support custom endpoint * feat(aws-android-sdk-cognitoidentityprovider): support custom endpoint unit tests * feat(aws-android-sdk-cognitoidentityprovider): support custom endpoint unit tests * feat(aws-android-sdk-machinelearning): update models to latest (#2407) Co-authored-by: Richard McClellan <ricmccle@amazon.com> * feat(aws-android-sdk-iot): update models to latest (#2408) Co-authored-by: Richard McClellan <ricmccle@amazon.com> * feat(aws-android-sdk-comprehend): update models to latest (#2409) Co-authored-by: Richard McClellan <ricmccle@amazon.com> * feat(aws-android-sdk-transcribe): update models to latest (#2410) Co-authored-by: Richard McClellan <ricmccle@amazon.com> * feat(aws-android-sdk-lex): update models to latest (#2413) Co-authored-by: Richard McClellan <ricmccle@amazon.com> * chore(lex): update service name for lex runtime (#2424) * feat(aws-android-sdk-kinesisvideo-archivedmedia): update models to latest (#2422) * Revert "feat(aws-android-sdk-cognitoidentityprovider): support custom endpoint" (#2425) Co-authored-by: Richard McClellan <ricmccle@amazon.com> * release: 2.22.6 (#2426) * fix(mobile-client): missing optional dependency warning removed (#2427) * fix(mobile-client): missing optional dependency warning removed * make comment more descriptive * chore: add fastlane scripts for release automation (#2428) * fix: change protocol for github import (#2429) * fix(s3): remove eTag validation logic (#2419) * chore(build): use in-memory key in CI (#2449) * change the time offset precision from int to long (#2448) **Notes:** The clockskew auto-correct logic in the SDK relies on the `int` primitive type when calculating the offset. When the offset is converted from milliseconds to days, the ms represented as an `int` have the boundaries as -24 and +24 days. Changing it to long (64-bit precision) fixes the limit. * fix(s3): force upload part tasks to be serial (#2447) * feat(aws-android-sdk-core): update models to latest (#2445) Co-authored-by: Richard McClellan <ricmccle@amazon.com> * release: AWS SDK for Android 2.22.7 (#2451) * release: AWS SDK for Android 2.23.0 * Update CHANGELOG.md Co-authored-by: Richard McClellan <ricmccle@amazon.com> * Update CHANGELOG.md * Update gradle.properties * Update CHANGELOG.md * Update CHANGELOG.md Co-authored-by: awsmobilesdk-dev+ghops <awsmobilesdk-dev+ghops@amazon.com> Co-authored-by: Chang Xu <42978935+changxu0306@users.noreply.github.com> Co-authored-by: Richard McClellan <ricmccle@amazon.com> * "feat(aws-android-sdk-cognitoidentityprovider): support custom endpoint" (#2455) * fix(pinpoint): add campaign attributes to push events (#2458) * release: AWS SDK for Android 2.23.0 (#2459) * release: AWS SDK for Android 2.22.8 * Update CHANGELOG.md * Update CHANGELOG.md * Update CHANGELOG.md * Update gradle.properties Co-authored-by: awsmobilesdk-dev+ghops <awsmobilesdk-dev+ghops@amazon.com> Co-authored-by: Chang Xu <42978935+changxu0306@users.noreply.github.com> * feat(aws-android-sdk-sns): update models to latest (#2461) * feat(aws-android-sdk-cognitoidentityprovider): update models to latest (#2456) Co-authored-by: Raphael Kim <52714340+raphkim@users.noreply.github.com> * chore(build): set region in circleci script (#2467) * fix: launch hosted-ui sign-out using custom tabs manager (#2472) * feat(mobile-client): hosted-ui auth response handler is now built into redirect activity (#2473) * feat(mobile-client): auth response handler is now built into redirect activity * add javadocs for redirect activities * add signout latch conditionally * add no history flag to auth signout flow * feat(aws-android-sdk-connect): update models to latest (#2469) Co-authored-by: Raphael Kim <52714340+raphkim@users.noreply.github.com> * feat(aws-android-sdk-transcribe): update models to latest (#2476) Co-authored-by: Raphael Kim <52714340+raphkim@users.noreply.github.com> * feat(aws-android-sdk-rekognition): update models to latest (#2487) Co-authored-by: Raphael Kim <52714340+raphkim@users.noreply.github.com> * feat(aws-android-sdk-iot): update models to latest (#2490) Co-authored-by: Raphael Kim <52714340+raphkim@users.noreply.github.com> Co-authored-by: Rafael Juliano <rjjulian@amazon.com> * feat(aws-android-sdk-location): update models to latest (#2494) Co-authored-by: Raphael Kim <52714340+raphkim@users.noreply.github.com> * feat(aws-android-sdk-sns): update models to latest (#2496) Co-authored-by: Raphael Kim <52714340+raphkim@users.noreply.github.com> * feat(aws-android-sdk-polly): update models to latest (#2497) Co-authored-by: Raphael Kim <52714340+raphkim@users.noreply.github.com> * chore(sts): add support for regionalizing sts client (#2493) * feat(sts): add support for regionalizing sts client * feat(aws-android-sdk-mobile-client): adds signature with user attributes in confirmSignIn (#2492) * feat(aws-android-sdk-mobile-client): adds signature with user attributes in confirmSignIn * code review suggestion Co-authored-by: Noyes <dnnoyes@f8ffc25e9e15.ant.amazon.com> * release: AWS SDK for Android 2.24.0 (#2500) * release: AWS SDK for Android 2.24.0 * Reword the changelog * include instruction for applying fix Co-authored-by: awsmobilesdk-dev+ghops <awsmobilesdk-dev+ghops@amazon.com> Co-authored-by: Raphael Kim <52714340+raphkim@users.noreply.github.com> * fix(aws-android-sdk-lex): prioritize custom lex signer for all regions (#2506) * fix(aws-android-sdk-lex): prioritize custom lex signer for all regions * add tests * fix(mobileclient): Honor auth flow setting from config (#2499) * fix(mobileclient): Honor auth flow setting from config * PR feedback * fix(aws-android-sdk-polly): use correct SignerConfig in all regions (#2505) Co-authored-by: Raphael Kim <52714340+raphkim@users.noreply.github.com> * feat(aws-android-sdk-cognitoidentityprovider): update models to latest (#2510) * release: AWS SDK for Android 2.25.0 (#2512) Co-authored-by: awsmobilesdk-dev+ghops <awsmobilesdk-dev+ghops@amazon.com> * chore(docs): releases not pushed to S3 anymore (#2514) * fix(aws-android-sdk-s3): implement retry mechanism for upload part (#2504) * implement retry mechanism for upload part * reduce backoff time and max attempts * lgtm warning * feat(aws-android-sdk-connect): update models to latest (#2516) * feat(aws-android-sdk-kms): update models to latest (#2518) * release: AWS SDK for Android 2.26.0 (#2525) Co-authored-by: awsmobilesdk-dev+ghops <awsmobilesdk-dev+ghops@amazon.com> * feat(aws-android-sdk-connect): update models to latest (#2526) Co-authored-by: Abhash Kumar Singh <abhashs@amazon.com> Co-authored-by: Abhash Kumar Singh <thisisabhash@gmail.com> Co-authored-by: Jameson Williams <jhwill@amazon.com> Co-authored-by: AWS Mobile SDK Team <46607340+awsmobilesdk@users.noreply.github.com> Co-authored-by: Richard McClellan <ricmccle@amazon.com> Co-authored-by: Raphael Kim <52714340+raphkim@users.noreply.github.com> Co-authored-by: Rafael Juliano <rjjulian@amazon.com> Co-authored-by: Daniel Rochetti <daniel.rochetti@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: awsmobilesdk-dev+ghops <awsmobilesdk-dev+ghops@amazon.com> Co-authored-by: Chang Xu <42978935+changxu0306@users.noreply.github.com> Co-authored-by: Dustin Noyes <dustin.noyes.dev@gmail.com> Co-authored-by: Noyes <dnnoyes@f8ffc25e9e15.ant.amazon.com> Co-authored-by: tllauda <85560392+tllauda@users.noreply.github.com> * Update UserPoolClientType.java remove duplicate vars. * delete code for removed API * fixes: - use access token to check claim - check for origin_jti claim - clientSecret is optional * Update aws-android-sdk-cognitoidentityprovider/src/main/java/com/amazonaws/mobileconnectors/cognitoidentityprovider/CognitoUser.java Co-authored-by: Richard McClellan <ricmccle@amazon.com> * swallow exceptions * update test mock classes with latest model changes * add unit tests * return revoketoken response result Co-authored-by: Divyesh Chitroda <div5yesh@gmail.com> Co-authored-by: Abhash Kumar Singh <abhashs@amazon.com> Co-authored-by: Abhash Kumar Singh <thisisabhash@gmail.com> Co-authored-by: AWS Mobile SDK Team <46607340+awsmobilesdk@users.noreply.github.com> Co-authored-by: Richard McClellan <ricmccle@amazon.com> Co-authored-by: Raphael Kim <52714340+raphkim@users.noreply.github.com> Co-authored-by: Rafael Juliano <rjjulian@amazon.com> Co-authored-by: Daniel Rochetti <daniel.rochetti@gmail.com> Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: awsmobilesdk-dev+ghops <awsmobilesdk-dev+ghops@amazon.com> Co-authored-by: Chang Xu <42978935+changxu0306@users.noreply.github.com> Co-authored-by: Dustin Noyes <dustin.noyes.dev@gmail.com> Co-authored-by: Noyes <dnnoyes@f8ffc25e9e15.ant.amazon.com> Co-authored-by: tllauda <85560392+tllauda@users.noreply.github.com> Co-authored-by: poojamat <mathpooj@amazon.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue #, if available: #2349
Description of changes:
Another attempt at fixing the above issue. The problem with the last fix is that we were mixing auth flow type names with the challenge name that should be set in AuthenticationDetails.
By submitting this pull request, I confirm that you can use, modify, copy, and redistribute this contribution, under the terms of your choice.