move config search to new config-service

dmstern · Aug 12, 2018 · ded1b07 · ded1b07
1 parent a343886
commit ded1b07
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 17 deletions.
diff --git a/server/artifactory-service.js b/server/artifactory-service.js
@@ -1,27 +1,12 @@
 const axios = require("axios");
-const path = require("path");
-const homedir = require("os").homedir();
-const configFile = process.env.MOCK
-  ? ".sample.npmfrogrc.json"
-  : ".npmfrogrc.json";
-let config;
 
-try {
-  config = require(path.join(__dirname, "..", configFile));
-} catch(er1) {
-  try {
-    config = require(path.join(homedir, configFile));
-  } catch(er2) {
-    console.log('No config file found. Please create a config file as described in the README.md file or set environment variable MOCK=true to test the UI.');
-  }
-}
+const config = require('./config-service.js');
+const repoKey = config.artifactory.repoKey;
 
 process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
 axios.defaults.baseURL = `${config.artifactory.baseURL}/artifactory/api/npm/`;
 axios.defaults.headers.common["Authorization"] = config.artifactory.apiKey;
 
-const repoKey = config.artifactory.repoKey;
-
 module.exports = {
   fetchPackages: async () => {
     if (process.env.MOCK) {

diff --git a/server/config-service.js b/server/config-service.js
@@ -0,0 +1,19 @@
+const path = require("path");
+const homedir = require("os").homedir();
+
+const configFile = process.env.MOCK
+  ? ".sample.npmfrogrc.json"
+  : ".npmfrogrc.json";
+let config;
+
+try {
+  config = require(path.join(__dirname, "..", configFile));
+} catch(er1) {
+  try {
+    config = require(path.join(homedir, configFile));
+  } catch(er2) {
+    console.log('No config file found. Please create a config file as described in the README.md file or set environment variable MOCK=true to test the UI.');
+  }
+}
+
+module.exports = config;