Files
waseel/lib/otp.ts
KrikoriosandClaude f50ff27e11 Build driver app, Uber-style dispatch, POI suggestions; fix map tiles
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>
2026-08-24 13:57:21 +03:00

61 lines
2.3 KiB
TypeScript

// Shared helpers for the 6-digit email codes used by sign-up verification and
// password reset. Both flows store a peppered HMAC-SHA256 hash keyed by email,
// so the code itself only ever lives in the outgoing mail. The HMAC uses
// AUTH_JWT_SECRET as a pepper: a DB dump alone cannot recover codes without it.
import { createHmac, randomInt, timingSafeEqual } from "crypto";
export const CODE_TTL_MINUTES = 15;
// A 6-digit code is only 1,000,000 wide, so the attempt cap is what actually
// makes it safe to email. Both code tables carry an `attempts` column.
export const MAX_CODE_ATTEMPTS = 5;
export const generateCode = (): string =>
String(randomInt(0, 1_000_000)).padStart(6, "0");
// Reuse the existing required secret as a pepper. No new env var and no
// schema change (the codes table has no salt column).
const pepper = (): string => {
const value = process.env.AUTH_JWT_SECRET;
if (!value) throw new Error("Missing AUTH_JWT_SECRET.");
return value;
};
export const hashCode = (email: string, code: string): string =>
createHmac("sha256", pepper())
.update(`waseel-otp:${email}:${code}`)
.digest("hex");
export const codeMatches = (
storedHash: string,
email: string,
code: string,
): boolean => {
const expected = Buffer.from(storedHash, "hex");
const actual = Buffer.from(hashCode(email, code), "hex");
return expected.length === actual.length && timingSafeEqual(expected, actual);
};
// Gmail and iOS Mail only offer a one-tap "copy code" / keyboard suggestion
// when the code leads the subject line and the body opens with a recognised
// phrasing. Keep both formats intact when editing this copy.
export const verificationEmail = (code: string) => ({
subject: `${code} is your Waseel verification code`,
text:
`${code} is your Waseel verification code.\n\n` +
`Welcome to Waseel! Enter this code in the app to finish signing up.\n` +
`It expires in ${CODE_TTL_MINUTES} minutes.\n`,
});
export const resetEmail = (code: string) => ({
subject: `${code} is your Waseel password reset code`,
text:
`${code} is your Waseel password reset code.\n\n` +
`We received a request to reset your Waseel password. Enter this code in ` +
`the app to choose a new one.\n` +
`It expires in ${CODE_TTL_MINUTES} minutes. If you didn't ask for this, ` +
`you can ignore this email.\n`,
});