浏览代码

Fix active & reset password user account type error

兔姬桑 4 年之前
父节点
当前提交
0927cd4e1c
共有 1 个文件被更改,包括 2 次插入4 次删除
  1. 2 4
      app/Http/Controllers/AuthController.php

+ 2 - 4
app/Http/Controllers/AuthController.php

@@ -401,9 +401,7 @@ class AuthController extends Controller
     {
         if ($request->isMethod('POST')) {
             // 校验请求
-            $validator = Validator::make($request->all(), [
-                'email' => 'required|email|exists:user,email',
-            ]);
+            $validator = Validator::make($request->all(), ['username' => 'required|'.(sysConfig('username_type') ?? 'email').'|exists:user,username']);
 
             if ($validator->fails()) {
                 return Redirect::back()->withInput()->withErrors($validator->errors());
@@ -509,7 +507,7 @@ class AuthController extends Controller
     public function activeUser(Request $request)
     {
         if ($request->isMethod('POST')) {
-            $validator = Validator::make($request->all(), ['email' => 'required|email|exists:user,email']);
+            $validator = Validator::make($request->all(), ['username' => 'required|'.(sysConfig('username_type') ?? 'email').'|exists:user,username']);
 
             if ($validator->fails()) {
                 return Redirect::back()->withInput()->withErrors($validator->errors());