From f069f2b24ffddb85dc473ca7354993cf271462f3 Mon Sep 17 00:00:00 2001
From: Hamza-Ayed <hamzaayedflutter@gmail.com>
Date: Sat, 27 Jun 2026 04:58:21 +0300
Subject: [PATCH] Update: 2026-06-27 04:58:21

---
 backend/auth/captin/loginFromGoogle.php                       | 4 ++--
 backend/connect.php                                           | 1 +
 .../lib/controller/auth/captin/login_captin_controller.dart   | 4 ++--
 .../lib/controller/auth/syria/registration_controller.dart    | 2 ++
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/backend/auth/captin/loginFromGoogle.php b/backend/auth/captin/loginFromGoogle.php
index 37ffbdce..cf6d3df5 100644
--- a/backend/auth/captin/loginFromGoogle.php
+++ b/backend/auth/captin/loginFromGoogle.php
@@ -4,9 +4,9 @@ require_once __DIR__ . '/../../connect.php';
 
 try {
     /* ────────────────────────────────
-       1) استخدام ID من التوكن (JWT)
+       1) استخدام ID: من الطلب أولاً، ثم من JWT
     ───────────────────────────────── */
-    $driverID = $user_id;
+    $driverID = filterRequest('driver_id') ?: $user_id;
 
     error_log("[Debug] DriverID from JWT: $driverID");
 
diff --git a/backend/connect.php b/backend/connect.php
index 8880a532..ffb0d31b 100644
--- a/backend/connect.php
+++ b/backend/connect.php
@@ -18,6 +18,7 @@ $decoded = $jwtService->authenticate();
 $user_id = $decoded->user_id ?? null;
 $role    = $decoded->role ?? 'passenger';
 
+
 // 3. Database Connection
 try {
     $con = Database::get('main');
diff --git a/siro_driver/lib/controller/auth/captin/login_captin_controller.dart b/siro_driver/lib/controller/auth/captin/login_captin_controller.dart
index ce0defa3..47774b08 100755
--- a/siro_driver/lib/controller/auth/captin/login_captin_controller.dart
+++ b/siro_driver/lib/controller/auth/captin/login_captin_controller.dart
@@ -334,7 +334,7 @@ class LoginDriverController extends GetxController {
     // await SecurityHelper.performSecurityChecks();
     // Log.print('(BoxName.emailDriver): ${box.read(BoxName.emailDriver)}');
     // await getJWT();
-    var res = await CRUD().get(link: AppLink.loginFromGoogleCaptin, payload: {});
+    var res = await CRUD().get(link: AppLink.loginFromGoogleCaptin, payload: {'driver_id': driverID});
     Log.print('loginDriver: ${res}');
     if (res == 'failure') {
       await isPhoneVerified();
@@ -485,7 +485,7 @@ class LoginDriverController extends GetxController {
     // await SecurityHelper.performSecurityChecks();
     // Log.print('(BoxName.emailDriver): ${box.read(BoxName.emailDriver)}');
 
-    var res = await CRUD().get(link: AppLink.loginFromGoogleCaptin, payload: {});
+    var res = await CRUD().get(link: AppLink.loginFromGoogleCaptin, payload: {'driver_id': driverID});
 
     // print('res is $res');
     // if (res == 'failure') {
diff --git a/siro_driver/lib/controller/auth/syria/registration_controller.dart b/siro_driver/lib/controller/auth/syria/registration_controller.dart
index f44691f9..3c9eb3e7 100644
--- a/siro_driver/lib/controller/auth/syria/registration_controller.dart
+++ b/siro_driver/lib/controller/auth/syria/registration_controller.dart
@@ -733,6 +733,8 @@ class RegistrationController extends GetxController {
         final c = Get.isRegistered<LoginDriverController>()
             ? Get.find<LoginDriverController>()
             : Get.put(LoginDriverController());
+        box.write(BoxName.firstTimeLoadKey, 'false');
+        await c.getJWT();
         c.loginDriver(driverID, email);
       } else {
         final msg = (json?['message'] ?? 'Registration failed.').toString();