Skip to content

AI-native knowledge base & Evernote/Obsidian alternative with instant sync & native MCP. Free on Cloudflare or self-hosted via Docker.

fix desktop session token retention

tianma-if8a578144ea23
diff --git a/apps/web/src/lib/api.test.mjs b/apps/web/src/lib/api.test.mjs
index 53bd2751..0c403a68 100644
--- a/apps/web/src/lib/api.test.mjs
+++ b/apps/web/src/lib/api.test.mjs
@@ -94,6 +94,50 @@ describe("desktop instance setup", () => {
window.edgeeverDesktop.apiBaseUrl = "";
});
+ test("preserves the desktop token when refreshing the same authenticated session", () => {
+ cacheDesktopSession({
+ authRequired: true,
+ authenticated: true,
+ demoMode: false,
+ sessionToken: "desktop-session-token",
+ user: { id: "user-1", username: "admin", displayName: null, role: "owner" },
+ });
+
+ cacheDesktopSession({
+ authRequired: true,
+ authenticated: true,
+ demoMode: false,
+ user: { id: "user-1", username: "admin", displayName: "Owner", role: "owner" },
+ });
+
+ expect(getCachedDesktopSession()).toEqual({
+ authRequired: true,
+ authenticated: true,
+ demoMode: false,
+ sessionToken: "desktop-session-token",
+ user: { id: "user-1", username: "admin", displayName: "Owner", role: "owner" },
+ });
+ });
+
+ test("does not carry a desktop token into a different account session", () => {
+ cacheDesktopSession({
+ authRequired: true,
+ authenticated: true,
+ demoMode: false,
+ sessionToken: "user-1-session-token",
+ user: { id: "user-1", username: "admin", displayName: null, role: "owner" },
+ });
+
+ cacheDesktopSession({
+ authRequired: true,
+ authenticated: true,
+ demoMode: false,
+ user: { id: "user-2", username: "member", displayName: null, role: "member" },
+ });
+
+ expect(getCachedDesktopSession()?.sessionToken).toBeUndefined();
+ });
+
test("uses the desktop session token and stops network retries after a 401", async () => {
calls.length = 0;
events.length = 0;
diff --git a/apps/web/src/lib/api.ts b/apps/web/src/lib/api.ts
index 4fed4477..020dd3c4 100644
--- a/apps/web/src/lib/api.ts
+++ b/apps/web/src/lib/api.ts
@@ -76,7 +76,18 @@ export const getCachedDesktopSession = (): AuthSession | null => {
export const cacheDesktopSession = (session: AuthSession) => {
if (typeof window === "undefined" || !window.edgeeverDesktop?.isAvailable) return;
try {
- window.localStorage.setItem(DESKTOP_SESSION_STORAGE_KEY, JSON.stringify(session));
+ const cached = getCachedDesktopSession();
+ const sessionToken =
+ session.authenticated &&
+ !session.sessionToken &&
+ cached?.authenticated &&
+ cached.user?.id === session.user?.id
+ ? cached.sessionToken
+ : session.sessionToken;
+ window.localStorage.setItem(
+ DESKTOP_SESSION_STORAGE_KEY,
+ JSON.stringify(sessionToken ? { ...session, sessionToken } : session),
+ );
} catch {
// A session cache is an offline convenience and must never block login.
}