微调 登录 代码

app/Http/Controllers/AuthController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Components\Helpers;
 use App\Components\IP;
+use App\Http\Requests\Auth\LoginRequest;
 use App\Http\Requests\Auth\RegisterRequest;
 use App\Models\EmailFilter;
 use App\Models\Invite;
@@ -45,13 +46,9 @@ class AuthController extends Controller
         return view('auth.login');
     }
 
-    public function login(Request $request)
+    public function login(LoginRequest $request)
     {
-        $validator = Validator::make($request->all(), ['username' => 'required', 'password' => 'required']);
-
-        if ($validator->fails()) {
-            return Redirect::back()->withInput()->withErrors($validator->errors());
-        }
+        $data = $request->validated();
 
         // 是否校验验证码
         $captcha = $this->check_captcha($request);
@@ -60,7 +57,7 @@ class AuthController extends Controller
         }
 
         // 验证账号并创建会话
-        if (! Auth::attempt($validator->validated(), $request->input('remember'))) {
+        if (! Auth::attempt($data, $request->has('remember'))) {
             return Redirect::back()->withInput()->withErrors(trans('auth.error.login_failed'));
         }
         $user = Auth::getUser();

app/Http/Controllers/OAuthController.php

@@ -1,10 +1,9 @@
 <?php
 
-namespace App\Http\Controllers\OAuth;
+namespace App\Http\Controllers;
 
 use App\Components\Helpers;
 use App\Components\IP;
-use App\Http\Controllers\Controller;
 use App\Models\User;
 use App\Models\UserOauth;
 use Auth;
@@ -12,7 +11,7 @@ use Illuminate\Http\Request;
 use Laravel\Socialite\Facades\Socialite;
 use Str;
 
-class BaseController extends Controller
+class OAuthController extends Controller
 {
     public function route(Request $request, string $type)
     {

app/Http/Requests/Auth/LoginRequest.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Http\Requests\Auth;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class LoginRequest extends FormRequest
+{
+    public function rules()
+    {
+        return [
+            'username' => 'required|'.(sysConfig('username_type') ?? 'email'),
+            'password' => 'required',
+        ];
+    }
+}