Merge cbc98c4a80 into 6f270ecb08

app/Http/Controllers/UserController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Models\Role;
 use App\Models\User;
+use App\Http\Requests\CredentialsRequest;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Hash;
 use Laravel\Sanctum\Exceptions\MissingAbilityException;
@@ -21,25 +22,19 @@ class UserController extends Controller {
     /**
      * Store a newly created resource in storage.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Http\Requests\CredentialsRequest  $request
      * @return \Illuminate\Http\Response
      */
-    public function store(Request $request) {
+    public function store(CredentialsRequest $request) {
-        $creds = $request->validate([
+        $user = User::where('email', $request['email'])->first();
-            'email' => 'required|email',
-            'password' => 'required',
-            'name' => 'nullable|string',
-        ]);
-
-        $user = User::where('email', $creds['email'])->first();
         if ($user) {
             return response(['error' => 1, 'message' => 'user already exists'], 409);
         }
 
         $user = User::create([
-            'email' => $creds['email'],
+            'email' => $request['email'],
-            'password' => Hash::make($creds['password']),
+            'password' => Hash::make($request['password']),
-            'name' => $creds['name'],
+            'name' => $request['name'],
         ]);
 
         $defaultRoleSlug = config('hydra.default_user_role_slug', 'user');
@@ -51,16 +46,11 @@ class UserController extends Controller {
     /**
      * Authenticate an user and dispatch token.
      *
-     * @param  \Illuminate\Http\Request  $request
+     * @param  \App\Http\Requests\CredentialsRequest  $request
      * @return \Illuminate\Http\Response
      */
-    public function login(Request $request) {
+    public function login(CredentialsRequest $request) {
-        $creds = $request->validate([
+        $user = User::where('email', $request['email'])->first();
-            'email' => 'required|email',
-            'password' => 'required',
-        ]);
-
-        $user = User::where('email', $creds['email'])->first();
         if (! $user || ! Hash::check($request->password, $user->password)) {
             return response(['error' => 1, 'message' => 'invalid credentials'], 401);
         }

app/Http/Requests/CredentialsRequest.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class CredentialsRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, mixed>
+     */
+    public function rules()
+    {
+        return [
+            'email' => 'required|email',
+            'password' => 'required',
+            'name' => 'nullable|string'
+        ];
+    }
+}