@vertesia/ui 1.3.0-dev.20260620.061059Z → 1.3.0-dev.20260621.071017Z

package/src/session/UserSession.ts

@@ -5,7 +5,7 @@ import { jwtDecode } from 'jwt-decode';
 import { createContext, useContext } from 'react';
 
 import { getComposableToken } from './auth/composable';
-import { authReturnUrl, shouldRedirectToCentralAuth } from './auth/domainRouting';
+import { authReturnUrl, mountRootUrl, shouldRedirectToCentralAuth } from './auth/domainRouting';
 import { getFirebaseAuth } from './auth/firebase';
 
 import { LastSelectedAccountId_KEY, LastSelectedProjectId_KEY } from './constants';
@@ -168,12 +168,13 @@ class UserSession {
             this.authToken = undefined;
             this.setSession = undefined;
             this.client.withAuthCallback(undefined);
-            // Navigate to root to avoid React rendering errors when
+            // Navigate to the app root to avoid React rendering errors when
             // unmounting deeply nested route components during logout.
-            // Only navigate if user was actually logged in to avoid
-            // infinite reload loop on fresh/incognito sessions.
+            // Use the mount root (not bare '/') so a gateway-mounted app stays
+            // on its mount. Only navigate if user was actually logged in to
+            // avoid an infinite reload loop on fresh/incognito sessions.
             if (wasLoggedIn) {
-                location.replace('/');
+                location.replace(mountRootUrl().toString());
             }
         }
     }
@@ -188,7 +189,9 @@ class UserSession {
             }
         }
 
-        window.location.replace(`/?a=${targetAccountId}`);
+        const url = mountRootUrl();
+        url.searchParams.set('a', targetAccountId);
+        window.location.replace(url.toString());
     }
 
     async switchProject(targetProjectId: string) {
@@ -196,7 +199,12 @@ class UserSession {
             localStorage.setItem(`${LastSelectedProjectId_KEY}-${this.account.id}`, targetProjectId);
         }
 
-        window.location.replace(`/?a=${this.account?.id}&p=${targetProjectId}`);
+        const url = mountRootUrl();
+        if (this.account?.id) {
+            url.searchParams.set('a', this.account.id);
+        }
+        url.searchParams.set('p', targetProjectId);
+        window.location.replace(url.toString());
     }
 
     async fetchAccounts() {

package/src/session/auth/domainRouting.test.ts

@@ -1,9 +1,15 @@
 import { afterEach, describe, expect, it } from 'vitest';
-import { shouldRedirectToCentralAuth, shouldUseFirebaseAuth } from './domainRouting';
+import { mountRootUrl, shouldRedirectToCentralAuth, shouldUseFirebaseAuth } from './domainRouting';
+
+// Stub document.baseURI to simulate the served `<base href>` (deep gateway mount) or its absence.
+function setBaseURI(baseURI: string) {
+    (globalThis as { document?: unknown }).document = { baseURI };
+}
 
 describe('domainRouting', () => {
     afterEach(() => {
         delete (globalThis as { window?: unknown }).window;
+        delete (globalThis as { document?: unknown }).document;
     });
 
     it("uses Firebase auth when AUTH_MODE is 'firebase'", () => {
@@ -23,4 +29,25 @@ describe('domainRouting', () => {
         expect(shouldUseFirebaseAuth()).toBe(false);
         expect(shouldRedirectToCentralAuth()).toBe(true);
     });
+
+    describe('mountRootUrl', () => {
+        it('returns the deep gateway mount root (dropping any deep route / query / hash)', () => {
+            const mount = 'https://gw.example.com/tenants/05948c_5ed5f4/apps/furniture-catalog/versions/v1/app/';
+            setBaseURI(mount);
+            expect(mountRootUrl().toString()).toBe(mount);
+        });
+
+        it('strips an existing query and hash so callers control the reload target', () => {
+            setBaseURI('https://gw.example.com/tenants/t/apps/a/versions/v/app/');
+            const url = mountRootUrl();
+            url.searchParams.set('a', 'acct1');
+            url.searchParams.set('p', 'proj1');
+            expect(url.toString()).toBe('https://gw.example.com/tenants/t/apps/a/versions/v/app/?a=acct1&p=proj1');
+        });
+
+        it('is the origin root for the Studio UI (no <base> element)', () => {
+            setBaseURI('https://studio.vertesia.io/');
+            expect(mountRootUrl().toString()).toBe('https://studio.vertesia.io/');
+        });
+    });
 });

package/src/session/auth/domainRouting.ts

@@ -33,3 +33,19 @@ export function authReturnUrl(): URL {
     target.hash = '';
     return target;
 }
+
+/**
+ * The app's mount root URL — the served `<base href>` (or the origin root for the Studio UI).
+ *
+ * Used for full-reload navigations that intentionally reset to the app root (logout, account /
+ * project switch). Building these from a bare `/` drops a gateway-mounted app off its mount and
+ * lands on a URL that serves no app; resolving against `document.baseURI` keeps the reload inside
+ * the mount. For the Studio UI (no `<base>` element) `document.baseURI` is the origin root, so the
+ * behavior is unchanged.
+ */
+export function mountRootUrl(): URL {
+    const url = new URL(document.baseURI);
+    url.hash = '';
+    url.search = '';
+    return url;
+}