Merge pull request 'feature/FixLogin' (#27) from feature/FixLogin into develop

Reviewed-on: #27

backend/app/Admin/Controllers/AuthController.php

@@ -16,19 +16,6 @@ class AuthController extends Controller
 {
     use ApiResponse;
 
-    public function register(RegisterRequest $request): JsonResponse
-    {
-        Expert::query()->create([
-            'username' => $request->username,
-            'email' => $request->email,
-            'password' => Hash::make($request->password),
-        ]);
-
-        $request->session()->regenerate();
-
-        return $this->successResponse();
-    }
-
     public function login(LoginRequest $request): JsonResponse
     {
         $credentials = ['password' => $request->password];
@@ -39,8 +26,7 @@ class AuthController extends Controller
             $credentials['username'] = $request->login;
         }
 
-        if (Auth::attempt($credentials))
+        if (Auth::guard('expert')->attempt($credentials)) {
-        {
             $request->session()->regenerate();
 
             return $this->successResponse();

backend/app/Enums/BusinessTypeEnum.php

@@ -41,7 +41,7 @@ enum BusinessTypeEnum: int
         };
     }
 
-    public function name($id): string
+    public static function name($id): string
     {
         $mapArray = [
             1 => 'medical',

backend/app/Models/Expert.php

@@ -5,17 +5,19 @@ namespace App\Models;
 use Database\Factories\ExpertFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Notifications\Notifiable;
+use Illuminate\Foundation\Auth\User as Authenticatable;
 use Spatie\Permission\Traits\HasRoles;
 
 /**
  * @method roles()
  * @method permissions()
  */
-class Expert extends Model
+class Expert extends Authenticatable
 {
     /** @use HasFactory<ExpertFactory> */
-    use HasFactory;
+
-    use HasRoles;
+    use Notifiable,HasFactory,HasRoles;
 
     protected $guarded = ['id'];
     protected string $guard_name = 'web';

backend/app/User/Controllers/ProfileController.php

@@ -46,7 +46,7 @@ class ProfileController extends Controller
             $user->update([
                 'first_name' => $request->first_name,
                 'last_name' => $request->last_name,
-                'national_id' => $request->national_id,
+                'national_id' => $user->kyc_status == 0 ? $request->national_id : $user->national_id,
                 'address' => $request->address,
                 'postal_code' => $request->postal_code,
                 'phone_number' => $request->phone_number,

backend/app/User/Resources/UserResource.php

@@ -24,12 +24,13 @@ class UserResource extends JsonResource
             'address' => $this->address,
             'postal_code' => $this->postal_code,
             'phone_number' => $this->phone_number,
-            'province_id' => $this->provonce_id,
+            'province_id' => $this->province_id,
             'province_name' => $this->province_name,
             'city_id' => $this->city_id,
             'city_name' => $this->city_name,
             'birth_date' => $this->birth_date,
             'kyc_status' => $this->kyc_status,
+            'authority_level' => $this->authority_level,
         ];
     }
 }

backend/config/auth.php

@@ -1,5 +1,6 @@
 <?php
 
+use App\Models\Expert;
 use App\Models\User;
 
 return [

backend/routes/expert.php

@@ -12,7 +12,6 @@ Route::prefix('auth')
     ->name('auth.')
     ->controller(AuthController::class)
     ->group(function () {
-        Route::post('register', 'register')->name('register');
         Route::post('login', 'login')->name('login');
         Route::post('logout', 'logout')->name('logout');
 });