فهرست منبع

fetch basic setting

itizawa 6 سال پیش
والد
کامیت
e16c0f062f
2فایلهای تغییر یافته به همراه6 افزوده شده و 2 حذف شده
  1. 2 2
      src/client/js/services/AdminBasicSecurityContainer.js
  2. 4 0
      src/server/routes/apiv3/security-setting.js

+ 2 - 2
src/client/js/services/AdminBasicSecurityContainer.js

@@ -27,9 +27,9 @@ export default class AdminBasicSecurityContainer extends Container {
    */
   async retrieveSecurityData() {
     const response = await this.appContainer.apiv3.get('/security-setting/');
-    const { basic } = response.data.securityParams;
+    const { basicAuth } = response.data.securityParams;
     this.setState({
-      isSameUsernameTreatedAsIdenticalUser: basic.isSameUsernameTreatedAsIdenticalUser || false,
+      isSameUsernameTreatedAsIdenticalUser: basicAuth.isSameUsernameTreatedAsIdenticalUser || false,
     });
   }
 

+ 4 - 0
src/server/routes/apiv3/security-setting.js

@@ -135,10 +135,14 @@ module.exports = (crowi) => {
 
     const securityParams = {
       generalAuth: {
+        isBasicEnabled: await crowi.configManager.getConfig('crowi', 'security:passport-basic:isEnabled'),
         isGoogleOAuthEnabled: await crowi.configManager.getConfig('crowi', 'security:passport-google:isEnabled'),
         isGithubOAuthEnabled: await crowi.configManager.getConfig('crowi', 'security:passport-github:isEnabled'),
         isTwitterOAuthEnabled: await crowi.configManager.getConfig('crowi', 'security:passport-twitter:isEnabled'),
       },
+      basicAuth: {
+        isSameUsernameTreatedAsIdenticalUser: await crowi.configManager.getConfig('crowi', 'security:passport-basic:isSameUsernameTreatedAsIdenticalUser'),
+      },
       googleOAuth: {
         googleClientId: await crowi.configManager.getConfig('crowi', 'security:passport-google:clientId'),
         googleClientSecret: await crowi.configManager.getConfig('crowi', 'security:passport-google:clientSecret'),