diff --git a/server.js b/server.js index c9ce63c8f..3a9b07b51 100644 --- a/server.js +++ b/server.js @@ -1,11 +1,7 @@ const DB = require('./server/db.js'); const server = require('./server/app.js'); -const config = require('nconf') - .argv() - .env({ lowerCase: true }) - .file('environment', { file: `config/${process.env.NODE_ENV}.json` }) - .file('defaults', { file: 'config/default.json' }); +const config = require('./server/config.js'); DB.connect(config).then(()=>{ // Ensure that we have successfully connected to the database diff --git a/server/config.js b/server/config.js new file mode 100644 index 000000000..fc50e68ba --- /dev/null +++ b/server/config.js @@ -0,0 +1,5 @@ +module.exports = require('nconf') + .argv() + .env({ lowerCase: true }) + .file('environment', { file: `config/${process.env.NODE_ENV}.json` }) + .file('defaults', { file: 'config/default.json' }); diff --git a/server/googleActions.js b/server/googleActions.js index 0050cb81d..b4eeba5e3 100644 --- a/server/googleActions.js +++ b/server/googleActions.js @@ -3,11 +3,7 @@ const _ = require('lodash'); const { google } = require('googleapis'); const { nanoid } = require('nanoid'); const token = require('./token.js'); -const config = require('nconf') - .argv() - .env({ lowerCase: true }) // Load environment variables - .file('environment', { file: `config/${process.env.NODE_ENV}.json` }) - .file('defaults', { file: 'config/default.json' }); +const config = require('./config.js'); //let oAuth2Client; diff --git a/server/token.js b/server/token.js index 40d76a484..70d6e01c5 100644 --- a/server/token.js +++ b/server/token.js @@ -1,11 +1,7 @@ const jwt = require('jwt-simple'); // Load configuration values -const config = require('nconf') - .argv() - .env({ lowerCase: true }) // Load environment variables - .file('environment', { file: `config/${process.env.NODE_ENV}.json` }) - .file('defaults', { file: 'config/default.json' }); +const config = require('./config.js'); // Generate an Access Token for the given User ID const generateAccessToken = (account)=>{