Merge branch 'dev'

This commit is contained in:
tokumeikoi
2022-12-15 17:35:49 +08:00
14 changed files with 109 additions and 22 deletions

View File

@ -17,7 +17,6 @@ use App\Utils\Helper;
use App\Utils\Dict;
use App\Utils\CacheKey;
use ReCaptcha\ReCaptcha;
use Firebase\JWT\JWT;
class AuthController extends Controller
{
@ -181,7 +180,7 @@ class AuthController extends Controller
$authService = new AuthService($user);
return response()->json([
'data' => $authService->generateAuthData('register')
'data' => $authService->generateAuthData($request)
]);
}
@ -220,7 +219,7 @@ class AuthController extends Controller
$authService = new AuthService($user);
return response([
'data' => $authService->generateAuthData('login')
'data' => $authService->generateAuthData($request)
]);
}
@ -252,7 +251,7 @@ class AuthController extends Controller
Cache::forget($key);
$authService = new AuthService($user);
return response([
'data' => $authService->generateAuthData('token')
'data' => $authService->generateAuthData($request)
]);
}
}