Hamza/tripz-llc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update codebase

Browse Source
This commit is contained in:
Hamza-Ayed
2026-08-09 16:56:13 +03:00
parent 95e2e4f35d
commit b64debaa88
1058 changed files with 164327 additions and 113928 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/driver/lib/controller/auth/captin/history_captain.dart
+1 -1
View File
@@ -1,6 +1,6 @@
import 'dart:convert';
import 'package:tripz_driver/views/widgets/elevated_btn.dart';
import 'package:siro_driver/views/widgets/elevated_btn.dart';
import 'package:get/get.dart';
import '../../../constant/box_name.dart';
apps/driver/lib/controller/auth/captin/invit_controller.dart
+52 -61
View File
@@ -1,4 +1,4 @@
import 'package:tripz_driver/constant/currency.dart';
import 'package:siro_driver/constant/currency.dart';
import 'dart:convert';
import 'dart:developer';
@@ -7,15 +7,15 @@ import 'package:flutter_contacts/contact.dart';
import 'package:flutter_contacts/flutter_contacts.dart';
import 'package:get/get.dart';
import 'package:local_auth/local_auth.dart';
import 'package:tripz_driver/constant/box_name.dart';
import 'package:tripz_driver/constant/links.dart';
import 'package:tripz_driver/controller/functions/crud.dart';
import 'package:tripz_driver/controller/home/payment/captain_wallet_controller.dart';
import 'package:tripz_driver/print.dart';
import 'package:tripz_driver/controller/functions/country_logic.dart';
import 'package:tripz_driver/main.dart';
import 'package:tripz_driver/views/widgets/error_snakbar.dart';
import 'package:tripz_driver/views/widgets/mydialoug.dart';
import 'package:siro_driver/constant/box_name.dart';
import 'package:siro_driver/constant/links.dart';
import 'package:siro_driver/controller/functions/crud.dart';
import 'package:siro_driver/controller/home/payment/captain_wallet_controller.dart';
import 'package:siro_driver/print.dart';
import 'package:siro_driver/controller/functions/country_logic.dart';
import 'package:siro_driver/main.dart';
import 'package:siro_driver/views/widgets/error_snakbar.dart';
import 'package:siro_driver/views/widgets/mydialoug.dart';
import 'package:share_plus/share_plus.dart';
import '../../firebase/local_notification.dart';
@@ -43,10 +43,10 @@ class InviteController extends GetxController {
Future<void> shareDriverCode() async {
if (driverCouponCode != null) {
final String shareText =
'''Join Tripz as a driver using my referral code!
'''Join Siro as a driver using my referral code!
Use code: $driverCouponCode
Download the Tripz Driver app now and earn rewards:
https://tripzmove.com/invite.php?code=$driverCouponCode&app=driver
Download the Siro Captain app now and earn rewards:
${AppLink.driverDownloadLinks}
''';
await Share.share(shareText);
}
@@ -54,10 +54,10 @@ https://tripzmove.com/invite.php?code=$driverCouponCode&app=driver
Future<void> sharePassengerCode() async {
if (couponCode != null) {
final String shareText = '''Get a discount on your first Tripz ride!
final String shareText = '''Get a discount on your first Siro ride!
Use my referral code: $couponCode
Download the Tripz app now and enjoy your ride:
https://tripzmove.com/invite.php?code=$couponCode&app=rider
Download the Siro app now and enjoy your ride:
https://siromove.com/invite.php?code=$couponCode&app=rider
''';
await Share.share(shareText);
}
@@ -66,62 +66,53 @@ https://tripzmove.com/invite.php?code=$couponCode&app=rider
@override
void onInit() {
super.onInit();
// **MODIFIED**: Sync contacts automatically on controller initialization.
syncContactsToServerOnce();
// ‏لا نقرأ دفتر الهاتف هنا. القراءة تحدث فقط حين يطلب الكابتن
// ‏اختيار جهة اتصال — انظر loadDeviceContacts أدناه.
// fetchDriverStats();
}
// --- NEW LOGIC: ONE-TIME CONTACTS SYNC ---
// --- قراءة جهات الاتصال محلياً، بطلب المستخدم وحده ---
/// **NEW**: Syncs all phone contacts to the server, but only runs once per user.
Future<void> syncContactsToServerOnce() async {
final String syncFlagKey = 'contactsSynced_${box.read(BoxName.driverID)}';
// 1. Check if contacts have already been synced for this user.
if (box.read(syncFlagKey) == true) {
print("Contacts have already been synced for this user.");
return;
}
/// ‏كان هنا `syncContactsToServerOnce`: يقرأ دفتر هاتف الكابتن كاملاً
/// ‏تلقائياً عند فتح شاشة الدعوة، ويرفع **كل** اسم ورقم إلى
/// ‏`ride/egyptPhones/syrianAdd.php` — طلب لكل جهة اتصال.
///
/// ‏أُزيل الرفع بالكامل، ولثلاثة أسباب لا واحد:
///
/// ‏١) سياسة Google Play: رفع دفتر العناوين جملةً يتطلب إفصاحاً بارزاً
/// ‏وموافقة صريحة، وإذن النظام وحده لا يكفي. والتطبيق موقوف أصلاً.
///
/// ‏٢) البيانات ليست بيانات الكابتن ليتبرّع بها: هي أسماء وأرقام أطراف
/// ‏ثالثة لم تُستأذن ولا تعلم بوجود سيرو.
///
/// ‏٣) لا ميزة تعتمد عليها. الدعوة تعمل بالمشاركة أو باختيار جهة واحدة
/// ‏عمداً، وكلاهما لا يحتاج نسخة من الدفتر على السيرفر.
///
/// ‏ما بقي هنا قراءة محلية بحتة لعرض قائمة يختار منها الكابتن — لا
/// ‏شيء يغادر الجهاز.
Future<void> loadDeviceContacts() async {
if (contactMaps.isNotEmpty) return; // مُحمّلة سلفاً في هذه الجلسة
try {
// 2. Request permission and fetch all contacts.
if (await FlutterContacts.requestPermission(readonly: true)) {
// mySnackbarSuccess('Starting contacts sync in background...'.tr);
final List<Contact> allContacts =
await FlutterContacts.getContacts(withProperties: true);
// **FIX**: Assign fetched contacts to the class variable.
contacts = allContacts;
contactMaps.value = contacts.map((contact) {
return {
'name': contact.displayName,
'phones':
contact.phones.map((phone) => phone.normalizedNumber).toList(),
'emails': contact.emails.map((email) => email.address).toList(),
};
}).toList();
contactMaps.value = allContacts
.where((c) => c.phones.isNotEmpty)
.map((contact) => {
'name': contact.displayName,
'phones': contact.phones
.map((phone) => phone.normalizedNumber)
.toList(),
'emails':
contact.emails.map((email) => email.address).toList(),
})
.toList();
update();
// 3. Loop through contacts and save them to the server.
for (var contact in allContacts) {
if (contact.phones.isNotEmpty) {
// Use the normalized phone number for consistency.
var phone = contact.phones.first.normalizedNumber;
if (phone.isNotEmpty) {
CRUD().post(link: AppLink.savePhonesSyria, payload: {
"driverId": box.read(BoxName.driverID), // Associate with driver
"name": contact.displayName ?? 'No Name',
"phone": phone,
});
}
}
}
// 4. After a successful sync, set the flag to prevent future syncs.
await box.write(syncFlagKey, true);
// mySnackbarSuccess('Contacts sync completed successfully!'.tr);
}
} catch (e) {
// mySnackbarError('An error occurred during contact sync: $e'.tr);
// قراءة دفتر الهاتف ليست حرجة — الدعوة تعمل بالمشاركة أيضاً.
}
}
@@ -494,7 +485,7 @@ https://tripzmove.com/invite.php?code=$couponCode&app=rider
var d = response;
mySnackbarSuccess('Invite sent successfully'.tr);
String inviteCode = d['message']['inviteCode'].toString();
String message = '${'*Tripz DRIVER CODE*'.tr}\n\n'
String message = '${'*Siro DRIVER CODE*'.tr}\n\n'
'${"Use this code in registration".tr}\n'
'${"To get a gift for both".tr}\n\n'
'${"The period of this code is 24 hours".tr}\n\n'
@@ -539,7 +530,7 @@ https://tripzmove.com/invite.php?code=$couponCode&app=rider
mySnackbarSuccess('Invite sent successfully'.tr);
String inviteCode = d['message']['inviteCode'].toString();
String message = '${'*Tripz APP CODE*'.tr}\n\n'
String message = '${'*Siro APP CODE*'.tr}\n\n'
'${"Use this code in registration".tr}\n\n'
'${"To get a gift for both".tr}\n\n'
'${"The period of this code is 24 hours".tr}\n\n'
apps/driver/lib/controller/auth/captin/login_captin_controller.dart
+438 -149
View File
@@ -5,17 +5,17 @@ import 'package:crypto/crypto.dart';
import 'dart:math';
import 'package:http/http.dart' as http;
import 'package:permission_handler/permission_handler.dart';
import 'package:tripz_driver/views/auth/syria/registration_view.dart';
import 'package:tripz_driver/views/widgets/elevated_btn.dart';
import 'package:tripz_driver/views/widgets/error_snakbar.dart';
import 'package:siro_driver/views/auth/syria/registration_view.dart';
import 'package:siro_driver/views/widgets/elevated_btn.dart';
import 'package:siro_driver/views/widgets/error_snakbar.dart';
import 'package:flutter/material.dart';
import 'package:flutter_secure_storage/flutter_secure_storage.dart';
import 'package:get/get.dart';
import 'package:tripz_driver/constant/box_name.dart';
import 'package:tripz_driver/constant/links.dart';
import 'package:tripz_driver/controller/functions/crud.dart';
import 'package:tripz_driver/main.dart';
import 'package:tripz_driver/views/home/Captin/home_captain/home_captin.dart';
import 'package:siro_driver/constant/box_name.dart';
import 'package:siro_driver/constant/links.dart';
import 'package:siro_driver/controller/functions/crud.dart';
import 'package:siro_driver/main.dart';
import 'package:siro_driver/views/home/Captin/home_captain/home_captin.dart';
import 'package:location/location.dart';
import '../../../constant/api_key.dart';
@@ -55,7 +55,7 @@ class LoginDriverController extends GetxController {
void togglePasswordVisibility() {
isPasswordHidden = !isPasswordHidden;
update([
'passwordVisibility'
'passwordVisibility',
]); // Use a unique ID to only update the password field
}
@@ -110,8 +110,9 @@ class LoginDriverController extends GetxController {
}
var res = await CRUD().post(
link: AppLink.isPhoneVerified,
payload: {'phone_number': box.read(BoxName.phoneDriver)});
link: AppLink.isPhoneVerified,
payload: {'phone_number': box.read(BoxName.phoneDriver)},
);
if (res != 'failure') {
// Get.offAll(() => SyrianCardAI());
@@ -197,13 +198,14 @@ class LoginDriverController extends GetxController {
Log.print('Security check passed');
dev = Platform.isAndroid ? 'android' : 'ios';
var fingerPrint = box.read(BoxName.deviceFingerprint)?.toString() ??
var fingerPrint =
box.read(BoxName.deviceFingerprint)?.toString() ??
await DeviceHelper.getDeviceFingerprint();
var payload = {
'id': box.read(BoxName.driverID),
'password': AK.passnpassenger,
'aud': '${AK.allowedWallet}$dev',
'fingerPrint': fingerPrint
'fingerPrint': fingerPrint,
};
var response1 = await http.post(
Uri.parse(AppLink.loginJwtWalletDriver),
@@ -228,104 +230,148 @@ class LoginDriverController extends GetxController {
return '';
}
getJWT() async {
static Future<bool>? _jwtFuture;
static DateTime _jwtCooldownUntil = DateTime(2000);
static int _jwtFailures = 0;
static Duration get jwtCooldownRemaining {
final d = _jwtCooldownUntil.difference(DateTime.now());
return d.isNegative ? Duration.zero : d;
}
/// [force] يتجاوز الـ backoff cooldown — يُستخدم فقط في المسارات التي
/// يبدأها المستخدم (فتح التطبيق / تسجيل الدخول)، لا في الطلبات الخلفية،
/// حتى لا يعلق الكابتن خارج التطبيق بانتظار انتهاء الـ cooldown.
Future<bool> getJWT({bool force = false}) async {
if (force) {
_jwtCooldownUntil = DateTime(2000);
_jwtFailures = 0;
}
if (_jwtFuture != null) {
Log.print('⏳ getJWT: تجديد قيد التنفيذ — إعادة استخدام نفس الـ future.');
return _jwtFuture!;
}
_jwtFuture = _getJwtInternal().catchError((e) {
return _onJwtFailure('exception: $e');
});
try {
return await _jwtFuture!;
} finally {
_jwtFuture = null;
}
}
/// يفكّ payload الـ JWT محلياً (بدون التحقق من التوقيع) لفحص نوعه فقط.
static Map<String, dynamic>? decodeJwtPayload(String? token) {
if (token == null || token.isEmpty) return null;
try {
final parts = token.split('.');
if (parts.length != 3) return null;
String payload = parts[1];
switch (payload.length % 4) {
case 2:
payload += '==';
break;
case 3:
payload += '=';
break;
}
final decoded = jsonDecode(utf8.decode(base64Url.decode(payload)));
return decoded is Map ? Map<String, dynamic>.from(decoded) : null;
} catch (_) {
return null;
}
}
/// توكن تسجيل (`registration` / `new`): يصدره loginFirstTimeDriver قبل أن
/// يصير للسائق id. الباك إند يسمح له بمسارات التسجيل فقط، وأي endpoint
/// آخر يردّ 403 "Token not authorized for this action".
static bool isRegistrationToken(Map<String, dynamic> payload) {
final type = payload['token_type']?.toString();
return type == 'registration' ||
type == 'new' ||
payload['user_id']?.toString() == 'new';
}
Future<bool> _getJwtInternal() async {
await EncryptionHelper.initialize();
// 1. Check secure storage first to avoid redundant API calls
String? secureJwt = await storage.read(key: BoxName.jwt);
if (secureJwt != null && secureJwt.isNotEmpty) {
bool isTokenValid = false;
try {
final parts = secureJwt.split('.');
if (parts.length == 3) {
String payload = parts[1];
switch (payload.length % 4) {
case 2:
payload += '==';
break;
case 3:
payload += '=';
break;
}
final decoded = jsonDecode(utf8.decode(base64Url.decode(payload)));
final exp = decoded['exp'];
if (exp != null) {
// Check if token is valid with a 30-second buffer
isTokenValid =
DateTime.now().millisecondsSinceEpoch < (exp * 1000 - 30000);
}
}
} catch (_) {}
dev = Platform.isAndroid ? 'android' : 'ios';
final driverId = box.read(BoxName.driverID)?.toString() ?? '';
final isRegistering = driverId.isEmpty;
if (isTokenValid) {
Log.print('🔑 Valid JWT found in secure storage. Skipping generation.');
return;
String? secureJwt = await storage.read(key: BoxName.jwt);
final cached = decodeJwtPayload(secureJwt);
if (cached != null) {
final exp = cached['exp'];
final notExpired = exp is int &&
DateTime.now().millisecondsSinceEpoch < (exp * 1000 - 30000);
if (notExpired) {
// ═══════════════════════════════════════════════════════════
// الصلاحية الزمنية وحدها لا تكفي: توكن التسجيل يبقى صالحاً
// ساعة كاملة لكنه بلا صلاحيات. لو اكتفينا بفحص exp يبقى
// مخزّناً بعد اكتمال الدخول فيردّ كل endpoint محمي 403.
// ═══════════════════════════════════════════════════════════
if (isRegistrationToken(cached) && !isRegistering) {
Log.print(
'♻️ getJWT: توكن registration مع driverID موجود — ترقية إلى توكن driver.',
);
} else if (!isRegistering &&
cached['user_id'] != null &&
cached['user_id'].toString() != driverId) {
// توكن يخص سائقاً/جهازاً سابقاً على نفس التثبيت.
Log.print(
'♻️ getJWT: التوكن مُصدر لـ ${cached['user_id']} لا $driverId — إعادة توليد.',
);
} else {
Log.print('🔑 Valid JWT found in secure storage. Skipping generation.');
_jwtFailures = 0;
_jwtCooldownUntil = DateTime(2000);
return true;
}
}
}
dev = Platform.isAndroid ? 'android' : 'ios';
Log.print(
'box.read(BoxName.firstTimeLoadKey): ${box.read(BoxName.firstTimeLoadKey)}');
if (box.read(BoxName.firstTimeLoadKey).toString() != 'false') {
var payload = {
'id': box.read(BoxName.driverID) ?? AK.newId,
'password': AK.passnpassenger,
'aud': '${AK.allowed}$dev',
'fingerPrint': box.read(BoxName.deviceFingerprint) ??
await DeviceHelper.getDeviceFingerprint(),
};
// Log.print('payload: ${payload}');
var response0 = await http.post(
Uri.parse(AppLink.loginFirstTimeDriver),
body: payload,
if (DateTime.now().isBefore(_jwtCooldownUntil)) {
Log.print(
'🛑 getJWT: بـ cooldown لمدة ${jwtCooldownRemaining.inSeconds}ث — تخطّي التجديد.',
);
Log.print('response0: ${response0.body}');
Log.print('request: ${response0.request}');
if (response0.statusCode == 200) {
final decodedResponse1 = jsonDecode(response0.body);
Log.print('decodedResponse1: ${decodedResponse1}');
return false;
}
String? jwt;
if (decodedResponse1['message'] is Map &&
decodedResponse1['message']['jwt'] != null) {
jwt = decodedResponse1['message']['jwt'];
} else {
jwt = decodedResponse1['jwt'];
}
if (jwt != null) {
// box.write(BoxName.jwt, c(jwt));
await storage.write(key: BoxName.jwt, value: jwt);
}
// ✅ بعد التأكد أن كل المفاتيح موجودة
await EncryptionHelper.initialize();
// await AppInitializer().getKey();
} else {}
if (isRegistering &&
box.read(BoxName.firstTimeLoadKey).toString() != 'false') {
return _getRegistrationJwt();
} else {
await EncryptionHelper.initialize();
if (isRegistering) {
return _onJwtFailure('renew: لا يوجد driverID');
}
var payload = {
'id': box.read(BoxName.driverID),
'password': box.read(BoxName.emailDriver),
'aud': '${AK.allowed}$dev',
'fingerPrint': box.read(BoxName.deviceFingerprint) ??
'fingerPrint':
box.read(BoxName.deviceFingerprint) ??
await DeviceHelper.getDeviceFingerprint(),
};
// print(payload);
var response1 = await http.post(
Uri.parse(AppLink.loginJwtDriver),
body: payload,
);
Log.print('response1.request: ${response1.request}');
Log.print('response1.body: ${response1.body}');
var response1 = await http
.post(Uri.parse(AppLink.loginJwtDriver), body: payload)
.timeout(const Duration(seconds: 30));
if (response1.statusCode == 429) {
final retryAfter =
int.tryParse(response1.headers['retry-after'] ?? '') ?? 60;
_jwtCooldownUntil = DateTime.now().add(Duration(seconds: retryAfter));
Log.print('🛑 getJWT: 429 — cooldown ${retryAfter}ث');
return false;
}
if (response1.statusCode == 200) {
final decodedResponse1 = jsonDecode(response1.body);
// Log.print('decodedResponse1: ${decodedResponse1}');
String? jwt;
if (decodedResponse1['message'] is Map &&
decodedResponse1['message']['jwt'] != null) {
@@ -335,15 +381,98 @@ class LoginDriverController extends GetxController {
}
if (jwt != null) {
// await box.write(BoxName.jwt, c(jwt));
await storage.write(key: BoxName.jwt, value: jwt);
needsDeviceVerification = false;
return _onJwtSuccess();
}
return _onJwtFailure('renew: لا يوجد jwt بالرد');
}
if (response1.statusCode == 401) {
// سائق لم يُكمل التسجيل بعد: عنده driverID من تحقق الهاتف لكن لا
// صفّ له في جدول driver، فـ loginJwtDriver يردّ 401 دائماً. هنا
// توكن التسجيل هو الصحيح — وبدون هذا الرجوع يعلق في منتصف التسجيل.
if (box.read(BoxName.firstTimeLoadKey).toString() != 'false') {
Log.print('↩️ getJWT: التسجيل لم يكتمل — الرجوع لتوكن التسجيل.');
return _getRegistrationJwt();
}
// await AppInitializer().getKey();
// سائق مكتمل: البصمة لا تطابق المخزّنة (جهاز جديد). الحل الوحيد
// OTP يعيد ربط البصمة — لا فائدة من إعادة المحاولة، فنرفع العلم
// ليحوّله loginDriver لصفحة التحقق.
needsDeviceVerification = true;
Log.print('🔐 getJWT: 401 من loginJwtDriver — الجهاز يحتاج تحقق OTP.');
}
return _onJwtFailure('renew: HTTP ${response1.statusCode}');
}
}
/// يُرفع عندما يرفض loginJwtDriver بصمة هذا الجهاز (401): السائق مسجّل
/// لكن الجهاز غير مربوط، ولا يمكن إصدار توكن driver قبل تحقق OTP.
static bool needsDeviceVerification = false;
/// توكن التسجيل — صالح لمسارات التسجيل وحدها (loginFromGoogle، register،
/// رفع المستندات…). يُستعمل قبل وجود صفّ للسائق، ويُستبدل بتوكن driver
/// فور اكتمال الدخول.
Future<bool> _getRegistrationJwt() async {
final payload = {
'id': box.read(BoxName.driverID) ?? AK.newId,
'password': AK.passnpassenger,
'aud': '${AK.allowed}$dev',
'fingerPrint':
box.read(BoxName.deviceFingerprint) ??
await DeviceHelper.getDeviceFingerprint(),
};
final response0 = await http
.post(Uri.parse(AppLink.loginFirstTimeDriver), body: payload)
.timeout(const Duration(seconds: 30));
if (response0.statusCode == 429) {
final retryAfter =
int.tryParse(response0.headers['retry-after'] ?? '') ?? 60;
_jwtCooldownUntil = DateTime.now().add(Duration(seconds: retryAfter));
Log.print('🛑 getJWT(firstTime): 429 — cooldown ${retryAfter}s');
return false;
}
if (response0.statusCode == 200) {
final decodedResponse1 = jsonDecode(response0.body);
String? jwt;
if (decodedResponse1['message'] is Map &&
decodedResponse1['message']['jwt'] != null) {
jwt = decodedResponse1['message']['jwt'];
} else {
jwt = decodedResponse1['jwt'];
}
if (jwt != null) {
await storage.write(key: BoxName.jwt, value: jwt);
await EncryptionHelper.initialize();
return _onJwtSuccess();
}
return _onJwtFailure('firstTime: لا يوجد jwt بالرد');
}
return _onJwtFailure('firstTime: HTTP ${response0.statusCode}');
}
bool _onJwtSuccess() {
_jwtFailures = 0;
_jwtCooldownUntil = DateTime(2000);
Log.print('✅ getJWT: تم توليد توكن جديد بنجاح.');
return true;
}
bool _onJwtFailure(String reason) {
_jwtFailures++;
final seconds = _jwtFailures >= 6 ? 60 : (1 << _jwtFailures);
_jwtCooldownUntil = DateTime.now().add(Duration(seconds: seconds));
Log.print(
'❌ getJWT فشل ($reason) — محاولة #$_jwtFailures، cooldown ${seconds}ث',
);
return false;
}
Future<void> getLocationPermission() async {
var status = await Permission.locationAlways.status;
if (!status.isGranted) {
@@ -357,9 +486,7 @@ class LoginDriverController extends GetxController {
Future updateInvitationCodeFromRegister() async {
var res = await CRUD().post(
link: AppLink.updateDriverInvitationDirectly,
payload: {
"inviterDriverPhone": box.read(BoxName.phoneDriver).toString(),
},
payload: {"inviterDriverPhone": box.read(BoxName.phoneDriver).toString()},
);
Log.print('invite: ${res}');
@@ -371,7 +498,11 @@ class LoginDriverController extends GetxController {
update();
box.write(BoxName.isInstall, '1');
NotificationController().showNotification(
"Code approved".tr, "Code approved".tr, 'tone2', '');
"Code approved".tr,
"Code approved".tr,
'tone2',
'',
);
try {
NotificationService.sendNotification(
@@ -389,6 +520,23 @@ class LoginDriverController extends GetxController {
}
}
/// جلسة محلية صالحة: عندنا driverID + رقم متحقق منه مسبقاً.
/// في هذه الحالة أي فشل شبكة/توكن هو عارض ولا يجوز إرجاع الكابتن لـ OTP.
bool get hasLocalVerifiedSession {
final id = box.read(BoxName.driverID)?.toString() ?? '';
return id.isNotEmpty &&
box.read(BoxName.phoneVerified).toString() == '1' &&
box.read(BoxName.firstTimeLoadKey).toString() == 'false';
}
/// نتائج عارضة من CRUD (ليست JSON) — شبكة/توكن/ضغط سيرفر.
static const _transientResults = {
'failure',
'no_internet',
'token_expired',
'rate_limited',
};
loginDriver(String driverID, email) async {
isloading = true;
update();
@@ -396,8 +544,47 @@ class LoginDriverController extends GetxController {
// Log.print('(BoxName.emailDriver): ${box.read(BoxName.emailDriver)}');
// await getJWT();
var res = await CRUD().get(
link: AppLink.loginFromGoogleCaptin, payload: {'driver_id': driverID});
link: AppLink.loginFromGoogleCaptin,
payload: {'driver_id': driverID},
);
Log.print('loginDriver: ${res}');
// ═══════════════════════════════════════════════════════════════
// فشل عارض (شبكة / توكن منتهي / rate limit):
// إذا الجهاز محفوظ والرقم متحقق ⇒ لا نرجع لـ OTP إطلاقاً.
// نجدّد التوكن مرة (متجاوزين الـ cooldown) ونعيد المحاولة مرة واحدة.
// ═══════════════════════════════════════════════════════════════
if (res is String && _transientResults.contains(res)) {
if (hasLocalVerifiedSession) {
Log.print(
'⚠️ loginDriver: نتيجة عارضة "$res" مع جلسة محلية صالحة — '
'إعادة محاولة بعد تجديد التوكن قسراً.',
);
final refreshed = await getJWT(force: true);
if (refreshed) {
res = await CRUD().get(
link: AppLink.loginFromGoogleCaptin,
payload: {'driver_id': driverID},
);
Log.print('loginDriver(retry): $res');
}
}
// ما زالت النتيجة عارضة
if (res is String && _transientResults.contains(res)) {
isloading = false;
update();
if (hasLocalVerifiedSession) {
// ندخله للتطبيق بجلسته المحفوظة بدل رميه على OTP.
mySnackbarError('Connection problem, please try again'.tr);
Get.offAll(() => HomeCaptain());
return true;
}
await isPhoneVerified();
return false;
}
}
if (res == 'failure') {
await isPhoneVerified();
isloading = false; // <--- أضفت هذا أيضاً
@@ -405,17 +592,46 @@ class LoginDriverController extends GetxController {
return false;
// Get.snackbar('Failure', '', backgroundColor: Colors.red);
} else {
var jsonDecoeded = jsonDecode(res);
dynamic jsonDecoeded;
try {
jsonDecoeded = jsonDecode(res);
} catch (e) {
// رد غير JSON — لا نُسقط الجلسة بسببه.
Log.print('❌ loginDriver: رد غير صالح "$res" ($e)');
isloading = false;
update();
if (hasLocalVerifiedSession) {
Get.offAll(() => HomeCaptain());
return true;
}
await isPhoneVerified();
return false;
}
var d = jsonDecoeded['data'][0];
if (jsonDecoeded.isNotEmpty) {
if (jsonDecoeded['status'] == 'success' &&
d['is_verified'].toString() == '1') {
final driverStatus = d['status']?.toString() ?? '';
final isAccountBlocked =
driverStatus == 'blocked' ||
driverStatus == 'banned' ||
driverStatus == 'disabled';
final isVerifiedUser =
!isAccountBlocked &&
(d['is_verified'].toString() == '1' ||
d['is_test'].toString() == '1' ||
driverStatus == 'actives' ||
driverStatus == 'active');
if (jsonDecoeded['status'] == 'success' && isVerifiedUser) {
box.write(BoxName.emailDriver, d['email']);
box.write(BoxName.firstTimeLoadKey, 'false');
box.write(BoxName.driverID, (d['id']));
box.write(BoxName.isTest, '1');
box.write(
BoxName.isTest,
d['is_test']?.toString() == '1' ? '1' : '0',
);
box.write(BoxName.gender, (d['gender']));
box.write(BoxName.phoneVerified, d['is_verified'].toString());
box.write(BoxName.phoneVerified, '1');
box.write(BoxName.phoneDriver, (d['phone']));
box.write(BoxName.is_claimed, d['is_claimed']);
box.write(BoxName.isInstall, d['isInstall']);
@@ -426,9 +642,10 @@ class LoginDriverController extends GetxController {
box.write(BoxName.bankCodeDriver, (d['bankCode']));
box.write(BoxName.accountBankNumberDriver, (d['accountBank']));
box.write(
BoxName.nameDriver,
'${(d['first_name'])}'
' ${(d['last_name'])}');
BoxName.nameDriver,
'${(d['first_name'])}'
' ${(d['last_name'])}',
);
if (((d['model']).toString().contains('دراجه') ||
d['make'].toString().contains('دراجه '))) {
if ((d['gender']).toString() == 'Male') {
@@ -449,15 +666,39 @@ class LoginDriverController extends GetxController {
box.write(BoxName.carTypeOfDriver, 'Awfar Car');
}
// ✅ الحصول على توكن access بدل registration قبل أي طلبات بعد تسجيل الدخول
// ═══════════════════════════════════════════════════════════
// ترقية التوكن: حتى هنا كنا نستعمل توكن registration (المسموح
// له بـ loginFromGoogle فقط). الآن صار عندنا driverID، فنستبدله
// بتوكن driver قبل أي طلب لاحق — بدون هذه الخطوة يردّ كل
// endpoint محمي 403 "Token not authorized for this action".
// ═══════════════════════════════════════════════════════════
Log.print('🔑 Getting access token after login...');
String fingerPrint = await DeviceHelper.getDeviceFingerprint();
// await storage.write(
// key: BoxName.fingerPrint, value: fingerPrint.toString());
// await getJWT();
// Log.print('🔑 Access token obtained.');
await storage.write(key: BoxName.fingerPrint, value: fingerPrint);
final upgraded = await getJWT(force: true);
Log.print(
upgraded
? '🔑 Access token obtained.'
: '⚠️ تعذّر الحصول على توكن driver بعد الدخول.',
);
// add invitations
// جهاز جديد: البصمة غير مربوطة، فلا يمكن إصدار توكن driver إلا
// بعد OTP يعيد الربط. نحوّله مباشرة بدل إدخاله بتوكن بلا صلاحيات.
if (!upgraded && needsDeviceVerification) {
isloading = false;
update();
Get.offAll(
() => OtpVerificationPage(
phone: d['phone'].toString(),
deviceToken: fingerPrint,
token: '',
ptoken: '',
),
);
return true;
}
// add invitations
if (box.read(BoxName.isInstall) == null ||
box.read(BoxName.isInstall).toString() == '0') {
updateInvitationCodeFromRegister();
@@ -467,14 +708,13 @@ class LoginDriverController extends GetxController {
final driverStatus = d['status'].toString();
if (driverStatus != 'yet' && driverStatus != 'pending_review') {
var token = await CRUD().get(
link: AppLink.getDriverToken,
payload: {
'captain_id': (box.read(BoxName.driverID)).toString()
});
link: AppLink.getDriverToken,
payload: {'captain_id': (box.read(BoxName.driverID)).toString()},
);
// print(jsonDecode(token)['data'][0]['token'].toString());
// print(box.read(BoxName.tokenDriver).toString());
// if (box.read(BoxName.emailDriver).toString() !=
// '963992952235@tripzapp.com') {
// '963992952235@intaleqapp.com') {
if (token != 'failure') {
var serverData = jsonDecode(token);
final serverToken = serverData['data'][0]['token'].toString();
@@ -483,9 +723,19 @@ class LoginDriverController extends GetxController {
final serverFp = serverData['data'][0]['fingerPrint'].toString();
final tokenMismatch =
storedToken.isNotEmpty && serverToken != storedToken;
// البصمة تُخزَّن مُهشّمة (sha256 + FP_PEPPER) بعد أول تجديد
// توكن. التطبيق لا يملك الـ pepper فلا يستطيع مقارنتها —
// ومقارنتها خاماً تعطي "اختلاف" دائماً وتفرض OTP بلا سبب.
// في هذه الحالة نتّكل على تحقّق السيرفر عند إصدار التوكن
// (loginJwtDriver يردّ 401 لجهاز غير مربوط).
final isHashedFp = RegExp(r'^[a-f0-9]{64}$').hasMatch(serverFp);
final fingerprintMismatch = serverFp.isNotEmpty &&
!isHashedFp &&
serverFp != fingerPrint.toString();
Log.print(
'🔍 [FP_COMPARE] serverFp: $serverFp | localFp: ${fingerPrint.toString()} | tokenMismatch: $tokenMismatch | serverToken: $serverToken | storedToken: $storedToken');
if (tokenMismatch) {
'🔍 [FP_COMPARE] serverFp: $serverFp | localFp: ${fingerPrint.toString()} | fingerprintMismatch: $fingerprintMismatch | tokenMismatch: $tokenMismatch | serverToken: $serverToken | storedToken: $storedToken',
);
if (fingerprintMismatch || tokenMismatch) {
Get.defaultDialog(
barrierDismissible: false,
title: 'Device Change Detected'.tr,
@@ -504,8 +754,9 @@ class LoginDriverController extends GetxController {
phone: d['phone'].toString(),
deviceToken: fingerPrint.toString(),
token: token.toString(),
ptoken:
jsonDecode(token)['data'][0]['token'].toString(),
ptoken: jsonDecode(
token,
)['data'][0]['token'].toString(),
),
);
},
@@ -523,7 +774,8 @@ class LoginDriverController extends GetxController {
return true;
} else {
Get.offAll(
() => DriverVerificationScreen()); // افترض أن هذا الكلاس موجود
() => DriverVerificationScreen(),
); // افترض أن هذا الكلاس موجود
isloading = false; // <--- أضفت هذا
update(); // <--- أضفت هذا
return false;
@@ -552,7 +804,9 @@ class LoginDriverController extends GetxController {
// Log.print('(BoxName.emailDriver): ${box.read(BoxName.emailDriver)}');
var res = await CRUD().get(
link: AppLink.loginFromGoogleCaptin, payload: {'driver_id': driverID});
link: AppLink.loginFromGoogleCaptin,
payload: {'driver_id': driverID},
);
// print('res is $res');
// if (res == 'failure') {
@@ -583,9 +837,10 @@ class LoginDriverController extends GetxController {
box.write(BoxName.bankCodeDriver, (d['bankCode']));
box.write(BoxName.accountBankNumberDriver, (d['accountBank']));
box.write(
BoxName.nameDriver,
'${(d['first_name'])}'
' ${(d['last_name'])}');
BoxName.nameDriver,
'${(d['first_name'])}'
' ${(d['last_name'])}',
);
if (((d['model']).toString().contains('دراجه') ||
d['make'].toString().contains('دراجه '))) {
if ((d['gender']).toString() == 'Male') {
@@ -645,51 +900,80 @@ class LoginDriverController extends GetxController {
'aud': AppInformation.appName,
};
Log.print(
'🚀 loginUsingCredentialsWithoutGoogle Request URL: ${AppLink.loginUsingCredentialsWithoutGoogle}',
);
Log.print('📦 loginUsingCredentialsWithoutGoogle Payload: $payload');
var response = await http.post(
Uri.parse(AppLink.loginUsingCredentialsWithoutGoogle),
body: payload,
);
Log.print(
'✅ loginUsingCredentialsWithoutGoogle Status Code: ${response.statusCode}',
);
Log.print(
'📄 loginUsingCredentialsWithoutGoogle Response Body: ${response.body}',
);
if (response.statusCode == 200 || response.statusCode == 201) {
var jsonDecoeded = jsonDecode(response.body);
if (jsonDecoeded['status'] == 'success') {
var d = jsonDecoeded['data'][0];
var jwt = jsonDecoeded['jwt'];
// حفظ التوكن أولاً
// حفظ التوكن في FlutterSecureStorage فقط
if (jwt != null) {
box.write(BoxName.jwt, c(jwt));
await storage.write(key: BoxName.jwt, value: c(jwt));
await storage.write(key: BoxName.jwt, value: jwt);
}
box.write(BoxName.emailDriver, (d['email']));
box.write(BoxName.driverID, (d['id']));
box.write(BoxName.isTest, '1');
box.write(BoxName.gender, (d['gender']));
box.write(BoxName.phoneVerified, d['is_verified'].toString());
final isVerifiedFlag =
(d['is_verified'].toString() == '1' ||
d['is_test'].toString() == '1' ||
d['status'].toString() == 'actives' ||
d['status'].toString() == 'active')
? '1'
: '0';
box.write(BoxName.phoneVerified, isVerifiedFlag);
box.write(BoxName.phoneDriver, (d['phone']));
box.write(BoxName.nameArabic, (d['name_arabic']));
box.write(BoxName.bankCodeDriver, (d['bankCode']));
box.write(BoxName.accountBankNumberDriver, d['accountBank']);
box.write(
BoxName.nameDriver,
'${(d['first_name'])}'
' ${(d['last_name'])}');
BoxName.nameDriver,
'${(d['first_name'])}'
' ${(d['last_name'])}',
);
await storage.write(key: BoxName.fingerPrint, value: fingerPrint);
Get.off(() => HomeCaptain());
} else {
mySnackbarError('Login failed'.tr);
Log.print('❌ Login failed message: ${jsonDecoeded['message']}');
mySnackbarError(
(jsonDecoeded['message'] ?? 'Login failed').toString().tr,
);
isloading = false;
update();
}
} else if (response.statusCode == 429) {
Log.print('❌ Too many attempts (429)');
mySnackbarError('Too many attempts. Please wait a minute.'.tr);
isloading = false;
update();
} else {
Log.print('❌ Server error response (Not 200/201/429)');
mySnackbarError('Server error'.tr);
isloading = false;
update();
}
} catch (e) {
Log.print('❌ Network/Exception error: $e');
mySnackbarError('Network error'.tr);
isloading = false;
update();
@@ -698,21 +982,26 @@ class LoginDriverController extends GetxController {
void loginByBoxData() async {
Get.to(() => HomeCaptain());
await CRUD().post(link: AppLink.addTokensDriver, payload: {
'token': box.read(BoxName.tokenDriver).toString(),
'captain_id': box.read(BoxName.driverID).toString()
});
await CRUD().post(
link: AppLink.addTokensDriver,
payload: {
'token': box.read(BoxName.tokenDriver).toString(),
'captain_id': box.read(BoxName.driverID).toString(),
},
);
CRUD().post(
link: "${AppLink.seferAlexandriaServer}/ride/firebase/addDriver.php",
payload: {
'token': box.read(BoxName.tokenDriver),
'captain_id': box.read(BoxName.driverID).toString()
});
link: "${AppLink.seferAlexandriaServer}/ride/firebase/addDriver.php",
payload: {
'token': box.read(BoxName.tokenDriver),
'captain_id': box.read(BoxName.driverID).toString(),
},
);
CRUD().post(
link: "${AppLink.seferGizaServer}/ride/firebase/addDriver.php",
payload: {
'token': box.read(BoxName.tokenDriver),
'captain_id': box.read(BoxName.driverID).toString()
});
link: "${AppLink.seferGizaServer}/ride/firebase/addDriver.php",
payload: {
'token': box.read(BoxName.tokenDriver),
'captain_id': box.read(BoxName.driverID).toString(),
},
);
}
}
apps/driver/lib/controller/auth/captin/ml_google_doc.dart
+2 -2
View File
@@ -4,8 +4,8 @@ import 'package:get/get.dart';
// import 'package:google_mlkit_text_recognition/google_mlkit_text_recognition.dart';
import 'package:image_cropper/image_cropper.dart';
import 'package:image_picker/image_picker.dart';
import 'package:tripz_driver/constant/colors.dart';
import 'package:tripz_driver/controller/functions/llama_ai.dart';
import 'package:siro_driver/constant/colors.dart';
import 'package:siro_driver/controller/functions/llama_ai.dart';
// class CarRegistrationRecognizerController extends GetxController {
// @override
apps/driver/lib/controller/auth/captin/opt_token_controller.dart
+35 -11
View File
@@ -1,8 +1,8 @@
import 'dart:async';
import 'package:get/get.dart';
import 'package:tripz_driver/print.dart';
import 'package:tripz_driver/views/home/Captin/home_captain/home_captin.dart';
import 'package:siro_driver/print.dart';
import 'package:siro_driver/views/home/Captin/home_captain/home_captin.dart';
import '../../../constant/box_name.dart';
import '../../../constant/links.dart';
@@ -10,6 +10,7 @@ import '../../../main.dart';
import '../../../views/widgets/error_snakbar.dart';
import '../../firebase/notification_service.dart';
import '../../functions/crud.dart';
import 'login_captin_controller.dart';
class OtpVerificationController extends GetxController {
final String phone;
@@ -95,6 +96,25 @@ class OtpVerificationController extends GetxController {
response != 'no_internet') {
Log.print('response (already decoded): ${response}');
// ═══════════════════════════════════════════════════════════
// التحقق نجح ⇒ السيرفر ربط بصمة هذا الجهاز وأصدر توكن driver.
// نحفظه فوراً: هو التوكن الوحيد الذي يملك صلاحيات بعد تغيير
// الجهاز، وبدونه تبقى كل الطلبات على 403.
// ═══════════════════════════════════════════════════════════
final issuedJwt = (response is Map && response['message'] is Map)
? response['message']['jwt']?.toString()
: null;
if (issuedJwt != null && issuedJwt.isNotEmpty) {
await storage.write(key: BoxName.jwt, value: issuedJwt);
LoginDriverController.needsDeviceVerification = false;
Log.print('🔑 تم حفظ توكن driver بعد تحقق تغيير الجهاز.');
} else {
// السيرفر لم يرجع توكناً — نطلب واحداً الآن بعد أن صارت
// البصمة مربوطة، وإلا دخل الكابتن بتوكن بلا صلاحيات.
LoginDriverController.needsDeviceVerification = false;
await Get.put(LoginDriverController()).getJWT(force: true);
}
// توجه إلى الصفحة التالية
await CRUD().post(
link: AppLink.addTokensDriver,
@@ -104,15 +124,19 @@ class OtpVerificationController extends GetxController {
'captain_id': box.read(BoxName.driverID).toString(),
});
await NotificationService.sendNotification(
target: ptoken.toString(),
title: 'token change'.tr,
body: 'token change'.tr,
isTopic: false,
tone: 'cancel',
driverList: [],
category: 'token change',
);
// إشعار الجهاز القديم — يُرسل فقط إذا عرفنا توكنه. عند دخول جهاز
// جديد لا نملك ptoken (تعذّر جلبه بلا صلاحيات) فنتخطّاه.
if (ptoken.isNotEmpty) {
await NotificationService.sendNotification(
target: ptoken,
title: 'token change'.tr,
body: 'token change'.tr,
isTopic: false,
tone: 'cancel',
driverList: [],
category: 'token change',
);
}
Get.offAll(() => HomeCaptain());
} else {
apps/driver/lib/controller/auth/captin/phone_helper_controller.dart
+21 -7
View File
@@ -1,10 +1,11 @@
import 'package:get/get.dart';
import 'package:tripz_driver/controller/auth/captin/login_captin_controller.dart';
import 'package:tripz_driver/controller/functions/crud.dart';
import 'package:tripz_driver/print.dart';
import 'package:tripz_driver/views/home/on_boarding_page.dart';
import 'package:tripz_driver/views/widgets/error_snakbar.dart';
import 'package:tripz_driver/controller/functions/country_logic.dart';
import 'package:siro_driver/controller/auth/captin/login_captin_controller.dart';
import 'package:siro_driver/controller/functions/crud.dart';
import 'package:siro_driver/print.dart';
import 'package:siro_driver/views/home/on_boarding_page.dart';
import 'package:siro_driver/views/widgets/error_snakbar.dart';
import 'package:siro_driver/controller/functions/country_logic.dart';
import 'package:siro_driver/controller/functions/package_info.dart';
import '../../../constant/box_name.dart';
import '../../../constant/links.dart';
@@ -66,13 +67,18 @@ class PhoneAuthHelper {
try {
final fixedPhone = CountryLogic.formatCurrentCountryPhone(phoneNumber);
Log.print('fixedPhone: $fixedPhone');
final fingerPrint = box.read(BoxName.deviceFingerprint)?.toString() ??
await DeviceHelper.getDeviceFingerprint();
final response = await CRUD().post(
link: _verifyOtpUrl,
payload: {
'phone_number': fixedPhone,
'token_code': otpCode,
'context': 'login',
'user_type': 'driver'
'user_type': 'driver',
// البصمة تُدمج داخل التوكن الذي يصدره السيرفر، وبدونها يُرفض
// كل طلب لاحق بـ 403 "Device verification required".
'fingerPrint': fingerPrint,
},
);
@@ -85,6 +91,14 @@ class PhoneAuthHelper {
box.write(BoxName.phoneDriver, phoneNumber);
box.write(BoxName.driverID, data['message']['driverID']);
// ✅ التحقق ينجح ⇒ السيرفر يصدر توكن driver كامل الصلاحيات.
// حفظه هنا هو ما يمنع بقاء توكن التسجيل مستعملاً بعد الدخول.
final issuedJwt = data['message']['jwt']?.toString();
if (issuedJwt != null && issuedJwt.isNotEmpty) {
await storage.write(key: BoxName.jwt, value: issuedJwt);
Log.print('🔑 تم حفظ توكن driver الصادر من التحقق بالـ OTP.');
}
if (isRegistered) {
// ✅ السائق مسجل مسبقًا - سجل دخوله واذهب إلى الصفحة الرئيسية
final driver = data['message']['driver'];
apps/driver/lib/controller/auth/onboarding_controller.dart
+2 -2
View File
@@ -1,7 +1,7 @@
import 'package:flutter/material.dart';
import 'package:get/get.dart';
import 'package:tripz_driver/constant/box_name.dart';
import 'package:tripz_driver/main.dart';
import 'package:siro_driver/constant/box_name.dart';
import 'package:siro_driver/main.dart';
import '../../models/model/onboarding_model.dart';
import '../../views/auth/captin/login_captin.dart';
apps/driver/lib/controller/auth/syria/registration_controller.dart
+7 -8
View File
@@ -7,8 +7,8 @@ import 'package:image_picker/image_picker.dart';
import 'package:image_cropper/image_cropper.dart';
import 'package:image/image.dart' as img;
import 'package:path/path.dart';
import 'package:tripz_driver/constant/links.dart';
import 'package:tripz_driver/controller/firebase/notification_service.dart';
import 'package:siro_driver/constant/links.dart';
import 'package:siro_driver/controller/firebase/notification_service.dart';
import '../../../constant/box_name.dart';
import 'package:path_provider/path_provider.dart';
@@ -371,8 +371,7 @@ class RegistrationController extends GetxController {
final uri = Uri.parse(currentUrl);
final request = http.MultipartRequest('POST', uri);
final _jwt = box.read(BoxName.jwt);
final String _token = _jwt != null ? r(_jwt).split(AppInformation.addd)[0] : '';
final String _token = await storage.read(key: BoxName.jwt) ?? '';
String timestamp = DateTime.now().millisecondsSinceEpoch.toString();
String nonce = timestamp;
@@ -581,8 +580,8 @@ class RegistrationController extends GetxController {
try {
// ترويسات مشتركة
final _jwt = box.read(BoxName.jwt);
final bearer = 'Bearer ${_jwt != null ? r(_jwt).split(AppInformation.addd)[0] : ''}';
final String _jwtToken = await storage.read(key: BoxName.jwt) ?? '';
final bearer = 'Bearer $_jwtToken';
final hmac = '${box.read(BoxName.hmac)}';
String fingerPrint =
@@ -612,7 +611,7 @@ class RegistrationController extends GetxController {
_addField(fields, 'password', 'generated_password_or_token');
_addField(fields, 'status', 'yet');
String generatedEmail = 'driver_${box.read(BoxName.driverID) ?? DateTime.now().millisecondsSinceEpoch}@tripzmove.com';
String generatedEmail = 'driver_${box.read(BoxName.driverID) ?? DateTime.now().millisecondsSinceEpoch}@siromove.com';
_addField(fields, 'email', generatedEmail);
_addField(fields, 'gender', 'Male'); // يفضل ربطها بـ Dropdown أيضاً
_addField(fields, 'country', box.read(BoxName.countryCode)?.toString() ?? 'Jordan');
@@ -764,7 +763,7 @@ class RegistrationController extends GetxController {
// isLoading.value = true;
// final uri = Uri.parse(
// 'https://tripz.xyz/tripz/auth/driver/register.php',
// 'https://intaleq.xyz/siro/auth/driver/register.php',
// );
// final client = http.Client();
apps/driver/lib/controller/auth/syria/registration_simulation.dart
+4 -4
View File
@@ -12,14 +12,14 @@ import 'dart:io';
/// 6. Final Submission (register_driver_and_car.php → Gemini bulk AI → DB insert → FCM)
/// 7. Admin Review & Activation
///
/// Run: `dart run tripz_driver/lib/controller/auth/syria/registration_simulation.dart`
/// Run: `dart run siro_driver/lib/controller/auth/syria/registration_simulation.dart`
void main() async {
print('═══════════════════════════════════════════════════════');
print(' SYRIA DRIVER REGISTRATION SIMULATION');
print('═══════════════════════════════════════════════════════');
const host = 'api-syria.tripzmove.com';
const host = 'api-syria.siromove.com';
const protocol = 'https';
const driverId = 'DRV2026061912345678';
@@ -137,7 +137,7 @@ void main() async {
}
print(' ✅ AI extraction: $expectedExtraction');
print(' ✅ Image URL: $protocol://$host/tripz/auth/uploads/documents/driver_${docType}_$driverId.jpg');
print(' ✅ Image URL: $protocol://$host/siro/auth/uploads/documents/driver_${docType}_$driverId.jpg');
}
// ================================================================
@@ -163,7 +163,7 @@ void main() async {
print(' MIME validation: image/jpeg, image/png, image/webp');
print(' Max size: 5 MB');
final signedUrl = '$protocol://$host/tripz/secure_image.php'
final signedUrl = '$protocol://$host/siro/secure_image.php'
'?driver_id=$driverId'
'&doc_type=$docType'
'&ext=jpg'
apps/driver/lib/controller/auth/tokens_controller.dart
+1 -1
View File
@@ -1,6 +1,6 @@
import 'dart:convert';
import 'package:tripz_driver/views/widgets/error_snakbar.dart';
import 'package:siro_driver/views/widgets/error_snakbar.dart';
import 'package:get/get.dart';
import 'package:http/http.dart' as http;