25-3/8/1

2025-03-08 19:35:09 +03:00
parent d41314cfed
commit 5a4664ed67
30 changed files with 433 additions and 306 deletions
--- a/lib/controller/auth/captin/login_captin_controller.dart
+++ b/lib/controller/auth/captin/login_captin_controller.dart
@@ -1,5 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
+import 'package:crypto/crypto.dart';
+
 import 'dart:math';
 import 'package:http/http.dart' as http;
 import 'package:secure_string_operations/secure_string_operations.dart';
@@ -109,14 +111,21 @@ class LoginDriverController extends GetxController {
    return jsonDecode(response1.body)['jwt'].toString();
  }

+  String shortHash(String password) {
+    var bytes = utf8.encode(password);
+    var digest = sha256.convert(bytes);
+    return base64UrlEncode(digest.bytes);
+  }
+
  getJWT() async {
-    // await SecurityHelper.performSecurityChecks();
    dev = Platform.isAndroid ? 'android' : 'ios';
+    Log.print(
+        'box.read(BoxName.firstTimeLoadKey): ${box.read(BoxName.firstTimeLoadKey)}');
    if (box.read(BoxName.firstTimeLoadKey).toString() != 'false') {
      var response0 = await http.post(
        Uri.parse(AppLink.loginFirstTimeDriver),
        body: {
-          'id': box.read(BoxName.passengerID) ?? AK.newId,
+          'id': box.read(BoxName.driverID) ?? AK.newId,
          'password': AK.passnpassenger,
          'aud': '${AK.allowed}$dev',
        },
@@ -139,20 +148,26 @@ class LoginDriverController extends GetxController {
      } else {}
    } else {
      await EncryptionHelper.initialize();
-
+      var emailDecrypted = (box.read(BoxName.emailDriver));
+      var pass = passwordController.text.isEmpty
+          ? '$emailDecrypted${box.read(BoxName.driverID)}'
+          : '${emailController.text.toString()}${box.read(BoxName.driverID)}';
+      String hashedPassword = shortHash(pass);
      var payload = {
-        'id': box.read(BoxName.passengerID),
-        'password': AK.passnpassenger,
+        'id': box.read(BoxName.driverID),
+        'password': hashedPassword,
        'aud': '${AK.allowed}$dev',
      };
      var response1 = await http.post(
        Uri.parse(AppLink.loginJwtDriver),
        body: payload,
      );
-
+      print(response1.request);
+      print(response1.body);
+      print(payload);
      if (response1.statusCode == 200) {
        final decodedResponse1 = jsonDecode(response1.body);
-        Log.print('decodedResponse1: ${decodedResponse1}');
+        // Log.print('decodedResponse1: ${decodedResponse1}');

        final jwt = decodedResponse1['jwt'];
        await box.write(BoxName.jwt, X.c(X.c(X.c(jwt, cn), cC), cs));
@@ -196,14 +211,18 @@ class LoginDriverController extends GetxController {
  loginWithGoogleCredential(String driverID, email) async {
    isloading = true;
    update();
+    await SecurityHelper.performSecurityChecks();
+    Log.print('(BoxName.emailDriver): ${box.read(BoxName.emailDriver)}');
+
    var res = await CRUD().get(link: AppLink.loginFromGoogleCaptin, payload: {
      'email': email.toString().contains('@')
+          // ? (box.read(BoxName.emailDriver))
          ? EncryptionHelper.instance.encryptData(email)
          : email,
      'id': driverID,
    });

-    print(res);
+    print('res is $res');
    if (res == 'failure') {
      //Failure
      if (box.read(BoxName.phoneVerified).toString() == '1') {
@@ -221,6 +240,7 @@ class LoginDriverController extends GetxController {
        if (jsonDecoeded['status'] == 'success' &&
            jsonDecoeded['data'][0]['is_verified'].toString() == '1') {
          box.write(BoxName.emailDriver, (jsonDecoeded['data'][0]['email']));
+          box.write(BoxName.firstTimeLoadKey, 'false');
          box.write(BoxName.driverID, (jsonDecoeded['data'][0]['id']));
          box.write(BoxName.isTest, '1');
          box.write(BoxName.gender, (jsonDecoeded['data'][0]['gender']));
@@ -345,8 +365,7 @@ class LoginDriverController extends GetxController {
      'email': EncryptionHelper.instance.encryptData(email),
      'password': password,
    });
-    box.write(BoxName.emailDriver,
-        EncryptionHelper.instance.encryptData(email).toString());
+    box.write(BoxName.emailDriver, (email).toString());
    print(res);
    if (res == 'failure') {
      //Failure
--- a/lib/controller/auth/captin/register_captin_controller.dart
+++ b/lib/controller/auth/captin/register_captin_controller.dart
@@ -123,7 +123,8 @@ class RegisterCaptainController extends GetxController {
                      .encryptData('+2${phoneController.text}'));
              await Get.put(LoginDriverController()).loginWithGoogleCredential(
                box.read(BoxName.driverID).toString(),
-                box.read(BoxName.emailDriver).toString(),
+                EncryptionHelper.instance
+                    .encryptData(box.read(BoxName.emailDriver).toString()),
              );
            } else {
              await CRUD().post(link: AppLink.sendVerifyOtpMessage, payload: {
@@ -132,7 +133,8 @@ class RegisterCaptainController extends GetxController {
                'token_code': EncryptionHelper.instance
                    .encryptData(randomNumber.toString()),
                "driverId": box.read(BoxName.driverID),
-                "email": box.read(BoxName.emailDriver),
+                "email": EncryptionHelper.instance
+                    .encryptData(box.read(BoxName.emailDriver)),
              });

              await smsEgyptController.sendSmsEgypt(
--- a/lib/controller/auth/google_sign.dart
+++ b/lib/controller/auth/google_sign.dart
@@ -94,8 +94,9 @@ class GoogleSignInHelper {
        // Retrieve driverID and emailDriver with added validation
        final driverID =
            (box.read(BoxName.driverID)!.toString()) ?? 'Unknown ID';
-        final emailDriver =
-            (box.read(BoxName.emailDriver)!.toString()) ?? 'Unknown Email';
+        final emailDriver = EncryptionHelper.instance
+                .encryptData(box.read(BoxName.emailDriver)!.toString()) ??
+            'Unknown Email';

        // Debug print statements
        print('Driver ID: $driverID');
@@ -125,8 +126,7 @@ class GoogleSignInHelper {
    // Store driver information
    box.write(BoxName.driverID,
        (user.id) ?? 'Unknown ID'); // Ensure there's a fallback value
-    box.write(BoxName.emailDriver,
-        EncryptionHelper.instance.encryptData(user.email) ?? 'Unknown Email');
+    box.write(BoxName.emailDriver, (user.email) ?? 'Unknown Email');
  }

  // Method to handle Google Sign-Out
--- a/lib/controller/auth/login_controller.dart
+++ b/lib/controller/auth/login_controller.dart
@@ -12,6 +12,8 @@ import 'package:sefer_driver/controller/functions/secure_storage.dart';
 import 'package:sefer_driver/main.dart';
 import 'package:sefer_driver/views/auth/verify_email_page.dart';

+import '../functions/encrypt_decrypt.dart';
+
 class LoginController extends GetxController {
  final formKey = GlobalKey<FormState>();
  final formKeyAdmin = GlobalKey<FormState>();
@@ -58,7 +60,10 @@ class LoginController extends GetxController {
        if (jsonDecoeded['status'] == 'success') {
          if (jsonDecoeded['data'][0]['verified'] == 1) {
            box.write(BoxName.driverID, jsonDecoeded['data'][0]['id']);
-            box.write(BoxName.emailDriver, jsonDecoeded['data'][0]['email']);
+            box.write(
+                BoxName.emailDriver,
+                EncryptionHelper.instance
+                    .encryptData(jsonDecoeded['data'][0]['email']));
            box.write(
                BoxName.nameDriver,
                jsonDecoeded['data'][0]['first_name'] +
--- a/lib/controller/functions/crud.dart
+++ b/lib/controller/functions/crud.dart
@@ -1,4 +1,5 @@
 import 'dart:convert';
+import 'package:jwt_decoder/jwt_decoder.dart';
 import 'package:secure_string_operations/secure_string_operations.dart';
 import 'package:sefer_driver/constant/box_name.dart';
 import 'package:sefer_driver/constant/links.dart';
@@ -22,6 +23,16 @@ class CRUD {
    required String link,
    Map<String, dynamic>? payload,
  }) async {
+    bool isTokenExpired = JwtDecoder.isExpired(X
+        .r(X.r(X.r(box.read(BoxName.jwt), cn), cC), cs)
+        .toString()
+        .split(AppInformation.addd)[0]);
+    Log.print('isTokenExpired: ${isTokenExpired}');
+
+    if (isTokenExpired) {
+      await LoginDriverController().getJWT();
+    }
+    // await Get.put(LoginDriverController()).getJWT();
    var url = Uri.parse(
      link,
    );
@@ -34,6 +45,9 @@ class CRUD {
            'Bearer ${X.r(X.r(X.r(box.read(BoxName.jwt), cn), cC), cs).toString().split(AppInformation.addd)[0]}'
      },
    );
+    print(response.request);
+    print(response.body);
+    print(payload);
    if (response.statusCode == 200) {
      var jsonData = jsonDecode(response.body);
      if (jsonData['status'] == 'success') {
@@ -48,7 +62,7 @@ class CRUD {
      if (jsonData['error'] == 'Token expired') {
        // Show snackbar prompting to re-login
        await Get.put(LoginDriverController()).getJWT();
-        mySnackbarSuccess('please order now'.tr);
+        // mySnackbarSuccess('please order now'.tr);

        return 'token_expired'; // Return a specific value for token expiration
      } else {
@@ -92,7 +106,7 @@ class CRUD {

      if (jsonData['error'] == 'Token expired') {
        // Show snackbar prompting to re-login
-        await Get.put(LoginDriverController()).getJwtWallet();
+        // await Get.put(LoginDriverController()).getJwtWallet();

        return 'token_expired'; // Return a specific value for token expiration
      } else {
@@ -111,6 +125,13 @@ class CRUD {
      {required String link, Map<String, dynamic>? payload}) async {
    var url = Uri.parse(link);
    try {
+      bool isTokenExpired = JwtDecoder.isExpired(X
+          .r(X.r(X.r(box.read(BoxName.jwt), cn), cC), cs)
+          .toString()
+          .split(AppInformation.addd)[0]);
+      if (isTokenExpired) {
+        await LoginDriverController().getJWT();
+      }
      var response = await http.post(
        url,
        body: payload,
@@ -121,6 +142,9 @@ class CRUD {
          // 'Authorization': 'Bearer ${box.read(BoxName.jwt)}'
        },
      );
+      print(response.request);
+      print(response.body);
+      print(payload);
      if (response.statusCode == 200) {
        try {
          var jsonData = jsonDecode(response.body);
@@ -139,7 +163,7 @@ class CRUD {

        if (jsonData['error'] == 'Token expired') {
          // Show snackbar prompting to re-login
-          await Get.put(LoginDriverController()).getJWT();
+          // await Get.put(LoginDriverController()).getJWT();
          // MyDialog().getDialog(
          //   'Session expired. Please log in again.'.tr,
          //   '',
--- a/lib/controller/functions/encrypt_decrypt.dart
+++ b/lib/controller/functions/encrypt_decrypt.dart
@@ -43,8 +43,8 @@ class EncryptionHelper {
  /// Encrypts a string
  String encryptData(String plainText) {
    try {
-      final encrypter =
-          encrypt.Encrypter(encrypt.AES(key, mode: encrypt.AESMode.cbc));
+      final encrypter = encrypt.Encrypter(
+          encrypt.AES(key, mode: encrypt.AESMode.cbc)); // AES-GCM
      final encrypted = encrypter.encrypt(plainText, iv: iv);
      return encrypted.base64;
    } catch (e) {
--- a/lib/controller/functions/face_detect.dart
+++ b/lib/controller/functions/face_detect.dart
@@ -1,8 +1,10 @@
 import 'dart:convert';
+import 'dart:io';
 import 'package:sefer_driver/constant/api_key.dart';
 import 'package:sefer_driver/constant/box_name.dart';
 import 'package:sefer_driver/main.dart';
 import 'package:http/http.dart' as http;
+import 'package:http/io_client.dart';

 import '../../constant/links.dart';
 import 'encrypt_decrypt.dart';
@@ -13,14 +15,16 @@ Future<String> faceDetector() async {
  await Future.delayed(const Duration(seconds: 2));

  var headers = {
-    'Authorization': 'Basic ${AK.basicCompareFaces}',
+    // 'Authorization': 'Basic ${AK.basicCompareFaces}',
+    'Authorization': 'Basic hamza:12345678',
    'Content-Type': 'application/json'
  };

+  // var request = http.Request('POST', Uri.parse(//Todo
+  //     'https://face-detect-f6924392c4c7.herokuapp.com/compare_faces'));
+
  var request = http.Request(
-      'POST',
-      Uri.parse(
-          'https://face-detect-f6924392c4c7.herokuapp.com/compare_faces'));
+      'POST', Uri.parse('https://mohkh.online:5000/compare_faces'));

  request.body = json.encode({
    "url1":
@@ -32,7 +36,9 @@ Future<String> faceDetector() async {
  request.headers.addAll(headers);

  try {
-    http.StreamedResponse response = await request.send();
+    http.Client client = await createHttpClient();
+    http.StreamedResponse response = await client.send(request);
+    // http.StreamedResponse response = await request.send();

    if (response.statusCode == 200) {
      String result = await response.stream.bytesToString();
@@ -47,3 +53,43 @@ Future<String> faceDetector() async {
    return 'Error: $e';
  }
 }
+
+Future<http.Client> createHttpClient() async {
+  final SecurityContext securityContext = SecurityContext();
+  HttpClient httpClient = HttpClient(context: securityContext);
+  httpClient.badCertificateCallback =
+      (X509Certificate cert, String host, int port) => true; // Bypass SSL
+  return IOClient(httpClient);
+}
+
+Future<String> faceDetector2(String url1, String url2) async {
+  var headers = {
+    'Authorization': 'Basic hamza:12345678',
+    'Content-Type': 'application/json'
+  };
+
+  var request = http.Request(
+      'POST', Uri.parse('https://mohkh.online:5000/compare_faces'));
+
+  request.body = json.encode({"url1": url1, "url2": url2});
+  request.headers.addAll(headers);
+
+  try {
+    http.Client client = await createHttpClient(); // Use custom client
+    DateTime startTime = DateTime.now();
+    http.StreamedResponse response = await client.send(request);
+    DateTime endTime = DateTime.now();
+    Duration duration = endTime.difference(startTime);
+    if (response.statusCode == 200) {
+      print(await response.stream.bytesToString());
+      print(duration.inSeconds);
+
+      return await response.stream.bytesToString();
+    } else {
+      print(await response.stream.bytesToString());
+      return 'Error: ${response.reasonPhrase}';
+    }
+  } catch (e) {
+    return 'Exception: $e';
+  }
+}
--- a/lib/controller/functions/gemeni.dart
+++ b/lib/controller/functions/gemeni.dart
@@ -2,6 +2,9 @@ import 'dart:async';
 import 'dart:convert';
 import 'dart:io';
 import 'dart:math';
+import 'dart:convert';
+import 'package:crypto/crypto.dart';
+
 import 'package:sefer_driver/constant/box_name.dart';
 import 'package:sefer_driver/constant/info.dart';
 import 'package:sefer_driver/constant/links.dart';
@@ -400,7 +403,10 @@ class AI extends GetxController {
      'last_name': EncryptionHelper.instance.encryptData(
              responseNonIdCardFront['full_name'].toString().split(' ').last) ??
          'Not specified',
-      'email': box.read(BoxName.emailDriver)?.toString() ?? 'Not specified',
+      'email': EncryptionHelper.instance
+              .encryptData(box.read(BoxName.emailDriver))
+              ?.toString() ??
+          'Not specified',
      'phone': box.read(BoxName.phoneDriver)?.toString() ?? 'Not specified',
      'id': box.read(BoxName.driverID)?.toString() ?? 'Not specified',
      'password':
@@ -494,9 +500,21 @@ class AI extends GetxController {
    }
  }

+  String shortHash(String password) {
+    var bytes = utf8.encode(password);
+    var digest = sha256.convert(bytes);
+    return base64UrlEncode(digest.bytes);
+  }
+
  Future<void> addDriverEgypt() async {
    isLoading = true;
    update();
+    final loginDriverController = Get.put(LoginDriverController());
+
+    var pass = loginDriverController.passwordController.text.isEmpty
+        ? '${box.read(BoxName.emailDriver)}${box.read(BoxName.driverID)}'
+        : '${loginDriverController.emailController.text.toString()}${box.read(BoxName.driverID)}';
+    String hashedPassword = shortHash(pass);

    var payload = {
      'first_name': EncryptionHelper.instance.encryptData(
@@ -505,16 +523,13 @@ class AI extends GetxController {
      'last_name': EncryptionHelper.instance.encryptData(
              responseIdEgyptDriverLicense['lastName'].toString()) ??
          'Not specified',
-      'email': box.read(BoxName.emailDriver)?.toString() ?? 'Not specified',
+      'email': EncryptionHelper.instance
+              .encryptData(box.read(BoxName.emailDriver))
+              .toString() ??
+          'Not specified',
      'phone': box.read(BoxName.phoneDriver)?.toString() ?? 'Not specified',
      'id': box.read(BoxName.driverID)?.toString() ?? 'Not specified',
-      'password':
-          Get.put(LoginDriverController()).passwordController.text.isEmpty
-              ? box.read(BoxName.emailDriver).toString()
-              : Get.find<LoginDriverController>()
-                  .passwordController
-                  .text
-                  .toString(),
+      'password': hashedPassword.toString(),
      'gender': EncryptionHelper.instance
              .encryptData(responseIdEgyptBack['gender'].toString()) ??
          'Not specified',
@@ -825,7 +840,7 @@ class AI extends GetxController {
      var json = jsonDecode(extractedString);
      // Log.print('extractedString: ${extractedString}');
      var textValues = CRUD().extractTextFromLines(json);
-      Log.print('textValues: ${textValues}');
+      Log.print('textValues: $textValues');
      // Log.print('json: ${json}');

      DocumentType detectedType = checkDocumentType(textValues);
@@ -1141,7 +1156,7 @@ class AI extends GetxController {
            jsonDecode(responseData['content'][0]['text']);
      } else if (idType == 'non_id_front') {
        responseNonIdCardFront = jsonDecode(responseData['content'][0]['text']);
-        Log.print('responseNonIdCardFront: ${responseNonIdCardFront}');
+        Log.print('responseNonIdCardFront: $responseNonIdCardFront');
      } else if (idType == 'non_id_back') {
        responseNonIdCardBack = jsonDecode(responseData['content'][0]['text']);
      }
--- a/lib/controller/functions/location_controller.dart
+++ b/lib/controller/functions/location_controller.dart
@@ -37,8 +37,12 @@ class LocationController extends GetxController {
  void onInit() async {
    super.onInit();
    location = Location(); // Initialize the location object
+    await location.changeSettings(
+        accuracy: LocationAccuracy.high,
+        interval: 5000, // 5 seconds
+        distanceFilter: 0);
    await getLocation(); // Fetch the location immediately
-    startLocationUpdates(); // Start periodic location updates
+    await startLocationUpdates(); // Start periodic location updates

    totalPoints = Get.put(CaptainWalletController()).totalPoints.toString();
    isActive = Get.put(HomeCaptainController()).isActive;
@@ -70,7 +74,6 @@ class LocationController extends GetxController {
      final locationData = location as Map<String, dynamic>;

      // Debugging: Print location data
-      print('Location Data: $locationData');

      // Convert string values to double
      final minLatitude =
@@ -83,7 +86,6 @@ class LocationController extends GetxController {
          double.tryParse(locationData['max_longitude'].toString()) ?? 0.0;

      // Debugging: Print converted values
-      // print(
      //     'Converted Values: minLatitude=$minLatitude, maxLatitude=$maxLatitude, minLongitude=$minLongitude, maxLongitude=$maxLongitude');

      if (latitude >= minLatitude &&
@@ -92,7 +94,6 @@ class LocationController extends GetxController {
          longitude <= maxLongitude) {
        box.write(BoxName.serverChosen,
            EncryptionHelper.instance.decryptData(locationData['server_link']));
-        // Log.print(
        //     'locationData----server_link: ${locationData['server_link']}');
        return locationData['name'];
      }
@@ -122,12 +123,10 @@ class LocationController extends GetxController {
              if (myLocation == null) {
                return;
              }
-              // print(
              //     'Latitude: ${myLocation.latitude}, Longitude: ${myLocation.longitude}');

              String area =
                  getLocationArea(myLocation.latitude, myLocation.longitude);
-              print('Determined Area: $area');

              if (box.read(BoxName.driverID) != null) {
                await CRUD().post(
@@ -160,9 +159,7 @@ class LocationController extends GetxController {
              }
            }
          }
-        } catch (e) {
-          Log.print('Error during location update: $e');
-        }
+        } catch (e) {}
      });
    }
  }
--- a/lib/controller/functions/package_info.dart
+++ b/lib/controller/functions/package_info.dart
@@ -235,12 +235,7 @@ class SecurityHelper {
    // debugPrint("Bundle ID: $bundleId"); // Print the bundle ID

    // Check for security risks and potentially show a warning
-    if (isNotTrust ||
-        isJailBroken ||
-        isTampered ||
-        isDevMode ||
-        isOnExternalStorage ||
-        !isRealDevice) {
+    if (isJailBroken || isNotTrust || !isRealDevice || isTampered) {
      //  print("security_warning".tr);  //using easy_localization
      // Use a more robust approach to show a warning, like a dialog:
      _showSecurityWarning();
--- a/lib/controller/functions/secure_storage.dart
+++ b/lib/controller/functions/secure_storage.dart
@@ -39,16 +39,13 @@ class AppInitializer {
  List<Map<String, dynamic>> links = [];

  Future<void> initializeApp() async {
-    Log.print('box.read("jwt"): ${box.read(BoxName.jwt)}');
    if (box.read(BoxName.jwt) == null) {
      await LoginDriverController().getJWT();
    } else {
-      print('firstTimeLoadKey ${box.read(BoxName.firstTimeLoadKey)}');
      bool isTokenExpired = JwtDecoder.isExpired(X
          .r(X.r(X.r(box.read(BoxName.jwt), cn), cC), cs)
          .toString()
          .split(AppInformation.addd)[0]);
-      Log.print('isTokenExpired: $isTokenExpired');
      if (isTokenExpired) {
        await LoginDriverController().getJWT();
      }
@@ -73,7 +70,6 @@ class AppInitializer {
    try {
      var res =
          await CRUD().get(link: AppLink.getLocationAreaLinks, payload: {});
-      // Log.print('res: ${res}');
      if (res != 'failure') {
        links = List<Map<String, dynamic>>.from(jsonDecode(res)['message']);
        await box.remove(BoxName.locationName);
@@ -93,8 +89,6 @@ class AppInitializer {
        await box.write(BoxName.paymentLink,
            EncryptionHelper.instance.decryptData(links[4]['server_link']));
      }
-    } catch (e) {
-      print('Error fetching or decoding location data: $e');
-    }
+    } catch (e) {}
  }
 }
--- a/lib/controller/functions/sms_egypt_controller.dart
+++ b/lib/controller/functions/sms_egypt_controller.dart
@@ -57,7 +57,8 @@ class SmsEgyptController extends GetxController {

      await Get.put(LoginDriverController()).loginWithGoogleCredential(
        box.read(BoxName.driverID).toString(),
-        box.read(BoxName.emailDriver).toString(),
+        EncryptionHelper.instance
+            .encryptData(box.read(BoxName.emailDriver).toString()),
      );
    } else {
      Get.defaultDialog(
--- a/lib/controller/local/translations.dart
+++ b/lib/controller/local/translations.dart
@@ -65,6 +65,7 @@ class MyTranslation extends Translations {
          "Order Applied": "تم تطبيق الطلب",

          //firebase above
+          "cancel": "إلغاء",
          'please order now': " ‏الرجاء الطلب مرة أخرى",
          'Session expired. Please log in again.':
              'انتهت الجلسة. يرجى تسجيل الدخول مرة أخرى.',
@@ -209,6 +210,10 @@ class MyTranslation extends Translations {
          "How much longer will you be?": "‏قدامك قد إيه",
          "Phone number is verified before": "تم التحقق من رقم الهاتف مسبقاً",
          "Change Ride": "تغيير الرحلة",
+          "Authentication failed": "فشل المصادقة",
+          "Biometric Authentication": "المصادقة البيومترية",
+          "You should use Touch ID or Face ID to confirm payment":
+              "يجب عليك استخدام Touch ID أو Face ID لتأكيد الدفع",
          "Cost Of Trip IS": "تكلفة الرحلة هي",
          "You must be recharge your Account":
              "رصيد حسابك غير كافٍ. يرجى إعادة الشحن للمتابعة",
--- a/lib/controller/payment/payment_controller.dart
+++ b/lib/controller/payment/payment_controller.dart
@@ -11,6 +11,7 @@ import 'package:flutter_paypal/flutter_paypal.dart';
 import 'package:flutter_stripe/flutter_stripe.dart';
 import 'package:get/get.dart';
 import 'package:local_auth/local_auth.dart';
+import 'package:sefer_driver/views/widgets/mydialoug.dart';

 import '../../constant/box_name.dart';
 import '../../constant/colors.dart';
@@ -158,8 +159,7 @@ class PaymentController extends GetxController {
        billingDetails: BillingDetails(
            name: EncryptionHelper.instance
                .decryptData(box.read(BoxName.nameDriver)),
-            email: EncryptionHelper.instance
-                .decryptData(box.read(BoxName.emailDriver)),
+            email: (box.read(BoxName.emailDriver)),
            phone: EncryptionHelper.instance
                .decryptData(box.read(BoxName.phoneDriver)),
            address: Address(
@@ -578,6 +578,9 @@ class PaymentController extends GetxController {
        // Authenticate the user
        bool didAuthenticate = await LocalAuthentication().authenticate(
          localizedReason: 'Use Touch ID or Face ID to confirm payment',
+          options: const AuthenticationOptions(
+            biometricOnly: true, // Only biometrics (no fallback to PIN/pattern)
+          ),
        );
        if (didAuthenticate) {
          final PaymobResponseWallet? response =
@@ -589,32 +592,10 @@ class PaymentController extends GetxController {
            billingData: PaymobBillingDataWallet(),
            onPayment: (PaymobResponseWallet response) {},
          );
-          // Log.print('message: ${response!.message}');
-          // Log.print('responseCode: ${response.responseCode}');
-          // Log.print('success: ${response.success}');
-          // Log.print('transactionID: ${response.transactionID}');
          if (response!.success == true &&
              response.message.toString() == 'Approved') {
-            // Log.print('transactionID wewer: ${response.transactionID}');
            Toast.show(context, 'Payment Successful'.tr, AppColor.greenColor);
            method();
-            // Get.defaultDialog(
-            //   barrierDismissible: false,
-            //   title: 'Payment Successful'.tr,
-            //   titleStyle: AppStyle.title,
-            //   content: Text(
-            //     'The payment was approved.'.tr,
-            //     style: AppStyle.title,
-            //   ),
-            //   confirm: MyElevatedButton(
-            //     title: 'OK'.tr,
-            //     kolor: AppColor.greenColor,
-            //     onPressed: () async {
-            //       Get.back();
-            //       method();
-            //     },
-            //   ),
-            // );
          } else {
            Get.defaultDialog(
              barrierDismissible: false,
@@ -653,57 +634,64 @@ class PaymentController extends GetxController {
          }
        } else {
          // Authentication failed, handle accordingly
+          MyDialog().getDialog('Authentication failed'.tr, ''.tr, () {
+            Get.back();
+          });
        }
      } else {
-        final PaymobResponse? response = await PaymobPayment.instance.pay(
-          context: context,
-          currency: currency, //"EGP",
-          amountInCents: newAmount, // 19.00 EGP
-          billingData: PaymobBillingData(),
-          onPayment: (PaymobResponse response) {},
-        );
+        MyDialog().getDialog('Biometric Authentication'.tr,
+            'You should use Touch ID or Face ID to confirm payment'.tr, () {
+          Get.back();
+        });
+        // final PaymobResponse? response = await PaymobPayment.instance.pay(
+        //   context: context,
+        //   currency: currency, //"EGP",
+        //   amountInCents: newAmount, // 19.00 EGP
+        //   billingData: PaymobBillingData(),
+        //   onPayment: (PaymobResponse response) {},
+        // );

-        // if (response!.responseCode == 'APPROVED') {
-        if (response!.responseCode == '200' && response.success == true) {
-          Toast.show(context, 'Payment Successful'.tr, AppColor.greenColor);
-          method();
-          // Get.defaultDialog(
-          //   barrierDismissible: false,
-          //   title: 'Payment Successful'.tr,
-          //   titleStyle: AppStyle.title,
-          //   // backgroundColor: AppColor.greenColor,
-          //   content: Text(
-          //     'The payment was approved.'.tr,
-          //     style: AppStyle.title,
-          //   ),
-          //   confirm: MyElevatedButton(
-          //     kolor: AppColor.greenColor,
-          //     title: 'OK'.tr,
-          //     onPressed: () async {
-          //       Get.back();
-          //       method();
-          //     },
-          //   ),
-          // );
-        } else {
-          Get.defaultDialog(
-            barrierDismissible: false,
-            // backgroundColor: AppColor.redColor,
-            title: 'Payment Failed'.tr,
-            content: Text(
-              'The payment was not approved. Please try again.'.tr,
-              textAlign: TextAlign.center,
-              style: AppStyle.title,
-            ),
-            confirm: MyElevatedButton(
-              title: 'OK'.tr,
-              kolor: AppColor.redColor,
-              onPressed: () async {
-                Get.back();
-              },
-            ),
-          );
-        }
+        // // if (response!.responseCode == 'APPROVED') {
+        // if (response!.responseCode == '200' && response.success == true) {
+        //   Toast.show(context, 'Payment Successful'.tr, AppColor.greenColor);
+        //   method();
+        // Get.defaultDialog(
+        //   barrierDismissible: false,
+        //   title: 'Payment Successful'.tr,
+        //   titleStyle: AppStyle.title,
+        //   // backgroundColor: AppColor.greenColor,
+        //   content: Text(
+        //     'The payment was approved.'.tr,
+        //     style: AppStyle.title,
+        //   ),
+        //   confirm: MyElevatedButton(
+        //     kolor: AppColor.greenColor,
+        //     title: 'OK'.tr,
+        //     onPressed: () async {
+        //       Get.back();
+        //       method();
+        //     },
+        //   ),
+        // );
+        // } else {
+        //   Get.defaultDialog(
+        //     barrierDismissible: false,
+        //     // backgroundColor: AppColor.redColor,
+        //     title: 'Payment Failed'.tr,
+        //     content: Text(
+        //       'The payment was not approved. Please try again.'.tr,
+        //       textAlign: TextAlign.center,
+        //       style: AppStyle.title,
+        //     ),
+        //     confirm: MyElevatedButton(
+        //       title: 'OK'.tr,
+        //       kolor: AppColor.redColor,
+        //       onPressed: () async {
+        //         Get.back();
+        //       },
+        //     ),
+        //   );
+        // }
      }
    } catch (e) {
      Get.defaultDialog(
--- a/lib/controller/payment/paymob.dart
+++ b/lib/controller/payment/paymob.dart
@@ -137,8 +137,7 @@ class PaymobManager extends GetxController {
            EncryptionHelper.instance.decryptData(box.read(BoxName.nameDriver)),
        "last_name": EncryptionHelper.instance
            .decryptData(box.read(BoxName.lastNameDriver)),
-        "email": EncryptionHelper.instance
-            .decryptData(box.read(BoxName.emailDriver)),
+        "email": (box.read(BoxName.emailDriver)),
        "phone_number": EncryptionHelper.instance
            .decryptData(box.read(BoxName.phoneDriver)),
        "apartment": "NA",
--- a/lib/controller/payment/paymob/paymob_response.dart
+++ b/lib/controller/payment/paymob/paymob_response.dart
@@ -224,8 +224,7 @@ class PaymobBillingData {

  Map<String, dynamic> toJson() {
    return {
-      "email":
-          EncryptionHelper.instance.decryptData(box.read(BoxName.emailDriver)),
+      "email": (box.read(BoxName.emailDriver)),
      "first_name": box.read(BoxName.nameDriver),
      "last_name": box.read(BoxName.nameDriver),
      "phone_number":
--- a/lib/controller/payment/paymob/paymob_wallet.dart
+++ b/lib/controller/payment/paymob/paymob_wallet.dart
@@ -267,8 +267,7 @@ class PaymobBillingDataWallet {

  Map<String, dynamic> toJson() {
    return {
-      "email":
-          EncryptionHelper.instance.decryptData(box.read(BoxName.emailDriver)),
+      "email": (box.read(BoxName.emailDriver)),
      "first_name": box.read(BoxName.name) ?? box.read(BoxName.nameDriver),
      "last_name": box.read(BoxName.name) ?? box.read(BoxName.nameDriver),
      "phone_number": (box.read(BoxName.phoneWallet)),
--- a/lib/controller/rate/rate_app_controller.dart
+++ b/lib/controller/rate/rate_app_controller.dart
@@ -42,9 +42,7 @@ class RatingController extends GetxController {
      "name": box.read(BoxName.driverID) != null
          ? box.read(BoxName.nameDriver)
          : box.read(BoxName.name),
-      "email": EncryptionHelper.instance
-          .decryptData(box.read(BoxName.emailDriver))
-          .toString(),
+      "email": (box.read(BoxName.emailDriver)).toString(),
      "phone": EncryptionHelper.instance
          .decryptData(box.read(BoxName.phoneDriver))
          .toString(),