From 6aa4c4b24e79c3048a3d3285e295a7cd7e05dc9a Mon Sep 17 00:00:00 2001
From: Edward Yang <yangjin@guangda.work>
Date: Wed, 21 Dec 2022 14:23:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=8E=E5=8F=B0=E7=99=BB?=
 =?UTF-8?q?=E5=BD=95=EF=BC=8C=E8=AE=B0=E4=BD=8F=E9=82=AE=E7=AE=B1=E5=AF=86?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Http/Controllers/LoginController.php      | 26 +++++++++++--------
 .../{LoginRequest => LoginRequest.php}        |  8 +++---
 .../admin/views/pages/login/login.blade.php   |  2 +-
 3 files changed, 20 insertions(+), 16 deletions(-)
 rename beike/Admin/Http/Requests/{LoginRequest => LoginRequest.php} (73%)

diff --git a/beike/Admin/Http/Controllers/LoginController.php b/beike/Admin/Http/Controllers/LoginController.php
index 45c08278..f2de0fb1 100644
--- a/beike/Admin/Http/Controllers/LoginController.php
+++ b/beike/Admin/Http/Controllers/LoginController.php
@@ -1,11 +1,19 @@
 <?php
+/**
+ * LoginController.php
+ *
+ * @copyright  2022 beikeshop.com - All Rights Reserved
+ * @link       https://beikeshop.com
+ * @author     Edward Yang <yangjin@guangda.work>
+ * @created    2022-12-21 14:22:26
+ * @modified   2022-12-21 14:22:26
+ */
 
 namespace Beike\Admin\Http\Controllers;
 
-use App\Http\Controllers\Controller;
 use Beike\Models\AdminUser;
-use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Auth;
+use App\Http\Controllers\Controller;
+use Beike\Admin\Http\Requests\LoginRequest;
 
 class LoginController extends Controller
 {
@@ -17,16 +25,12 @@ class LoginController extends Controller
         return view('admin::pages.login.login', \request()->only('admin_email', 'admin_password'));
     }
 
-    public function store(Request $request)
+
+    public function store(LoginRequest $loginRequest)
     {
-        $validator =Validator::make($request->all(),[
-            'email' => 'required|email',
-            'password' => 'required'
-        ]);
-        if (auth(AdminUser::AUTH_GUARD)->attempt($validator->validated())) {
+        if (auth(AdminUser::AUTH_GUARD)->attempt($loginRequest->validated())) {
             return redirect(admin_route('home.index'));
         }
-
-        return redirect()->back()->with(['error' => 'Invalid credentials'])->withInput();
+        return redirect()->back()->with(['error' => trans('auth.failed')])->withInput();
     }
 }
diff --git a/beike/Admin/Http/Requests/LoginRequest b/beike/Admin/Http/Requests/LoginRequest.php
similarity index 73%
rename from beike/Admin/Http/Requests/LoginRequest
rename to beike/Admin/Http/Requests/LoginRequest.php
index dd422c2d..dc8a204d 100644
--- a/beike/Admin/Http/Requests/LoginRequest
+++ b/beike/Admin/Http/Requests/LoginRequest.php
@@ -11,7 +11,7 @@ class LoginRequest extends FormRequest
      *
      * @return bool
      */
-    public function authorize():bool
+    public function authorize(): bool
     {
         return true;
     }
@@ -21,11 +21,11 @@ class LoginRequest extends FormRequest
      *
      * @return array<string, mixed>
      */
-    public function rules():array
+    public function rules(): array
     {
         return [
-            'email'=>['required','email'],
-            'password'=>'required',
+            'email' => ['required', 'email'],
+            'password' => 'required',
         ];
     }
 
diff --git a/resources/beike/admin/views/pages/login/login.blade.php b/resources/beike/admin/views/pages/login/login.blade.php
index 1621f0a4..fdf23671 100644
--- a/resources/beike/admin/views/pages/login/login.blade.php
+++ b/resources/beike/admin/views/pages/login/login.blade.php
@@ -39,7 +39,7 @@
               </div>
 
               @if (session('error'))
-                <div class="alert alert-success">
+                <div class="alert alert-danger">
                   {{ session('error') }}
                 </div>
               @endif