Applied manual JWT check and restored all driver fields68j2

This commit is contained in:
Hamza-Ayed
2026-04-25 15:07:51 +03:00
parent da590e7fc0
commit 61212b60af
5 changed files with 52 additions and 7 deletions

View File

@@ -170,6 +170,7 @@ class AuthController extends Controller
'driver_license_back' => 'required|url',
'car_license_front' => 'required|url',
'car_license_back' => 'required|url',
'national_number' => 'required|string',
]);
$data = $request->all();
@@ -396,7 +397,7 @@ class AuthController extends Controller
->select([
'd.id', 'd.phone', 'd.email', 'd.gender', 'd.status',
'd.first_name', 'd.last_name', 'd.password',
'd.name_arabic',
'd.name_arabic', 'd.national_number',
'phone_verification.verified as is_verified',
'invites.isInstall',
'shamCash.is_claimed',
@@ -418,7 +419,7 @@ class AuthController extends Controller
}
// Decrypt necessary fields
$fieldsToDecrypt = ['email', 'phone', 'first_name', 'last_name', 'gender', 'name_arabic'];
$fieldsToDecrypt = ['email', 'phone', 'first_name', 'last_name', 'gender', 'name_arabic', 'national_number'];
foreach ($fieldsToDecrypt as $field) {
if (!empty($driver[$field])) {
$dec = $this->encryption->decrypt($driver[$field]);
@@ -459,7 +460,7 @@ class AuthController extends Controller
->leftJoin('driverToken', 'driverToken.captain_id', '=', 'd.id')
->select([
'd.id', 'd.phone', 'd.email', 'd.gender', 'd.status',
'd.first_name', 'd.last_name', 'd.name_arabic',
'd.first_name', 'd.last_name', 'd.name_arabic', 'd.national_number',
'd.birthdate', 'd.site', 'd.employmentType', 'd.maritalStatus',
'd.accountBank', 'd.bankCode',
'phone_verification.is_verified',
@@ -478,7 +479,7 @@ class AuthController extends Controller
$driver = (array) $row;
// Decrypt necessary fields
$fieldsToDecrypt = ['email', 'phone', 'first_name', 'last_name', 'gender', 'name_arabic'];
$fieldsToDecrypt = ['email', 'phone', 'first_name', 'last_name', 'gender', 'name_arabic', 'national_number'];
foreach ($fieldsToDecrypt as $field) {
if (!empty($driver[$field])) {
$dec = $this->encryption->decrypt($driver[$field]);