fix(oauth-desktop): Call fxaLogin before fxaOAuthLogin with expected data during signin #17744
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
LZoog
force-pushed
the
FXA-10388
branch
3 times, most recently
from
a3e7068
to
ee4c67e
Compare
jonalmeida
approved these changes
Oct 2, 2024
| @@ -295,7 +295,7 @@ | |||
| "id": "5882386c6d801776", | |||
| "hashedSecret": "71b5283536f1f1c331eca2f75c58a5947d7a7ac54164eadb4b33a889afe89fbf", | |||
| "imageUri": "", | |||
| "redirectUri": "urn:ietf:wg:oauth:2.0:oob:oauth-redirect-webchannel", | |||
| "redirectUri": "urn:ietf:wg:oauth:2.0:oob:oauth-redirect-webchannel,http://localhost:3030/oauth/success/5882386c6d801776", | |||
There was a problem hiding this comment.
Non-blocking question: Just want to verify if it intentional to also include this localhost as well even though this is the dev.json since we've had oauth desktop supported before and we hadn't needed this then.
Comment on lines
+301
to
+304
| // NOTE, Oauth desktop needs to add `service=sync` as a query parameter for this | ||
| // to take users to the inline recovery key flow (SYNC-4408). (We may want | ||
| // check for client ID to determine oauth desktop instead, TBD slight refactor for | ||
| // FXA-10313). |
There was a problem hiding this comment.
For my own sanity: we had checked the source offline for app services and saw that service=sync is not used there for consumers of the oauth fxaclient (currently only our mobile browsers). However, I forgot to check desktop separately as well, which has a bunch of tests for fx_desktop_v3 which still exist: https://searchfox.org/mozilla-central/search?q=service%3Dsync&path=&case=false®exp=false
…data during signin Because: * We want to support the new oauth desktop flow, and there is a bug during signin because we were sending fxaOAuthLogin first This commit: * Refactors signin/utils to swap the order these web channel messages fire * Fixes an additional intermittent bug for 2FA and new account signins caused by sending keyFetchToken and unwrapBKey * Adds oauth desktop config * Renames oauthCode to oauthData in oauth hook fixes FXA-10388
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.
Because:
This commit:
fixes FXA-10388
Most of this was already accounted for in page-level tests. I'm going to be taking a better look at our test coverage in FXA-10328 next.
Test this by running
yarn firefoxfor our desktop v3 flow andFXA_DESKTOP_CONTEXT=oauth_webchannel_v1 yarn firefoxfor the oauth desktop flow. Check out a standard Sync signin (requires email code), a new Sync account signin (no code), and 2FA signin. Users should be fully logged into Sync.