Merge pull request #22 from ubpon/main

Added FormRequest and Resource

Author: Nilanth

app/Http/Controllers/Api/Auth/AuthController.php

@@ -3,53 +3,39 @@
 namespace App\Http\Controllers\Api\Auth;
 
 use App\Http\Controllers\Controller;
+use App\Http\Requests\AuthenticateRequest;
+use App\Http\Requests\RegisterRequest;
+use App\Http\Resources\UserResource;
 use App\Models\User;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
-use Illuminate\Support\Facades\Hash;
-
 
 class AuthController extends Controller
 {
-    /**
-     * Handle an authentication attempt.
-     *
-     * @param Request $request
-     * @return JsonResponse
-     */
-    public function authenticate(Request $request): JsonResponse
+    public function authenticate(AuthenticateRequest $request): UserResource|JsonResponse
     {
-        $request->validate([
-            'email' => 'required|email|exists:users,email',
-            'password' => 'required|min:6',
-        ]);
-
-        if (Auth::attempt(['email' => $request['email'], 'password' => $request['password']], $request['remember'])) {
-            $request->session()->regenerate();
-            $user = Auth::user();
-            return response()->json(['data' => $user]);
-        } else {
+        $data = [
+            'email' => $request['email'],
+            'password' => $request['password']
+        ];
+
+        if (!Auth::attempt($data, $request['remember'])) {
             return response()->json(['message' => 'Invalid credentials'], 401);
         }
+
+        $request->session()->regenerate();
+
+        return new UserResource(Auth::user());
     }
 
-    public function register(Request $request): JsonResponse
+    public function register(RegisterRequest $request): UserResource
     {
-        $request->validate([
-            'name' => ['required', 'string', 'max:255'],
-            'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
-            'password' => ['required', 'string', 'min:8', 'confirmed'],
-        ]);
-
-        $user = User::create([
-            'name' => $request['name'],
-            'email' => $request['email'],
-            'password' => Hash::make($request['password']),
-        ]);
+        $user = User::create($request->validated());
 
         $request->session()->regenerate();
-        return response()->json(['data' => $user], 201);
+
+        return new UserResource($user);
     }
 
     public function logout(Request $request): JsonResponse

app/Http/Requests/AuthenticateRequest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class AuthenticateRequest 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', 'exists:users,email'],
+            'password' => ['required', 'min:6'],
+        ];
+    }
+}

app/Http/Requests/RegisterRequest.php

@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Http\Requests;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class RegisterRequest 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 [
+            'name' => ['required', 'string', 'max:255'],
+            'email' => ['required', 'string', 'email', 'max:255', 'unique:users'],
+            'password' => ['required', 'string', 'min:8', 'confirmed'],
+        ];
+    }
+}

app/Http/Resources/UserResource.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace App\Http\Resources;
+
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class UserResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @param  \Illuminate\Http\Request  $request
+     * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
+     */
+    public function toArray($request)
+    {
+        return parent::toArray($request);
+    }
+}