From d9c4fc3a9effab2ed5fa066561d6f8668c4a0f43 Mon Sep 17 00:00:00 2001 From: Peng Xiao Date: Thu, 13 Apr 2023 00:05:54 +0800 Subject: [PATCH] fix: cors header handling (#1900) --- apps/electron/layers/main/src/app-state/index.ts | 2 +- apps/electron/layers/main/src/protocol.ts | 11 ++++++++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/apps/electron/layers/main/src/app-state/index.ts b/apps/electron/layers/main/src/app-state/index.ts index cb0c0e681..4320ffbc9 100644 --- a/apps/electron/layers/main/src/app-state/index.ts +++ b/apps/electron/layers/main/src/app-state/index.ts @@ -56,7 +56,7 @@ export const registerHandlers = () => { }; app.removeListener('open-url', handleOpenUrl); resolve(token.id_token); - logger.info('google sign in', token); + logger.info('google sign in successful', token); }; app.on('open-url', handleOpenUrl); diff --git a/apps/electron/layers/main/src/protocol.ts b/apps/electron/layers/main/src/protocol.ts index 583fc5972..eef3c5546 100644 --- a/apps/electron/layers/main/src/protocol.ts +++ b/apps/electron/layers/main/src/protocol.ts @@ -23,9 +23,18 @@ export function registerProtocol() { session.defaultSession.webRequest.onHeadersReceived( (responseDetails, callback) => { - const { responseHeaders, url } = responseDetails; + const { responseHeaders } = responseDetails; if (responseHeaders) { + delete responseHeaders['access-control-allow-origin']; + delete responseHeaders['access-control-allow-methods']; responseHeaders['Access-Control-Allow-Origin'] = ['*']; + responseHeaders['Access-Control-Allow-Methods'] = [ + 'GET', + 'POST', + 'PUT', + 'DELETE', + 'OPTIONS', + ]; } callback({ responseHeaders });