fix(auth): dispatch customOAuthState before signInWithRedirect_failure on OAuth error redirects - #14855
Open
y-hsgw wants to merge 3 commits into
Open
fix(auth): dispatch customOAuthState before signInWithRedirect_failure on OAuth error redirects#14855y-hsgw wants to merge 3 commits into
y-hsgw wants to merge 3 commits into
Conversation
🦋 Changeset detectedLatest commit: 208a6c0 The changes in this PR will be included in the next version bump. This PR includes changesets to release 3 packages
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
Fixes the dispatch of customOAuthState to ensure it occurs before the signInWithRedirect_failure during OAuth error redirects.
This file contains hidden or 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
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.
Description of changes
When
signInWithRedirectfails during the OAuth callback (e.g. Cognito redirects back with?error=...&error_description=...&state=..., such as when a PreSignUp Lambda trigger throws to block sign-in),completeOAuthFlowthrew before reaching the point wherecustomOAuthStateis dispatched. As a result, anycustomStatepassed tosignInWithRedirect({ customState })was lost on failure — onlysignInWithRedirect_failurefired, with no way to recover the custom state via the Hub event system.This change dispatches
customOAuthStatefrom theerrorbranch ofcompleteOAuthFlowbefore throwing, sosignInWithRedirect_failurelisteners can still read the custom state that was passed tosignInWithRedirect.Per the maintainer's guidance on the issue, the custom state is recovered from the state Amplify itself persisted when
signInWithRedirect({ customState })was called (oAuthStore.loadOAuthState()), rather than from the unvalidatedstatequery param. This avoids dispatching attacker-influenceable data intocustomOAuthState, which commonly drives a redirect target. The existingisCustomState/getCustomState/urlSafeDecodehelpers are reused, matching the success path incompleteFlow.Issue #, if available
#14853
Description of how you validated changes
Added unit tests in
completeOAuthFlow.test.tscovering the error redirect path:customOAuthState(recovered from the persisted state) before throwing when the persisted state contains a custom statecustomOAuthStatewhen the persisted state has no custom statecustomOAuthStatewhen there is no persisted stateyarn test --scope @aws-amplify/authpasses for the affected suites.Checklist
yarn testpassesBy submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.