Skip to content
Merged
Show file tree
Hide file tree
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
4 changes: 3 additions & 1 deletion packages/darkauth-client/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -700,7 +700,9 @@ export async function refreshSession(
const currentRefreshMode = refreshMode();
const refreshToken =
currentRefreshMode === "token"
? memoryRefreshToken || localStorage.getItem(REFRESH_TOKEN_KEY)
? tokenStorageMode() === "localStorage"
? localStorage.getItem(REFRESH_TOKEN_KEY) || memoryRefreshToken
: memoryRefreshToken || localStorage.getItem(REFRESH_TOKEN_KEY)
: null;
if (currentRefreshMode === "token" && !refreshToken) return null;
const endpoints = await resolveEndpoints();
Expand Down
42 changes: 42 additions & 0 deletions packages/darkauth-client/tests/refreshSession.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -121,3 +121,45 @@ test("refreshSession force refreshes even when stored id token is still valid",
assert.equal(refreshed.idToken, refreshedToken);
assert.equal(globalThis.localStorage.getItem("refresh_token"), "rt-6");
});

test("refreshSession prefers the latest localStorage refresh token over stale memory in token mode", async () => {
setupEnvironment({ tokenStorage: "localStorage" });
const firstToken = createIdToken("user-1");
const secondToken = createIdToken("user-2");
globalThis.localStorage.setItem("refresh_token", "rt-memory");
let fetchCalls = 0;
globalThis.fetch = async (_url, init) => {
fetchCalls += 1;
if (fetchCalls === 1) {
assert.equal(init.body.get("refresh_token"), "rt-memory");
return {
ok: true,
status: 200,
json: async () => ({
id_token: firstToken,
access_token: "at-1",
refresh_token: "rt-memory-next",
}),
};
}

assert.equal(init.body.get("refresh_token"), "rt-other-tab");
return {
ok: true,
status: 200,
json: async () => ({
id_token: secondToken,
access_token: "at-2",
refresh_token: "rt-final",
}),
};
};

await refreshSession({ force: true });
globalThis.localStorage.setItem("refresh_token", "rt-other-tab");
const refreshed = await refreshSession({ force: true });

assert.equal(fetchCalls, 2);
assert.equal(refreshed.idToken, secondToken);
assert.equal(globalThis.localStorage.getItem("refresh_token"), "rt-final");
});
Loading