Skip to content

fix(portal): skip admin Bearer JWT on customer-portal routes #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rrader26 merged 1 commit into from
May 23, 2026
Merged

fix(portal): skip admin Bearer JWT on customer-portal routes #3

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion src/core/apolloClient/init.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,22 @@ export const initializeApolloClient = async () => {
const customerPortalToken = getItemFromLS(CUSTOMER_PORTAL_TOKEN_LS_KEY)
const currentOrganizationId = getCurrentOrganizationId()

// The customer portal authenticates via the `customer-portal-token`
// header, NOT the admin Bearer JWT. If a user has logged into Lago
// admin in this browser, the admin JWT sits in localStorage; sending
// it on portal requests means an expired admin JWT (12h TTL) causes
// GraphQL to return `expired_jwt_token` on the portal — even though
// the portal session itself is fine. Skip the Bearer for portal routes.
const isCustomerPortalRoute = !!matchPath(
`${CUSTOMER_PORTAL_ROUTE}/*`,
window.location.pathname,
)
const shouldSendBearer = !!token && !isCustomerPortalRoute

operation.setContext({
headers: {
...headers,
...(!token ? {} : { authorization: `Bearer ${token}` }),
...(shouldSendBearer ? { authorization: `Bearer ${token}` } : {}),
...(!customerPortalToken ? {} : { 'customer-portal-token': customerPortalToken }),
'x-lago-organization': currentOrganizationId,
},
Expand Down
Loading