@stepzen/graphiql-proxy 0.21.0-beta.1 → 0.21.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@stepzen/graphiql-proxy",
-  "version": "0.21.0-beta.1",
+  "version": "0.21.0-beta.2",
   "author": "Darren Waddell <darren@stepzen.com>",
   "license": "MIT",
   "homepage": "https://stepzen.com",
@@ -57,5 +57,5 @@
     "sinon-chai": "3.7.0",
     "ts-node": "^10.8.2"
   },
-  "gitHead": "6dddebabddbbd69adb07b5e7c816125ae5dc3430"
+  "gitHead": "58b85cc37fa990639bf7170d4224cf51cc1f7ad1"
 }

package/src/server/api/details.js

@@ -1,9 +1,9 @@
 // Copyright (c) 2020,2021,2022, StepZen, Inc.
 
 const details = async (req, res) => {
-  const {account, domain, predicates, workspace} = req.stepzen
+  const {zenservUrl, predicates, workspace} = req.stepzen
 
-  const endpoint = `https://${account}.${domain}/${workspace.endpoint}/__graphql`
+  const endpoint = `${zenservUrl}/${workspace.endpoint}/__graphql`
 
   res.json({
     endpoint,

package/src/server/api/proxy.js

@@ -6,22 +6,32 @@ const fetch = require('node-fetch')
 const {version} = require('../../../package.json')
 
 const proxy = async (req, res) => {
-  const {account, adminkey, debugging, domain, predicates, workspace} =
-    req.stepzen
+  const {
+    adminkey,
+    debugging,
+    zenservDomain,
+    zenservUrl,
+    predicates,
+    workspace,
+  } = req.stepzen
 
   let endpoint = workspace.endpoint
 
-  let headers = {}
+  let headers = {
+    host: zenservDomain,
+  }
 
   if (predicates.available && predicates.enabled) {
     try {
       const others = JSON.parse(JSON.stringify(predicates.headers))
       headers = {
+        ...headers,
         ...others,
       }
     } catch {}
   } else {
     headers = {
+      ...headers,
       Authorization: `Apikey ${adminkey}`,
     }
   }
@@ -33,10 +43,7 @@ const proxy = async (req, res) => {
     }
   }
 
-  const url = `https://${account}.${domain.replace(
-    '.io',
-    '.net',
-  )}/${endpoint}/__graphql`
+  const url = `${zenservUrl}/${endpoint}/__graphql`
 
   debug('stepzen:dashboard')(`proxy headers: ${JSON.stringify(headers)}`)
   debug('stepzen:dashboard')(`proxy url: ${url}`)

package/src/server/index.js

@@ -15,24 +15,41 @@ const _predicates = require('./api/predicates')
 const proxy = require('./api/proxy')
 const samples = require('./api/samples')
 
-module.exports = async ({
-  account,
-  adminkey,
-  apikey,
-  cli = {version: ''},
-  domain = 'stepzen.io',
-  port = 5000,
-  predicates = {
-    available: false,
-    enabled: false,
-    onTogglePredicates: async () => {},
-  },
-  debugging = {
-    enabled: false,
-    onToggleDebugging: async () => {},
-  },
-  workspace,
-}) => {
+module.exports = async options => {
+  const {
+    /** @deprecated use zenservDomain and zenservUrl */
+    account,
+    adminkey,
+    apikey,
+    cli = {version: ''},
+    /** @deprecated use zenservDomain and zenservUrl */
+    domain = 'stepzen.io',
+    port = 5000,
+    predicates = {
+      available: false,
+      enabled: false,
+      onTogglePredicates: async () => {},
+    },
+    debugging = {
+      enabled: false,
+      onToggleDebugging: async () => {},
+    },
+    workspace,
+    zenservDomain,
+    zenservUrl,
+  } = options
+
+  const warnIfUsingDeprecatedOption = option => {
+    if (options[option]) {
+      debug('stepzen:dashboard')(
+        `The account ${option} is deprecated.` +
+          ` Please use zenservDomain and zenservUrl instead.`,
+      )
+    }
+  }
+  warnIfUsingDeprecatedOption('account')
+  warnIfUsingDeprecatedOption('domain')
+
   const app = express()
 
   app.use(express.json())
@@ -41,14 +58,16 @@ module.exports = async ({
   app.use(express.static(`${__dirname}/../ui/build`))
   app.use((req, res, next) => {
     req.stepzen = {
-      account,
       adminkey,
       apikey,
       cli,
       debugging,
-      domain,
       predicates,
       workspace,
+      zenservDomain:
+        zenservDomain || `${account}.${domain.replace('.io', '.net')}`,
+      zenservUrl:
+        zenservUrl || `https://${account}.${domain.replace('.io', '.net')}`,
     }
     next()
   })

package/src/ui/build/asset-manifest.json

@@ -1,7 +1,7 @@
 {
   "files": {
     "main.css": "/static/css/main.4fb42d49.css",
-    "main.js": "/static/js/main.58ea6b6f.js",
+    "main.js": "/static/js/main.6e3668a7.js",
     "static/js/503.a3ba392a.chunk.js": "/static/js/503.a3ba392a.chunk.js",
     "static/js/136.7849911c.chunk.js": "/static/js/136.7849911c.chunk.js",
     "static/js/190.e088a175.chunk.js": "/static/js/190.e088a175.chunk.js",
@@ -27,7 +27,7 @@
     "static/media/logo.svg": "/static/media/logo.2fa5e016c31f1c335b07ff477d91ee9a.svg",
     "index.html": "/index.html",
     "main.4fb42d49.css.map": "/static/css/main.4fb42d49.css.map",
-    "main.58ea6b6f.js.map": "/static/js/main.58ea6b6f.js.map",
+    "main.6e3668a7.js.map": "/static/js/main.6e3668a7.js.map",
     "503.a3ba392a.chunk.js.map": "/static/js/503.a3ba392a.chunk.js.map",
     "136.7849911c.chunk.js.map": "/static/js/136.7849911c.chunk.js.map",
     "190.e088a175.chunk.js.map": "/static/js/190.e088a175.chunk.js.map",
@@ -53,6 +53,6 @@
   },
   "entrypoints": [
     "static/css/main.4fb42d49.css",
-    "static/js/main.58ea6b6f.js"
+    "static/js/main.6e3668a7.js"
   ]
 }

package/src/ui/build/index.html

@@ -1 +1 @@
-<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title>StepZen</title><script defer="defer" src="/static/js/main.58ea6b6f.js"></script><link href="/static/css/main.4fb42d49.css" rel="stylesheet"></head><body><div id="root"></div></body></html>
+<!doctype html><html lang="en"><head><meta charset="utf-8"/><link rel="icon" href="/favicon.ico"/><meta name="viewport" content="width=device-width,initial-scale=1"/><title>StepZen</title><script defer="defer" src="/static/js/main.6e3668a7.js"></script><link href="/static/css/main.4fb42d49.css" rel="stylesheet"></head><body><div id="root"></div></body></html>