@mimik/configuration 4.4.6 → 4.4.7

package/index.js

@@ -135,7 +135,6 @@ const setupRedis = () => {
       idTTL: parseInt(process.env.CACHE_API_ID_TTL, 10) || DEFAULT_CACHE_API_ID_TTL,
       optionTTL: parseInt(process.env.CACHE_API_OPTION_TTL, 10) || DEFAULT_CACHE_API_OPTION_TTL,
     },
-    isMSTSet,
   };
 };
 
@@ -304,22 +303,25 @@ const setupEncryption = (encryptionOpts) => {
 };
 
 const checkConfig = (config) => {
-  const errs = [];
+  const errors = [];
 
   function traverseNodeSync(node, path) {
     Object.keys(node).forEach((prop) => {
       if (typeof node[prop] === 'object' && node[prop]) {
         traverseNodeSync(node[prop], `${path}.${prop}`);
       }
-      else if (_.isUndefined(node[prop])) errs.push(`${path}.${prop}`);
+      else if (_.isUndefined(node[prop])) errors.push({ reason: 'missing', value: `${path}.${prop}` });
     });
   }
 
   traverseNodeSync(config, 'configuration');
-  if (errs.length > 0) {
-    const error = new Error('Missing values');
+  // dependency errors
+  if (isMSTSet && config.security.apiKeys.length === 0) errors.push({ reason: 'invalid', value: 'config.security.apiKeys', cause: 'isMSTSet' });
+
+  if (errors.length > 0) {
+    const error = new Error('Errors in configuration');
 
-    logger.error(error, { values: errs }, correlationIdStart);
+    logger.error(error, { errors }, correlationIdStart);
     throw error;
   }
 };
@@ -372,7 +374,7 @@ const configuration = {
     admin: {
       externalId: process.env.ADMIN_EXTERNAL_ID || DEFAULT_ADMIN_EXTERNAL_ID,
     },
-    server: !isMSTSet ? {} : {
+    server: {
       id: process.env.OAUTH_CLIENT_ID,
       secret: process.env.OAUTH_CLIENT_SECRET,
       accessKey: process.env.OAUTH_CLIENT_ACCESS_KEY,
@@ -398,7 +400,7 @@ const configuration = {
   topic: {
     set: process.env.TOPIC_SET || DEFAULT_TOPIC_SET,
   },
-  dependencies: !isMSTSet ? {} : { // every server will report to mIT unless mST setup is disabled
+  dependencies: {
     mIT: {
       url: process.env.MIT_URL,
       audience: process.env.MIT_AUDIENCE,
@@ -410,9 +412,12 @@ const configuration = {
   },
 };
 
+// cross dependencies
 if (!isMSTSet) {
   configuration.registration.set = SET_OFF;
   configuration.cluster.management = SET_OFF;
+  configuration.security.server = {};
+  configuration.dependencies = {};
 }
 if (process.env.OAUTH_GENERIC_PREVIOUS_KEY) configuration.security.generic.previousKey = process.env.OAUTH_GENERIC_PREVIOUS_KEY;
 if (process.env.SWAGGER_API_KEY) configuration.serverSettings.apiKey = process.env.SWAGGER_API_KEY;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mimik/configuration",
-  "version": "4.4.6",
+  "version": "4.4.7",
   "description": "Common configuration for mimik services",
   "main": "index.js",
   "scripts": {