Switch to new tenant after loading a copied long URL (opensearch-proj…

…ect#1450) (opensearch-project#1477) * Replace legacy template with index template (opensearch-project#1359) Signed-off-by: Chang Liu <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * added loginEndPointWithPath (opensearch-project#1358) * added loginEndPointWithPath Signed-off-by: Mattijs Vanhaverbeke <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Add release notes for 1.3.9 (opensearch-project#1379) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * No blank backend role before adding a new one in Create User page (opensearch-project#1384) * Add last backend role empty check Signed-off-by: nursaadat <[email protected]> Signed-off-by: Saadat Nursultan <[email protected]> * Add backend role empty check Signed-off-by: nursaadat <[email protected]> Signed-off-by: Saadat Nursultan <[email protected]> * Add strict comparison Signed-off-by: nursaadat <[email protected]> Signed-off-by: Saadat Nursultan <[email protected]> * Fix lint errors Signed-off-by: nursaadat <[email protected]> Signed-off-by: Saadat Nursultan <[email protected]> * Add tests for backend role panel Signed-off-by: Saadat Nursultan <[email protected]> * Fix lint errors Signed-off-by: Saadat Nursultan <[email protected]> --------- Signed-off-by: nursaadat <[email protected]> Signed-off-by: Saadat Nursultan <[email protected]> Co-authored-by: nursaadat <[email protected]> Co-authored-by: Saadat Nursultan <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Fix script for Windows (opensearch-project#1393) * Fix script for Windows Signed-off-by: nurbqq <[email protected]> Signed-off-by: nurbqq <[email protected]> Co-authored-by: Stephen Crawford <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Adding new actions for ppl and datasource apis (opensearch-project#1395) * Adding new actions for ppl and datasource apis Signed-off-by: vamsi-amazon <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Fix "Get started" image is not adaptive to the browser window size. (opensearch-project#1396) * Fixed get-started page image not adapting to the browser window size Signed-off-by: Sirazh Gabdullin <[email protected]> * Update fix by applying suggested changes Signed-off-by: Sirazh Gabdullin <[email protected]> * Update unit tests snapshot Signed-off-by: Sirazh Gabdullin <[email protected]> --------- Signed-off-by: Sirazh Gabdullin <[email protected]> Co-authored-by: Stephen Crawford <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Split up a value into multiple cookie payloads (opensearch-project#1352) * PoC for splitting up a value into multiple cookie payloads Signed-off-by: Jochen Kressin <[email protected]> * Cookie splitting for OpenId and SAML Signed-off-by: Jochen Kressin <[email protected]> * Changes after review comments Signed-off-by: Jochen Kressin <[email protected]> * WIP: First unit tests Signed-off-by: Jochen Kressin <[email protected]> * More unit tests Signed-off-by: Jochen Kressin <[email protected]> * Fix for multi auth, request argument was missing Signed-off-by: Jochen Kressin <[email protected]> * Fixed linting errors Signed-off-by: Jochen Kressin <[email protected]> * Added one additional cookie for the SAML integration tests Signed-off-by: Jochen Kressin <[email protected]> --------- Signed-off-by: Jochen Kressin <[email protected]> Co-authored-by: Stephen Crawford <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Dynamic tenancy configurations (opensearch-project#1394) * Dynamic multitenancy feature. Signed-off-by: Abhi Kalra <[email protected]> * Dynamic multitenancy feature -PR feedback Signed-off-by: Abhi Kalra <[email protected]> --------- Signed-off-by: Abhi Kalra <[email protected]> Co-authored-by: Abhi Kalra <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Add release notes for 2.7.0 (opensearch-project#1407) * Add release notes for 2.7.0 Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Removes tiny.amazon.com links (opensearch-project#1420) Signed-off-by: Darshit Chanpura <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Fixing dynamic tenancy changes for issues 1412 (opensearch-project#1419) * Fixing dynamic tenancy changes for opensearchdasbhoard.yaml Signed-off-by: Abhi Kalra <[email protected]> Co-authored-by: Abhi Kalra <[email protected]> Co-authored-by: Stephen Crawford <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Change the testuser's password in some integration test cases into a stronger password (opensearch-project#1428) * Change the testuser's password into a stronger password Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Increment version to 3.0.0.0 (opensearch-project#1414) Signed-off-by: opensearch-ci-bot <[email protected]> Co-authored-by: opensearch-ci-bot <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Adds the newly created admin api permissions to the static dropdown list (opensearch-project#1426) * Adds the newly created admin api permissions to the static dropdown of permissions displayed when creating/modifying a role --------- Signed-off-by: Darshit Chanpura <[email protected]> Co-authored-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Update account-nav-button.tsx Fix added to set the window.location to the pathname, rather than just reload & clear lastURL as it would be from the previous tenant. Signed-off-by: Leanne Lacey-Byrne <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Update account-nav-button.tsx Adding comments to explain changes Signed-off-by: Leanne Lacey-Byrne <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * add new cluster permissions constants for lron (opensearch-project#1444) Signed-off-by: zhichao-aws <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * removing whitespace due to linting fix Signed-off-by: Leanne Lacey-Byrne <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Adding tests for account-nav-button wip Signed-off-by: leanneeliatra <[email protected]> * put commented code to original state Signed-off-by: leanneeliatra <[email protected]> * Skip flaky SAML test as it awaits a fix (opensearch-project#1453) Signed-off-by: Craig Perkins <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Use version from package.json for integration tests (opensearch-project#1463) * Use version from package.json for integration tests Signed-off-by: Craig Perkins <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Adds 2.8 release notes (opensearch-project#1464) Signed-off-by: Darshit Chanpura <[email protected]> Co-authored-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Adding tests to jest test for tenant switch. Putting test in correct folder and renaming function. Signed-off-by: leanneeliatra <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * handle switch calling correct function Signed-off-by: Leanne Lacey-Byrne <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * checking for session storage Signed-off-by: leanneeliatra <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * adding window to make sessionStorage more explicit Signed-off-by: leanneeliatra <[email protected]> * Moved the test into account-nav-button.test.tsx Signed-off-by: leanneeliatra <[email protected]> * Removing additional files. Signed-off-by: leanneeliatra <[email protected]> * Declared session storage as a constant Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Update account-nav-button.tsx Fix added to set the window.location to the pathname, rather than just reload & clear lastURL as it would be from the previous tenant. Signed-off-by: Leanne Lacey-Byrne <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Update account-nav-button.tsx Adding comments to explain changes Signed-off-by: Leanne Lacey-Byrne <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * removing whitespace due to linting fix Signed-off-by: Leanne Lacey-Byrne <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Adding tests for account-nav-button wip Signed-off-by: leanneeliatra <[email protected]> * put commented code to original state Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Adding tests to jest test for tenant switch. Putting test in correct folder and renaming function. Signed-off-by: leanneeliatra <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * handle switch calling correct function Signed-off-by: Leanne Lacey-Byrne <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Removing additional files. Signed-off-by: leanneeliatra <[email protected]> * Fix unwanted changes Signed-off-by: Darshit Chanpura <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Update account-nav-button.tsx Fix added to set the window.location to the pathname, rather than just reload & clear lastURL as it would be from the previous tenant. Signed-off-by: Leanne Lacey-Byrne <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Adding tests for account-nav-button wip Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Adding tests to jest test for tenant switch. Putting test in correct folder and renaming function. Signed-off-by: leanneeliatra <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * checking for session storage Signed-off-by: leanneeliatra <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Declared session storage as a constant Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Adding tests for account-nav-button wip Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Adding tests to jest test for tenant switch. Putting test in correct folder and renaming function. Signed-off-by: leanneeliatra <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Moved the test into account-nav-button.test.tsx Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Dynamic tenancy configurations (opensearch-project#1394) * Dynamic multitenancy feature. Signed-off-by: Abhi Kalra <[email protected]> * Dynamic multitenancy feature -PR feedback Signed-off-by: Abhi Kalra <[email protected]> --------- Signed-off-by: Abhi Kalra <[email protected]> Co-authored-by: Abhi Kalra <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Fixing dynamic tenancy changes for issues 1412 (opensearch-project#1419) * Fixing dynamic tenancy changes for opensearchdasbhoard.yaml Signed-off-by: Abhi Kalra <[email protected]> Co-authored-by: Abhi Kalra <[email protected]> Co-authored-by: Stephen Crawford <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Removing Prerequisite Checks Workflow (opensearch-project#1456) Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Use version from package.json for integration tests (opensearch-project#1463) * Use version from package.json for integration tests Signed-off-by: Craig Perkins <[email protected]> Signed-off-by: leanneeliatra <[email protected]> * Removing unneded file Signed-off-by: leanneeliatra <[email protected]> --------- Signed-off-by: Chang Liu <[email protected]> Signed-off-by: leanneeliatra <[email protected]> Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: nursaadat <[email protected]> Signed-off-by: Saadat Nursultan <[email protected]> Signed-off-by: nurbqq <[email protected]> Signed-off-by: nurbqq <[email protected]> Signed-off-by: vamsi-amazon <[email protected]> Signed-off-by: Sirazh Gabdullin <[email protected]> Signed-off-by: Jochen Kressin <[email protected]> Signed-off-by: Abhi Kalra <[email protected]> Signed-off-by: Darshit Chanpura <[email protected]> Signed-off-by: opensearch-ci-bot <[email protected]> Signed-off-by: Leanne Lacey-Byrne <[email protected]> Signed-off-by: zhichao-aws <[email protected]> Signed-off-by: Craig Perkins <[email protected]> Signed-off-by: Ryan Liang <[email protected]> Signed-off-by: Craig Perkins <[email protected]> Co-authored-by: Chang Liu <[email protected]> Co-authored-by: mattieserver <[email protected]> Co-authored-by: Ryan Liang <[email protected]> Co-authored-by: Saadat Nursultan <[email protected]> Co-authored-by: nursaadat <[email protected]> Co-authored-by: Saadat Nursultan <[email protected]> Co-authored-by: Nurbakhyt Sembayev <[email protected]> Co-authored-by: Stephen Crawford <[email protected]> Co-authored-by: Vamsi Manohar <[email protected]> Co-authored-by: Sirazh Gabdullin <[email protected]> Co-authored-by: Jochen Kressin <[email protected]> Co-authored-by: Abhi Kalra <[email protected]> Co-authored-by: Abhi Kalra <[email protected]> Co-authored-by: Darshit Chanpura <[email protected]> Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com> Co-authored-by: opensearch-ci-bot <[email protected]> Co-authored-by: zhichao-aws <[email protected]> Co-authored-by: Craig Perkins <[email protected]> Co-authored-by: Darshit Chanpura <[email protected]> (cherry picked from commit 7f4e0f29f11668b09c5343da2cbc97ac1d6d0acf) Co-authored-by: leanneeliatra <[email protected]>
RyanL1997 · Jun 20, 2023 · b784657 · b784657
1 parent 7c94046
commit b784657
Show file tree

Hide file tree

Showing 3 changed files with 153 additions and 2 deletions.
diff --git a/public/apps/account/account-nav-button.tsx b/public/apps/account/account-nav-button.tsx
@@ -62,7 +62,7 @@ export function AccountNavButton(props: {
           }}
           handleSwitchAndClose={() => {
             setModal(null);
-            window.location.reload();
+            reloadAfterTenantSwitch();
           }}
           tenant={props.tenant!}
         />
@@ -186,3 +186,24 @@ export function AccountNavButton(props: {
     </EuiHeaderSectionItemButton>
   );
 }
+
+export function reloadAfterTenantSwitch(): void {
+  // the below portion is to clear URLs starting with 'lastUrl'
+  // when switching tenants, the last URLs will be from the old tenancy therefore we need to remove these from sessionStorage.
+  const lastUrls = [];
+  const { sessionStorage } = window;
+
+  for (let i = 0; i < sessionStorage.length; i++) {
+    const key = sessionStorage.key(i);
+    if (key?.startsWith('lastUrl')) {
+      lastUrls.push(key);
+    }
+  }
+  for (let i = 0; i < lastUrls.length; i++) {
+    sessionStorage.removeItem(lastUrls[i]);
+  }
+
+  // rather than just reload when we switch tenants, we set the URL to the pathname. i.e. the portion like: '/app/dashboards'
+  // therefore, the copied URL will now allow tenancy changes.
+  window.location.href = window.location.pathname;
+}
diff --git a/public/apps/account/test/account-nav-button.test.tsx b/public/apps/account/test/account-nav-button.test.tsx
@@ -15,7 +15,7 @@
 
 import { shallow } from 'enzyme';
 import React from 'react';
-import { AccountNavButton } from '../account-nav-button';
+import { AccountNavButton, reloadAfterTenantSwitch } from '../account-nav-button';
 import { getShouldShowTenantPopup, setShouldShowTenantPopup } from '../../../utils/storage-utils';
 import { getDashboardsInfo } from '../../../utils/dashboards-info-utils';
 
@@ -174,3 +174,60 @@ describe('Account navigation button, multitenancy disabled', () => {
     expect(setState).toBeCalledTimes(0);
   });
 });
+
+describe('Reload window after tenant switch', () => {
+  const originalLocation = window.location;
+  const mockSetWindowHref = jest.fn();
+  let pathname: string = '';
+  beforeAll(() => {
+    pathname = '/app/myapp';
+    Object.defineProperty(window, 'location', {
+      value: {
+        get pathname() {
+          return pathname;
+        },
+        get href() {
+          return '/app/dashboards?security_tenant=admin_tenant';
+        },
+        set href(value: string) {
+          mockSetWindowHref(value);
+        },
+      },
+    });
+  });
+
+  afterAll(() => {
+    window.location = originalLocation;
+  });
+
+  it('should remove the tenant query parameter before reloading', () => {
+    pathname = '/app/pathname-only';
+    reloadAfterTenantSwitch();
+    expect(mockSetWindowHref).toHaveBeenCalledWith(pathname);
+  });
+});
+
+describe('Clear lastUrls after tenant switch', () => {
+  afterAll(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should clear out keys with a lastUrl prefix', () => {
+    window.sessionStorage.setItem('lastUrl:dashboard', '/dashboard1');
+    window.sessionStorage.setItem('lastUrl:otherApp', '/otherApp');
+    window.sessionStorage.setItem('somethingElse:here', '/random');
+    const mockRemoveItem = jest.spyOn(Object.getPrototypeOf(window.sessionStorage), 'removeItem');
+    reloadAfterTenantSwitch();
+    expect(mockRemoveItem).toHaveBeenCalledWith('lastUrl:dashboard');
+    expect(mockRemoveItem).toHaveBeenCalledWith('lastUrl:otherApp');
+    expect(mockRemoveItem).toHaveBeenCalledTimes(2);
+  });
+
+  it('should not clear out keys without a lastUrl prefix', () => {
+    window.sessionStorage.setItem('somethingElse:here', '/random');
+    const mockRemoveItem = jest.spyOn(Object.getPrototypeOf(window.sessionStorage), 'removeItem');
+
+    reloadAfterTenantSwitch();
+    expect(mockRemoveItem).toHaveBeenCalledTimes(0);
+  });
+});
diff --git a/public/apps/account/test/switch-tenants.test.tsx b/public/apps/account/test/switch-tenants.test.tsx
@@ -0,0 +1,73 @@
+/*
+ *   Copyright OpenSearch Contributors
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License").
+ *   You may not use this file except in compliance with the License.
+ *   A copy of the License is located at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   or in the "license" file accompanying this file. This file is distributed
+ *   on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
+ *   express or implied. See the License for the specific language governing
+ *   permissions and limitations under the License.
+ */
+
+import { reloadAfterTenantSwitch } from '../account-nav-button';
+
+describe('Reload window after tenant switch', () => {
+  const originalLocation = window.location;
+  const mockSetWindowHref = jest.fn();
+  let pathname: string = '';
+  beforeAll(() => {
+    pathname = '/app/myapp';
+    Object.defineProperty(window, 'location', {
+      value: {
+        get pathname() {
+          return pathname;
+        },
+        get href() {
+          return '/app/dashboards?security_tenant=admin_tenant';
+        },
+        set href(value: string) {
+          mockSetWindowHref(value);
+        },
+      },
+    });
+  });
+
+  afterAll(() => {
+    window.location = originalLocation;
+  });
+
+  it('should remove the tenant query parameter before reloading', () => {
+    pathname = '/app/pathname-only';
+    reloadAfterTenantSwitch();
+    expect(mockSetWindowHref).toHaveBeenCalledWith(pathname);
+  });
+});
+
+describe('Clear lastUrls after tenant switch', () => {
+  afterAll(() => {
+    jest.clearAllMocks();
+  });
+
+  it('should clear out keys with a lastUrl prefix', () => {
+    window.sessionStorage.setItem('lastUrl:dashboard', '/dashboard1');
+    window.sessionStorage.setItem('lastUrl:otherApp', '/otherApp');
+    window.sessionStorage.setItem('somethingElse:here', '/random');
+    const mockRemoveItem = jest.spyOn(Object.getPrototypeOf(window.sessionStorage), 'removeItem');
+    reloadAfterTenantSwitch();
+    expect(mockRemoveItem).toHaveBeenCalledWith('lastUrl:dashboard');
+    expect(mockRemoveItem).toHaveBeenCalledWith('lastUrl:otherApp');
+    expect(mockRemoveItem).toHaveBeenCalledTimes(2);
+  });
+
+  it('should not clear out keys without a lastUrl prefix', () => {
+    window.sessionStorage.setItem('somethingElse:here', '/random');
+    const mockRemoveItem = jest.spyOn(Object.getPrototypeOf(window.sessionStorage), 'removeItem');
+
+    reloadAfterTenantSwitch();
+    expect(mockRemoveItem).toHaveBeenCalledTimes(0);
+  });
+});