From a8d7eb27d91b906f95cc77400e820ed873e33ca7 Mon Sep 17 00:00:00 2001
From: zengqiao <zengqiao_cn@163.com>
Date: Wed, 12 Jan 2022 18:03:16 +0800
Subject: [PATCH] ldap config add default value

---
 container/helm/templates/configmap.yaml               | 11 ++++++++++-
 .../account/component/sso/BaseSessionSignOn.java      |  8 ++++----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/container/helm/templates/configmap.yaml b/container/helm/templates/configmap.yaml
index cefa9d0d..1428cf11 100644
--- a/container/helm/templates/configmap.yaml
+++ b/container/helm/templates/configmap.yaml
@@ -67,7 +67,16 @@ data:
       # ldap settings
       ldap:
         enabled: false
-        authUserRegistration: false
+        url: ldap://127.0.0.1:389/
+        basedn: dc=tsign,dc=cn
+        factory: com.sun.jndi.ldap.LdapCtxFactory
+        filter: sAMAccountName
+        security:
+          authentication: simple
+          principal: cn=admin,dc=tsign,dc=cn
+          credentials: admin
+        auth-user-registration: false
+        auth-user-registration-role: normal
 
     kcm:
       enabled: false
diff --git a/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/sso/BaseSessionSignOn.java b/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/sso/BaseSessionSignOn.java
index 1ff36964..d826507d 100644
--- a/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/sso/BaseSessionSignOn.java
+++ b/kafka-manager-extends/kafka-manager-account/src/main/java/com/xiaojukeji/kafka/manager/account/component/sso/BaseSessionSignOn.java
@@ -31,16 +31,16 @@ public class BaseSessionSignOn extends AbstractSingleSignOn {
     private LdapAuthentication ldapAuthentication;
 
     //是否开启ldap验证
-    @Value(value = "${account.ldap.enabled:}")
+    @Value(value = "${account.ldap.enabled:false}")
     private Boolean accountLdapEnabled;
 
     //ldap自动注册的默认角色。请注意：它通常来说都是低权限角色
-    @Value(value = "${account.ldap.auth-user-registration-role:}")
+    @Value(value = "${account.ldap.auth-user-registration-role:normal}")
     private String authUserRegistrationRole;
 
     //ldap自动注册是否开启
-    @Value(value = "${account.ldap.auth-user-registration:}")
-    private boolean authUserRegistration;
+    @Value(value = "${account.ldap.auth-user-registration:false}")
+    private Boolean authUserRegistration;
 
     @Override
     public Result<String> loginAndGetLdap(HttpServletRequest request, HttpServletResponse response, LoginDTO dto) {