colin
/
bookstack
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into release

This commit is contained in:
Dan Brown 2018-08-19 15:33:10 +01:00
parent a8cfc059c8 d2a9b312e9
commit 83d06beb70
No known key found for this signature in database
GPG Key ID: 46D9F943C24A2EF9
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/Auth/LoginController.php
View File

@ -103,7 +103,7 @@ class LoginController extends Controller
// Sync LDAP groups if required // Sync LDAP groups if required
if ($this->ldapService->shouldSyncGroups()) { if ($this->ldapService->shouldSyncGroups()) {
$this->ldapService->syncGroups($user); $this->ldapService->syncGroups($user, $request->get($this->username()));
} }
$path = session()->pull('url.intended', '/'); $path = session()->pull('url.intended', '/');

5
app/Services/LdapService.php
View File

@ -299,11 +299,12 @@ class LdapService
/** /**
* Sync the LDAP groups to the user roles for the current user * Sync the LDAP groups to the user roles for the current user
* @param \BookStack\User $user * @param \BookStack\User $user
* @param string $username
* @throws LdapException * @throws LdapException
*/ */
public function syncGroups(User $user) public function syncGroups(User $user, string $username)
{ {
$userLdapGroups = $this->getUserGroups($user->external_auth_id); $userLdapGroups = $this->getUserGroups($username);
// Get the ids for the roles from the names // Get the ids for the roles from the names
$ldapGroupsAsRoles = $this->matchLdapGroupsToSystemsRoles($userLdapGroups); $ldapGroupsAsRoles = $this->matchLdapGroupsToSystemsRoles($userLdapGroups);