github-mirror/BookStack
2
0
Fork 0
mirror of https://github.com/BookStackApp/BookStack.git synced 2025-05-23 23:29:59 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Merge branch 'master' of git://github.com/brennanmurphy/BookStack into brennanmurphy-master

Browse Source
This commit is contained in:
Dan Brown
2018-07-14 14:17:55 +01:00
parent 985e214d94 37aa8b05f8
commit 1776204870
5 changed files with 229 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5,6 +5,7 @@ namespace BookStack\Http\Controllers\Auth;
use BookStack\Exceptions\AuthException;
use BookStack\Http\Controllers\Controller;
use BookStack\Repos\UserRepo;
use BookStack\Repos\LdapRepo;
use BookStack\Services\SocialAuthService;
use Illuminate\Contracts\Auth\Authenticatable;
use Illuminate\Foundation\Auth\AuthenticatesUsers;
@ -96,6 +97,13 @@ class LoginController extends Controller
auth()->login($user);
}
// ldap groups refresh
if (config('services.ldap.user_to_groups') !== false && $request->filled('username')) {
$ldapRepo = new LdapRepo($this->userRepo);
$ldapRepo->syncGroups($user, $request->input('username'));
}
$path = session()->pull('url.intended', '/');
$path = baseUrl($path, true);
return redirect($path);