Skip to content

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

fix(auth): avoid redundant desktop session check

tianma-if9f2682d5ef88
diff --git a/apps/web/src/lib/api.test.mjs b/apps/web/src/lib/api.test.mjs
index 0e12e3e0..037b2607 100644
--- a/apps/web/src/lib/api.test.mjs
+++ b/apps/web/src/lib/api.test.mjs
@@ -317,6 +317,46 @@ describe("desktop instance setup", () => {
});
});
+ test("does not clear a replacement session when an older desktop token is rejected late", async () => {
+ events.length = 0;
+ storage.set(DESKTOP_API_BASE_URL_STORAGE_KEY, "https://notes.example.com");
+ await cacheDesktopSession({
+ authRequired: true,
+ authenticated: true,
+ demoMode: false,
+ sessionToken: "stale-session-token",
+ user: { id: "user-1", username: "admin", displayName: null, role: "owner" },
+ });
+
+ let releaseRequest;
+ globalThis.fetch = async () => {
+ await new Promise((resolve) => {
+ releaseRequest = resolve;
+ });
+ return new Response(JSON.stringify({ error: { code: "unauthorized", message: "Authentication required" } }), {
+ status: 401,
+ headers: { "Content-Type": "application/json" },
+ });
+ };
+
+ const staleRequest = api.syncBootstrap({ limit: 200 });
+ await Promise.resolve();
+ await cacheDesktopSession({
+ authRequired: true,
+ authenticated: true,
+ demoMode: false,
+ sessionToken: "current-session-token",
+ user: { id: "user-1", username: "admin", displayName: "Owner", role: "owner" },
+ });
+ releaseRequest();
+
+ await expect(staleRequest).rejects.toMatchObject({ status: 401 });
+ await Promise.resolve();
+ expect(secureSessionToken).toBe("current-session-token");
+ expect(getCachedDesktopSession()).toMatchObject({ authenticated: true, user: { id: "user-1" } });
+ expect(events).toEqual([]);
+ });
+
test("preserves Cloudflare response diagnostics for login failures", async () => {
globalThis.fetch = async () => new Response("<html>challenge</html>", {
status: 403,
diff --git a/apps/web/src/lib/api.ts b/apps/web/src/lib/api.ts
index 64f1cecb..a2c7b84b 100644
--- a/apps/web/src/lib/api.ts
+++ b/apps/web/src/lib/api.ts
@@ -330,9 +330,21 @@ const confirmSessionLost = async (): Promise<boolean> => {
return unauthorizedConfirmPromise;
};
-const notifyUnauthorized = async (isDesktop: boolean) => {
+const notifyUnauthorized = async (isDesktop: boolean, rejectedDesktopSessionToken?: string) => {
if (isDesktop && desktopSessionRejected) return;
+ // A desktop API request authenticates with one explicit bearer token. A 401
+ // therefore rejects that exact credential and does not need a second
+ // /auth/session request. Compare against the current token first so a late
+ // response from an older request cannot clear a freshly logged-in session.
+ if (isDesktop && rejectedDesktopSessionToken) {
+ if (getDesktopSessionToken() !== rejectedDesktopSessionToken) return;
+ clearCachedDesktopSession();
+ desktopSessionRejected = true;
+ window.dispatchEvent(new CustomEvent("edgeever:unauthorized"));
+ return;
+ }
+
const sessionLost = await confirmSessionLost();
if (!sessionLost) return;
@@ -385,7 +397,7 @@ const request = async <T>(path: string, init?: RequestInit): Promise<T> => {
};
if (response.status === 401 && path !== "/api/v1/auth/login") {
- void notifyUnauthorized(isDesktop);
+ void notifyUnauthorized(isDesktop, sessionToken);
}
throw new ApiRequestError(