Clean LDAP group search impl async/await

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

@@ -450,79 +450,84 @@ export const ldapConfigServiceFactory = ({
       });
     }
 
-    const user = await userDAL.findOne({ id: userAlias.userId });
+    const user = await userDAL.transaction(async (tx) => {
+      const newUser = await userDAL.findOne({ id: userAlias.userId }, tx);
+      if (groups) {
+        const ldapGroupIdsToBePartOf = (
+          await ldapGroupMapDAL.find({
+            ldapConfigId,
+            $in: {
+              ldapGroupCN: groups.map((group) => group.cn)
+            }
+          })
+        ).map((groupMap) => groupMap.groupId);
 
-    if (groups) {
-      const ldapGroupIdsToBePartOf = (
-        await ldapGroupMapDAL.find({
-          ldapConfigId,
+        const groupsToBePartOf = await groupDAL.find({
+          orgId,
           $in: {
-            ldapGroupCN: groups.map((group) => group.cn)
+            id: ldapGroupIdsToBePartOf
           }
-        })
-      ).map((groupMap) => groupMap.groupId);
+        });
+        const toBePartOfGroupIdsSet = new Set(groupsToBePartOf.map((groupToBePartOf) => groupToBePartOf.id));
 
-      const groupsToBePartOf = await groupDAL.find({
-        orgId,
-        $in: {
-          id: ldapGroupIdsToBePartOf
+        const allLdapGroupMaps = await ldapGroupMapDAL.find({
+          ldapConfigId
+        });
+
+        const ldapGroupIdsCurrentlyPartOf = (
+          await userGroupMembershipDAL.find({
+            userId: newUser.id,
+            $in: {
+              groupId: allLdapGroupMaps.map((groupMap) => groupMap.groupId)
+            }
+          })
+        ).map((userGroupMembership) => userGroupMembership.groupId);
+
+        const userGroupMembershipGroupIdsSet = new Set(ldapGroupIdsCurrentlyPartOf);
+
+        for await (const group of groupsToBePartOf) {
+          if (!userGroupMembershipGroupIdsSet.has(group.id)) {
+            // add user to group that they should be part of
+            await addUsersToGroupByUserIds({
+              group,
+              userIds: [newUser.id],
+              userDAL,
+              userGroupMembershipDAL,
+              orgDAL,
+              groupProjectDAL,
+              projectKeyDAL,
+              projectDAL,
+              projectBotDAL,
+              tx
+            });
+          }
         }
-      });
-      const toBePartOfGroupIdsSet = new Set(groupsToBePartOf.map((groupToBePartOf) => groupToBePartOf.id));
 
-      const allLdapGroupMaps = await ldapGroupMapDAL.find({
-        ldapConfigId
-      });
-
-      const ldapGroupIdsCurrentlyPartOf = (
-        await userGroupMembershipDAL.find({
-          userId: user.id,
+        const groupsCurrentlyPartOf = await groupDAL.find({
+          orgId,
           $in: {
-            groupId: allLdapGroupMaps.map((groupMap) => groupMap.groupId)
+            id: ldapGroupIdsCurrentlyPartOf
           }
-        })
-      ).map((userGroupMembership) => userGroupMembership.groupId);
+        });
 
-      const userGroupMembershipGroupIdsSet = new Set(ldapGroupIdsCurrentlyPartOf);
-
-      for await (const group of groupsToBePartOf) {
-        if (!userGroupMembershipGroupIdsSet.has(group.id)) {
-          // add user to group that they should be part of
-          await addUsersToGroupByUserIds({
-            group,
-            userIds: [user.id],
-            userDAL,
-            userGroupMembershipDAL,
-            orgDAL,
-            groupProjectDAL,
-            projectKeyDAL,
-            projectDAL,
-            projectBotDAL
-          });
+        for await (const group of groupsCurrentlyPartOf) {
+          if (!toBePartOfGroupIdsSet.has(group.id)) {
+            // remove user from group that they should no longer be part of
+            await removeUsersFromGroupByUserIds({
+              group,
+              userIds: [newUser.id],
+              userDAL,
+              userGroupMembershipDAL,
+              groupProjectDAL,
+              projectKeyDAL,
+              tx
+            });
+          }
         }
       }
 
-      const groupsCurrentlyPartOf = await groupDAL.find({
-        orgId,
-        $in: {
-          id: ldapGroupIdsCurrentlyPartOf
-        }
-      });
-
-      for await (const group of groupsCurrentlyPartOf) {
-        if (!toBePartOfGroupIdsSet.has(group.id)) {
-          // remove user from group that they should no longer be part of
-          await removeUsersFromGroupByUserIds({
-            group,
-            userIds: [user.id],
-            userDAL,
-            userGroupMembershipDAL,
-            groupProjectDAL,
-            projectKeyDAL
-          });
-        }
-      }
-    }
+      return newUser;
+    });
 
     const isUserCompleted = Boolean(user.isAccepted);
 

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

@@ -1,5 +1,18 @@
 import { TOrgPermission } from "@app/lib/types";
 
+export type TLDAPConfig = {
+  id: string;
+  organization: string;
+  isActive: boolean;
+  url: string;
+  bindDN: string;
+  bindPass: string;
+  searchBase: string;
+  groupSearchBase: string;
+  groupSearchFilter: string;
+  caCert: string;
+};
+
 export type TCreateLdapCfgDTO = {
   orgId: string;
   isActive: boolean;

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

@@ -1,11 +1,28 @@
-import ldap from "ldapjs";
+import ldapjs from "ldapjs";
+
+import { logger } from "@app/lib/logger";
+
+import { TLDAPConfig } from "./ldap-config-types";
 
 export const searchGroups = async (
-  ldapClient: ldap.Client,
+  ldapConfig: TLDAPConfig,
   filter: string,
   base: string
 ): Promise<{ dn: string; cn: string }[]> => {
   return new Promise((resolve, reject) => {
+    const ldapClient = ldapjs.createClient({
+      url: ldapConfig.url,
+      bindDN: ldapConfig.bindDN,
+      bindCredentials: ldapConfig.bindPass,
+      ...(ldapConfig.caCert !== ""
+        ? {
+            tlsOptions: {
+              ca: [ldapConfig.caCert]
+            }
+          }
+        : {})
+    });
+
     ldapClient.search(
       base,
       {
@@ -14,6 +31,11 @@ export const searchGroups = async (
       },
       (err, res) => {
         if (err) {
+          ldapClient.unbind((unbindError) => {
+            if (unbindError) {
+              logger.error("Error unbinding LDAP client:", unbindError);
+            }
+          });
           return reject(err);
         }
 
@@ -29,10 +51,19 @@ export const searchGroups = async (
           groups.push({ dn, cn });
         });
         res.on("error", (error) => {
-          console.error(`error: ${error.message}`);
+          ldapClient.unbind((unbindError) => {
+            if (unbindError) {
+              logger.error("Error unbinding LDAP client:", unbindError);
+            }
+          });
           reject(error);
         });
         res.on("end", () => {
+          ldapClient.unbind((unbindError) => {
+            if (unbindError) {
+              logger.error("Error unbinding LDAP client:", unbindError);
+            }
+          });
           resolve(groups);
         });
       }

backend/src/ee/services/ldap-config/ldap-group-map-dal.ts

@@ -16,8 +16,8 @@ export const ldapGroupMapDALFactory = (db: TDbClient) => {
         .select(selectAllTableCols(TableName.LdapGroupMap))
         .select(
           db.ref("id").withSchema(TableName.Groups).as("groupId"),
-          db.ref("name").withSchema(TableName.Groups).as("groupSlug"),
-          db.ref("slug").withSchema(TableName.Groups).as("groupName")
+          db.ref("name").withSchema(TableName.Groups).as("groupName"),
+          db.ref("slug").withSchema(TableName.Groups).as("groupSlug")
         );
 
       return docs.map((doc) => {