Merge pull request #3 from OsmosysSoftware/revert-1-issue-181

[bookstack] / app / Services / LdapService.php

diff --git a/app/Services/LdapService.php b/app/Services/LdapService.php
index f8a4b88bb4b985c5fb75d5af875d3efb765864bd..71dc9c0e1a57b731048445bcdd78fed57e98c6a2 100644 (file)
--- a/app/Services/LdapService.php
+++ b/app/Services/LdapService.php
@@ -41,7 +41,8 @@ class LdapService
         // Find user
         $userFilter = $this->buildFilter($this->config['user_filter'], ['user' => $userName]);
         $baseDn = $this->config['base_dn'];
         // Find user
         $userFilter = $this->buildFilter($this->config['user_filter'], ['user' => $userName]);
         $baseDn = $this->config['base_dn'];

-        $users = $this->ldap->searchAndGetEntries($ldapConnection, $baseDn, $userFilter, ['cn', 'uid', 'dn', 'mail']);
+        $emailAttr = $this->config['email_attribute'];
+        $users = $this->ldap->searchAndGetEntries($ldapConnection, $baseDn, $userFilter, ['cn', 'uid', 'dn', $emailAttr]);

         if ($users['count'] === 0) return null;
 
         $user = $users[0];
         if ($users['count'] === 0) return null;
 
         $user = $users[0];


@@ -49,7 +50,7 @@ class LdapService
             'uid'   => (isset($user['uid'])) ? $user['uid'][0] : $user['dn'],
             'name'  => $user['cn'][0],
             'dn'    => $user['dn'],
             'uid'   => (isset($user['uid'])) ? $user['uid'][0] : $user['dn'],
             'name'  => $user['cn'][0],
             'dn'    => $user['dn'],

-            'email' => (isset($user['mail'])) ? $user['mail'][0] : null
+            'email' => (isset($user[$emailAttr])) ? (is_array($user[$emailAttr]) ? $user[$emailAttr][0] : $user[$emailAttr]) : null

         ];
     }
 
         ];
     }