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

2026-04-03-maplibra come next

Browse Source
This commit is contained in:
Hamza-Ayed
2026-04-03 16:23:14 +03:00
parent c6b27d06d4
commit e325405dff
13 changed files with 363 additions and 830 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
lib/controller/auth/login_controller.dart
View File

@@ -4,6 +4,7 @@ import 'dart:math';
import 'package:Intaleq/constant/api_key.dart';
import 'package:Intaleq/controller/firebase/firbase_messge.dart';
import 'package:Intaleq/views/auth/otp_page.dart';
import 'package:Intaleq/views/widgets/error_snakbar.dart';
import 'package:http/http.dart' as http;
import 'package:Intaleq/constant/info.dart';
@@ -276,37 +277,47 @@ class LoginController extends GetxController {
// مهم: تأكد من passengerID في الـ box
box.write(BoxName.passengerID, passengerID);
// 4) نفّذ عمليات مكلفة بالتوازي: getTokens + fingerprint
// 4) تنفيذ العمليات بالتوازي: getTokens + fingerprint محلي
final results = await Future.wait([
CRUD().get(link: AppLink.getTokens, payload: {
'passengerID': passengerID, // FIX: لا تستخدم box هنا
}),
CRUD().get(
link: AppLink.getTokens, payload: {'passengerID': passengerID}),
DeviceHelper.getDeviceFingerprint(),
]);
await box.write(BoxName.firstTimeLoadKey, 'false');
final tokenResp = results[0];
final fingerPrint = (results[1] ?? '').toString();
await storage.write(key: BoxName.fingerPrint, value: fingerPrint);
final tokenResp = results[0];
final localFP = (results[1] ?? '').toString();
await storage.write(key: BoxName.fingerPrint, value: localFP);
await box.write(BoxName.firstTimeLoadKey, 'false');
// ── 5. المقارنة: FCM token + fingerprint ──────────────────────
if (email != '962798583052@intaleqapp.com' && tokenResp != 'failure') {
final tokenJson = jsonDecode(tokenResp);
final serverToken = tokenJson['message']?['token']?.toString() ?? '';
// Log.print('serverToken: ${serverToken}');
final localFcm = (box.read(BoxName.tokenFCM) ?? '').toString();
// Log.print('localFcm: ${localFcm}');
final serverData = tokenJson['message'] as Map?; // null = أول تسجيل
// 5) اختلاف الجهاز -> تحقّق OTP
if (serverToken.isNotEmpty && serverToken != localFcm) {
final goVerify = await _confirmDeviceChangeDialog();
if (goVerify == true) {
if (serverData != null) {
final serverFCM = serverData['token']?.toString() ?? '';
final serverFP = serverData['fingerPrint']?.toString() ?? '';
final localFCM = (box.read(BoxName.tokenFCM) ?? '').toString();
// ── اختلاف أي منهما = جهاز مختلف أو تثبيت جديد ─────────
final fcmChanged = serverFCM.isNotEmpty && serverFCM != localFCM;
final fpChanged = serverFP.isNotEmpty && serverFP != localFP;
if (fcmChanged || fpChanged) {
// final goVerify = await _confirmDeviceChangeDialog();
// if (goVerify == true) {
mySnackbarInfo('Device Change Detected'.tr);
//
await Get.to(() => OtpVerificationPage(
phone: data['phone'].toString(),
deviceToken: fingerPrint,
token: tokenResp.toString(),
ptoken: serverToken,
deviceToken: localFP,
token: tokenResp,
ptoken: serverFCM, // نمرر FCM القديم للـ OTP controller
));
// بعد العودة من OTP (نجح/فشل)، أخرج من الميثود كي لا يحصل offAll مرتين
return;
return; // لا تكمل — الـ OTP controller يتولى الانتقال
// }
}
}
}
@@ -359,18 +370,18 @@ class LoginController extends GetxController {
}
}
Future<bool?> _confirmDeviceChangeDialog() {
return Get.defaultDialog<bool>(
barrierDismissible: false,
title: 'Device Change Detected'.tr,
middleText: 'Please verify your identity'.tr,
textConfirm: 'Verify'.tr,
confirmTextColor: Colors.white,
onConfirm: () => Get.back(result: true),
textCancel: 'Cancel'.tr,
onCancel: () => Get.back(result: false),
);
}
// Future<bool?> _confirmDeviceChangeDialog() {
// return Get.defaultDialog<bool>(
// barrierDismissible: false,
// title: 'Device Change Detected'.tr,
// middleText: 'Please verify your identity'.tr,
// textConfirm: 'Verify'.tr,
// confirmTextColor: Colors.white,
// onConfirm: () => Get.back(result: true),
// textCancel: 'Cancel'.tr,
// onCancel: () => Get.back(result: false),
// );
// }
void login() async {
isloading = true;