From 4df754979996d18245cd67f168e03f355f9e385b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=CC=81rgio=20Ramos?= Date: Thu, 20 Jul 2017 14:44:55 +0100 Subject: [PATCH] fix(portal-api): better handle dev enviroments --- packages/portal-api/lib/index.js | 9 +++++++++ packages/portal-api/package.json | 3 ++- packages/portal-api/server.js | 8 +++++++- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/packages/portal-api/lib/index.js b/packages/portal-api/lib/index.js index 41519c49..7d0dd957 100644 --- a/packages/portal-api/lib/index.js +++ b/packages/portal-api/lib/index.js @@ -9,6 +9,13 @@ const Resolvers = require('./resolvers'); const ContainerPilotWatcher = require('./watch/container-pilot'); const MachinesWatcher = require('./watch/machines'); +const { + NAMESPACE +} = process.env; + +const namespace = NAMESPACE + ? `/${NAMESPACE}` + : ''; const internals = {}; @@ -59,6 +66,8 @@ module.exports = function (server, options, next) { { register: Graphi, options: { + graphqlPath: `${namespace}/graphql`, + graphiqlPath: `${namespace}/graphiql`, schema: Schema, resolvers: Resolvers(data) } diff --git a/packages/portal-api/package.json b/packages/portal-api/package.json index 3dab0b1e..5a3c95cb 100644 --- a/packages/portal-api/package.json +++ b/packages/portal-api/package.json @@ -11,7 +11,8 @@ "lint-ci": "belly-button", "test": "lab -c", "test-ci": "echo 0", - "start": "node server.js" + "start": "node server.js", + "dev": "CORS=1 NAMESPACE=api node server.js" }, "keywords": [], "author": "wyatt", diff --git a/packages/portal-api/server.js b/packages/portal-api/server.js index d04428ab..c42f4c27 100644 --- a/packages/portal-api/server.js +++ b/packages/portal-api/server.js @@ -14,7 +14,13 @@ const Fs = require('fs'); const Url = require('url'); const server = new Hapi.Server(); -server.connection({ port: 3000 }); + +server.connection({ + port: 3000, + routes: { + cors: Boolean(process.env.CORS) + } +}); const swaggerOptions = { info: {