Fix LDAP AD login without domain (simply user ID).

Leantime · Aug 29, 2024 · 814f109 · 814f109
1 parent 92d3698
commit 814f109
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/app/Domain/Ldap/Services/Ldap.php b/app/Domain/Ldap/Services/Ldap.php
@@ -141,14 +141,17 @@ public function bind(string $username = '', string $password = ''): bool
             if ($this->directoryType == 'AD') {
                 $usernameDN = $username;
 
-                $bind = ldap_bind($this->ldapConnection, $usernameDN, $passwordBind);
+                if (str_contains($usernameDN, '@')) {
+                    $bind = ldap_bind($this->ldapConnection, $usernameDN, $passwordBind);
+                } else {
+                    $bind = ldap_bind($this->ldapConnection, $usernameDN . "@" . $this->ldapDomain, $passwordBind);
+                }
+
                 if ($bind) {
                     return true;
                 }
-
-                $bind = ldap_bind($this->ldapConnection, $usernameDN . "@" . $this->ldapDomain, $passwordBind);
-                //OL requires distinguished name login
             } else {
+                //OL requires distinguished name login
                 $usernameDN = $this->ldapKeys->username . "=" . $username . "," . $this->ldapDn;
 
                 $bind = ldap_bind($this->ldapConnection, $usernameDN, $passwordBind);