From 503e020412f94df18fd9ba112ed305477217b168 Mon Sep 17 00:00:00 2001 From: pengx17 Date: Mon, 23 Sep 2024 04:05:04 +0000 Subject: [PATCH] fix(electron): cookie redirecting issue (#8347) fix AF-1416 --- packages/frontend/apps/electron/src/main/protocol.ts | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/frontend/apps/electron/src/main/protocol.ts b/packages/frontend/apps/electron/src/main/protocol.ts index e70fccd235..f186fd87a3 100644 --- a/packages/frontend/apps/electron/src/main/protocol.ts +++ b/packages/frontend/apps/electron/src/main/protocol.ts @@ -110,7 +110,8 @@ export function registerProtocol() { const protocol = url.protocol; const origin = url.origin; - const sameOrigin = origin === CLOUD_BASE_URL || protocol === 'file:'; + const sameSite = + url.host === new URL(CLOUD_BASE_URL).host || protocol === 'file:'; // offline whitelist // 1. do not block non-api request for http://localhost || file:// (local dev assets) @@ -142,7 +143,7 @@ export function registerProtocol() { // session cookies are set to file:// on production // if sending request to the cloud, attach the session cookie (to affine cloud server) - if (isNetworkResource(pathname) && sameOrigin) { + if (isNetworkResource(pathname) && sameSite) { const cookie = getCookies(); if (cookie) { const cookieString = cookie.map(c => `${c.name}=${c.value}`).join('; ');