luulam/AFFiNE
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix(electron): cookie redirecting issue (#8347)

Browse Source 
fix AF-1416
This commit is contained in:
pengx17
2024-09-23 04:05:04 +00:00
parent f9e0c1e57b
commit 503e020412
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packages/frontend/apps/electron/src/main/protocol.ts
View File

@@ -110,7 +110,8 @@ export function registerProtocol() {
const protocol = url.protocol; const protocol = url.protocol;
const origin = url.origin; 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 // offline whitelist
// 1. do not block non-api request for http://localhost || file:// (local dev assets) // 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 // session cookies are set to file:// on production
// if sending request to the cloud, attach the session cookie (to affine cloud server) // 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(); const cookie = getCookies();
if (cookie) { if (cookie) {
const cookieString = cookie.map(c => `${c.name}=${c.value}`).join('; '); const cookieString = cookie.map(c => `${c.name}=${c.value}`).join('; ');