Merge pull request #18940 from mozilla/FXA-11730

feat(oauth): redirect on prompt=none and return_on_error=false

Author: chenba

packages/functional-tests/tests/oauth/oauthPromptNone.spec.ts

@@ -17,10 +17,10 @@ test.describe('severity-1 #smoke', () => {
   });
 
   test.describe('oauth prompt none', () => {
-    test('fails if no user logged in', async ({
+    test('redirects to signup if no user logged in', async ({
       page,
       target,
-      pages: { relier },
+      pages: { relier, signup },
       testAccountTracker,
     }) => {
       const { email } = testAccountTracker.generateAccountDetails();
@@ -32,9 +32,8 @@ test.describe('severity-1 #smoke', () => {
       await page.goto(`${target.relierUrl}/?${query.toString()}`);
       await relier.signInPromptNone();
 
-      //Verify error message
-      await page.waitForURL(/authorization/);
-      await expect(page.getByText('User is not signed in')).toBeVisible();
+      await page.waitForURL(/oauth/);
+      await expect(signup.signupFormHeading).toBeVisible();
     });
 
     test('fails RP that is not allowed', async ({
@@ -93,10 +92,10 @@ test.describe('severity-1 #smoke', () => {
       ).toBeVisible();
     });
 
-    test('fails if session is no longer valid', async ({
+    test('redirects if session is no longer valid', async ({
       page,
       target,
-      pages: { relier, settings, signin },
+      pages: { relier, settings, signin, signup },
       testAccountTracker,
     }) => {
       const credentials = await testAccountTracker.signUp();
@@ -120,9 +119,8 @@ test.describe('severity-1 #smoke', () => {
       await page.goto(`${target.relierUrl}/?${query.toString()}`);
       await relier.signInPromptNone();
 
-      // Verify error message
-      await page.waitForURL(/authorization/);
-      await expect(page.getByText('User is not signed in')).toBeVisible();
+      await page.waitForURL(/oauth/);
+      await expect(signup.signupFormHeading).toBeVisible();
     });
 
     test('fails if account is not verified', async ({

packages/functional-tests/tests/react-conversion/oauthPromptNone.spec.ts

@@ -18,7 +18,11 @@ import { currentAccount } from '../../lib/cache';
 import { useFinishOAuthFlowHandler } from '../../lib/oauth/hooks';
 import OAuthDataError from '../../components/OAuthDataError';
 import { cachedSignIn, handleNavigation } from '../Signin/utils';
-import { AuthError, OAuthError } from '../../lib/oauth/oauth-errors';
+import {
+  AuthError,
+  OAUTH_ERRORS,
+  OAuthError,
+} from '../../lib/oauth/oauth-errors';
 import { AuthUiErrors } from '../../lib/auth-errors/auth-errors';
 import { hardNavigate } from 'fxa-react/lib/utils';
 import { useNavigateWithQuery } from '../../lib/hooks/useNavigateWithQuery';
@@ -120,13 +124,22 @@ const AuthorizationContainer = ({
         return;
       }
 
+      if (
+        !(integration as OAuthWebIntegration).returnOnError() &&
+        err.errno === OAUTH_ERRORS['PROMPT_NONE_NOT_SIGNED_IN'].errno
+      ) {
+        navigateWithQuery('/oauth');
+        return;
+      }
+
       setOauthError(err);
     }
   }, [
     authClient,
     finishOAuthFlowHandler,
     integration,
     location.search,
+    navigateWithQuery,
     session,
   ]);