kaori před 4 roky
rodič
revize
7c19377d27

+ 1 - 1
src/server/models/config.js

@@ -43,7 +43,7 @@ module.exports = function(crowi) {
 
       'security:registrationMode'      : 'Open',
       'security:registrationWhiteList' : [],
-      'security:isPasswordResetEnabled'  : true,
+      'security:passport-local:isPasswordResetEnabled'  : true,
 
       'security:list-policy:hideRestrictedByOwner' : false,
       'security:list-policy:hideRestrictedByGroup' : false,

+ 3 - 3
src/server/routes/apiv3/security-setting.js

@@ -368,7 +368,7 @@ module.exports = (crowi) => {
         useOnlyEnvVarsForSomeOptions: await crowi.configManager.getConfig('crowi', 'security:passport-local:useOnlyEnvVarsForSomeOptions'),
         registrationMode: await crowi.configManager.getConfig('crowi', 'security:registrationMode'),
         registrationWhiteList: await crowi.configManager.getConfig('crowi', 'security:registrationWhiteList'),
-        isPasswordResetEnabled: await crowi.configManager.getConfig('crowi', 'security:isPasswordResetEnabled'),
+        isPasswordResetEnabled: await crowi.configManager.getConfig('crowi', 'security:passport-local:isPasswordResetEnabled'),
       },
       generalAuth: {
         isLocalEnabled: await crowi.configManager.getConfig('crowi', 'security:passport-local:isEnabled'),
@@ -695,7 +695,7 @@ module.exports = (crowi) => {
     const requestParams = {
       'security:registrationMode': req.body.registrationMode,
       'security:registrationWhiteList': req.body.registrationWhiteList,
-      'security:isPasswordResetEnabled': req.body.isPasswordResetEnabled,
+      'security:passport-local:isPasswordResetEnabled': req.body.isPasswordResetEnabled,
     };
     try {
       await updateAndReloadStrategySettings('local', requestParams);
@@ -703,7 +703,7 @@ module.exports = (crowi) => {
       const localSettingParams = {
         registrationMode: await crowi.configManager.getConfig('crowi', 'security:registrationMode'),
         registrationWhiteList: await crowi.configManager.getConfig('crowi', 'security:registrationWhiteList'),
-        isPasswordResetEnabled: await crowi.configManager.getConfig('crowi', 'security:isPasswordResetEnabled'),
+        isPasswordResetEnabled: await crowi.configManager.getConfig('crowi', 'security:passport-local:isPasswordResetEnabled'),
       };
       return res.apiv3({ localSettingParams });
     }

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

@@ -268,7 +268,7 @@ const ENV_VAR_NAME_TO_CONFIG_INFO = {
   },
   LOCAL_STRATEGY_PASSWORD_RESET_ENABLED: {
     ns:      'crowi',
-    key:     'security:isPasswordResetEnabled',
+    key:     'security:passport-local:isPasswordResetEnabled',
     type:    TYPES.BOOLEAN,
     default: true,
   },

+ 1 - 1
src/server/views/login.html

@@ -109,7 +109,7 @@
 
       {% set registrationMode = getConfig('crowi', 'security:registrationMode') %}
       {% set isRegistrationEnabled = passportService.isLocalStrategySetup && registrationMode != 'Closed' %}
-      {% set isPasswordResetEnabled = getConfig('crowi', 'security:isPasswordResetEnabled') %}
+      {% set isPasswordResetEnabled = getConfig('crowi', 'security:passport-local:isPasswordResetEnabled') %}
 
       <div
         id="login-form"