mirror of
https://github.com/BookStackApp/BookStack.git
synced 2024-08-26 20:22:18 +00:00
parent
c860645a5a
commit
92c9837157
@ -70,6 +70,7 @@ class LoginController extends Controller
|
|||||||
* @param Authenticatable $user
|
* @param Authenticatable $user
|
||||||
* @return \Illuminate\Http\RedirectResponse
|
* @return \Illuminate\Http\RedirectResponse
|
||||||
* @throws AuthException
|
* @throws AuthException
|
||||||
|
* @throws \BookStack\Exceptions\LdapException
|
||||||
*/
|
*/
|
||||||
protected function authenticated(Request $request, Authenticatable $user)
|
protected function authenticated(Request $request, Authenticatable $user)
|
||||||
{
|
{
|
||||||
|
@ -202,7 +202,7 @@ class LdapService
|
|||||||
/**
|
/**
|
||||||
* Get the groups a user is a part of on ldap
|
* Get the groups a user is a part of on ldap
|
||||||
* @param string $userName
|
* @param string $userName
|
||||||
* @return array|null
|
* @return array
|
||||||
* @throws LdapException
|
* @throws LdapException
|
||||||
*/
|
*/
|
||||||
public function getUserGroups($userName)
|
public function getUserGroups($userName)
|
||||||
@ -211,7 +211,7 @@ class LdapService
|
|||||||
$user = $this->getUserWithAttributes($userName, [$groupsAttr]);
|
$user = $this->getUserWithAttributes($userName, [$groupsAttr]);
|
||||||
|
|
||||||
if ($user === null) {
|
if ($user === null) {
|
||||||
return null;
|
return [];
|
||||||
}
|
}
|
||||||
|
|
||||||
$userGroups = $this->groupFilter($user);
|
$userGroups = $this->groupFilter($user);
|
||||||
|
Loading…
Reference in New Issue
Block a user