Update: 2026-07-26 01:03:40

backend/auth/driver/login.php

@@ -2,13 +2,45 @@
 
 require_once __DIR__ . '/../../connect.php';
 
+global $blindIndex;
+
 $email = filterRequest('email');
 $phone = filterRequest('phone');
 $password = filterRequest('password');
 
-// تشفير الحقول المطلوبة قبل الاستعلام
-$email = $encryptionHelper->encryptData($email);
-$phone = $encryptionHelper->encryptData($phone);
+if (empty($phone) && empty($email)) {
+    jsonError("Phone or email is required.");
+    exit;
+}
+
+$conditions = [];
+$params = [];
+
+if (!empty($phone)) {
+    $phoneEnc = $encryptionHelper->encryptData($phone);
+    $conditions[] = "driver.phone = :phone";
+    $params[':phone'] = $phoneEnc;
+
+    $phoneBidx = $blindIndex ? $blindIndex->index('driver.phone', $phone) : null;
+    if ($phoneBidx) {
+        $conditions[] = "driver.phone_bidx = :phone_bidx";
+        $params[':phone_bidx'] = $phoneBidx;
+    }
+}
+
+if (!empty($email)) {
+    $emailEnc = $encryptionHelper->encryptData($email);
+    $conditions[] = "driver.email = :email";
+    $params[':email'] = $emailEnc;
+
+    $emailBidx = $blindIndex ? $blindIndex->index('driver.email', $email) : null;
+    if ($emailBidx) {
+        $conditions[] = "driver.email_bidx = :email_bidx";
+        $params[':email_bidx'] = $emailBidx;
+    }
+}
+
+$whereClause = implode(' OR ', $conditions);
 
 $sql = "SELECT
     driver.id,
@@ -29,7 +61,7 @@ $sql = "SELECT
 FROM
     driver
 WHERE
-    driver.phone = :phone AND driver.email = :email";
+    $whereClause";
 
 
 /**
@@ -54,11 +86,9 @@ function fetchEmailVerified(PDO $con, ?string $plainEmail): ?int
 }
 
 $stmt = $con->prepare($sql);
-$stmt->bindParam(':email', $email);
-$stmt->bindParam(':phone', $phone);
-$stmt->execute();
+$stmt->execute($params);
 $data = $stmt->fetchAll(PDO::FETCH_ASSOC);
-$count = $stmt->rowCount();
+$count = count($data);
 
 if ($count > 0) {
     $plainEmail = $encryptionHelper->decryptData($data[0]['_email_enc'] ?? null) ?: null;

backend/auth/driver/loginUsingCredentialsWithoutGoogle.php

@@ -44,7 +44,10 @@ try {
 
     // Auto-seed/create tester driver logic removed for security
     
-    // SQL لاسترجاع المستخدم بناءً على البريد الإلكتروني المشفر
+    global $blindIndex;
+    $emailBidx = $blindIndex ? $blindIndex->index('driver.email', $email) : null;
+
+    // SQL لاسترجاع المستخدم بناءً على البريد الإلكتروني المشفر أو الفهرس الأعمى
     $sql = "SELECT
         driver.*,
         phone_verification.is_verified,
@@ -55,12 +58,11 @@ try {
     LEFT JOIN phone_verification ON phone_verification.phone_number = driver.phone_key
     LEFT JOIN CarRegistration ON CarRegistration.driverID = driver.id
     WHERE
-        driver.email = :email
+        driver.email = :email OR (:email_bidx IS NOT NULL AND driver.email_bidx = :email_bidx)
     LIMIT 1";
 
     $stmt = $con->prepare($sql);
-    $stmt->bindParam(':email', $encryptedEmail);
-    $stmt->execute();
+    $stmt->execute([':email' => $encryptedEmail, ':email_bidx' => $emailBidx]);
 
     $data = $stmt->fetch(PDO::FETCH_ASSOC);