fix(settings,auth): Fix sumo login issue

packages/fxa-settings/src/lib/passkeys/signin-flow.test.tsx

@@ -128,11 +128,13 @@ const buildArgs = (
     emails: [{ email: EMAIL, isPrimary: true, verified: true }],
     totp: { exists: false, verified: false },
   });
+  const sessionResendVerifyCode = jest.fn();
 
   const authClient = {
     beginPasskeyAuthentication,
     completePasskeyAuthentication,
     account,
+    sessionResendVerifyCode
   } as jest.Mocked<PasskeySignInAuthClient>;
   const integration = {
     isSync: () => false,
@@ -231,6 +233,7 @@ describe('usePasskeySignIn', () => {
       performNavigation: true,
       isPasskeySession: true,
       accountHasTotp: false,
+      authClient: args.authClient,
     });
     expect(storeAccountData).toHaveBeenCalledWith({
       email: EMAIL,
@@ -281,6 +284,7 @@ describe('usePasskeySignIn', () => {
       performNavigation: true,
       isPasskeySession: true,
       accountHasTotp: false,
+      authClient: args.authClient,
     });
   });
 

packages/fxa-settings/src/lib/passkeys/signin-flow.ts

@@ -154,7 +154,7 @@ export type PasskeySignInIntegration = NavigationOptions['integration'];
 /** Pick<> so tests can pass minimal mocks without `as any`. */
 export type PasskeySignInAuthClient = Pick<
   AuthClient,
-  'beginPasskeyAuthentication' | 'completePasskeyAuthentication' | 'account'
+  'beginPasskeyAuthentication' | 'completePasskeyAuthentication' | 'account' | 'sessionResendVerifyCode'
 >;
 
 /**
@@ -373,6 +373,7 @@ export function usePasskeySignIn({
         performNavigation: true,
         isPasskeySession: true,
         accountHasTotp,
+        authClient
       });
 
       if (navError) {

packages/fxa-settings/src/models/mocks.tsx

@@ -147,10 +147,12 @@ export function mockAuthClient() {
   if (typeof jest !== 'undefined') {
     return {
       sessionStatus: jest.fn().mockResolvedValue(mockSessionStatus),
+      sessionResendVerifyCode: jest.fn().mockResolvedValue(undefined),
     } as unknown as AuthClient;
   } else {
     return {
       sessionStatus: () => Promise.resolve(mockSessionStatus),
+      sessionResendVerifyCode: () => Promise.resolve(undefined),
     } as unknown as AuthClient;
   }
 }

packages/fxa-settings/src/pages/Authorization/container.tsx

@@ -11,7 +11,6 @@ import {
   RelierAccount,
   useAuthClient,
   useConfig,
-  useSession,
 } from '../../models';
 
 import { useCallback, useEffect, useState, useRef } from 'react';
@@ -58,7 +57,6 @@ const AuthorizationContainer = ({
   const config = useConfig();
   const location = useLocation();
   const navigateWithQuery = useNavigateWithQuery();
-  const session = useSession();
   const { finishOAuthFlowHandler, oAuthDataError } = useFinishOAuthFlowHandler(
     authClient,
     integration
@@ -76,12 +74,9 @@ const AuthorizationContainer = ({
         relierAccount
       );
 
-      const isOauthPromptNone = true;
       const { data, error } = await cachedSignIn(
         account?.sessionToken!,
         authClient,
-        session,
-        isOauthPromptNone
       );
 
       if (error === AuthUiErrors.SESSION_EXPIRED) {
@@ -122,6 +117,7 @@ const AuthorizationContainer = ({
           redirectTo: integration.data.redirectTo,
           finishOAuthFlowHandler,
           queryParams: location.search,
+          authClient
         };
 
         const { error: navError } = await handleNavigation(navigationOptions);
@@ -156,7 +152,6 @@ const AuthorizationContainer = ({
     integration,
     location.search,
     navigateWithQuery,
-    session,
   ]);
 
   useEffect(() => {

packages/fxa-settings/src/pages/PostVerify/SetPassword/container.tsx

@@ -193,6 +193,7 @@ const SetPasswordContainer = ({
             // users will see a "flash" of whatever page we navigate them to
             // before the client closes the view. See FXA-11944
             performNavigation: !integration.isFirefoxMobileClient(),
+            authClient
           };
 
           const { error } = await handleNavigation(navigationOptions);

packages/fxa-settings/src/pages/PostVerify/ThirdPartyAuthCallback/index.test.tsx

@@ -12,7 +12,7 @@ import { renderWithLocalizationProvider } from 'fxa-react/lib/test-utils/localiz
 import ThirdPartyAuthCallback from '.';
 import { AppContext } from '../../../models';
 import { createAppContext, mockAppContext } from '../../../models/mocks';
-import { useAccount } from '../../../models';
+import { useAccount, useAuthClient } from '../../../models';
 import { useFinishOAuthFlowHandler } from '../../../lib/oauth/hooks';
 import {
   handleNavigation,
@@ -23,17 +23,19 @@ import { MOCK_EMAIL, MOCK_SESSION_TOKEN } from '../../mocks';
 import { LocationProvider } from '@reach/router';
 import { GenericData } from '../../../lib/model-data';
 
-jest.mock('../../../models', () => ({
-  ...jest.requireActual('../../../models'),
-  useClientInfoState: jest.fn(),
-  useProductInfoState: jest.fn(),
-  useAccount: jest.fn(),
-  useAuthClient: () => {
-    return {
-      checkTotpTokenExists: jest.fn().mockResolvedValue({ verified: true }),
-    };
-  },
-}));
+jest.mock('../../../models', () => {
+  const mockAuthClient = {
+    checkTotpTokenExists: jest.fn().mockResolvedValue({ verified: true }),
+    sessionResendVerifyCode: jest.fn().mockResolvedValue(undefined),
+  };
+  return {
+    ...jest.requireActual('../../../models'),
+    useClientInfoState: jest.fn(),
+    useProductInfoState: jest.fn(),
+    useAccount: jest.fn(),
+    useAuthClient: () => mockAuthClient,
+  };
+});
 
 jest.mock('@reach/router', () => ({
   ...jest.requireActual('@reach/router'),
@@ -165,6 +167,15 @@ describe('ThirdPartyAuthCallback component', () => {
     mockHandleNavigation = jest.fn().mockResolvedValue({ error: null });
     (handleNavigation as jest.Mock).mockReturnValue(mockHandleNavigation);
     (ensureCanLinkAcountOrRedirect as jest.Mock).mockResolvedValue(true);
+    // useAuthClient returns a stable mock; restore its implementations here
+    // because afterEach's resetAllMocks() wipes them between tests.
+    const authClient = useAuthClient();
+    (authClient.checkTotpTokenExists as jest.Mock).mockResolvedValue({
+      verified: true,
+    });
+    (authClient.sessionResendVerifyCode as jest.Mock).mockResolvedValue(
+      undefined
+    );
     mockNavigateWithQuery.mockClear();
     mockCurrentAccount();
   });
@@ -262,6 +273,7 @@ describe('ThirdPartyAuthCallback component', () => {
         isSignInWithThirdPartyAuth: true,
         queryParams: '?',
         redirectTo: redirectTo,
+        authClient: useAuthClient(),
         signinData: {
           sessionToken: MOCK_SESSION_TOKEN,
           uid: '123',

packages/fxa-settings/src/pages/PostVerify/ThirdPartyAuthCallback/index.tsx

@@ -128,6 +128,7 @@ const ThirdPartyAuthCallback = ({
         // user sets a password and keys are available (see SetPassword/container.tsx).
         handleFxaLogin: isFirefoxNonSync,
         handleFxaOAuthLogin: isFirefoxNonSync,
+        authClient
       };
 
       const { error: navError } = await handleNavigation(navigationOptions);
@@ -144,6 +145,7 @@ const ThirdPartyAuthCallback = ({
       navigateWithQuery,
       webRedirectCheck,
       ftlMsgResolver,
+      authClient
     ]
   );
 

packages/fxa-settings/src/pages/Signin/SigninPasskeyFallback/container.tsx

@@ -149,6 +149,7 @@ const SigninPasskeyFallbackContainer = ({
         queryParams: location.search,
         handleFxaLogin: true,
         handleFxaOAuthLogin: true,
+        authClient
       });
       if (navError) {
         GleanMetrics.passkeyEnterPassword.submitFrontendError({

packages/fxa-settings/src/pages/Signin/SigninPasswordlessCode/index.tsx

@@ -292,6 +292,7 @@ const SigninPasswordlessCode = ({
           integration.isFirefoxMobileClient() && isSessionVerified
         ),
         isPasswordlessOtpSignin: true,
+        authClient
       };
 
       // For existing users signing into Sync (signin flow), show merge warning

packages/fxa-settings/src/pages/Signin/SigninRecoveryCode/index.test.tsx

@@ -29,6 +29,14 @@ jest.mock('../../../lib/hooks/useNavigateWithQuery', () => ({
   useNavigateWithQuery: () => mockNavigateWithQuery,
 }));
 
+const mockSessionResendVerifyCode = jest.fn().mockResolvedValue(undefined);
+jest.mock('../../../models', () => ({
+  ...jest.requireActual('../../../models'),
+  useAuthClient: () => ({
+    sessionResendVerifyCode: mockSessionResendVerifyCode,
+  }),
+}));
+
 jest.mock('../../../lib/glean', () => ({
   __esModule: true,
   default: {

packages/fxa-settings/src/pages/Signin/SigninRecoveryCode/index.tsx

@@ -5,7 +5,7 @@
 import { useCallback, useEffect, useState } from 'react';
 import { RouteComponentProps, useLocation } from '@reach/router';
 import { FtlMsg } from 'fxa-react/lib/utils';
-import { isWebIntegration, useFtlMsgResolver } from '../../../models';
+import { isWebIntegration, useAuthClient, useFtlMsgResolver } from '../../../models';
 import { BackupCodesImage } from '../../../components/images';
 import LinkExternal from 'fxa-react/components/LinkExternal';
 import FormVerifyCode, {
@@ -55,6 +55,7 @@ const SigninRecoveryCode = ({
     'Backup authentication code required'
   );
   const location = useLocation();
+  const authClient = useAuthClient();
 
   const webRedirectCheck = useWebRedirect(integration.data.redirectTo);
 
@@ -109,6 +110,7 @@ const SigninRecoveryCode = ({
       handleFxaLogin: true,
       handleFxaOAuthLogin: true,
       performNavigation: !integration.isFirefoxMobileClient(),
+      authClient
     };
 
     const { error } = await handleNavigation(navigationOptions);
@@ -129,6 +131,7 @@ const SigninRecoveryCode = ({
     uid,
     unwrapBKey,
     ftlMsgResolver,
+    authClient
   ]);
 
   const localizedInvalidCodeError = getLocalizedErrorMessage(

packages/fxa-settings/src/pages/Signin/SigninRecoveryPhone/container.tsx

@@ -130,6 +130,7 @@ const SigninRecoveryPhoneContainer = ({
         handleFxaLogin: true,
         handleFxaOAuthLogin: true,
         performNavigation: !integration.isFirefoxMobileClient(),
+        authClient
       };
 
       await handleNavigation(navigationOptions);

packages/fxa-settings/src/pages/Signin/SigninTokenCode/index.tsx

@@ -7,6 +7,7 @@ import { RouteComponentProps, useLocation } from '@reach/router';
 import { FtlMsg } from 'fxa-react/lib/utils';
 import {
   isWebIntegration,
+  useAuthClient,
   useFtlMsgResolver,
   useSession,
 } from '../../../models';
@@ -62,6 +63,7 @@ const SigninTokenCode = ({
   const [resendCountdown, setResendCountdown] = useState<number>(0);
   const { isThrottled, startThrottle } = useThrottle();
 
+  const authClient = useAuthClient();
   const webRedirectCheck = useWebRedirect(integration.data.redirectTo);
   const redirectTo =
     isWebIntegration(integration) && webRedirectCheck?.isValid
@@ -186,6 +188,7 @@ const SigninTokenCode = ({
           handleFxaLogin: false,
           handleFxaOAuthLogin: true,
           performNavigation: !integration.isFirefoxMobileClient(),
+          authClient
         };
 
         await GleanMetrics.isDone();
@@ -228,6 +231,7 @@ const SigninTokenCode = ({
       showInlineRecoveryKeySetup,
       onSessionVerified,
       startThrottle,
+      authClient
     ]
   );
 

packages/fxa-settings/src/pages/Signin/SigninTotpCode/index.tsx

@@ -5,7 +5,7 @@
 import React, { useEffect, useState } from 'react';
 import { Link, RouteComponentProps, useLocation } from '@reach/router';
 import { FtlMsg } from 'fxa-react/lib/utils';
-import { useAlertBar, useFtlMsgResolver, useSession } from '../../../models';
+import { useAlertBar, useAuthClient, useFtlMsgResolver, useSession } from '../../../models';
 import { logViewEvent } from '../../../lib/metrics';
 import { MozServices } from '../../../lib/types';
 import firefox from '../../../lib/channels/firefox';
@@ -58,6 +58,7 @@ export const SigninTotpCode = ({
   const session = useSession();
   const isSessionAALUpgrade = signinState.isSessionAALUpgrade;
   const alertBar = useAlertBar();
+  const authClient = useAuthClient();
 
   const [bannerError, setBannerError] = useState<string>('');
 
@@ -176,6 +177,7 @@ export const SigninTotpCode = ({
         handleFxaLogin: true,
         handleFxaOAuthLogin: true,
         performNavigation: !integration.isFirefoxMobileClient(),
+        authClient
       };
 
       const { error: navError } = await handleNavigation(navigationOptions);

packages/fxa-settings/src/pages/Signin/SigninTotpCode/mocks.tsx

@@ -5,10 +5,12 @@
 import { LocationProvider } from '@reach/router';
 import { OAuthNativeServices } from '@fxa/accounts/oauth';
 import {
+  AppContext,
   IntegrationData,
   IntegrationType,
   RelierCmsInfo,
 } from '../../../models';
+import { mockAppContext } from '../../../models/mocks';
 import { SigninTotpCode, SigninTotpCodeProps } from '.';
 import {
   MOCK_EMAIL,
@@ -100,16 +102,18 @@ export const Subject = ({
   submitTotpCode = mockSubmitTotpCode,
 }: Partial<SigninTotpCodeProps>) => {
   return (
-    <LocationProvider>
-      <SigninTotpCode
-        {...{
-          finishOAuthFlowHandler,
-          integration,
-          serviceName,
-          signinState,
-          submitTotpCode,
-        }}
-      />
-    </LocationProvider>
+    <AppContext.Provider value={mockAppContext()}>
+      <LocationProvider>
+        <SigninTotpCode
+          {...{
+            finishOAuthFlowHandler,
+            integration,
+            serviceName,
+            signinState,
+            submitTotpCode,
+          }}
+        />
+      </LocationProvider>
+    </AppContext.Provider>
   );
 };

packages/fxa-settings/src/pages/Signin/SigninUnblock/index.test.tsx

@@ -52,6 +52,14 @@ jest.mock('@reach/router', () => ({
   navigate: jest.fn(),
 }));
 
+const mockSessionResendVerifyCode = jest.fn().mockResolvedValue(undefined);
+jest.mock('../../../models', () => ({
+  ...jest.requireActual('../../../models'),
+  useAuthClient: () => ({
+    sessionResendVerifyCode: mockSessionResendVerifyCode,
+  }),
+}));
+
 const email = MOCK_EMAIL;
 const hasLinkedAccount = false;
 const hasPassword = true;