From ac4e2b354615cb071052726c0601d9257551263b Mon Sep 17 00:00:00 2001
From: "mike.rode" <mike.rode@malauzai.com>
Date: Tue, 12 Feb 2019 20:37:35 -0600
Subject: [PATCH] Fix config export so server settings are correct.

---
 config/index.js                              | 5 ++---
 config/local.js                              | 3 +--
 index.js                                     | 4 ++--
 package.json                                 | 2 +-
 server/controllers/apis/plex/index.js        | 1 -
 server/index.js                              | 4 ++--
 test/server/services/plexApi/plexApi.test.js | 1 +
 7 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/config/index.js b/config/index.js
index cee3c66..01e2fff 100644
--- a/config/index.js
+++ b/config/index.js
@@ -3,11 +3,10 @@ const _ = require('lodash');
 
 const env = process.env.NODE_ENV || 'local';
 
-const envConfig = require(`./${env}`);
+const envConfig = require(`./${env}`).default;
 const plexConfig = require('./plex').default;
 
 const defaultConfig = {
   env,
 };
-
-export default {env: _.merge(defaultConfig, envConfig), plex: plexConfig};
+export default {server: _.merge(defaultConfig, envConfig), plex: plexConfig};
diff --git a/config/local.js b/config/local.js
index 8031d0c..7307b2d 100644
--- a/config/local.js
+++ b/config/local.js
@@ -1,7 +1,6 @@
 const localConfig = {
   hostname: 'localhost',
-  port: 8000,
-  // viewDir: './app/views',
+  port: 8080,
 };
 
 export default localConfig;
diff --git a/index.js b/index.js
index f219fd6..41b57a5 100644
--- a/index.js
+++ b/index.js
@@ -2,8 +2,8 @@ import config from './config';
 
 const server = require('./server').default();
 
-server.create(config.env);
+server.create(config);
 
 server.start();
 
-export default server.create(config.env);
+export default server.create(config);
diff --git a/package.json b/package.json
index 666230a..bfb8595 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "main": "index.js",
   "scripts": {
     "test": "mocha --compilers js:babel-core/register ./test/**/**/**/*.test.js --exit",
-    "dev": "nodemon --exec babel-node index.js",
+    "dev": "nodemon --exec babel-node --inspect-brk index.js",
     "start": "nodemon --exec babel-node index.js"
   },
   "author": "",
diff --git a/server/controllers/apis/plex/index.js b/server/controllers/apis/plex/index.js
index 99c6034..a469b3b 100644
--- a/server/controllers/apis/plex/index.js
+++ b/server/controllers/apis/plex/index.js
@@ -4,6 +4,5 @@ import plexService from '../../../services/plex';
 const router = Router();
 
 router.get('/users', plexService.getUsers);
-// router.get('/:id', plexService.getDogWithId);
 
 export default router;
diff --git a/server/index.js b/server/index.js
index e0fbbac..fc2de66 100644
--- a/server/index.js
+++ b/server/index.js
@@ -9,8 +9,8 @@ export default () => {
   const create = config => {
     // Server settings
     server.set('env', config.env);
-    server.set('port', config.port);
-    server.set('hostname', config.hostname);
+    server.set('port', config.server.port);
+    server.set('hostname', config.server.hostname);
 
     // Returns middleware that parses json
     server.use(json());
diff --git a/test/server/services/plexApi/plexApi.test.js b/test/server/services/plexApi/plexApi.test.js
index 35683e0..544e9e1 100644
--- a/test/server/services/plexApi/plexApi.test.js
+++ b/test/server/services/plexApi/plexApi.test.js
@@ -43,6 +43,7 @@ describe('plexApi', () => {
     nock('https://plex.tv')
       .get('/api/users?X-Plex-Token=plexToken')
       .replyWithFile(200, usersResponse, { 'Content-Type': 'text/xml' });
+
     const options = { token: 'plexToken' };
     const PlexApi = new PlexApiClient(options);
     const urlParams = PlexApi.getUsersUrlParams();