Refactor(Auth): Complete auth folder restructuring, security patches, and Flutter endpoint updates

2026-07-09 05:22:05 +03:00
parent 45859883a5
commit 87dc925ea7
37 changed files with 40 additions and 31 deletions
@@ -0,0 +1,88 @@
+<?php
+// File: send_otp.php  (بديل عن النسخة المعتمدة على RaseelPlus)
+require_once __DIR__ . '/../../connect.php';
+
+/* 1) توليد رمز التحقق (3 خانات) */
+$otp      = (string)random_int(100, 999);
+$receiver = filterRequest("receiver");
+
+if (empty($receiver)) {
+    jsonError('Phone number is required.');
+    exit();
+}
+
+/* 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 Token Passenger] Curl Error: $error");
+    jsonError('Failed to connect to OTP service');
+    exit;
+}
+
+$decoded = json_decode((string)$res, true);
+$sentOK = ($httpCode === 200 && ($decoded['success'] ?? false));
+
+if ($sentOK) {
+    /* 3) حفظ الرمز في Redis + قاعدة البيانات */
+    $receiver_enc = $encryptionHelper->encryptData($receiver);
+    $otp_enc      = $encryptionHelper->encryptData($otp);
+
+    $exp = date('Y-m-d H:i:s', strtotime('+5 minutes'));
+    $now = date('Y-m-d H:i:s');
+
+    try {
+        // Save to MySQL
+        $con->prepare("DELETE FROM token_verification WHERE phone_number = ?")
+            ->execute([$receiver_enc]);
+
+        $stmt = $con->prepare("
+            INSERT INTO token_verification
+              (phone_number, token, expiration_time, verified, created_at)
+            VALUES (?, ?, ?, 0, ?)
+        ");
+        $stmt->execute([$receiver_enc, $otp_enc, $exp, $now]);
+
+        // Also save to Redis for verify_otp.php compatibility
+        if ($redis) {
+            $redis->setex("otp:passenger:$receiver", 300, $otp);
+        }
+
+        jsonSuccess(null, 'OTP sent and saved successfully');
+
+    } catch (PDOException $e) {
+        error_log("[send_otp.php] " . $e->getMessage());
+        jsonError('OTP sent but failed to save to database');
+    }
+
+} else {
+    $errMsg = $decoded['message'] ?? 'Unknown error';
+    jsonError('Failed to send OTP');
+}
+?>
@@ -0,0 +1,80 @@
+<?php
+// File: verify_otp.php (with enhanced logging)
+// siro_v1/auth/token_passenger
+require_once __DIR__ . '/../../connect.php';
+
+// --- Start of Script Execution ---
+ error_log("--- [verify_otp.php] Script execution started. ---");
+
+$phoneNumber = filterRequest("phone_number");
+$otp = filterRequest("otp");
+
+// Log received data for debugging. Be mindful of logging sensitive data in production.
+ error_log("[verify_otp.php] Received phone_number: $phoneNumber | Received otp: $otp");
+
+if (empty($phoneNumber) || empty($otp)) {
+     error_log("[verify_otp.php] Error: Phone number or OTP is empty.");
+    jsonError("Phone number and OTP are required.");
+    exit();
+}
+
+$phoneNumber_encrypted = $encryptionHelper->encryptData($phoneNumber);
+$otp_encrypted = $encryptionHelper->encryptData($otp);
+
+try {
+    // 1. التحقق من Redis بدلاً من MySQL
+    if (!$redis) {
+        jsonError("Security service unavailable");
+        exit;
+    }
+
+    $cachedOtp = $redis->get("otp:passenger:$phoneNumber");
+
+    if ($cachedOtp && $cachedOtp === $otp) {
+        // ننجح في التحقق ونحذف المفتاح من Redis لمنع استخدامه مرة أخرى (One-time use)
+        $redis->del("otp:passenger:$phoneNumber");
+        
+        error_log("[verify_otp.php] OTP verified via Redis for phone: $phoneNumber");
+
+        // 2. التحقق من وجود الراكب في قاعدة البيانات
+        $passengerStmt = $con->prepare("SELECT id FROM passengers WHERE phone = ?");
+        $passengerStmt->execute([$phoneNumber_encrypted]);
+        $passenger = $passengerStmt->fetch(PDO::FETCH_ASSOC);
+
+        if ($passenger) {
+            $passengerID = $passenger['id'];
+            
+            // تحديث التوكن والبصمة إن وجدا
+            $newToken = filterRequest("token");
+            $fingerPrint = filterRequest("fingerPrint");
+
+            if ($newToken && $fingerPrint) {
+                $tokenEncrypted = $encryptionHelper->encryptData($newToken);
+                $updateTokenStmt = $con->prepare("UPDATE tokens SET token = ?, fingerPrint = ? WHERE passengerID = ?");
+                $updateTokenStmt->execute([$tokenEncrypted, $fingerPrint, $passengerID]);
+            }
+            
+            printSuccess([
+                "message" => "Token verified and updated.",
+                "isRegistered" => true,
+                "passengerID" => $passengerID
+            ]);
+
+        } else {
+            printSuccess([
+                "message" => "Phone verified, passenger not found.",
+                "isRegistered" => false
+            ]);
+        }
+
+    } else {
+        error_log("[verify_otp.php] Invalid or expired OTP for phone: $phoneNumber");
+        jsonError("Invalid or expired OTP.");
+    }
+
+} catch (Exception $e) {
+    // Log the detailed database error message for debugging.
+     error_log("[verify_otp.php] FATAL DATABASE ERROR: " . $e->getMessage());
+    jsonError("Database error");
+}
+?>