write for user

backend/app/User/Controller/Auth/AuthController.php

@@ -3,12 +3,14 @@
 namespace App\User\Controller\Auth;
 
 use App\Http\Controllers\Controller;
+use App\Http\Resources\UserResource;
 use App\Models\User;
 use App\Traits\ApiResponse;
 use App\User\Requests\Auth\LoginRequest;
 use App\User\Requests\Auth\RegisterRequest;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Hash;
 
 class AuthController extends Controller
@@ -17,42 +19,48 @@ class AuthController extends Controller
 
     public function register(RegisterRequest $request): JsonResponse
     {
-        $user = User::query()->create([
+        User::query()->create([
             'username' => $request->username,
             'email' => $request->email,
             'password' => Hash::make($request->password),
         ]);
 
-        $token = $user->createToken('Register Token')->accessToken;
+        $request->session()->regenerate();
 
-        return $this->successResponse([
-            'token' => $token,
-        ]);
+        return $this->successResponse();
     }
 
     public function login(LoginRequest $request): JsonResponse
     {
-        $uniq_identifier = $request->input('login');
-        $user = User::query()
-            ->where('email', $uniq_identifier)
-            ->orWhere('username', $uniq_identifier)
-            ->first();
+        $credentials = ['password' => $request->password,];
 
-
-        if (!$user || !Hash::check($request->password, $user->password)) {
-            return $this->errorResponse('');
+        if (filter_var($request->login, FILTER_VALIDATE_EMAIL)) {
+            $credentials['email'] = $request->login;
+        } else {
+            $credentials['username'] = $request->login;
         }
 
-        $token = $user->createToken('Login Token')->accessToken;
+        if (Auth::attempt($credentials))
+        {
+            $request->session()->regenerate();
 
-        return $this->successResponse([
-            'token' => $token,
-        ]);
+            $user = Auth::user();
+
+            return $this->successResponse([
+                'info' => new UserResource($user),
+            ]);
+        }
+
+        return $this->errorResponse(__('messages.incorrect_or_username_password'));
     }
 
     public function logout(Request $request): JsonResponse
     {
-        $request->user()->token()->revoke();
+        Auth::logout();
+
+        $request->session()->invalidate();
+
+        $request->session()->regenerateToken();
 
         return $this->successResponse();
     }

backend/app/User/Controller/ProfileController.php

@@ -0,0 +1,61 @@
+<?php
+
+namespace App\User\Controller;
+
+use App\Http\Controllers\Controller;
+use App\Http\Resources\UserResource;
+use App\Traits\ApiResponse;
+use App\User\Requests\Profile\ChangePasswordRequest;
+use App\User\Requests\Profile\EditRequest;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Hash;
+
+class ProfileController extends Controller
+{
+    use ApiResponse;
+
+    public function info(): JsonResponse
+    {
+        $user = Auth::user();
+
+        return $this->successResponse([
+            'info' => new UserResource($user),
+        ]);
+    }
+
+    public function edit(EditRequest $request): JsonResponse
+    {
+        $user = Auth::user();
+
+        $user->update([
+            'first_name' => $request->first_name,
+            'last_name' => $request->last_name,
+            'national_id' => $request->national_id,
+            'address' => $request->address,
+            'postal_code' => $request->postal_code,
+            'account_number' => $request->account_number,
+            'phone_number' => $request->phone_number,
+            'province_id' => $request->province_id,
+            'city_id' => $request->city_id,
+        ]);
+
+        return $this->successResponse();
+    }
+
+    public function changePassword(ChangePasswordRequest $request): JsonResponse
+    {
+        $user = Auth::user();
+
+        if (! Hash::check($request->current_password, $user->password)) {
+            return $this->errorResponse(__('messages.incorrect_current_password'));
+        }
+
+        $user->update([
+            'password' => Hash::make($request->new_password),
+        ]);
+
+        return $this->successResponse();
+
+    }
+}

backend/app/User/Requests/Auth/LoginRequest.php

@@ -22,8 +22,7 @@ class LoginRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'username' => 'required_without:email|string',
-            'email' => 'required_without:name|email',
+            'login' => 'required|string',
             'password' => 'required|string',
         ];
     }

backend/app/User/Requests/Auth/RegisterRequest.php

@@ -22,9 +22,9 @@ class RegisterRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'username' => 'required_without:email|unique:users,name',
-            'email' => 'required_without:name|email|unique:users,email',
-            'password' => 'required|string|regex:/^(?=.*[a-zA-Z])(?=.*\d).+$/|min:8',
+            'username' => 'required|unique:users,username',
+            'email' => 'required|email|unique:users,email',
+            'password' => 'required|string|regex:/^(?=.*[a-zA-Z])(?=.*\d).+$/|min:6',
         ];
     }
 }

backend/app/User/Requests/Profile/ChangePasswordRequest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\User\Requests\Profile;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+
+class ChangePasswordRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, ValidationRule|array|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'current_password' => 'required|string|regex:/^(?=.*[a-zA-Z])(?=.*\d).+$/|min:6',
+            'new_password' => 'required|string|regex:/^(?=.*[a-zA-Z])(?=.*\d).+$/|min:6',
+        ];
+    }
+}

backend/app/User/Requests/Profile/EditRequest.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\User\Requests\Profile;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+
+class EditRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, ValidationRule|array|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'first_name' => 'required|string',
+            'last_name' => 'required|string',
+            'national_id' => 'required',
+            'address' => 'required',
+            'postal_code' => 'required',
+            'account_number' => 'required',
+            'phone_number' => 'required|regex:/^964\d{9}$/|numeric|digits:11',
+            'province_id' => 'required',
+            'city_id' => 'required',
+        ];
+    }
+}