25-3/8/1

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

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(

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

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'] +