X-Git-Url: http://source.bookstackapp.com/bookstack/blobdiff_plain/0821672e70cf9eb81091032514634b299cc5900b..refs/pull/1755/head:/app/Providers/LdapUserProvider.php diff --git a/app/Providers/LdapUserProvider.php b/app/Providers/LdapUserProvider.php index 30fa739c2..9c91def2f 100644 --- a/app/Providers/LdapUserProvider.php +++ b/app/Providers/LdapUserProvider.php @@ -2,10 +2,7 @@ namespace BookStack\Providers; - -use BookStack\Role; -use BookStack\Services\LdapService; -use BookStack\User; +use BookStack\Auth\Access\LdapService; use Illuminate\Contracts\Auth\Authenticatable; use Illuminate\Contracts\Auth\UserProvider; @@ -20,7 +17,7 @@ class LdapUserProvider implements UserProvider protected $model; /** - * @var LdapService + * @var \BookStack\Auth\LdapService */ protected $ldapService; @@ -28,7 +25,7 @@ class LdapUserProvider implements UserProvider /** * LdapUserProvider constructor. * @param $model - * @param LdapService $ldapService + * @param \BookStack\Auth\LdapService $ldapService */ public function __construct($model, LdapService $ldapService) { @@ -102,7 +99,9 @@ class LdapUserProvider implements UserProvider { // Get user via LDAP $userDetails = $this->ldapService->getUserDetails($credentials['username']); - if ($userDetails === null) return null; + if ($userDetails === null) { + return null; + } // Search current user base by looking up a uid $model = $this->createModel(); @@ -110,12 +109,14 @@ class LdapUserProvider implements UserProvider ->where('external_auth_id', $userDetails['uid']) ->first(); - if ($currentUser !== null) return $currentUser; + if ($currentUser !== null) { + return $currentUser; + } $model->name = $userDetails['name']; $model->external_auth_id = $userDetails['uid']; $model->email = $userDetails['email']; - $model->email_confirmed = true; + $model->email_confirmed = false; return $model; }