Driver side (was a stub): - In-app driver onboarding: a driver-role user creates their own linked drivers profile (driver/profile+api GET/POST/PATCH). - Driver dashboard: online/offline toggle, today's earnings, incoming request cards (accept/decline), active ride panel (start/complete trip). Polls /driver/rides every 4s while online. - Location heartbeat (use-driver-location): watchPositionAsync pings /driver/location every ~5s; restarts the watch on app foreground so a backgrounded driver doesn't go permanently stale and miss requests. Dispatch (auto-match nearest, Uber-style): - Ride state machine: requested -> accepted -> en_route -> completed/cancelled with a nullable driver_id until matched (lib/dispatch.matchNextDriver). - matchNextDriver locks the ride (SELECT FOR UPDATE), expires 15s-stale offers, picks the nearest eligible driver of the matching service by haversine, offers one at a time. Called from ride/create, ride/[id] GET (lazy match on the rider's poll), and ride/[id]/respond (on decline). - ride/create is now a request endpoint (driver_id NULL, status=requested, service); drops the pre-match driver_id payment reconciliation. - ride/[id] GET returns status/service/nullable driver; PATCH handles rider cancel + driver en_route/completed. ride/list backs the history tabs. Rider flow (best experience): - confirm-ride is now a request screen: single trip fare + nearest-driver ETA + cash/card + Request Ride -> live status. Periodically polls online drivers of the selected service and disables Request when none are online (prevents the "stuck searching forever" state). - book-ride is the live ride-status screen (searching -> accepted -> en_route -> completed/cancelled + Cancel), polling every 3s. - lib/request-ride unifies the Areeba card flow + cash path. - Map reads /driver/nearby (real positions, service-filtered); lib/map adds calculateTripFare + service-aware fares. POI suggestions: - lib/places (Google Nearby Search) + nearby-suggestions chips for mall/hospital/pharmacy/restaurant on the home screen. Service categories now drive both matching and a per-service fare multiplier (car 1.0 / moto 0.7 / courier 0.85 / chauffeur 1.5). Map tiles: react-native-maps rendered blank on Android because no Google Maps key was set. Switched app.json -> app.config.js so android.config.googleMaps.apiKey is injected from EXPO_PUBLIC_GOOGLE_API_KEY at build time (keeps the key out of git). Requires a native rebuild (expo run:android) to take effect. Also includes the prior payment/auth hardening (server-authoritative payment_orders ledger with double-spend guards, peppered OTP, register TOCTOU fix, stats cents fix) that was left uncommitted. Co-Authored-By: Claude <noreply@anthropic.com>
123 lines
3.6 KiB
TypeScript
123 lines
3.6 KiB
TypeScript
import { randomUUID } from "crypto";
|
|
|
|
import { requireAuth } from "@/lib/jwt";
|
|
import { createCheckoutSession } from "@/lib/areeba";
|
|
import { createOrder } from "@/lib/payment-orders";
|
|
|
|
// Only these return URLs may be handed to the gateway. Anything else
|
|
// (including open redirects) is rejected and we fall back to the deep link.
|
|
const isAllowedReturnUrl = (url: string): boolean => {
|
|
try {
|
|
const parsed = new URL(url);
|
|
|
|
// The app's own deep link is always allowed.
|
|
if (parsed.protocol === "waseel:") return true;
|
|
|
|
// The configured server origin (EXPO_PUBLIC_SERVER_URL), if set.
|
|
const serverUrl = process.env.EXPO_PUBLIC_SERVER_URL;
|
|
if (serverUrl) {
|
|
const server = new URL(serverUrl);
|
|
if (parsed.protocol === server.protocol && parsed.host === server.host)
|
|
return true;
|
|
}
|
|
|
|
return false;
|
|
} catch {
|
|
return false;
|
|
}
|
|
};
|
|
|
|
// Resolve the fare to integer cents. Accept fare_cents directly, or fare /
|
|
// amount in dollars (legacy client field) and convert.
|
|
const resolveAmountCents = (fareCents: unknown, fare: unknown, amount: unknown): number | null => {
|
|
let cents: number;
|
|
if (fareCents !== undefined && fareCents !== null) {
|
|
cents = Math.round(Number(fareCents));
|
|
} else if (fare !== undefined && fare !== null) {
|
|
cents = Math.round(Number(fare) * 100);
|
|
} else if (amount !== undefined && amount !== null) {
|
|
cents = Math.round(Number(amount) * 100);
|
|
} else {
|
|
return null;
|
|
}
|
|
|
|
if (!Number.isFinite(cents) || cents <= 0) return null;
|
|
return cents;
|
|
};
|
|
|
|
export async function POST(req: Request) {
|
|
const auth = requireAuth(req);
|
|
if ("error" in auth) return auth.error;
|
|
|
|
const body = await req.json().catch(() => ({}));
|
|
const {
|
|
name,
|
|
email,
|
|
amount,
|
|
fare_cents,
|
|
fare,
|
|
returnUrl,
|
|
driver_id,
|
|
origin_address,
|
|
destination_address,
|
|
origin_latitude,
|
|
origin_longitude,
|
|
destination_latitude,
|
|
destination_longitude,
|
|
ride_time,
|
|
} = body;
|
|
|
|
if (!name || !email)
|
|
return Response.json(
|
|
{ error: "Missing required payment information." },
|
|
{ status: 400 },
|
|
);
|
|
|
|
const amountCents = resolveAmountCents(fare_cents, fare, amount);
|
|
if (amountCents === null)
|
|
return Response.json({ error: "Invalid fare amount." }, { status: 400 });
|
|
|
|
const finalReturnUrl =
|
|
typeof returnUrl === "string" && isAllowedReturnUrl(returnUrl)
|
|
? returnUrl
|
|
: "waseel://book-ride";
|
|
|
|
try {
|
|
const orderId = randomUUID();
|
|
|
|
const session = await createCheckoutSession({
|
|
orderId,
|
|
amount: amountCents / 100,
|
|
currency: "USD",
|
|
description: `Waseel ride payment for ${name}`,
|
|
returnUrl: finalReturnUrl,
|
|
});
|
|
|
|
// The successIndicator stays server-side; the client never sees it.
|
|
if (!session.successIndicator)
|
|
throw new Error("Areeba did not return a successIndicator.");
|
|
|
|
await createOrder({
|
|
order_id: orderId,
|
|
user_id: auth.userId,
|
|
amount_cents: amountCents,
|
|
currency: "USD",
|
|
driver_id: driver_id ?? null,
|
|
origin_address: origin_address ?? null,
|
|
destination_address: destination_address ?? null,
|
|
origin_latitude: origin_latitude ?? null,
|
|
origin_longitude: origin_longitude ?? null,
|
|
destination_latitude: destination_latitude ?? null,
|
|
destination_longitude: destination_longitude ?? null,
|
|
ride_time: ride_time ?? null,
|
|
success_indicator: session.successIndicator,
|
|
status: "pending",
|
|
});
|
|
|
|
return Response.json({ orderId, checkoutUrl: session.checkoutUrl });
|
|
} catch (err) {
|
|
console.log("[AREEBA_PAYMENT_CREATE]: ", err);
|
|
|
|
return Response.json({ error: "Internal Server Error" }, { status: 500 });
|
|
}
|
|
} |