feature/FixLogin #27

Merged
amirghasempoor merged 3 commits from feature/FixLogin into develop 2026-05-25 12:48:51 +00:00
7 changed files with 11 additions and 22 deletions

View File

@@ -16,19 +16,6 @@ class AuthController extends Controller
{ {
use ApiResponse; 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 public function login(LoginRequest $request): JsonResponse
{ {
$credentials = ['password' => $request->password]; $credentials = ['password' => $request->password];
@@ -39,8 +26,7 @@ class AuthController extends Controller
$credentials['username'] = $request->login; $credentials['username'] = $request->login;
} }
if (Auth::attempt($credentials)) if (Auth::guard('expert')->attempt($credentials)) {
{
$request->session()->regenerate(); $request->session()->regenerate();
return $this->successResponse(); return $this->successResponse();

View File

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

View File

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

View File

@@ -46,7 +46,7 @@ class ProfileController extends Controller
$user->update([ $user->update([
'first_name' => $request->first_name, 'first_name' => $request->first_name,
'last_name' => $request->last_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, 'address' => $request->address,
'postal_code' => $request->postal_code, 'postal_code' => $request->postal_code,
'phone_number' => $request->phone_number, 'phone_number' => $request->phone_number,

View File

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

View File

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

View File

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