itizawa 6 лет назад
Родитель
Сommit
5e8a0afcb6

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

@@ -18,7 +18,7 @@ export default class AdminLdapSecurityContainer extends Container {
 
     this.state = {
       serverUrl: '',
-      ldapBindMode: 'manager',
+      isUserBind: false,
       ldapBindDN: '',
       ldapBindDNPassword: '',
       ldapSearchFilter: '',
@@ -40,7 +40,7 @@ export default class AdminLdapSecurityContainer extends Container {
     const response = await this.appContainer.apiv3.get('/security-setting/');
     const { ldapAuth } = response.data.securityParams;
     this.setState({
-      // ldapBindMode: 'manager',
+      isUserBind: ldapAuth.isUserBind,
       ldapBindDN: ldapAuth.ldapBindDN,
       ldapBindDNPassword: ldapAuth.ldapBindDNPassword,
       ldapSearchFilter: ldapAuth.ldapSearchFilter,

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

@@ -239,8 +239,8 @@ module.exports = (crowi) => {
         isTwitterOAuthEnabled: await crowi.configManager.getConfig('crowi', 'security:passport-twitter:isEnabled'),
       },
       ldapAuth: {
-        // ldapBindMode: await crowi.configManager.getConfig('crowi', 'security:passport-ldap:isEnabled'),
-        ldapBindDN: await crowi.configManager.getConfig('crowi', 'security:passport-ldap:isUserBind'),
+        isUserBind: await crowi.configManager.getConfig('crowi', 'security:passport-ldap:isUserBind'),
+        ldapBindDN: await crowi.configManager.getConfig('crowi', 'security:passport-ldap:bindDN'),
         ldapBindDNPassword: await crowi.configManager.getConfig('crowi', 'security:passport-ldap:bindDNPassword'),
         ldapSearchFilter: await crowi.configManager.getConfig('crowi', 'security:passport-ldap:isEnabled'),
         ldapAttrMapUsername: await crowi.configManager.getConfig('crowi', 'security:passport-ldap:attrMapUsername'),