mizozobu 6 ani în urmă
părinte
comite
40803c876c
2 a modificat fișierele cu 8 adăugiri și 8 ștergeri
  1. 2 4
      src/server/routes/admin.js
  2. 6 4
      src/server/routes/index.js

+ 2 - 4
src/server/routes/admin.js

@@ -14,7 +14,7 @@ module.exports = function(crowi, app) {
   const GlobalNotificationMailSetting = models.GlobalNotificationMailSetting;
   const GlobalNotificationSlackSetting = models.GlobalNotificationSlackSetting; // eslint-disable-line no-unused-vars
 
-  const { configManager } = crowi;
+  const { configManager, aclService } = crowi;
 
   const recommendedWhitelist = require('@commons/service/xss/recommended-whitelist');
   const PluginUtils = require('../plugins/plugin-utils');
@@ -914,9 +914,7 @@ module.exports = function(crowi, app) {
     }
 
     const form = req.form.settingForm;
-    const config = crowi.getConfig();
-    const isPublicWikiOnly = Config.isPublicWikiOnly(config);
-    if (isPublicWikiOnly) {
+    if (aclService.getIsPublicWikiOnly()) {
       const basicName = form['security:basicName'];
       const basicSecret = form['security:basicSecret'];
       if (basicName !== '' || basicSecret !== '') {

+ 6 - 4
src/server/routes/index.js

@@ -22,10 +22,12 @@ module.exports = function(crowi, app) {
   const revision = require('./revision')(crowi, app);
   const search = require('./search')(crowi, app);
   const hackmd = require('./hackmd')(crowi, app);
-  const loginRequired = middlewares.loginRequired;
-  const adminRequired = middlewares.adminRequired;
-  const accessTokenParser = middlewares.accessTokenParser;
-  const csrf = middlewares.csrfVerify;
+  const {
+    loginRequired,
+    adminRequired,
+    accessTokenParser,
+    csrfVerify: csrf,
+  } = middlewares;
   const { configManager } = crowi;
 
   /* eslint-disable max-len, comma-spacing, no-multi-spaces */