Revert "Fix web SAML cancel not showing login form on browser-back"

This reverts commit 452c858.

Author: MelvinBot

src/pages/signin/SAMLSignInPage/index.tsx

@@ -27,9 +27,6 @@ function SAMLSignInPage() {
                     handleSAMLLoginError(translate('common.error.login'), false);
                     return;
                 }
-                // Mark that SAML login was initiated so SignInPage can detect a browser-back
-                // from the IdP and clear sign-in data instead of re-initiating SAML
-                sessionStorage.setItem('EXPENSIFY_SAML_INITIATED', 'true');
                 window.location.replace(response.url);
             })
             .catch((error: Error) => {

src/pages/signin/SignInPage.tsx

@@ -67,7 +67,6 @@ type GetRenderOptionsParams = {
     isPrimaryLogin: boolean;
     isUsingMagicCode: boolean;
     hasInitiatedSAMLLogin: boolean;
-    isReturningFromSAMLOnWeb: boolean;
     shouldShowAnotherLoginPageOpenedMessage: boolean;
     credentials: OnyxEntry<Credentials>;
     isAccountValidated?: boolean;
@@ -90,7 +89,6 @@ function getRenderOptions({
     isPrimaryLogin,
     isUsingMagicCode,
     hasInitiatedSAMLLogin,
-    isReturningFromSAMLOnWeb,
     shouldShowAnotherLoginPageOpenedMessage,
     credentials,
     isAccountValidated,
@@ -102,14 +100,13 @@ function getRenderOptions({
     const hasSMSDeliveryFailure = !!account?.smsDeliveryFailureStatus?.hasSMSDeliveryFailure;
 
     // True, if the user has SAML required, and we haven't yet initiated SAML for their account
-    const shouldInitiateSAMLLogin = hasAccount && hasLogin && isSAMLRequired && !hasInitiatedSAMLLogin && !isReturningFromSAMLOnWeb && !!account.isLoading;
+    const shouldInitiateSAMLLogin = hasAccount && hasLogin && isSAMLRequired && !hasInitiatedSAMLLogin && !!account.isLoading;
     const shouldShowChooseSSOOrMagicCode = hasAccount && hasLogin && isSAMLEnabled && !isSAMLRequired && !isUsingMagicCode;
 
     // SAML required users may reload the login page after having already entered their login details, in which
     // case we want to clear their sign in data so they don't end up in an infinite loop redirecting back to their
-    // SSO provider's login page. On web, also trigger when returning from an IdP redirect (browser-back) since
-    // account.isLoading may still be true during Onyx hydration.
-    const isClearingSAMLSignInData = hasLogin && isSAMLRequired && !shouldInitiateSAMLLogin && ((!hasInitiatedSAMLLogin && !account.isLoading) || isReturningFromSAMLOnWeb);
+    // SSO provider's login page
+    const isClearingSAMLSignInData = hasLogin && isSAMLRequired && !shouldInitiateSAMLLogin && !hasInitiatedSAMLLogin && !account.isLoading;
     if (isClearingSAMLSignInData) {
         clearSignInData();
     }
@@ -180,20 +177,6 @@ function SignInPage({ref}: SignInPageProps) {
      *  if we need to clear their sign in details so they can enter a login */
     const [hasInitiatedSAMLLogin, setHasInitiatedSAMLLogin] = useState(false);
 
-    // On web, detect if the user is returning from a SAML IdP redirect (e.g. browser-back).
-    // sessionStorage survives page reloads within the same tab, unlike React state.
-    const [isReturningFromSAMLOnWeb] = useState(() => {
-        if (typeof sessionStorage === 'undefined') {
-            return false;
-        }
-        const flag = sessionStorage.getItem('EXPENSIFY_SAML_INITIATED');
-        if (flag === 'true') {
-            sessionStorage.removeItem('EXPENSIFY_SAML_INITIATED');
-            return true;
-        }
-        return false;
-    });
-
     const isClientTheLeader = !!activeClients && isClientTheLeaderActiveClientManager();
     // We need to show "Another login page is opened" message if the page isn't active and visible
     // eslint-disable-next-line rulesdir/no-negated-variables
@@ -231,7 +214,6 @@ function SignInPage({ref}: SignInPageProps) {
         isPrimaryLogin: !account?.primaryLogin || account.primaryLogin === credentials?.login,
         isUsingMagicCode,
         hasInitiatedSAMLLogin,
-        isReturningFromSAMLOnWeb,
         shouldShowAnotherLoginPageOpenedMessage,
         credentials,
         isAccountValidated,