From ca8a9801da934a94a199bd2986afda04097fe744 Mon Sep 17 00:00:00 2001 From: JaguarJack Date: Mon, 20 Feb 2023 16:15:54 +0800 Subject: [PATCH] fix: auth user --- modules/User/Events/Login.php | 2 +- modules/User/Http/Controllers/AuthController.php | 10 +++++----- modules/User/database/seeder/User.php | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/User/Events/Login.php b/modules/User/Events/Login.php index 9f46172..26e9a12 100644 --- a/modules/User/Events/Login.php +++ b/modules/User/Events/Login.php @@ -19,7 +19,7 @@ class Login */ public function __construct( public Request $request, - public User $user + public ?User $user ) { } } diff --git a/modules/User/Http/Controllers/AuthController.php b/modules/User/Http/Controllers/AuthController.php index 635039e..f549077 100644 --- a/modules/User/Http/Controllers/AuthController.php +++ b/modules/User/Http/Controllers/AuthController.php @@ -22,15 +22,15 @@ class AuthController extends Controller /* @var User $user */ $user = User::query()->where('email', $request->get('email'))->first(); - $token = $user?->createToken('token')->plainTextToken; - Event::dispatch(new Login($request, $user)); - if (! $token) { - throw new FailedException('登录失败!请检查邮箱或者密码'); + if ($user && bcrypt($request->get('password')) == $user->password) { + $token = $user->createToken('token')->plainTextToken; + + return compact('token'); } - return compact('token'); + throw new FailedException('登录失败!请检查邮箱或者密码'); } diff --git a/modules/User/database/seeder/User.php b/modules/User/database/seeder/User.php index 04f2532..372b818 100644 --- a/modules/User/database/seeder/User.php +++ b/modules/User/database/seeder/User.php @@ -17,7 +17,7 @@ return new class extends Seeder 'email' => 'catch@admin.com', - 'password' => bcrypt('catchadmin'), + 'password' => 'catchadmin', 'creator_id' => 1,