diff --git a/.changeset/wicked-turkeys-sell.md b/.changeset/wicked-turkeys-sell.md new file mode 100644 index 0000000000..927357bb51 --- /dev/null +++ b/.changeset/wicked-turkeys-sell.md @@ -0,0 +1,7 @@ +--- +"@medusajs/draft-order": patch +"@medusajs/admin-bundler": patch +"@medusajs/dashboard": patch +--- + +chore: Allow injection of our JS-SDK's auth type in dashboard diff --git a/packages/admin/admin-bundler/src/utils/config.ts b/packages/admin/admin-bundler/src/utils/config.ts index 6d6f31559e..48ea17a0b9 100644 --- a/packages/admin/admin-bundler/src/utils/config.ts +++ b/packages/admin/admin-bundler/src/utils/config.ts @@ -23,6 +23,8 @@ export async function getViteConfig( const backendUrl = options.backendUrl ?? "" const storefrontUrl = options.storefrontUrl ?? "" + const authType = process.env.ADMIN_AUTH_TYPE ?? undefined + const jwtTokenStorageKey = process.env.ADMIN_JWT_TOKEN_STORAGE_KEY ?? undefined const baseConfig: InlineConfig = { root, @@ -48,6 +50,8 @@ export async function getViteConfig( define: { __BASE__: JSON.stringify(options.path), __BACKEND_URL__: JSON.stringify(backendUrl), + __AUTH_TYPE__: JSON.stringify(authType), + __JWT_TOKEN_STORAGE_KEY__: JSON.stringify(jwtTokenStorageKey), __STOREFRONT_URL__: JSON.stringify(storefrontUrl), }, server: { @@ -92,7 +96,11 @@ export async function getViteConfig( // Handle HMR_BIND_HOST after merge to detect conflicts if (process.env.HMR_BIND_HOST) { - if (finalConfig.server?.hmr && typeof finalConfig.server.hmr === "object" && finalConfig.server.hmr.server) { + if ( + finalConfig.server?.hmr && + typeof finalConfig.server.hmr === "object" && + finalConfig.server.hmr.server + ) { console.warn( "HMR_BIND_HOST is set but a custom hmr.server is already configured. HMR_BIND_HOST will be ignored." ) @@ -103,7 +111,10 @@ export async function getViteConfig( if (!finalConfig.server) { finalConfig.server = {} } - if (!finalConfig.server.hmr || typeof finalConfig.server.hmr !== "object") { + if ( + !finalConfig.server.hmr || + typeof finalConfig.server.hmr !== "object" + ) { finalConfig.server.hmr = {} } finalConfig.server.hmr.server = hmrServer diff --git a/packages/admin/dashboard/src/lib/client/client.ts b/packages/admin/dashboard/src/lib/client/client.ts index d3ba815841..382aa9e6c5 100644 --- a/packages/admin/dashboard/src/lib/client/client.ts +++ b/packages/admin/dashboard/src/lib/client/client.ts @@ -1,11 +1,14 @@ import Medusa from "@medusajs/js-sdk" export const backendUrl = __BACKEND_URL__ ?? "/" +const authType = __AUTH_TYPE__ ?? "session" +const jwtTokenStorageKey = __JWT_TOKEN_STORAGE_KEY__ || undefined export const sdk = new Medusa({ baseUrl: backendUrl, auth: { - type: "session", + type: authType, + jwtTokenStorageKey }, }) diff --git a/packages/admin/dashboard/src/vite-env.d.ts b/packages/admin/dashboard/src/vite-env.d.ts index 43280db07e..72f604fd0d 100644 --- a/packages/admin/dashboard/src/vite-env.d.ts +++ b/packages/admin/dashboard/src/vite-env.d.ts @@ -16,3 +16,5 @@ interface ImportMeta { declare const __BACKEND_URL__: string | undefined declare const __STOREFRONT_URL__: string | undefined declare const __BASE__: string +declare const __AUTH_TYPE__: "session" | "jwt" | undefined +declare const __JWT_TOKEN_STORAGE_KEY__: string | undefined diff --git a/packages/plugins/draft-order/src/admin/lib/queries/sdk.ts b/packages/plugins/draft-order/src/admin/lib/queries/sdk.ts index 0a03491c05..04c1dd4fa1 100644 --- a/packages/plugins/draft-order/src/admin/lib/queries/sdk.ts +++ b/packages/plugins/draft-order/src/admin/lib/queries/sdk.ts @@ -1,8 +1,13 @@ import Medusa from "@medusajs/js-sdk" +const backendUrl = __BACKEND_URL__ ?? "/" +const authType = __AUTH_TYPE__ ?? "session" +const jwtTokenStorageKey = __JWT_TOKEN_STORAGE_KEY__ || undefined + export const sdk = new Medusa({ - baseUrl: __BACKEND_URL__ || "/", + baseUrl: backendUrl, auth: { - type: "session", + type: authType, + jwtTokenStorageKey: jwtTokenStorageKey, }, }) diff --git a/packages/plugins/draft-order/src/admin/vite-env.d.ts b/packages/plugins/draft-order/src/admin/vite-env.d.ts index a8013c26b1..a24447b282 100644 --- a/packages/plugins/draft-order/src/admin/vite-env.d.ts +++ b/packages/plugins/draft-order/src/admin/vite-env.d.ts @@ -1 +1,3 @@ declare const __BACKEND_URL__: string | undefined +declare const __AUTH_TYPE__: "session" | "jwt" | undefined +declare const __JWT_TOKEN_STORAGE_KEY__: string | undefined