georges/waseel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Build driver app, Uber-style dispatch, POI suggestions; fix map tiles

Browse Source 
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>
This commit is contained in:
Krikorios
2026-08-24 13:57:21 +03:00
co-authored by Claude
parent 4e0a7cca51
commit f50ff27e11
48 changed files with 3342 additions and 602 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/(api)/auth/forgot-password+api.ts
+22 -17
View File
@@ -1,5 +1,5 @@
import { sql } from "@/lib/db";
import { sendEmail } from "@/lib/mailer";
import { sql, transaction } from "@/lib/db";
import { isDevOtpExposed, sendEmail } from "@/lib/mailer";
import {
CODE_TTL_MINUTES,
generateCode,
@@ -26,20 +26,24 @@ export async function POST(req: Request) {
return Response.json({ data: { sent: false } });
}
const code = generateCode();
const code = await transaction(async (tx) => {
const generated = generateCode();
await sql`
INSERT INTO password_reset_codes (email, code_hash, expires_at)
VALUES (
${normalized},
${hashCode(normalized, code)},
CURRENT_TIMESTAMP + make_interval(mins => ${CODE_TTL_MINUTES})
)
ON CONFLICT (email) DO UPDATE SET
code_hash = EXCLUDED.code_hash,
expires_at = EXCLUDED.expires_at,
attempts = 0
`;
await tx`
INSERT INTO password_reset_codes (email, code_hash, expires_at)
VALUES (
${normalized},
${hashCode(normalized, generated)},
CURRENT_TIMESTAMP + make_interval(mins => ${CODE_TTL_MINUTES})
)
ON CONFLICT (email) DO UPDATE SET
code_hash = EXCLUDED.code_hash,
expires_at = EXCLUDED.expires_at,
attempts = 0
`;
return generated;
});
const mail = resetEmail(code);
const delivered = await sendEmail(normalized, mail.subject, mail.text);
@@ -48,8 +52,9 @@ export async function POST(req: Request) {
data: {
sent: delivered,
// Without SMTP configured there is nothing to receive, so surface the
// code to keep the reset flow usable on a self-hosted box.
...(delivered ? {} : { devCode: code }),
// code to keep the reset flow usable on a self-hosted box. Never
// expose the code in production, even on delivery failure.
...(delivered || !isDevOtpExposed() ? {} : { devCode: code }),
},
});
} catch (error) {
app/(api)/auth/register+api.ts
+40 -39
View File
@@ -1,18 +1,13 @@
import { sql } from "@/lib/db";
import { sql, transaction } from "@/lib/db";
import { hashPassword } from "@/lib/password";
import { sendEmail } from "@/lib/mailer";
import { isDevOtpExposed, sendEmail } from "@/lib/mailer";
import {
CODE_TTL_MINUTES,
generateCode,
hashCode,
verificationEmail,
} from "@/lib/otp";
const normalizePhone = (raw: string): string => {
const cleaned = raw.replace(/[^\d+]/g, "");
if (cleaned.startsWith("+")) return cleaned;
return `+961${cleaned.replace(/^0+/, "")}`;
};
import { normalizePhone } from "@/lib/utils";
export async function POST(req: Request) {
const { name, email, phone, password, role } = await req.json();
@@ -46,37 +41,42 @@ export async function POST(req: Request) {
}
// Unverified rows may be re-registered (e.g. the first mail never arrived).
await sql`
INSERT INTO users (name, email, phone, password_hash, email_verified, role)
VALUES (
${name.trim()},
${email.trim().toLowerCase()},
${phone ? normalizePhone(phone) : null},
${hashPassword(password)},
FALSE,
${normalizedRole}
)
ON CONFLICT (email) DO UPDATE SET
name = EXCLUDED.name,
phone = COALESCE(EXCLUDED.phone, users.phone),
password_hash = EXCLUDED.password_hash,
role = EXCLUDED.role
`;
const code = await transaction(async (tx) => {
await tx`
INSERT INTO users (name, email, phone, password_hash, email_verified, role)
VALUES (
${name.trim()},
${email.trim().toLowerCase()},
${phone ? normalizePhone(phone) : null},
${hashPassword(password)},
FALSE,
${normalizedRole}
)
ON CONFLICT (email) DO UPDATE SET
name = EXCLUDED.name,
phone = COALESCE(EXCLUDED.phone, users.phone),
password_hash = EXCLUDED.password_hash,
role = EXCLUDED.role
WHERE users.email_verified = FALSE
`;
const code = generateCode();
const generated = generateCode();
await sql`
INSERT INTO email_verification_codes (email, code_hash, expires_at)
VALUES (
${email.trim().toLowerCase()},
${hashCode(email.trim().toLowerCase(), code)},
CURRENT_TIMESTAMP + make_interval(mins => ${CODE_TTL_MINUTES})
)
ON CONFLICT (email) DO UPDATE SET
code_hash = EXCLUDED.code_hash,
expires_at = EXCLUDED.expires_at,
attempts = 0
`;
await tx`
INSERT INTO email_verification_codes (email, code_hash, expires_at)
VALUES (
${email.trim().toLowerCase()},
${hashCode(email.trim().toLowerCase(), generated)},
CURRENT_TIMESTAMP + make_interval(mins => ${CODE_TTL_MINUTES})
)
ON CONFLICT (email) DO UPDATE SET
code_hash = EXCLUDED.code_hash,
expires_at = EXCLUDED.expires_at,
attempts = 0
`;
return generated;
});
const mail = verificationEmail(code);
const delivered = await sendEmail(
@@ -90,8 +90,9 @@ export async function POST(req: Request) {
data: {
sent: delivered,
// Without SMTP/Gmail configured there is nothing to receive, so
// surface the code to keep self-hosted sign-up usable.
...(delivered ? {} : { devCode: code }),
// surface the code to keep self-hosted sign-up usable. Never expose
// the code in production, even on delivery failure.
...(delivered || !isDevOtpExposed() ? {} : { devCode: code }),
},
},
{ status: 201 },
app/(api)/auth/reset-password+api.ts
+49 -34
View File
@@ -1,4 +1,4 @@
import { sql } from "@/lib/db";
import { transaction } from "@/lib/db";
import { MAX_CODE_ATTEMPTS, codeMatches } from "@/lib/otp";
import { hashPassword } from "@/lib/password";
import { issueSession, toProfile } from "@/lib/users";
@@ -24,52 +24,67 @@ export async function POST(req: Request) {
try {
// Charge the attempt before comparing so concurrent guesses can't race
// past the cap, and so a correct guess still costs one of the five.
const attempts = await sql<{ code_hash: string; attempts: number }>`
UPDATE password_reset_codes
SET attempts = attempts + 1
WHERE email = ${normalized} AND expires_at > CURRENT_TIMESTAMP
RETURNING code_hash, attempts
`;
// past the cap, and so a correct guess still costs one of the five. Wrap
// the attempt charge, password update, and code cleanup in one
// transaction.
const result = await transaction(async (tx) => {
const attempts = await tx<{ code_hash: string; attempts: number }>`
UPDATE password_reset_codes
SET attempts = attempts + 1
WHERE email = ${normalized} AND expires_at > CURRENT_TIMESTAMP
RETURNING code_hash, attempts
`;
const record = attempts[0];
const record = attempts[0];
if (
!record ||
record.attempts > MAX_CODE_ATTEMPTS ||
!codeMatches(record.code_hash, normalized, code)
) {
if (
!record ||
record.attempts > MAX_CODE_ATTEMPTS ||
!codeMatches(record.code_hash, normalized, code)
) {
return { kind: "invalid" as const };
}
// A successful reset also proves control of the mailbox, so verify it
// too.
const rows = await tx<{
id: string;
name: string;
email: string;
role: string | null;
}>`
UPDATE users
SET password_hash = ${hashPassword(password)}, email_verified = TRUE
WHERE email = ${normalized}
RETURNING id, name, email, role
`;
const user = rows[0];
if (!user) {
return { kind: "not_found" as const };
}
await tx`DELETE FROM password_reset_codes WHERE email = ${normalized}`;
return { kind: "ok" as const, user };
});
if (result.kind === "invalid") {
return Response.json(
{ error: "Invalid or expired reset code." },
{ status: 400 },
);
}
// A successful reset also proves control of the mailbox, so verify it too.
const rows = await sql<{
id: string;
name: string;
email: string;
role: string | null;
}>`
UPDATE users
SET password_hash = ${hashPassword(password)}, email_verified = TRUE
WHERE email = ${normalized}
RETURNING id, name, email, role
`;
const user = rows[0];
if (!user) {
if (result.kind === "not_found") {
return Response.json({ error: "User not found." }, { status: 404 });
}
await sql`DELETE FROM password_reset_codes WHERE email = ${normalized}`;
const session = issueSession(user);
const session = issueSession(result.user);
return Response.json({
data: { token: session.token, user: toProfile(user) },
data: { token: session.token, user: toProfile(result.user) },
});
} catch (error) {
console.error("[RESET_PASSWORD]: ", error);
app/(api)/auth/verify+api.ts
+45 -32
View File
@@ -1,4 +1,4 @@
import { sql } from "@/lib/db";
import { transaction } from "@/lib/db";
import {
MAX_CODE_ATTEMPTS,
codeMatches,
@@ -19,50 +19,63 @@ export async function POST(req: Request) {
try {
// Charge the attempt before comparing so concurrent guesses can't race
// past the cap, and so a correct guess still costs one of the five.
const attempts = await sql<{ code_hash: string; attempts: number }>`
UPDATE email_verification_codes
SET attempts = attempts + 1
WHERE email = ${normalized} AND expires_at > CURRENT_TIMESTAMP
RETURNING code_hash, attempts
`;
// past the cap, and so a correct guess still costs one of the five. Wrap
// the attempt charge, verification, and code cleanup in one transaction.
const result = await transaction(async (tx) => {
const attempts = await tx<{ code_hash: string; attempts: number }>`
UPDATE email_verification_codes
SET attempts = attempts + 1
WHERE email = ${normalized} AND expires_at > CURRENT_TIMESTAMP
RETURNING code_hash, attempts
`;
const record = attempts[0];
const record = attempts[0];
if (
!record ||
record.attempts > MAX_CODE_ATTEMPTS ||
!codeMatches(record.code_hash, normalized, code)
) {
if (
!record ||
record.attempts > MAX_CODE_ATTEMPTS ||
!codeMatches(record.code_hash, normalized, code)
) {
return { kind: "invalid" as const };
}
const rows = await tx<{
id: string;
name: string;
email: string;
role: string | null;
}>`
UPDATE users SET email_verified = TRUE
WHERE email = ${normalized}
RETURNING id, name, email, role
`;
const user = rows[0];
if (!user) {
return { kind: "not_found" as const };
}
await tx`DELETE FROM email_verification_codes WHERE email = ${normalized}`;
return { kind: "ok" as const, user };
});
if (result.kind === "invalid") {
return Response.json(
{ error: "Invalid or expired verification code." },
{ status: 400 },
);
}
const rows = await sql<{
id: string;
name: string;
email: string;
role: string | null;
}>`
UPDATE users SET email_verified = TRUE
WHERE email = ${normalized}
RETURNING id, name, email, role
`;
const user = rows[0];
if (!user) {
if (result.kind === "not_found") {
return Response.json({ error: "User not found." }, { status: 404 });
}
await sql`DELETE FROM email_verification_codes WHERE email = ${normalized}`;
const session = issueSession(user);
const session = issueSession(result.user);
return Response.json({
data: { token: session.token, user: toProfile(user) },
data: { token: session.token, user: toProfile(result.user) },
});
} catch (error) {
console.error("[VERIFY]: ", error);