Skip to content

Commit c93f77d

Browse files
authored
chore: Configure auth on JS-SDK in dashboard (#14013)
* chore: Use env vars rather than configs * Create wicked-turkeys-sell.md
1 parent 2b6c395 commit c93f77d

File tree

6 files changed

+35
-5
lines changed

6 files changed

+35
-5
lines changed

.changeset/wicked-turkeys-sell.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
"@medusajs/draft-order": patch
3+
"@medusajs/admin-bundler": patch
4+
"@medusajs/dashboard": patch
5+
---
6+
7+
chore: Allow injection of our JS-SDK's auth type in dashboard

packages/admin/admin-bundler/src/utils/config.ts

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ export async function getViteConfig(
2323

2424
const backendUrl = options.backendUrl ?? ""
2525
const storefrontUrl = options.storefrontUrl ?? ""
26+
const authType = process.env.ADMIN_AUTH_TYPE ?? undefined
27+
const jwtTokenStorageKey = process.env.ADMIN_JWT_TOKEN_STORAGE_KEY ?? undefined
2628

2729
const baseConfig: InlineConfig = {
2830
root,
@@ -48,6 +50,8 @@ export async function getViteConfig(
4850
define: {
4951
__BASE__: JSON.stringify(options.path),
5052
__BACKEND_URL__: JSON.stringify(backendUrl),
53+
__AUTH_TYPE__: JSON.stringify(authType),
54+
__JWT_TOKEN_STORAGE_KEY__: JSON.stringify(jwtTokenStorageKey),
5155
__STOREFRONT_URL__: JSON.stringify(storefrontUrl),
5256
},
5357
server: {
@@ -92,7 +96,11 @@ export async function getViteConfig(
9296

9397
// Handle HMR_BIND_HOST after merge to detect conflicts
9498
if (process.env.HMR_BIND_HOST) {
95-
if (finalConfig.server?.hmr && typeof finalConfig.server.hmr === "object" && finalConfig.server.hmr.server) {
99+
if (
100+
finalConfig.server?.hmr &&
101+
typeof finalConfig.server.hmr === "object" &&
102+
finalConfig.server.hmr.server
103+
) {
96104
console.warn(
97105
"HMR_BIND_HOST is set but a custom hmr.server is already configured. HMR_BIND_HOST will be ignored."
98106
)
@@ -103,7 +111,10 @@ export async function getViteConfig(
103111
if (!finalConfig.server) {
104112
finalConfig.server = {}
105113
}
106-
if (!finalConfig.server.hmr || typeof finalConfig.server.hmr !== "object") {
114+
if (
115+
!finalConfig.server.hmr ||
116+
typeof finalConfig.server.hmr !== "object"
117+
) {
107118
finalConfig.server.hmr = {}
108119
}
109120
finalConfig.server.hmr.server = hmrServer

packages/admin/dashboard/src/lib/client/client.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
import Medusa from "@medusajs/js-sdk"
22

33
export const backendUrl = __BACKEND_URL__ ?? "/"
4+
const authType = __AUTH_TYPE__ ?? "session"
5+
const jwtTokenStorageKey = __JWT_TOKEN_STORAGE_KEY__ || undefined
46

57
export const sdk = new Medusa({
68
baseUrl: backendUrl,
79
auth: {
8-
type: "session",
10+
type: authType,
11+
jwtTokenStorageKey
912
},
1013
})
1114

packages/admin/dashboard/src/vite-env.d.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,5 @@ interface ImportMeta {
1616
declare const __BACKEND_URL__: string | undefined
1717
declare const __STOREFRONT_URL__: string | undefined
1818
declare const __BASE__: string
19+
declare const __AUTH_TYPE__: "session" | "jwt" | undefined
20+
declare const __JWT_TOKEN_STORAGE_KEY__: string | undefined
Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
import Medusa from "@medusajs/js-sdk"
22

3+
const backendUrl = __BACKEND_URL__ ?? "/"
4+
const authType = __AUTH_TYPE__ ?? "session"
5+
const jwtTokenStorageKey = __JWT_TOKEN_STORAGE_KEY__ || undefined
6+
37
export const sdk = new Medusa({
4-
baseUrl: __BACKEND_URL__ || "/",
8+
baseUrl: backendUrl,
59
auth: {
6-
type: "session",
10+
type: authType,
11+
jwtTokenStorageKey: jwtTokenStorageKey,
712
},
813
})
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
declare const __BACKEND_URL__: string | undefined
2+
declare const __AUTH_TYPE__: "session" | "jwt" | undefined
3+
declare const __JWT_TOKEN_STORAGE_KEY__: string | undefined

0 commit comments

Comments
 (0)