Hamza/Siro
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update: 2026-06-27 04:58:21

Browse Source
This commit is contained in:
Hamza-Ayed
2026-06-27 04:58:21 +03:00
parent 8be2af314e
commit f069f2b24f
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
backend/auth/captin/loginFromGoogle.php
View File

@@ -4,9 +4,9 @@ require_once __DIR__ . '/../../connect.php';
try { try {
/* ──────────────────────────────── /* ────────────────────────────────
1) استخدام ID من التوكن (JWT) 1) استخدام ID: من الطلب أولاً، ثم من JWT
───────────────────────────────── */ ───────────────────────────────── */
$driverID = $user_id; $driverID = filterRequest('driver_id') ?: $user_id;
error_log("[Debug] DriverID from JWT: $driverID"); error_log("[Debug] DriverID from JWT: $driverID");

1
backend/connect.php
View File

@@ -18,6 +18,7 @@ $decoded = $jwtService->authenticate();
$user_id = $decoded->user_id ?? null; $user_id = $decoded->user_id ?? null;
$role = $decoded->role ?? 'passenger'; $role = $decoded->role ?? 'passenger';
// 3. Database Connection // 3. Database Connection
try { try {
$con = Database::get('main'); $con = Database::get('main');

4
siro_driver/lib/controller/auth/captin/login_captin_controller.dart
View File

@@ -334,7 +334,7 @@ class LoginDriverController extends GetxController {
// await SecurityHelper.performSecurityChecks(); // await SecurityHelper.performSecurityChecks();
// Log.print('(BoxName.emailDriver): ${box.read(BoxName.emailDriver)}'); // Log.print('(BoxName.emailDriver): ${box.read(BoxName.emailDriver)}');
// await getJWT(); // 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}'); Log.print('loginDriver: ${res}');
if (res == 'failure') { if (res == 'failure') {
await isPhoneVerified(); await isPhoneVerified();
@@ -485,7 +485,7 @@ class LoginDriverController extends GetxController {
// await SecurityHelper.performSecurityChecks(); // await SecurityHelper.performSecurityChecks();
// Log.print('(BoxName.emailDriver): ${box.read(BoxName.emailDriver)}'); // 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'); // print('res is $res');
// if (res == 'failure') { // if (res == 'failure') {

2
siro_driver/lib/controller/auth/syria/registration_controller.dart
View File

@@ -733,6 +733,8 @@ class RegistrationController extends GetxController {
final c = Get.isRegistered<LoginDriverController>() final c = Get.isRegistered<LoginDriverController>()
? Get.find<LoginDriverController>() ? Get.find<LoginDriverController>()
: Get.put(LoginDriverController()); : Get.put(LoginDriverController());
box.write(BoxName.firstTimeLoadKey, 'false');
await c.getJWT();
c.loginDriver(driverID, email); c.loginDriver(driverID, email);
} else { } else {
final msg = (json?['message'] ?? 'Registration failed.').toString(); final msg = (json?['message'] ?? 'Registration failed.').toString();