From 9b7c25a73d5eff55dce78f892f63e33c243dcd90 Mon Sep 17 00:00:00 2001
From: Simone Corsi <simonecorsi.dev@gmail.com>
Date: Mon, 21 Nov 2022 16:38:41 +0100
Subject: [PATCH] fix(ldap.ts): default auth function signature

---
 packages/ldap-auth-backend/src/ldap.ts | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/packages/ldap-auth-backend/src/ldap.ts b/packages/ldap-auth-backend/src/ldap.ts
index 5cd0d28d..4470f51e 100644
--- a/packages/ldap-auth-backend/src/ldap.ts
+++ b/packages/ldap-auth-backend/src/ldap.ts
@@ -65,14 +65,20 @@ export async function defaultLDAPAuthentication(
     ldapAuthOptions: AuthenticationOptions,
     authFunction: typeof authenticate = authenticate
 ): Promise<LDAPUser> {
-    const { usernameAttribute, userSearchBase } = ldapAuthOptions;
+    const usernameAttribute = ldapAuthOptions.usernameAttribute || 'uid';
+
+    const userDn =
+        dn`${usernameAttribute as string}=${username as string},` +
+        ldapAuthOptions.userSearchBase;
+
     const authObj = {
         ...ldapAuthOptions,
+        username,
+        usernameAttribute,
+        userDn,
         userPassword: password,
-        userDn:
-            dn`${usernameAttribute as string}=${username as string},` +
-            userSearchBase,
     };
+
     const user = await authFunction(authObj);
     if (!user[usernameAttribute as string]) {
         throw new Error(AUTH_USER_NOT_FOUND);