25-5-30/1

2025-05-30 16:58:17 +03:00
parent bdf380b925
commit cf8966ea29
41 changed files with 538 additions and 904 deletions
--- a/lib/controller/auth/google_sign.dart
+++ b/lib/controller/auth/google_sign.dart
@@ -167,11 +167,9 @@ class GoogleSignInHelper {
    // Store driver information

    box.write(BoxName.passengerID, user.id);
-    box.write(BoxName.email, EncryptionHelper.instance.encryptData(user.email));
-    box.write(BoxName.name,
-        EncryptionHelper.instance.encryptData(user.displayName.toString()));
-    box.write(BoxName.passengerPhotoUrl,
-        EncryptionHelper.instance.encryptData(user.photoUrl.toString()));
+    box.write(BoxName.email, (user.email));
+    box.write(BoxName.name, (user.displayName.toString()));
+    box.write(BoxName.passengerPhotoUrl, (user.photoUrl.toString()));

    // Perform any additional sign-up tasks or API calls here
    // For example, you can send the user data to your server for registration
--- a/lib/controller/auth/login_controller.dart
+++ b/lib/controller/auth/login_controller.dart
@@ -196,10 +196,8 @@ class LoginController extends GetxController {

    var res =
        await CRUD().get(link: AppLink.loginFromGooglePassenger, payload: {
-      'email': email.toString().contains('@')
-          ? EncryptionHelper.instance.encryptData(email)
-          : email,
-      'id': passengerID,
+      'email': email.toString(),
+      'id': passengerID.toString(),
      "platform": Platform.isAndroid ? 'android' : 'ios',
      "appName": AppInformation.appName,
    });
@@ -229,59 +227,112 @@ class LoginController extends GetxController {
          box.write(BoxName.firstTimeLoadKey, 'false');
          d['inviteCode'] != null
              ? box.write(
-                  BoxName.inviteCode,
-                  EncryptionHelper.instance
-                          .decryptData(d['inviteCode'].toString()) ??
-                      'none')
+                  BoxName.inviteCode, (d['inviteCode'].toString()) ?? 'none')
              : null;

          var token = await CRUD().get(link: AppLink.getTokens, payload: {
            'passengerID': box.read(BoxName.passengerID).toString()
          });
-          var fingerPrint = DeviceHelper.getDeviceFingerprint().toString();
+          var fingerPrint = await DeviceHelper.getDeviceFingerprint();
+          Log.print('fingerPrint 0: ${fingerPrint}');
          await storage.write(key: BoxName.fingerPrint, value: fingerPrint);
-          if (token != 'failure') {
-            if ((jsonDecode(token)['data'][0]['token'].toString()) !=
-                box.read(BoxName.tokenFCM)) {
-              MyDialog().getDialog('change device'.tr, 'token change'.tr,
-                  () async {
-                List<Future> updatetoken = [
-                  CRUD().post(
-                      link: "${AppLink.server}/ride/firebase/add.php",
-                      payload: {
-                        'token': box.read(BoxName.tokenFCM),
-                        'passengerID': box.read(BoxName.passengerID).toString(),
-                        'fingerPrint': (fingerPrint).toString()
-                      }),
-                  CRUD().post(
-                      link:
-                          "${AppLink.tripzAlexandriaServer}/ride/firebase/add.php",
-                      payload: {
-                        'token': box.read(BoxName.tokenFCM),
-                        'passengerID': box.read(BoxName.passengerID).toString(),
-                        'fingerPrint': (fingerPrint).toString()
-                      }),
-                  CRUD().post(
-                      link: "${AppLink.tripzGizaServer}/ride/firebase/add.php",
-                      payload: {
-                        'token': box.read(BoxName.tokenFCM),
-                        'passengerID': box.read(BoxName.passengerID).toString(),
-                        'fingerPrint': (fingerPrint).toString()
-                      }),
-                ];
-                // cameras = await availableCameras();
-                await Future.wait(updatetoken);
-                Get.put(FirebaseMessagesController())
-                    .sendNotificationToDriverMAP(
-                  'token change'.tr,
-                  'change device'.tr,
-                  EncryptionHelper.instance.decryptData(
-                      jsonDecode(token)['data'][0]['token'].toString()),
-                  [],
-                  'cancel.wav',
-                );
-              });

+          if (token != 'failure') {
+            if ((jsonDecode(token)['message']['token'].toString()) !=
+                box.read(BoxName.tokenFCM)) {
+              // MyDialog().getDialog('change device'.tr, 'token change'.tr,
+              //     () async {
+              //   List<Future> updatetoken = [
+              //     CRUD().post(
+              //         link: "${AppLink.server}/ride/firebase/add.php",
+              //         payload: {
+              //           'token': box.read(BoxName.tokenFCM),
+              //           'passengerID': box.read(BoxName.passengerID).toString(),
+              //           'fingerPrint': (fingerPrint).toString()
+              //         }),
+              //     CRUD().post(
+              //         link:
+              //             "${AppLink.tripzAlexandriaServer}/ride/firebase/add.php",
+              //         payload: {
+              //           'token': box.read(BoxName.tokenFCM),
+              //           'passengerID': box.read(BoxName.passengerID).toString(),
+              //           'fingerPrint': (fingerPrint).toString()
+              //         }),
+              //     CRUD().post(
+              //         link: "${AppLink.tripzGizaServer}/ride/firebase/add.php",
+              //         payload: {
+              //           'token': box.read(BoxName.tokenFCM),
+              //           'passengerID': box.read(BoxName.passengerID).toString(),
+              //           'fingerPrint': (fingerPrint).toString()
+              //         }),
+              //   ];
+              //   // cameras = await availableCameras();
+              //   await Future.wait(updatetoken);
+              //   Get.put(FirebaseMessagesController())
+              //       .sendNotificationToDriverMAP(
+              //     'token change'.tr,
+              //     'change device'.tr,
+              //     (jsonDecode(token)['data'][0]['token'].toString()),
+              //     [],
+              //     'cancel.wav',
+              //   );
+              // });
+              await Get.defaultDialog(
+                title: 'Device Change Detected'.tr,
+                middleText:
+                    'You can only use one device at a time. This device will now be set as your active device.'
+                        .tr,
+                textConfirm: 'OK'.tr,
+                confirmTextColor: Colors.white,
+                onConfirm: () async {
+                  Get.back(); // Close dialog
+
+                  /// تحديث التوكين في السيرفرات
+                  List<Future> updatetoken = [
+                    CRUD().post(
+                        link: "${AppLink.server}/ride/firebase/add.php",
+                        payload: {
+                          'token': box.read(BoxName.tokenFCM),
+                          'passengerID':
+                              box.read(BoxName.passengerID).toString(),
+                          'fingerPrint': fingerPrint
+                        }),
+                    CRUD().post(
+                        link:
+                            "${AppLink.tripzAlexandriaServer}/ride/firebase/add.php",
+                        payload: {
+                          'token': box.read(BoxName.tokenFCM),
+                          'passengerID':
+                              box.read(BoxName.passengerID).toString(),
+                          'fingerPrint': fingerPrint
+                        }),
+                    CRUD().post(
+                        link:
+                            "${AppLink.tripzGizaServer}/ride/firebase/add.php",
+                        payload: {
+                          'token': box.read(BoxName.tokenFCM),
+                          'passengerID':
+                              box.read(BoxName.passengerID).toString(),
+                          'fingerPrint': fingerPrint
+                        }),
+                  ];
+
+                  await Future.wait(updatetoken);
+
+                  /// إشعار للسائق بأنه تم تغيير الجهاز
+                  await Get.put(FirebaseMessagesController())
+                      .sendNotificationToDriverMAP(
+                    'token change'.tr,
+                    'change device'.tr,
+                    jsonDecode(token)['message']['token'].toString(),
+                    [],
+                    'cancel.wav',
+                  );
+
+                  /// التوجه للصفحة الرئيسية
+                  Get.offAll(() => const MapPagePassenger());
+                },
+              );
              Future.delayed(const Duration(seconds: 1));

              Get.defaultDialog(
@@ -305,8 +356,7 @@ class LoginController extends GetxController {
              box.read(BoxName.isInstall).toString() != '1') {
            await CRUD()
                .post(link: AppLink.updatePassengersInvitation, payload: {
-              "inviteCode": EncryptionHelper.instance
-                  .encryptData(box.read(BoxName.inviteCode).toString()),
+              "inviteCode": (box.read(BoxName.inviteCode).toString()),
              "passengerID": box.read(BoxName.passengerID).toString(),
            });
            Get.defaultDialog(
@@ -318,7 +368,7 @@ class LoginController extends GetxController {
                try {
                  CRUD().post(link: AppLink.addPassengersPromo, payload: {
                    "promoCode":
-                        'S-${EncryptionHelper.instance.decryptData(box.read(BoxName.name)).toString().split(' ')[0]}',
+                        'S-${(box.read(BoxName.name)).toString().split(' ')[0]}',
                    "amount": '25',
                    "passengerID": box.read(BoxName.passengerID).toString(),
                    "description": 'promo first'
@@ -354,11 +404,12 @@ class LoginController extends GetxController {
  void login() async {
    isloading = true;
    update();
-    var res =
-        await CRUD().get(link: AppLink.loginFromGooglePassenger, payload: {
-      'email': EncryptionHelper.instance.encryptData(emailController.text),
-      'id': passwordController.text
-    });
+    var res = await CRUD().get(
+        link: AppLink.loginFromGooglePassenger,
+        payload: {
+          'email': (emailController.text),
+          'id': passwordController.text
+        });

    isloading = false;
    update();
--- a/lib/controller/auth/register_controller.dart
+++ b/lib/controller/auth/register_controller.dart
@@ -32,7 +32,7 @@ class RegisterController extends GetxController {
  TextEditingController phoneController = TextEditingController();
  TextEditingController passwordController = TextEditingController();
  TextEditingController siteController = TextEditingController();
-  TextEditingController verfyCode = TextEditingController();
+  // TextEditingController verfyCode = TextEditingController();
  TextEditingController verifyCode = TextEditingController();
  int remainingTime = 300; // 5 minutes in seconds
  bool isSent = false;
@@ -125,9 +125,6 @@ class RegisterController extends GetxController {
      // Initialize SmsEgyptController
      smsEgyptController = Get.put(SmsEgyptController());

-      // Generate a random OTP
-      int randomNumber = Random().nextInt(100000) + 1;
-
      isLoading = true;
      update();

@@ -143,8 +140,7 @@ class RegisterController extends GetxController {
          var responseChecker = await CRUD().post(
            link: AppLink.checkPhoneNumberISVerfiedPassenger,
            payload: {
-              'phone_number':
-                  EncryptionHelper.instance.encryptData(phoneNumber),
+              'phone_number': (phoneNumber),
              'email': box.read(BoxName.email),
            },
          );
@@ -157,20 +153,16 @@ class RegisterController extends GetxController {
              Get.snackbar('Phone number is verified before'.tr, '',
                  backgroundColor: AppColor.greenColor);
              box.write(BoxName.isVerified, '1');
-              box.write(BoxName.phone,
-                  EncryptionHelper.instance.encryptData(phoneNumber));
+              box.write(BoxName.phone, (phoneNumber));
              Get.offAll(const MapPagePassenger());
            } else {
-              await sendOtp(phoneNumber, randomNumber, isEgyptianNumber,
-                  smsEgyptController);
+              await sendOtp(phoneNumber, isEgyptianNumber, smsEgyptController);
            }
          } else {
-            await sendOtp(phoneNumber, randomNumber, isEgyptianNumber,
-                smsEgyptController);
+            await sendOtp(phoneNumber, isEgyptianNumber, smsEgyptController);
          }
        } else if (phoneNumber.length > 9) {
-          sendOtp(
-              phoneNumber, randomNumber, isEgyptianNumber, smsEgyptController);
+          sendOtp(phoneNumber, isEgyptianNumber, smsEgyptController);
        }
      } else {
        MyDialog().getDialog(
@@ -189,44 +181,38 @@ class RegisterController extends GetxController {
  }

 // Helper function to send OTP or WhatsApp message based on phone number location
-  Future<void> sendOtp(String phoneNumber, int otp, bool isEgyptian,
+  Future<void> sendOtp(String phoneNumber, bool isEgyptian,
      SmsEgyptController controller) async {
    // Trim any leading or trailing whitespace from the phone number
    phoneNumber = phoneNumber.trim();
    var dd = await CRUD().post(link: AppLink.sendVerifyOtpMessage, payload: {
-      'phone_number': EncryptionHelper.instance.encryptData(phoneNumber),
-      'token': EncryptionHelper.instance.encryptData(otp.toString()),
+      'phone_number': (phoneNumber),
    });
    Log.print('dd: ${dd}');

    // Common Registration Logic (extracted for reuse)
    Future<void> registerUser() async {
      await CRUD().post(link: AppLink.updatePhoneInvalidSMSPassenger, payload: {
-        "phone_number": EncryptionHelper.instance
-            .encryptData(Get.find<RegisterController>().phoneController.text)
+        "phone_number": (Get.find<RegisterController>().phoneController.text)
      });

-      box.write(BoxName.phone,
-          EncryptionHelper.instance.encryptData(phoneController.text));
+      box.write(BoxName.phone, (phoneController.text));

-      var nameParts = EncryptionHelper.instance
-          .decryptData(box.read(BoxName.name))
-          .toString()
-          .split(' ');
+      var nameParts = (box.read(BoxName.name)).toString().split(' ');
      var firstName = nameParts.isNotEmpty ? nameParts[0] : 'unknown';
      var lastName = nameParts.length > 1 ? nameParts[1] : 'unknown';

      var payload = {
        'id': box.read(BoxName.passengerID),
-        'phone': EncryptionHelper.instance.encryptData(phoneController.text),
+        'phone': (phoneController.text),
        'email': box.read(BoxName.email),
-        'password': EncryptionHelper.instance.encryptData(
-            'unknown'), //Consider if you *really* want to store 'unknown' passwords
-        'gender': EncryptionHelper.instance.encryptData('unknown'),
-        'birthdate': EncryptionHelper.instance.encryptData('2002-01-01'),
+        'password':
+            ('unknown'), //Consider if you *really* want to store 'unknown' passwords
+        'gender': ('unknown'),
+        'birthdate': ('2002-01-01'),
        'site': box.read(BoxName.passengerPhotoUrl) ?? 'unknown',
-        'first_name': EncryptionHelper.instance.encryptData(firstName),
-        'last_name': EncryptionHelper.instance.encryptData(lastName),
+        'first_name': (firstName),
+        'last_name': (lastName),
      };

      var res1 = await CRUD().post(
@@ -253,8 +239,7 @@ class RegisterController extends GetxController {
        box.write(BoxName.isVerified, '1');
        box.write(
            BoxName.isFirstTime, '0'); //Double-check the logic for isFirstTime
-        box.write(BoxName.phone,
-            EncryptionHelper.instance.encryptData(phoneController.text));
+        box.write(BoxName.phone, (phoneController.text));

        Get.put(LoginController()).loginUsingCredentials(
          box.read(BoxName.passengerID).toString(),
@@ -264,7 +249,8 @@ class RegisterController extends GetxController {
    }

    if (isEgyptian) {
-      await registerUser(); // Use the common registration logic
+      // verifySMSCode();
+      // await registerUser(); // Use the common registration logic
      // await controller.sendSmsEgypt(phoneNumber, otp.toString()); // Optional: Send SMS if Egyptian
    } else if (phoneController.text.toString().length >= 10) {
      await registerUser(); // Use the common registration logic for non-Egyptian users as well.
@@ -283,24 +269,19 @@ class RegisterController extends GetxController {
    try {
      if (formKey3.currentState!.validate()) {
        var res = await CRUD().post(link: AppLink.verifyOtpPassenger, payload: {
-          'phone_number': "201023248456",
-          'token': ("74787"),
+          'phone_number': phoneController.text,
+          'token': verifyCode.text,
        });

        if (res != 'failure') {
-          box.write(BoxName.phone,
-              EncryptionHelper.instance.encryptData(phoneController.text));
-          var nameParts = EncryptionHelper.instance
-              .decryptData(box.read(BoxName.name))
-              .toString()
-              .split(' ');
+          box.write(BoxName.phone, (phoneController.text));
+          var nameParts = (box.read(BoxName.name)).toString().split(' ');
          var firstName = nameParts.isNotEmpty ? nameParts[0] : 'unknown';
          var lastName = nameParts.length > 1 ? nameParts[1] : 'unknown';

          var payload = {
            'id': box.read(BoxName.passengerID),
-            'phone':
-                EncryptionHelper.instance.decryptData(phoneController.text),
+            'phone': (phoneController.text),
            'email': box.read(BoxName.email),
            'password': 'unknown',
            'gender': 'unknown',
@@ -332,8 +313,7 @@ class RegisterController extends GetxController {

            box.write(BoxName.isVerified, '1');
            box.write(BoxName.isFirstTime, '0');
-            box.write(BoxName.phone,
-                EncryptionHelper.instance.decryptData(phoneController.text));
+            box.write(BoxName.phone, (phoneController.text));

            Get.put(LoginController()).loginUsingCredentials(
              box.read(BoxName.passengerID).toString(),
@@ -362,7 +342,7 @@ class RegisterController extends GetxController {
  sendVerifications() async {
    var res = await CRUD().post(link: AppLink.verifyEmail, payload: {
      'email': emailController.text,
-      'token': verfyCode.text,
+      'token': verifyCode.text,
    });
    var dec = jsonDecode(res);
    if (dec['status'] == 'success') {