Browse Source

getEnvVarsForDisplay

itizawa 6 years ago
parent
commit
0b76fc9503

+ 1 - 1
src/server/routes/apiv3/admin-home.js

@@ -70,7 +70,7 @@ module.exports = (crowi) => {
       npmVersion: crowi.runtimeVersions.versions.npm ? crowi.runtimeVersions.versions.npm.version.version : '-',
       yarnVersion: crowi.runtimeVersions.versions.yarn ? crowi.runtimeVersions.versions.yarn.version.version : '-',
       installedPlugins: pluginUtils.listPlugins(crowi.rootDir),
-      envVars: await crowi.configManager.getAllConfigFromEnvVars(),
+      envVars: await crowi.configManager.configLoader.getEnvVarsForDisplay(),
     };
 
     return res.apiv3({ adminHomeParams });

+ 22 - 0
src/server/service/config-loader.js

@@ -349,6 +349,28 @@ class ConfigLoader {
     return config;
   }
 
+  /**
+   * get config from the environment variables for display admin page
+   *
+   * **use this only admin home page.**
+   */
+  getEnvVarsForDisplay() {
+    const config = {};
+    for (const ENV_VAR_NAME of Object.keys(ENV_VAR_NAME_TO_CONFIG_INFO)) {
+      const configInfo = ENV_VAR_NAME_TO_CONFIG_INFO[ENV_VAR_NAME];
+      if (config[configInfo.ns] === undefined) {
+        config[configInfo.ns] = {};
+      }
+
+      if (!envUtils.isSecurityEnv(configInfo.key) && process.env[ENV_VAR_NAME] !== undefined) {
+        config[configInfo.ns][ENV_VAR_NAME] = configInfo.type.parse(process.env[ENV_VAR_NAME]);
+      }
+    }
+
+    debug('ConfigLoader#getEnvVarsForDisplay', config);
+    return config;
+  }
+
 }
 
 module.exports = ConfigLoader;

+ 0 - 9
src/server/service/config-manager.js

@@ -145,15 +145,6 @@ class ConfigManager {
     return this.searchOnlyFromEnvVarConfigs(namespace, key);
   }
 
-  /**
-   * get all config from the environment variables
-   *
-   * **use this only admin home page.**
-   */
-  getAllConfigFromEnvVars() {
-    return this.configObject.fromEnvVars;
-  }
-
   /**
    * update configs in the same namespace
    *