Set headers in electron app for subscriptions

Re: #1448
altair-graphql · Feb 15, 2021 · 5b50dfa · 5b50dfa
1 parent e08a089
commit 5b50dfa
Show file tree

Hide file tree

Showing 4 changed files with 348 additions and 380 deletions.
diff --git a/packages/altair-app/src/app/effects/query.effect.ts b/packages/altair-app/src/app/effects/query.effect.ts
@@ -487,6 +487,7 @@ export class QueryEffects {
           let variables = this.environmentService.hydrate(response.data.variables.variables);
           let variablesObj: IDictionary = {};
           let selectedOperation = response.data.query.selectedOperation;
+          let headers = this.environmentService.hydrateHeaders(response.data.headers);
 
           if (transformedData) {
             subscriptionUrl = this.environmentService.hydrate(response.data.query.subscriptionUrl, {
@@ -498,8 +499,14 @@ export class QueryEffects {
             variables = this.environmentService.hydrate(response.data.variables.variables, {
               activeEnvironment: transformedData.environment
             });
+            headers = this.environmentService.hydrateHeaders(response.data.headers, {
+              activeEnvironment: transformedData.environment
+            });
           }
 
+          // For electron app, send the instruction to set headers
+          this.electronAppService.setHeaders(headers);
+
           const subscriptionErrorHandler = (err: Error | Error[], errMsg?: string) => {
             if (Array.isArray(err)) {
               err = err[0];

diff --git a/packages/altair-electron/package.json b/packages/altair-electron/package.json
@@ -33,7 +33,7 @@
     "devtron": "^1.4.0",
     "dotenv": "^8.1.0",
     "electron": "^11.2.2",
-    "electron-builder": "^21.2.0",
+    "electron-builder": "^22.9.1",
     "electron-notarize": "^1.0.0",
     "electron-reloader": "^0.3.0",
     "eslint": "^7.3.1",

diff --git a/packages/altair-electron/src/app/window.js b/packages/altair-electron/src/app/window.js
@@ -136,6 +136,7 @@ class WindowManager {
       // Set defaults
       details.requestHeaders.Origin = 'electron://altair';
 
+      // console.log(this.requestHeaders);
       // console.log('sending headers', details.requestHeaders);
       // Set the request headers
       Object.keys(this.requestHeaders).forEach(key => {