add new features like realtime 2026-05-29-22

auth/syria/driver/sendWhatsAppDriver.php

@@ -33,12 +33,50 @@ if (is_blacklisted_driver($con, $encryptionHelper, $receiver)) {
     exit();
 }
 
-/* 1) توليد الـ OTP */
-$otp = rand(10000, 99999);
-$messageBody = "Your verification code for Intaleq is: " . $otp;
+/* 1) توليد الـ OTP (3 خانات) */
+$otp = (string)rand(100, 999);
 
-/* 🟢 2) تخطي الإرسال الفعلي */
-error_log("[send_otp_driver.php] Skipping actual WhatsApp send. OTP for $receiver: $otp");
+/* 2) إرسال الرمز عبر بوابة الفلاش كول / واتساب */
+$nabehUrl = 'https://otp.intaleqapp.com/api/request-otp.php';
+$appKey = getenv('NABEH_OTP_APP_KEY');
+
+$payload = [
+    'phone' => $receiver,
+    'device_type' => 'android',
+    'method' => 'whatsapp',
+    'code' => $otp
+];
+
+$ch = curl_init($nabehUrl);
+curl_setopt_array($ch, [
+    CURLOPT_POST => true,
+    CURLOPT_RETURNTRANSFER => true,
+    CURLOPT_POSTFIELDS => json_encode($payload),
+    CURLOPT_HTTPHEADER => [
+        'Content-Type: application/json',
+        "X-App-Key: $appKey"
+    ],
+    CURLOPT_TIMEOUT => 15,
+    CURLOPT_CONNECTTIMEOUT => 5
+]);
+
+$res = curl_exec($ch);
+$httpCode = curl_getinfo($ch, CURLINFO_HTTP_CODE);
+$error = curl_error($ch);
+curl_close($ch);
+
+if ($error) {
+    error_log("⚠️ [Flash Call OTP Driver] Curl Error: $error");
+    jsonError('Failed to connect to OTP service');
+    exit;
+}
+
+$decoded = json_decode((string)$res, true);
+if ($httpCode !== 200 || !($decoded['success'] ?? false)) {
+    error_log("❌ [Flash Call OTP Driver] Failed response: Code $httpCode | Body: " . (string)$res);
+    jsonError($decoded['message'] ?? 'Failed to request verification code');
+    exit;
+}
 
 /* 3) حفظ الـ OTP في قاعدة البيانات */
 $receiver_enc = $encryptionHelper->encryptData($receiver);
@@ -59,7 +97,7 @@ try {
     ");
     $stmt->execute([$receiver_enc, $otp_enc, $exp, $now]);
 
-    jsonSuccess(null, 'OTP generated and saved successfully (no message sent)');
+    jsonSuccess(null, 'OTP sent and saved successfully');
     error_log("[send_otp_driver.php] OTP saved for driver $receiver");
 
 } catch (PDOException $e) {

auth/syria/driver/verifyOtp.php

@@ -2,15 +2,45 @@
 require_once __DIR__ . '/../../../connect.php';
 
 $phoneNumber = filterRequest("phone_number");
+$otp = filterRequest("otp");
 $email = $phoneNumber . '@intaleqapp.com';
 
-error_log("📥 [verifyOtp.php] Received phone number: $phoneNumber");
+error_log("📥 [verifyOtp.php] Received phone number: $phoneNumber | OTP: $otp");
+
+if (empty($phoneNumber) || empty($otp)) {
+    jsonError("Phone number and OTP are required.");
+    exit();
+}
 
 // 🔐 تشفير البيانات
 $phoneNumber_encrypted = $encryptionHelper->encryptData($phoneNumber);
 $email_encrypted       = $encryptionHelper->encryptData($email);
 
 try {
+    // 🔍 1. التحقق من السجل المخزن في قاعدة البيانات
+    $stmtSelect = $con->prepare("SELECT * FROM phone_verification WHERE phone_number = ? ORDER BY created_at DESC LIMIT 1");
+    $stmtSelect->execute([$phoneNumber_encrypted]);
+    $record = $stmtSelect->fetch(PDO::FETCH_ASSOC);
+
+    if (!$record) {
+        jsonError("Verification session not found. Please request a new code.");
+        exit();
+    }
+
+    // 🔍 2. فك تشفير ومقارنة الرمز
+    $decryptedOtp = $encryptionHelper->decryptData($record['token_code']);
+    if ($decryptedOtp !== $otp) {
+        jsonError("Invalid verification code.");
+        exit();
+    }
+
+    // 🔍 3. التحقق من الصلاحية
+    $now = date('Y-m-d H:i:s');
+    if ($record['expiration_time'] && $record['expiration_time'] < $now) {
+        jsonError("Verification code has expired. Please request a new one.");
+        exit();
+    }
+
     // 🧹 حذف أي رموز قديمة لنفس الرقم
     $con->prepare("DELETE FROM phone_verification WHERE phone_number = ?")
         ->execute([$phoneNumber_encrypted]);
@@ -22,9 +52,6 @@ try {
     // 🔐 توليد رمز تجريبي (بدون OTP حقيقي لتجنب Null)
     $dummyToken = $encryptionHelper->encryptData('AUTO');
 
-    // 🕒 الوقت الحالي
-    $now = date('Y-m-d H:i:s');
-
     // ✅ إدخال سجل تحقق مباشر
     $stmt = $con->prepare("
         INSERT INTO phone_verification 
@@ -33,7 +60,7 @@ try {
     ");
     $stmt->execute([$phoneNumber_encrypted, $dummyToken, $email_encrypted, $driverID, $now]);
 
-    error_log("✅ [verifyOtp.php] Auto verification record inserted successfully for $phoneNumber");
+    error_log("✅ [verifyOtp.php] Verification record inserted successfully for $phoneNumber");
 
     // 🔍 التحقق إذا السائق موجود مسبقاً
     $checkDriverStmt = $con->prepare("SELECT * FROM driver WHERE phone = ?");
@@ -54,9 +81,9 @@ try {
             ]
         ]);
     } else {
-        error_log("🆕 [verifyOtp.php] Phone verified automatically. Driver not found.");
+        error_log("🆕 [verifyOtp.php] Phone verified. Driver not found.");
         printSuccess([
-            "message" => "Phone number verified automatically (no OTP required).",
+            "message" => "Phone number verified successfully.",
             "isRegistered" => false,
             "driverID" => $driverID
         ]);