fix code

Reviewed-on: #17

backend/app/Admin/Controllers/AuthController.php

@@ -2,26 +2,34 @@
 
 namespace App\Admin\Controllers;
 
+use App\Admin\Requests\Auth\LoginRequest;
+use App\Admin\Requests\Auth\RegisterRequest;
 use App\Http\Controllers\Controller;
+use App\Models\Expert;
 use App\Traits\ApiResponse;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Hash;
 
 class AuthController extends Controller
 {
     use ApiResponse;
 
-    public function register(Request $request): JsonResponse
+    public function register(RegisterRequest $request): JsonResponse
     {
-//        Expert::query()->create();
+        Expert::query()->create([
+            'username' => $request->username,
+            'email' => $request->email,
+            'password' => Hash::make($request->password),
+        ]);
 
         $request->session()->regenerate();
 
         return $this->successResponse();
     }
 
-    public function login(Request $request): JsonResponse
+    public function login(LoginRequest $request): JsonResponse
     {
         $credentials = ['password' => $request->password];
 
@@ -35,13 +43,7 @@ class AuthController extends Controller
         {
             $request->session()->regenerate();
 
-            $user = Auth::user();
+            return $this->successResponse();
-
-            return $this->successResponse([
-                'id' => $user->id,
-                'username' => $user->username,
-                'email' => $user->email,
-            ]);
         }
 
         return $this->errorResponse(__('messages.incorrect_or_username_password'));
@@ -49,7 +51,7 @@ class AuthController extends Controller
 
     public function logout(Request $request): JsonResponse
     {
-        Auth::logout();
+        Auth::guard('expert')->logout();
 
         $request->session()->invalidate();
 

backend/app/Admin/Controllers/DocumentationController.php

@@ -2,6 +2,7 @@
 
 namespace App\Admin\Controllers;
 
+use App\Admin\Requests\Documentation\RejectRequest;
 use App\Facades\DataTable\DataTableFacade;
 use App\Http\Controllers\Controller;
 use App\Models\User;
@@ -16,31 +17,37 @@ class DocumentationController extends Controller
     public function index(Request $request): array
     {
         return DataTableFacade::run(
-            User::query()->with('documents'),
+            User::query(),
             $request,
             allowedFilters: ['*'],
             allowedSortings: ['*'],
             allowedSelects: [
-                'users.id', 'users.first_name', 'users.last_name', 'users.national_id',
+                'id', 'first_name', 'last_name', 'national_id',
-                'users.phone_number', 'users.postal_code', 'users.city_id', 'users.province_id',
+                'phone_number', 'postal_code', 'city_id', 'province_id',
-                'users.province_name', 'users.city_name', 'users.address', 'documents.title', 'documents.url'
+                'province_name', 'city_name', 'address'
             ]
         );
     }
 
+    public function files(User $user): JsonResponse
+    {
+        return $this->successResponse($user->load('documents'));
+    }
+
     public function confirm(User $user): JsonResponse
     {
         $user->update([
-
+            'authority_level' => 1
         ]);
 
         return $this->successResponse();
     }
 
-    public function reject(User $user): JsonResponse
+    public function reject(RejectRequest $request, User $user): JsonResponse
     {
         $user->update([
-
+            'kyc_status' => 0,
+            'kyc_reject_reason' => $request->kyc_reject_reason
         ]);
 
         return $this->successResponse();

backend/app/Admin/Controllers/ExpertManagementController.php

@@ -67,8 +67,7 @@ class ExpertManagementController extends Controller
      */
     public function show(Expert $expert): JsonResponse
     {
-        return $this->successResponse(
+        return $this->successResponse($expert->load(['roles','permissions'])
-            new ExpertManagementResource($expert)
         );
     }
 

backend/app/Admin/Controllers/ProfileController.php

@@ -2,11 +2,14 @@
 
 namespace App\Admin\Controllers;
 
+use App\Admin\Requests\Profile\ChangePasswordRequest;
+use App\Admin\Requests\Profile\EditRequest;
 use App\Admin\Resources\ExpertResource;
 use App\Http\Controllers\Controller;
 use App\Traits\ApiResponse;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Hash;
 
 class ProfileController extends Controller
 {
@@ -14,6 +17,40 @@ class ProfileController extends Controller
 
     public function info(): JsonResponse
     {
-        return $this->successResponse(new ExpertResource(Auth::user()));
+        return $this->successResponse(new ExpertResource(Auth::guard('expert')->user()));
+    }
+
+    public function edit(EditRequest $request): JsonResponse
+    {
+        $expert = $request->user('expert');
+
+        $expert->update([
+            'username' => $request->username,
+            'first_name' => $request->first_name,
+            'last_name' => $request->last_name,
+            'email' => $expert->email,
+            'national_id' => $request->national_id,
+            'phone_number' => $request->phone_number,
+            'province_id' => $request->province_id,
+            'city_id' => $request->city_id,
+        ]);
+
+        return $this->successResponse();
+    }
+
+    public function changePassword(ChangePasswordRequest $request): JsonResponse
+    {
+        $expert = Auth::guard('expert')->user();
+
+        if (! Hash::check($request->current_password, $expert->password))
+        {
+            return $this->errorResponse(__('messages.incorrect_current_password'));
+        }
+
+        $expert->update([
+            'password' => Hash::make($request->new_password)
+        ]);
+
+        return $this->successResponse();
     }
 }

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

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Admin\Requests\Auth;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+
+class LoginRequest 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 [
+            'login' => 'required|string',
+            'password' => 'required|string',
+        ];
+    }
+}

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

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Admin\Requests\Auth;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+
+class RegisterRequest 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 [
+            'username' => 'required|unique:experts,username',
+            'email' => 'required|email|unique:experts,email',
+            'password' => 'required|string|regex:/^(?=.*[a-zA-Z])(?=.*\d).+$/|min:6|confirmed',
+        ];
+    }
+}

backend/app/Admin/Requests/Documentation/RejectRequest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Admin\Requests\Documentation;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+
+class RejectRequest 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 [
+            'kyc_reject_reason' => 'required|string',
+        ];
+    }
+}

backend/app/Admin/Requests/PermissionManagement/UpdateRequest.php

@@ -27,7 +27,7 @@ class UpdateRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'name' => ['required', 'string', 'max:255', Rule::unique('permission', 'name')->ignore($this->permission->id)],
+            'name' => ['required', 'string', 'max:255', Rule::unique('permissions', 'name')->ignore($this->permission->id)],
         ];
     }
 }

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

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Admin\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:8',
+            'new_password' => 'required|string|regex:/^(?=.*[a-zA-Z])(?=.*\d).+$/|min:8',
+        ];
+    }
+}

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

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Admin\Requests\Profile;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+use Illuminate\Validation\Validator;
+
+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
+    {
+        $user = $this->user();
+        return [
+            'username' => 'string|max:255',
+            'first_name' => 'required|string',
+            'last_name' => 'required|string',
+            'national_id' => 'required',
+            'email' => 'string|email|max:255',
+            'phone_number' => 'string',
+            'province_id' => 'string',
+            'city_id' => 'string',
+        ];
+    }
+}

backend/app/Admin/Requests/RoleManagement/StoreRequest.php

@@ -24,8 +24,8 @@ class StoreRequest extends FormRequest
     {
         return [
             'name' => 'required|string|unique:roles,name',
-            'permissions' => 'required|array',
+            'permissions' => 'array',
-            'permissions.*.name' => 'required|string|exists:permissions,name',
+            'permissions.*' => 'integer|exists:permissions,id',
         ];
     }
 }

backend/app/Admin/Requests/RoleManagement/UpdateRequest.php

@@ -27,9 +27,9 @@ class UpdateRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'name' => ['required', 'string', 'max:255', Rule::unique('roles', 'name')->ignore($this->role->id)],
+            'name' => ['string', 'max:255', Rule::unique('roles', 'name')->ignore($this->role->id)],
-            'permissions' => 'required|array',
+            'permissions' => 'array',
-            'permissions.*.name' => 'required|string|exists:permissions,name',
+            'permissions.*' => 'integer|exists:permissions,id',
         ];
     }
 }

backend/app/Admin/Resources/ExpertManagementResource.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Admin\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/**
- * @method roles()
- * @method getAllPermissions()
- */
-class ExpertManagementResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'username' => $this->username,
-            'first_name' => $this->first_name,
-            'last_name' => $this->last_name,
-            'national_id' => $this->national_id,
-            'email' => $this->email,
-            'phone_number' => $this->phone_number,
-            'province_name' => $this->province_name,
-            'city_name' => $this->city_name,
-            'roles' => $this->roles()
-                ->pluck('name')
-                ->values(),
-
-            'permissions' => $this->getAllPermissions()
-                ->pluck('name')
-                ->values(),
-        ];
-    }
-}
-

backend/app/Models/Expert.php

@@ -5,6 +5,7 @@ namespace App\Models;
 use Database\Factories\ExpertFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Spatie\Permission\Traits\HasRoles;
 
 /**
  * @method roles()
@@ -14,6 +15,8 @@ class Expert extends Model
 {
     /** @use HasFactory<ExpertFactory> */
     use HasFactory;
+    use HasRoles;
 
     protected $guarded = ['id'];
+    protected string $guard_name = 'web';
 }

backend/app/Models/Gateway.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Database\Factories\GatewayFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Gateway extends Model
+{
+    /** @use HasFactory<GatewayFactory> */
+    use HasFactory;
+
+    protected $guarded = ['id'];
+}

backend/app/Models/GatewayCategory.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Database\Factories\GatewayCategoryFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class GatewayCategory extends Model
+{
+    /** @use HasFactory<GatewayCategoryFactory> */
+    use HasFactory;
+
+    protected $guarded = ['id'];
+}

backend/app/Models/Payment.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Database\Factories\PaymentFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Payment extends Model
+{
+    /** @use HasFactory<PaymentFactory> */
+    use HasFactory;
+
+    protected $guarded = ['id'];
+}

backend/app/Models/PaymentStatus.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Database\Factories\PaymentStatusFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class PaymentStatus extends Model
+{
+    /** @use HasFactory<PaymentStatusFactory> */
+    use HasFactory;
+
+    protected $guarded = ['id'];
+}

backend/app/Models/User.php

@@ -10,6 +10,8 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
+use Illuminate\Support\Facades\Hash;
+use Laravel\Passport\Bridge\Client;
 use Laravel\Passport\HasApiTokens;
 
 #[Guarded(['id'])]
@@ -24,4 +26,14 @@ class User extends Authenticatable
     {
         return $this->morphToMany(Document::class, 'documentable');
     }
+
+    public function validateForPassportPasswordGrant(string $password): bool
+    {
+        return Hash::check($password, $this->password);
+    }
+
+    public function findForPassport(string $username, Client $client): User
+    {
+        return $this->where('username', $username)->first();
+    }
 }

backend/app/Providers/AppServiceProvider.php

@@ -22,6 +22,8 @@ class AppServiceProvider extends ServiceProvider
     public function boot(): void
     {
         Passport::enablePasswordGrant();
+        Passport::tokensExpireIn(CarbonInterval::minutes(1));
+        Passport::refreshTokensExpireIn(CarbonInterval::minutes(5));
         Passport::personalAccessTokensExpireIn(CarbonInterval::minutes(1));
     }
 }

backend/app/Services/FIB/AuthorizationService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\User\Services\FIB;
+namespace App\Services\FIB;
 
 use Exception;
 use Illuminate\Http\Client\ConnectionException;

backend/app/Services/FIB/CancelPaymentService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\User\Services\FIB;
+namespace App\Services\FIB;
 
 use Exception;
 use Illuminate\Http\Client\ConnectionException;

backend/app/Services/FIB/CheckPaymentStatusService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\User\Services\FIB;
+namespace App\Services\FIB;
 
 use Exception;
 use Illuminate\Http\Client\ConnectionException;

backend/app/Services/FIB/CreatePaymentService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\User\Services\FIB;
+namespace App\Services\FIB;
 
 use Exception;
 use Illuminate\Http\Client\ConnectionException;

backend/app/Services/FIB/RefundService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\User\Services\FIB;
+namespace App\Services\FIB;
 
 use Exception;
 use Illuminate\Http\Client\ConnectionException;

backend/app/User/Controllers/AuthController.php

@@ -18,12 +18,14 @@ class AuthController extends Controller
 
     public function register(RegisterRequest $request): JsonResponse
     {
-        User::query()->create([
+        $user = User::query()->create([
             'username' => $request->username,
             'email' => $request->email,
             'password' => Hash::make($request->password),
         ]);
 
+        Auth::guard('web')->login($user);
+
         $request->session()->regenerate();
 
         return $this->successResponse();
@@ -43,13 +45,7 @@ class AuthController extends Controller
         {
             $request->session()->regenerate();
 
-            $user = Auth::user();
+            return $this->successResponse();
-
-            return $this->successResponse([
-                'id' => $user->id,
-                'username' => $user->username,
-                'email' => $user->email,
-            ]);
         }
 
         return $this->errorResponse(__('messages.incorrect_or_username_password'));
@@ -57,7 +53,7 @@ class AuthController extends Controller
 
     public function logout(Request $request): JsonResponse
     {
-        Auth::logout();
+        Auth::guard('web')->logout();
 
         $request->session()->invalidate();
 

backend/app/User/Controllers/Dashboard/ConfirmController.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace App\User\Controllers\Dashboard;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-
-class ConfirmController extends Controller
-{
-    public function index()
-    {
-        //
-    }
-}

backend/app/User/Controllers/Dashboard/DocumentationController.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\User\Controller\Dashboard;
-
-use App\Http\Controllers\Controller;
-use App\Traits\ApiResponse;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class DocumentationController extends Controller
-{
-    use ApiResponse;
-
-    public function store(StoreRequest $request): jsonResponse
-    {
-        //
-    }
-
-    public function update(UpdateRequest $request): JsonResponse
-    {
-        //
-    }
-
-}

backend/app/User/Controllers/DocumentationController.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\User\Controllers;
+
+use App\Facades\File\FileFacade;
+use App\Http\Controllers\Controller;
+use App\Traits\ApiResponse;
+use App\User\Requests\Documentation\EditRequest;
+use App\User\Requests\Documentation\UploadRequest;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class DocumentationController extends Controller
+{
+    use ApiResponse;
+
+    public function upload(UploadRequest $request): jsonResponse
+    {
+        $user = Auth::guard('web')->user();
+
+        foreach ($request->documents as $document) {
+            $user->documents()->create([
+                'title' => $document['title'],
+                'url' => FileFacade::save($document['file'], "/{$user->id}/documents", $document['title']),
+            ]);
+        }
+
+        return $this->successResponse();
+    }
+
+    public function edit(EditRequest $request): JsonResponse
+    {
+        $user = Auth::guard('web')->user();
+
+        foreach ($request->documents as $document) {
+            $user->documents()->sync();
+        }
+
+        return $this->successResponse();
+    }
+}

backend/app/User/Controllers/ProfileController.php

@@ -24,17 +24,7 @@ class ProfileController extends Controller
     {
         $user = Auth::user();
 
-        $user->update([
+        $user->update($request->validated());
-            'first_name' => $request->first_name,
-            'last_name' => $request->last_name,
-            'national_id' => $request->national_id,
-            'address' => $request->address,
-            'postal_code' => $request->postal_code,
-            'phone_number' => $request->phone_number,
-            'province_id' => $request->province_id,
-            'city_id' => $request->city_id,
-            'status' => 1
-        ]);
 
         return $this->successResponse();
     }

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

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\User\Requests\Documentation;
+
+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 [
+            'documents' => 'required|array',
+            'documents.*.file' => 'required|file|mimes:pdf,jpg,jpeg,png|max:2048',
+            'documents.*.title' => 'required|string',
+        ];
+    }
+}

backend/app/User/Requests/Documentation/UploadRequest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\User\Requests\Documentation;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+
+class UploadRequest 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 [
+            'documents' => 'required|array',
+            'documents.*.file' => 'required|file|mimes:pdf,jpg,jpeg,png|max:2048',
+            'documents.*.title' => 'required|string',
+        ];
+    }
+}

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

@@ -4,6 +4,8 @@ namespace App\User\Requests\Profile;
 
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+use Illuminate\Validation\Validator;
 
 class EditRequest extends FormRequest
 {
@@ -22,10 +24,18 @@ class EditRequest extends FormRequest
      */
     public function rules(): array
     {
+        $user = $this->user();
+
         return [
-            'first_name' => 'required|string',
+            'first_name' => [
-            'last_name' => 'required|string',
+                Rule::prohibitedIf($user->kyc_status == 1), 'string',
-            'national_id' => 'required',
+            ],
+            'last_name' => [
+                Rule::prohibitedIf($user->kyc_status == 1), 'string',
+            ],
+            'national_id' => [
+                Rule::prohibitedIf($user->kyc_status == 1), 'string',
+            ],
             'address' => 'required',
             'postal_code' => 'required',
             'phone_number' => 'required',
@@ -33,4 +43,28 @@ class EditRequest extends FormRequest
             'city_id' => 'required',
         ];
     }
+    public function after(): array
+    {
+        return [
+            function (Validator $validator) {
+                $user = $this->user();
+                if ($user->kyc_status == 1) {
+                    $lockedFields = [
+                        'first_name',
+                        'last_name',
+                        'national_id',
+                    ];
+
+                    foreach ($lockedFields as $field) {
+                        if ($this->filled($field)) {
+                            $validator->errors()->add(
+                                $field,
+                                'you cannot change this field.'
+                            );
+                        }
+                    }
+                }
+            },
+        ];
+    }
 }