itizawa пре 6 година
родитељ
комит
1dde359551

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

@@ -1,5 +1,6 @@
 const express = require('express');
 const PluginUtils = require('../../plugins/plugin-utils');
+const ConfigLoader = require('../../service/config-loader');
 
 const pluginUtils = new PluginUtils();
 
@@ -70,7 +71,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.configLoader.getEnvVarsForDisplay(false),
+      envVars: await ConfigLoader.getEnvVarsForDisplay(true),
     };
 
     return res.apiv3({ adminHomeParams });

+ 2 - 2
src/server/service/config-loader.js

@@ -355,14 +355,14 @@ class ConfigLoader {
    *
    * **use this only admin home page.**
    */
-  getEnvVarsForDisplay(isIncludedSeurity = true) {
+  static getEnvVarsForDisplay(avoidSecurity = false) {
     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 (process.env[ENV_VAR_NAME] === undefined) {
         continue;
       }
-      if (isSecurityEnv(configInfo.key) && !isIncludedSeurity) {
+      if (isSecurityEnv(configInfo.key) && avoidSecurity) {
         continue;
       }
       config[ENV_VAR_NAME] = configInfo.type.parse(process.env[ENV_VAR_NAME]);

+ 1 - 1
src/server/service/export.js

@@ -38,7 +38,7 @@ class ExportService {
     this.per = 100;
     this.zlibLevel = 9; // 0(min) - 9(max)
 
-    this.configLoader = new ConfigLoader();
+    this.configLoader = ConfigLoader;
     this.adminEvent = crowi.event('admin');
 
     this.currentProgressingStatus = null;