Patch LDAP issue

backend/src/ee/routes/v1/ldap-router.ts

@@ -103,16 +103,10 @@ export const registerLdapRouter = async (server: FastifyZodProvider) => {
               : {})
           });
 
-          ldapClient.bind(ldapConfig.bindDN, ldapConfig.bindPass, (err) => {
+          const groupFilter = "(|(memberUid={{.Username}})(member={{.UserDN}})(uniqueMember={{.UserDN}}))";
-            if (err) {
+          const searchFilter =
-              ldapClient.unbind();
-              return cb(err);
-            }
-
-            const groupFilter =
             ldapConfig.groupSearchFilter ||
-              "(|(memberUid={{.Username}})(member={{.UserDN}})(uniqueMember={{.UserDN}}))";
+            groupFilter.replace("{{.Username}}", user.uid).replace("{{.UserDN}}", user.dn);
-            const searchFilter = groupFilter.replace("{{.Username}}", user.uid).replace("{{.UserDN}}", user.dn);
 
           searchGroups(ldapClient, searchFilter, ldapConfig.groupSearchBase)
             .then((groups) => {
@@ -134,10 +128,9 @@ export const registerLdapRouter = async (server: FastifyZodProvider) => {
             })
             .catch((err2) => {
               ldapClient.unbind();
-                logger.error(err);
+              logger.error(err2);
               cb(err2, false);
             });
-          });
         } catch (error) {
           logger.error(error);
           return cb(error, false);

backend/src/ee/services/ldap-config/ldap-fns.ts

@@ -14,19 +14,24 @@ export const searchGroups = async (
       },
       (err, res) => {
         if (err) {
-          reject(err);
+          return reject(err);
         }
 
         const groups: { dn: string; cn: string }[] = [];
 
         res.on("searchEntry", (entry) => {
-          groups.push({ dn: entry.object.dn, cn: entry.object.cn as string });
+          const dn = entry.dn.toString();
-        });
+          const regex = /cn=([^,]+)/;
+          const match = dn.match(regex);
+          // parse the cn from the dn
+          const cn = (match && match[1]) as string;
 
+          groups.push({ dn, cn });
+        });
         res.on("error", (error) => {
+          console.error(`error: ${error.message}`);
           reject(error);
         });
-
         res.on("end", () => {
           resolve(groups);
         });

backend/src/services/auth/auth-login-service.ts

@@ -191,7 +191,7 @@ export const authLoginServiceFactory = ({
       const decodedProviderToken = validateProviderAuthToken(providerAuthToken, email);
 
       authMethod = decodedProviderToken.authMethod;
-      if (isAuthMethodSaml(authMethod) && decodedProviderToken.orgId) {
+      if ((isAuthMethodSaml(authMethod) || authMethod === AuthMethod.LDAP) && decodedProviderToken.orgId) {
         organizationId = decodedProviderToken.orgId;
       }
     }