From 588bcebc877a77a4a357cf54c1459524eaca5b16 Mon Sep 17 00:00:00 2001
From: Alexey Sachkov <sachkov2011@gmail.com>
Date: Fri, 21 Jan 2022 23:11:44 +0300
Subject: [PATCH] [NFC] Outline config creation into a separate module

This is done in order to have config creation rules
unified in one place to avoid modifying them multiple times
if they change.

We already had 3 duplicated pieces of code initializing the
config and there will be more config uses in future tests.

This resolves #1960
---
 server.js               | 6 +-----
 server/config.js        | 5 +++++
 server/googleActions.js | 6 +-----
 server/token.js         | 6 +-----
 4 files changed, 8 insertions(+), 15 deletions(-)
 create mode 100644 server/config.js

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)=>{