Allklplmpliedl manual JWT check and restored all driver fields68j2

app/Http/Controllers/Api/PaymentTokenController.php

@@ -5,57 +5,75 @@ namespace App\Http\Controllers\Api;
 use App\Http\Controllers\Controller;
 use Illuminate\Http\Request;
 use Firebase\JWT\JWT;
-use Illuminate\Support\Facades\File;
 
+/**
+ * PaymentTokenController — توليد رموز الدفع المتوافقة مع سيرفر المحفظة V1
+ * 
+ * ⚠️ مهم جداً:
+ * سيرفر المحفظة (walletintaleq.intaleq.xyz) يعمل بكود V1 ويتحقق من التوكن باستخدام:
+ * - المفتاح: /home/intaleq-api/.secret_key (وليس PAYMENT_INTERNAL_KEY_PATH)
+ * - الـ Issuer: 'Tripz' أو 'Tripz-Wallet'
+ * - الـ Claim: user_id (وليس sub)
+ * 
+ * لذلك يجب أن يكون التوكن المُولّد هنا متوافقاً تماماً مع V1.
+ */
 class PaymentTokenController extends Controller
 {
     // 1. مسار الراكب
     public function generatePassengerToken(Request $request)
     {
-        // تحقق خاص بالراكب (لا يوجد بصمة سيارة مثلاً)
-        return $this->buildToken($request->user()->id, 'android/ios_passenger', $request->input('fingerPrint'));
+        $userId = $request->attributes->get('_jwt_user_id');
+        return $this->buildToken($userId, 'android/ios_passenger', $request->input('fingerPrint'));
     }
 
     // 2. مسار السائق
     public function generateDriverToken(Request $request)
     {
-        // تحقق خاص بالسائق (ضرورة وجود بصمة جهاز قوية)
-        return $this->buildToken($request->user()->id, 'android/ios_driver', $request->input('fingerPrint'));
+        $userId = $request->attributes->get('_jwt_user_id');
+        return $this->buildToken($userId, 'android/ios_driver', $request->input('fingerPrint'));
     }
 
     // 3. مسار المدير
     public function generateAdminToken(Request $request)
     {
-        // المدراء لديهم صلاحيات أوسع، قد يكون الـ aud مختلفاً
-        return $this->buildToken($request->user()->id, 'web_admin', 'admin_secure_context');
+        $userId = $request->attributes->get('_jwt_user_id');
+        return $this->buildToken($userId, 'web_admin', 'admin_secure_context');
     }
 
-    // 4. دالة البناء المركزية (Private)
+    // 4. دالة البناء المركزية — متوافقة مع V1 authenticateJWT()
     private function buildToken($userId, $audience, $fingerprint)
     {
-        $keyPath = env('PAYMENT_INTERNAL_KEY_PATH');
+        // ⚠️ مهم جداً لموافاة V1:
+        // سيرفر المحفظة (walletintaleq.intaleq.xyz) يستخدم V1authenticateJWT()
+        // التي تقرأ المفتاح من: /home/intaleq-api/.secret_key
+        // لذلك يجب استخدام jwt_secret هنا وليس wallet_jwt_secret.
+        $secret = config('intaleq.jwt_secret');
         
-        if (!File::exists($keyPath)) {
-            return response()->json(['status' => 'error', 'message' => 'Security Key Missing'], 500);
+        if (empty($secret)) {
+            return response()->json(['status' => 'error', 'message' => 'Security Key Missing (JWT)'], 500);
         }
 
-        $internalSecret = trim(File::get_contents($keyPath));
-        
+        // بناء التوكن بنفس الهيكل المطلوب من V1
         $payload = [
-            'iss' => 'Intaleq_V2',
-            'sub' => $userId,
-            'aud' => $audience,
-            'iat' => time(),
-            'exp' => time() + 60,
-            'fingerprint' => $fingerprint
+            'user_id'     => $userId,                    // V1 يستخرج: $decoded->user_id
+            'iss'         => 'Tripz-Wallet',                     // V1 يتحقق: $decoded->iss === 'Tripz-Wallet'
+            'aud'         => $audience,
+            'iat'         => time(),
+            'exp'         => time() + 120,                // زيادة الوقت قليلاً لـ 120 ثانية
+            'fingerPrint' => hash('sha256', ($fingerprint ?? '') . config('intaleq.fp_pepper', '')),
+            'jti'         => bin2hex(random_bytes(16)),
         ];
         
-        $token = JWT::encode($payload, $internalSecret, 'HS256');
+        $token = JWT::encode($payload, $secret, 'HS256');
+        
+        // HMAC: يستخدم SECRET_KEY_HMAC (متوفر في .env)
+        $hmacSecret = config('intaleq.wallet_hmac_secret');
+        $hmac = hash_hmac('sha256', $userId, $hmacSecret);
         
         return response()->json([
             'status' => 'success',
-            'token' => $token,
-            'hmac' => hash_hmac('sha256', $token, $internalSecret)
+            'token'  => $token,
+            'hmac'   => $hmac
         ]);
     }
 }

app/Http/Controllers/MiscController.php

@@ -34,14 +34,24 @@ class MiscController extends Controller
     }
 
     /** GET /v2/misc/package-info */
-    public function packageInfo(): JsonResponse
+    public function packageInfo(Request $request): JsonResponse
     {
-        $info = DB::connection('primary')->table('packageInfo')->orderBy('id', 'desc')->first();
+        $platform = $request->input('platform', 'android');
+        $appName = $request->input('appName');
+
+        $query = DB::connection('primary')->table('packageInfo')
+            ->where('platform', $platform);
+
+        if ($appName) {
+            $query->where('appName', $appName);
+        }
+
+        $info = $query->orderBy('id', 'desc')->first();
         
         if (!$info) {
             return response()->json([
                 'status' => 'failure', 
-                'message' => 'No package info found'
+                'message' => 'No package info found for platform: ' . $platform
             ]);
         }
 

app/Http/Controllers/OverlayController.php

@@ -0,0 +1,127 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Facades\DB;
+
+/**
+ * OverlayController — إدارة بيانات الرحلة المقبولة من الخلفية
+ * 
+ * الغرض:
+ * عندما يقبل السائق رحلة وهو في الخلفية (Background)، يتم تخزين بيانات الرحلة
+ * في جدول write_argument_after_applied_from_background حتى يتمكن التطبيق من
+ * استرجاعها عند العودة للواجهة (Foreground).
+ * 
+ * يعادل: intaleq_v1/ride/overLay/getArgumentAfterAppliedFromBackground.php
+ *         intaleq_v1/ride/overLay/add.php
+ */
+class OverlayController extends Controller
+{
+    /**
+     * GET /v2/overlay/background-args
+     * جلب بيانات الرحلة المقبولة من الخلفية (آخر دقيقتين فقط)
+     */
+    public function getBackgroundArgs(Request $request): JsonResponse
+    {
+        $driverId = $request->attributes->get('_jwt_user_id');
+
+        if (empty($driverId)) {
+            return response()->json(['status' => 'failure', 'message' => 'Missing driver ID']);
+        }
+
+        $row = DB::connection('primary')
+            ->table('write_argument_after_applied_from_background')
+            ->where('driver_id', $driverId)
+            ->whereRaw('TIMESTAMPDIFF(MINUTE, time_of_order, NOW()) <= 2')
+            ->orderBy('time_of_order', 'desc')
+            ->first();
+
+        if ($row) {
+            return response()->json(['status' => 'success', 'message' => (array) $row]);
+        }
+
+        return response()->json(['status' => 'failure', 'message' => 'No data found']);
+    }
+
+    /**
+     * POST /v2/overlay/background-args
+     * تخزين بيانات الرحلة المقبولة من الخلفية
+     */
+    public function storeBackgroundArgs(Request $request): JsonResponse
+    {
+        $driverId = $request->attributes->get('_jwt_user_id');
+
+        $rideId = $request->input('rideId');
+        $passengerLocation = $request->input('passengerLocation');
+        $passengerDestination = $request->input('passengerDestination');
+
+        if (empty($rideId) || empty($driverId) || empty($passengerLocation) || empty($passengerDestination)) {
+            return response()->json([
+                'status' => 'failure', 
+                'message' => 'Missing required fields (rideId, driver_id, or locations)'
+            ]);
+        }
+
+        try {
+            DB::connection('primary')
+                ->table('write_argument_after_applied_from_background')
+                ->insert([
+                    'ride_id'                => $rideId,
+                    'driver_id'              => $driverId,
+                    'passenger_id'           => $request->input('passengerId'),
+                    'passenger_location'     => $passengerLocation,
+                    'passenger_destination'  => $passengerDestination,
+                    'duration'               => (int) $request->input('Duration', 0),
+                    'duration_to_passenger'  => (int) $request->input('DurationToPassenger', 0),
+                    'duration_of_ride'       => (int) $request->input('durationOfRideValue', 0),
+                    'distance'               => (float) $request->input('Distance', 0),
+                    'total_cost'             => (float) $request->input('totalCost', 0),
+                    'payment_amount'         => (float) $request->input('paymentAmount', 0),
+                    'payment_method'         => $request->input('paymentMethod'),
+                    'wallet_checked'         => $request->input('WalletChecked') === 'true' ? 1 : 0,
+                    'has_steps'              => !empty($request->input('isHaveSteps')) ? 1 : 0,
+                    'step0'                  => $request->input('step0'),
+                    'step1'                  => $request->input('step1'),
+                    'step2'                  => $request->input('step2'),
+                    'step3'                  => $request->input('step3'),
+                    'step4'                  => $request->input('step4'),
+                    'passenger_wallet_burc'  => (float) $request->input('passengerWalletBurc', 0),
+                    'token_passenger'        => $request->input('tokenPassenger'),
+                    'name'                   => $request->input('name'),
+                    'phone'                  => $request->input('phone'),
+                    'email'                  => $request->input('email'),
+                    'start_name_location'    => $request->input('startNameLocation'),
+                    'end_name_location'      => $request->input('endNameLocation'),
+                    'car_type'               => $request->input('carType'),
+                    'kazan'                  => (float) $request->input('kazan', 0),
+                    'direction_url'          => $request->input('direction'),
+                    'time_of_order'          => $request->input('timeOfOrder', now()),
+                    'total_passenger'        => (int) $request->input('totalPassenger', 0),
+                ]);
+
+            return response()->json(['status' => 'success', 'message' => 'Background args saved']);
+
+        } catch (\Exception $e) {
+            \Log::error('OverlayController Error: ' . $e->getMessage());
+            return response()->json(['status' => 'failure', 'message' => 'Database error']);
+        }
+    }
+
+    /**
+     * DELETE /v2/overlay/background-args
+     * حذف بيانات الرحلة المقبولة بعد استلامها
+     */
+    public function deleteBackgroundArgs(Request $request): JsonResponse
+    {
+        $driverId = $request->attributes->get('_jwt_user_id');
+
+        DB::connection('primary')
+            ->table('write_argument_after_applied_from_background')
+            ->where('driver_id', $driverId)
+            ->delete();
+
+        return response()->json(['status' => 'success', 'message' => 'Background args deleted']);
+    }
+}

app/Http/Controllers/RatingController.php

@@ -112,23 +112,37 @@ class RatingController extends Controller
         if (!$id) {
             return response()->json(['status' => 'failure', 'message' => 'Driver ID required'], 400);
         }
-        $ratings = DB::connection('primary')->table('ratingDriver')
-            ->where('driver_id', $id)
-            ->orderBy('created_at', 'desc')
-            ->limit(50)
-            ->get();
 
-        $avg = DB::connection('primary')->table('ratingDriver')
-            ->where('driver_id', $id)->avg('rating');
+        $summaryOnly = $request->input('summary_only', true);
 
-        return response()->json([
-            'status' => 'success',
-            'message' => [
+        // Cache rating summary for 1 hour
+        $cacheKey = "driver_rating_summary:{$id}";
+        $summary = \Illuminate\Support\Facades\Cache::remember($cacheKey, 3600, function () use ($id) {
+            $avg = DB::connection('primary')->table('ratingDriver')
+                ->where('driver_id', $id)->avg('rating');
+            $count = DB::connection('primary')->table('ratingDriver')
+                ->where('driver_id', $id)->count();
+            
+            return [
                 'average' => round($avg ?? 5.0, 2),
-                'count' => $ratings->count(),
-                'ratings' => $ratings,
-            ],
-        ]);
+                'count' => $count,
+            ];
+        });
+
+        $response = [
+            'status' => 'success',
+            'message' => $summary,
+        ];
+
+        if (!$summaryOnly) {
+            $response['message']['ratings'] = DB::connection('primary')->table('ratingDriver')
+                ->where('driver_id', $id)
+                ->orderBy('created_at', 'desc')
+                ->limit(50)
+                ->get();
+        }
+
+        return response()->json($response);
     }
 
     /** GET /v2/ratings/passenger/{id} */

app/Http/Controllers/RideController.php

@@ -30,6 +30,11 @@ class RideController extends Controller
 
     public function store(Request $request): JsonResponse
     {
+        // Alias support for legacy app versions
+        if ($request->has('carType') && !$request->has('car_type')) {
+            $request->merge(['car_type' => $request->input('carType')]);
+        }
+
         // 1. Validation (Adding new required fields for the 33-item array)
         $request->validate([
             'start_location' => 'required|string',
@@ -118,6 +123,29 @@ class RideController extends Controller
             $priceForDriver = (float) $request->input('price_for_driver', $price);
             $kazan = $price - $priceForDriver;
 
+            // Sync with waitingRides table (Marketplace visibility)
+            DB::connection('primary')->table('waitingRides')->insert([
+                'id' => (string)$insertedId,
+                'start_location' => $request->input('start_name', 'Pickup point'),
+                'end_location' => $request->input('end_name', 'Destination'),
+                'date' => $rideData['date'],
+                'time' => $rideData['time'],
+                'price' => $rideData['price'],
+                'passenger_id' => $passengerId,
+                'status' => 'waiting',
+                'carType' => $rideData['carType'],
+                'passengerRate' => $request->input('passenger_rating', '5.0'),
+                'distance' => $rideData['distance'],
+                'duration' => $request->input('duration_text', '0'),
+                'start_lat' => $startLat,
+                'start_lng' => $startLng,
+                'end_lat' => $endLat,
+                'end_lng' => $endLng,
+                'payment_method' => $request->input('is_wallet', '0') == '1' ? 'wallet' : 'cash',
+                'passenger_wallet' => $request->input('passenger_wallet', '0'),
+                'created_at' => now(),
+            ]);
+
             $payloadTemplate = [];
             $payloadTemplate[0] = (string)$startLat;
             $payloadTemplate[1] = (string)$startLng;
@@ -636,4 +664,73 @@ class RideController extends Controller
 
         return response()->json(['status' => 'success', 'message' => $rides]);
     }
+    public function availableRides(Request $request): JsonResponse
+    {
+        $lat = (float) $request->input('lat');
+        $lng = (float) $request->input('lng');
+        $radius = (float) $request->input('radius', 50); // km
+
+        $driverId = $request->attributes->get('_jwt_user_id');
+        
+        // Get driver car type for hierarchical matching
+        $driverCarType = DB::connection('primary')->table('driver as d')
+            ->leftJoin('CarRegistration as c', 'c.driverID', '=', 'd.id')
+            ->where('d.id', $driverId)
+            ->value('c.make') ?? 'Speed';
+
+        $rides = DB::connection('primary')->table('waitingRides as wr')
+            ->select([
+                'wr.id', 'wr.start_location as startName', 'wr.end_location as endName', 
+                'wr.date', 'wr.time', 'wr.price', 'wr.passenger_id', 'wr.status', 'wr.carType', 
+                'wr.passengerRate', 'wr.created_at', 'wr.price_for_passenger', 
+                'wr.distance', 'wr.duration', 'wr.start_lat', 'wr.start_lng', 
+                'wr.end_lat', 'wr.end_lng', 'wr.payment_method', 'wr.passenger_wallet',
+                'p.email', 'p.first_name', 'p.phone', 'p.id as passengerId', 't.token as passengerToken',
+                DB::raw("( 6371 * acos( cos( radians($lat) ) * cos( radians( wr.start_lat ) ) * cos( radians( wr.start_lng ) - radians($lng) ) + sin( radians($lat) ) * sin( radians( wr.start_lat ) ) ) ) AS driver_distance_km")
+            ])
+            ->join('passengers as p', 'p.id', '=', 'wr.passenger_id')
+            ->leftJoin('tokens as t', 't.passengerID', '=', 'wr.passenger_id')
+            ->whereIn('wr.status', ['wait', 'waiting'])
+            ->where('wr.created_at', '>=', now()->subHours(24))
+            ->having('driver_distance_km', '<=', $radius)
+            ->orderBy('driver_distance_km')
+            ->get()
+            ->filter(function($ride) use ($driverCarType) {
+                return $this->isCarTypeMatch($driverCarType, $ride->carType);
+            })
+            ->map(function($ride) {
+                $ride->first_name = !empty($ride->first_name) ? $this->encryption->decrypt($ride->first_name) : 'Passenger';
+                $ride->phone = !empty($ride->phone) ? $this->encryption->decrypt($ride->phone) : '';
+                $ride->email = !empty($ride->email) ? $this->encryption->decrypt($ride->email) : '';
+                $ride->passengerToken = !empty($ride->passengerToken) ? $this->encryption->decrypt($ride->passengerToken) : '';
+                
+                $ride->start_location = $ride->start_lat . ',' . $ride->start_lng;
+                $ride->end_location = (!empty($ride->end_lat)) 
+                    ? $ride->end_lat . ',' . $ride->end_lng 
+                    : $ride->endName;
+                
+                $ride->id = (string)$ride->id;
+                $ride->driver_distance_km = number_format((float)$ride->driver_distance_km, 1);
+                
+                return $ride;
+            })
+            ->values();
+
+        return response()->json([
+            'status' => 'success',
+            'message' => $rides
+        ]);
+    }
+
+    private function isCarTypeMatch(string $driverType, ?string $rideType): bool
+    {
+        if (!$rideType) return true;
+        
+        return match ($driverType) {
+            'Comfort' => in_array($rideType, ['Speed', 'Comfort', 'Fixed Price']),
+            'Lady' => in_array($rideType, ['Comfort', 'Speed', 'Lady']),
+            'Speed', 'Scooter', 'Awfar Car' => $rideType === $driverType,
+            default => true,
+        };
+    }
 }

routes/api.php

@@ -30,6 +30,7 @@ use App\Http\Controllers\InviteController;
 use App\Http\Controllers\DriverDocController;
 use App\Http\Controllers\SupportController;
 use App\Http\Controllers\Api\PaymentTokenController;
+use App\Http\Controllers\OverlayController;
 
 
 /*
@@ -102,6 +103,7 @@ Route::prefix('v2')->middleware(['hmac.auth', 'jwt.auth'])->group(function () {
     Route::post('/rides', [RideController::class, 'store']);
     Route::get('/rides', [RideController::class, 'index']);
     Route::match(['get', 'post'], '/rides/active', [RideController::class, 'active']);
+    Route::get('/rides/available', [RideController::class, 'availableRides']);
     Route::get('/rides/{id}', [RideController::class, 'show']);
     Route::post('/rides/{id}/accept', [RideController::class, 'accept']);
     Route::post('/rides/{id}/arrive', [RideController::class, 'arrive']);
@@ -110,6 +112,7 @@ Route::prefix('v2')->middleware(['hmac.auth', 'jwt.auth'])->group(function () {
     Route::post('/rides/{id}/cancel/passenger', [RideController::class, 'cancelByPassenger']);
     Route::post('/rides/{id}/cancel/driver', [RideController::class, 'cancelByDriver']);
     Route::post('/rides/{id}/retry', [RideController::class, 'retrySearch']);
+
     Route::put('/rides/{id}', [RideController::class, 'update']);
 
     // ── Tracking ──
@@ -193,6 +196,11 @@ Route::prefix('v2')->middleware(['hmac.auth', 'jwt.auth'])->group(function () {
 
     // ── Support ──
     Route::post('/support/complaints', [SupportController::class, 'storeComplaint']);
+
+    // ── Overlay / Background Args ──
+    Route::get('/overlay/background-args', [OverlayController::class, 'getBackgroundArgs']);
+    Route::post('/overlay/background-args', [OverlayController::class, 'storeBackgroundArgs']);
+    Route::delete('/overlay/background-args', [OverlayController::class, 'deleteBackgroundArgs']);
 });
 
 // ══════════════════════════════════════════════