Skip to content

Commit e00b18f

Browse files
Merge pull request #6770 from Shopify/fix-tae-token-errors
only send auth headers for proxied theme requests
2 parents 52a5981 + 44a3911 commit e00b18f

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

packages/theme/src/cli/utilities/theme-environment/proxy.ts

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -306,15 +306,19 @@ export function proxyStorefrontRequest(event: H3Event, ctx: DevServerContext): P
306306
const headers = getProxyStorefrontHeaders(event)
307307
const body = getRequestWebStream(event)
308308

309-
const finalHeaders = cleanHeader({
309+
const baseHeaders: {[key: string]: string} = {
310310
...headers,
311311
...defaultHeaders(),
312-
Authorization: `Bearer ${ctx.session.storefrontToken}`,
313-
// Required header for CDN requests
314312
referer: url.origin,
315-
// Update the cookie with the latest session
316313
Cookie: buildCookies(ctx.session, {headers}),
317-
})
314+
}
315+
316+
// Only include Authorization for theme dev, not theme-extensions
317+
if (ctx.type === 'theme') {
318+
baseHeaders.Authorization = `Bearer ${ctx.session.storefrontToken}`
319+
}
320+
321+
const finalHeaders = cleanHeader(baseHeaders)
318322

319323
// eslint-disable-next-line no-restricted-globals
320324
return fetch(url, {

packages/theme/src/cli/utilities/theme-environment/theme-environment.test.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,6 @@ describe('setupDevServer', () => {
872872
headers: expect.objectContaining({
873873
referer,
874874
'User-Agent': expect.stringContaining('Shopify CLI'),
875-
Authorization: expect.stringContaining('Bearer'),
876875
}),
877876
}),
878877
)

0 commit comments

Comments
 (0)