From 357484e16af8631d066d2c1be61bbf068afad712 Mon Sep 17 00:00:00 2001
From: Sabri <pwnsdx@users.noreply.github.com>
Date: Wed, 5 Feb 2020 19:24:29 +0100
Subject: [PATCH] fix: CORS when using localhost env (#3549)

An error in the typings happened a few weeks ago and the docs has been fixed accordingly https://github.com/electron/electron/pull/21730
---
 electron/src/main.ts | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/electron/src/main.ts b/electron/src/main.ts
index 6dd12ee8aab..bad3b1b6fb9 100644
--- a/electron/src/main.ts
+++ b/electron/src/main.ts
@@ -563,22 +563,22 @@ class ElectronWrapperInit {
               urls: config.backendOrigins.map(value => `${value}/*`),
             };
 
-            const listener = (
-              _details: OnHeadersReceivedListenerDetails,
+            const listenerOnHeadersReceived = (
+              details: OnHeadersReceivedListenerDetails,
               callback: (response: HeadersReceivedResponse) => void,
             ) => {
               const responseHeaders = {
-                'Access-Control-Allow-Credentials': 'true',
-                'Access-Control-Allow-Origin': 'http://localhost:8081',
+                'Access-Control-Allow-Credentials': ['true'],
+                'Access-Control-Allow-Origin': ['http://localhost:8081'],
               };
 
               callback({
                 cancel: false,
-                responseHeaders,
+                responseHeaders: {...details.responseHeaders, ...responseHeaders},
               });
             };
 
-            contents.session.webRequest.onHeadersReceived(filter, listener);
+            contents.session.webRequest.onHeadersReceived(filter, listenerOnHeadersReceived);
           }
 
           contents.on('before-input-event', (_event, input) => {