From b85e49f4b8318d77a92ba6ea2d154047fcaf26e8 Mon Sep 17 00:00:00 2001
From: Hamza-Ayed <hamzaayedflutter@gmail.com>
Date: Sat, 25 Apr 2026 12:13:28 +0300
Subject: [PATCH] Applied manual JWT check and restored all driver fields

---
 app/Http/Controllers/AuthController.php |  8 +++-----
 app/Http/Controllers/OtpController.php  | 19 ++++++++++---------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/app/Http/Controllers/AuthController.php b/app/Http/Controllers/AuthController.php
index 5c89e36..a38e09b 100644
--- a/app/Http/Controllers/AuthController.php
+++ b/app/Http/Controllers/AuthController.php
@@ -456,17 +456,15 @@ class AuthController extends Controller
             ->leftJoin('invites', 'invites.inviterDriverPhone', '=', 'd.phone')
             ->leftJoin('driver_gifts', 'driver_gifts.driver_id', '=', 'd.id')
             ->leftJoin('CarRegistration', 'CarRegistration.driverID', '=', 'd.id')
-            ->leftJoin('captain_bank', 'captain_bank.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.birthdate', 'd.site', 'd.employmentType', 'd.maritalStatus',
                 'd.accountBank', 'd.bankCode',
                 'phone_verification.verified as is_verified',
-                'invites.isInstall',
+                'invites.isInstall', 'invites.isGiftToken',
                 'driver_gifts.is_claimed',
                 'CarRegistration.make', 'CarRegistration.model', 'CarRegistration.year',
-                'captain_bank.bankCode as bank_code_alt', 'captain_bank.accountBank as account_bank_alt',
             ])
             ->where('d.id', $id)
             ->first();
diff --git a/app/Http/Controllers/OtpController.php b/app/Http/Controllers/OtpController.php
index 7eae5f7..5e00bc0 100644
--- a/app/Http/Controllers/OtpController.php
+++ b/app/Http/Controllers/OtpController.php
@@ -294,20 +294,21 @@ class OtpController extends Controller
             return $this->failure('Phone parameter is missing', 400);
         }
 
-        // We check phone_verification table (Legacy V1 style)
-        $verified = DB::connection('primary')->table('phone_verification')
-            ->where('phone_number', $phone)
-            ->where('verified', 1) // In V1 it might be 'verified' or 'is_verified'
-            ->exists();
-
-        // Fallback for column name 'is_verified' if 'verified' fails
-        if (!$verified) {
+        try {
+            $verified = DB::connection('primary')->table('phone_verification')
+                ->where('phone_number', $phone)
+                ->where('verified', 1) // In V1 it might be 'verified' or 'is_verified'
+                ->exists();
+        } catch (\Exception $e) {
+            // Fallback for column name 'is_verified' if 'verified' fails
             try {
                 $verified = DB::connection('primary')->table('phone_verification')
                     ->where('phone_number', $phone)
                     ->where('is_verified', 1)
                     ->exists();
-            } catch (\Exception $e) {}
+            } catch (\Exception $e2) {
+                $verified = false;
+            }
         }
 
         return response()->json([