The complete open source platform to run your entire marketplace. Storefront, vendor panel, admin console, and integrations in one enterprise-grade platform you own.
TypeScript b2b-marketplacecomposable-commerceecommerceenterpriseheadless-commercemarketplacemedusamedusajsmulti-vendortypescript
fix(panels): respect base path on session-expiry login redirect (#1223)
Viktor Holikb98bbd85ce1d
diff --git a/packages/admin/src/lib/client/client.ts b/packages/admin/src/lib/client/client.tsindex 7f5175aa1..08f5f5447 100644--- a/packages/admin/src/lib/client/client.ts+++ b/packages/admin/src/lib/client/client.ts@@ -2,6 +2,8 @@ import { createClient, InferClient } from '@mercurjs/client'import { Routes } from '@mercurjs/core/_generated'import config from 'virtual:mercur/config'+import { assetUrl } from '../../utils/asset-url'+export const backendUrl = config.backendUrl ?? 'http://localhost:9000'export const sdk: InferClient<Routes> = createClient({@@ -66,7 +68,7 @@ export const fetchQuery = async (const errorData = await response.json()if (response.status === 401) {- window.location.href = '/login?reason=Unauthorized'+ window.location.href = `${assetUrl('/login')}?reason=Unauthorized`return}diff --git a/packages/admin/src/utils/asset-url.ts b/packages/admin/src/utils/asset-url.tsnew file mode 100644index 000000000..b3a4691d7--- /dev/null+++ b/packages/admin/src/utils/asset-url.ts@@ -0,0 +1,8 @@+export function assetUrl(path: string): string {+ const base = (typeof __BASE__ !== "undefined" ? __BASE__ : "/").replace(+ /\/+$/,+ ""+ )+ const cleanPath = path.startsWith("/") ? path : `/${path}`+ return `${base}${cleanPath}`+}diff --git a/packages/vendor/src/lib/client/client.ts b/packages/vendor/src/lib/client/client.tsindex 7f5175aa1..08f5f5447 100644--- a/packages/vendor/src/lib/client/client.ts+++ b/packages/vendor/src/lib/client/client.ts@@ -2,6 +2,8 @@ import { createClient, InferClient } from '@mercurjs/client'import { Routes } from '@mercurjs/core/_generated'import config from 'virtual:mercur/config'+import { assetUrl } from '../../utils/asset-url'+export const backendUrl = config.backendUrl ?? 'http://localhost:9000'export const sdk: InferClient<Routes> = createClient({@@ -66,7 +68,7 @@ export const fetchQuery = async (const errorData = await response.json()if (response.status === 401) {- window.location.href = '/login?reason=Unauthorized'+ window.location.href = `${assetUrl('/login')}?reason=Unauthorized`return}