Просмотр исходного кода

Merge pull request #1703 from weseek/reactify-admin/fix-typo-ABLC-Rule

fix typo ABLC Rule
Yuki Takei 6 лет назад
Родитель
Сommit
6b22c9c08c

+ 1 - 1
src/client/js/services/AdminSamlSecurityContainer.js

@@ -169,7 +169,7 @@ export default class AdminSamlSecurityContainer extends Container {
       attrMapLastName: this.state.samlAttrMapLastName,
       attrMapLastName: this.state.samlAttrMapLastName,
       isSameUsernameTreatedAsIdenticalUser: this.state.isSameUsernameTreatedAsIdenticalUser,
       isSameUsernameTreatedAsIdenticalUser: this.state.isSameUsernameTreatedAsIdenticalUser,
       isSameEmailTreatedAsIdenticalUser: this.state.isSameEmailTreatedAsIdenticalUser,
       isSameEmailTreatedAsIdenticalUser: this.state.isSameEmailTreatedAsIdenticalUser,
-      ABLCRule: this.state.ABLCRule,
+      ABLCRule: this.state.samlABLCRule,
     };
     };
 
 
     requestParams = await removeNullPropertyFromObject(requestParams);
     requestParams = await removeNullPropertyFromObject(requestParams);

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

@@ -660,7 +660,7 @@ module.exports = (crowi) => {
       return res.apiv3Err(req.t('form_validation.error_message'), 400, invalidValues);
       return res.apiv3Err(req.t('form_validation.error_message'), 400, invalidValues);
     }
     }
 
 
-    const rule = req.body.samlABLCRule;
+    const rule = req.body.ABLCRule;
     // Empty string disables attribute-based login control.
     // Empty string disables attribute-based login control.
     // So, when rule is empty string, validation is passed.
     // So, when rule is empty string, validation is passed.
     if (rule != null && (rule == null || crowi.passportService.parseABLCRule(rule) == null)) {
     if (rule != null && (rule == null || crowi.passportService.parseABLCRule(rule) == null)) {