Merge pull request #17064 from mozilla/FXA-9663-p2

bug(settings): Login breaking after swapping secondary and primary emails.
mozilla · Jun 5, 2024 · d5febb9 · d5febb9
2 parents e2bce39 + 0cfad2e
commit d5febb9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/packages/fxa-auth-client/lib/client.ts b/packages/fxa-auth-client/lib/client.ts
@@ -575,7 +575,7 @@ export default class AuthClient {
   async signInWithAuthPW(
     email: string,
     authPW: string,
-    options: Omit<SignInOptions, 'skipCaseError' | 'originalLoginEmail'> = {},
+    options: SignInOptions = {},
     headers?: Headers
   ): Promise<Omit<SignedInAccountData, 'unwrapBKey'>> {
     const payloadOptions = ({ keys, ...rest }: any) => rest;

diff --git a/packages/fxa-settings/src/pages/Signin/container.test.tsx b/packages/fxa-settings/src/pages/Signin/container.test.tsx
@@ -456,30 +456,29 @@ describe('signin container', () => {
     });
 
     it('handles incorrect email case error', async () => {
+      const email = `orginal-${MOCK_EMAIL}`;
+      const correctedEmail = `new-${MOCK_EMAIL}`;
       await render([
         mockGqlAvatarUseQuery(),
         // The first call should fail, and the incorrect email case error
         // with the corrected email in the error response should be returned.
         {
-          ...mockGqlBeginSigninMutation(
-            { keys: false },
-            { email: MOCK_EMAIL.toUpperCase() }
-          ),
+          ...mockGqlBeginSigninMutation({ keys: false }, { email: email }),
           error: mockGqlError(AuthUiErrors.INCORRECT_EMAIL_CASE, {
-            email: MOCK_EMAIL,
+            email: correctedEmail,
           }),
         },
-        // The corrected email should then be used, for the second attempt, and
-        // the login should succeed.
-        mockGqlBeginSigninMutation({
-          keys: false,
-          originalLoginEmail: MOCK_EMAIL.toUpperCase(),
-        }),
+        // Note, that originalEmail should also be sent up. This is a requirement for v1 passwords!
+        mockGqlBeginSigninMutation(
+          { keys: false, originalLoginEmail: email },
+          { email: correctedEmail }
+        ),
       ]);
 
       await waitFor(async () => {
+        // Emulates providing the original email even after they swapped in a primary email.
         const handlerResult = await currentSigninProps?.beginSigninHandler(
-          MOCK_EMAIL.toUpperCase(),
+          email,
           MOCK_PASSWORD
         );
         expect(handlerResult?.data).toBeDefined();

diff --git a/packages/fxa-settings/src/pages/Signin/container.tsx b/packages/fxa-settings/src/pages/Signin/container.tsx
@@ -639,15 +639,17 @@ export async function trySignIn(
       const { v1Credentials, v2Credentials } = await onRetryCorrectedEmail(
         result.error.email
       );
-      options.originalLoginEmail = email;
       // Try one more time with the corrected email
       return trySignIn(
         result.error.email,
         v1Credentials,
         v2Credentials,
         unverifiedAccount,
         beginSignin,
-        options
+        {
+          ...options,
+          originalLoginEmail: email,
+        }
       );
     }