Skip to content
Draft
Changes from all commits
Commits
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
47 changes: 44 additions & 3 deletions packages/clerk-js/src/core/auth/devBrowser.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import { DEV_BROWSER_JWT_HEADER, extractDevBrowserJWTFromURL, setDevBrowserJWTInURL } from '@clerk/shared/devBrowser';
import {
DEV_BROWSER_JWT_HEADER,
DEV_BROWSER_JWT_KEY,
extractDevBrowserJWTFromURL,
setDevBrowserJWTInURL,
} from '@clerk/shared/devBrowser';
import { parseErrors } from '@clerk/shared/error';
import type { ClerkAPIErrorJSON } from '@clerk/shared/types';

Expand Down Expand Up @@ -27,17 +32,53 @@ export type CreateDevBrowserOptions = {

export function createDevBrowser({ cookieSuffix, frontendApi, fapiClient }: CreateDevBrowserOptions): DevBrowser {
const devBrowserCookie = createDevBrowserCookie(cookieSuffix);
let inMemoryDevBrowserJWT: string | undefined;

const getStoredDevBrowserJWT = () => {
try {
if (typeof window === 'undefined') {
return undefined;
}
return window.localStorage.getItem(DEV_BROWSER_JWT_KEY) || undefined;
} catch {
return undefined;
}
};

const setStoredDevBrowserJWT = (jwt: string) => {
try {
if (typeof window !== 'undefined') {
window.localStorage.setItem(DEV_BROWSER_JWT_KEY, jwt);
}
} catch {
// Best effort only. Some embedded environments disable storage access.
}
};

const removeStoredDevBrowserJWT = () => {
try {
if (typeof window !== 'undefined') {
window.localStorage.removeItem(DEV_BROWSER_JWT_KEY);
}
} catch {
// Best effort only.
}
};

function getDevBrowserJWT() {
return devBrowserCookie.get();
return devBrowserCookie.get() || getStoredDevBrowserJWT() || inMemoryDevBrowserJWT;
}

function setDevBrowserJWT(jwt: string) {
inMemoryDevBrowserJWT = jwt;
devBrowserCookie.set(jwt);
setStoredDevBrowserJWT(jwt);
}

function removeDevBrowserJWT() {
inMemoryDevBrowserJWT = undefined;
devBrowserCookie.remove();
removeStoredDevBrowserJWT();
}

function clear() {
Expand Down Expand Up @@ -72,7 +113,7 @@ export function createDevBrowser({ cookieSuffix, frontendApi, fapiClient }: Crea
}

// 2. If no JWT is found in the first step, check if a JWT is already available in the __clerk_db_jwt JS cookie
if (devBrowserCookie.get()) {
if (getDevBrowserJWT()) {
return;
}

Expand Down
Loading