0b2/catchAdmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update:优化auth

Browse Source
This commit is contained in:
JaguarJack 2021-02-22 08:52:39 +08:00
parent e9179ee084
commit 50c8470d73
1 changed files with 15 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
extend/catcher/CatchAuth.php
View File

@ -8,7 +8,6 @@ use catcher\exceptions\FailedException;
use catcher\exceptions\LoginFailedException; use catcher\exceptions\LoginFailedException;
use thans\jwt\facade\JWTAuth; use thans\jwt\facade\JWTAuth;
use think\facade\Session; use think\facade\Session;
use think\helper\Str;
class CatchAuth class CatchAuth
{ {
@ -65,26 +64,20 @@ class CatchAuth
*/ */
public function attempt($condition) public function attempt($condition)
{ {
try { $user = $this->authenticate($condition);
$user = $this->authenticate($condition); if (!$user) {
throw new LoginFailedException();
if (!$user) {
throw new LoginFailedException();
}
if ($user->status == Users::DISABLE) {
throw new LoginFailedException('该用户已被禁用|' . $user->username, Code::USER_FORBIDDEN);
}
if ($this->checkPassword && !password_verify($condition['password'], $user->password)) {
throw new LoginFailedException('登录失败|' . $user->username);
}
return $this->{$this->getDriver()}($user);
} catch (\Exception $exception) {
//
} }
if ($user->status == Users::DISABLE) {
throw new LoginFailedException('该用户已被禁用|' . $user->username, Code::USER_FORBIDDEN);
}
if ($this->checkPassword && !password_verify($condition['password'], $user->password)) {
throw new LoginFailedException('登录失败|' . $user->username);
}
return $this->{$this->getDriver()}($user);
} }
@ -250,8 +243,10 @@ class CatchAuth
{ {
$where = []; $where = [];
$fields = array_keys(app($this->getProvider()['model'])->getFields());
foreach ($condition as $field => $value) { foreach ($condition as $field => $value) {
if ($field != $this->password) { if (in_array($field, $fields) && $field != $this->password) {
$where[$field] = $value; $where[$field] = $value;
} }
} }