From 0927cd4e1c98f98d512fce383abfc6b9d42e9d69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=85=94=E5=A7=AC=E6=A1=91?= <monkeyblacktech97@gmail.com>
Date: Tue, 27 Jul 2021 20:11:46 +0800
Subject: [PATCH] Fix active & reset password user account type error

---
 app/Http/Controllers/AuthController.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index 4c95d3c4..1b789196 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/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());