Sign-in gains a "Keep me signed in" checkbox: checked issues a 30-day token and prefills the address next launch, unchecked drops the session to 12 hours and forgets the address. The TTL is chosen server-side in the login route. Emailed codes are now reachable without retyping. OtpField opts into the iOS one-time-code keyboard suggestion and raises a paste chip when the user returns from Gmail with a code on the clipboard. The mails put the code first in the subject and body, which is what makes Gmail render its "Copy code" notification action at all. Fixes found along the way: - Session was wiped on every launch. decodeJwtExp used atob, which neither RN 0.74 nor Expo SDK 51 defines, so it threw, returned null, and the caller read that as "expired" and deleted the token. Replaced with a dependency-free base64url decoder, and restore now only discards a session it can prove is expired. - Verification and reset codes counted attempts but never enforced them, leaving a 6-digit code open to unlimited guessing. Both routes now charge the attempt before comparing so concurrent guesses can't race past the cap of five, and compare in constant time. - A wrong verification code showed the "Verified" success screen: onModalHide fired unconditionally, so the failure state advanced the flow. Only an explicit "verified" state does that now. - fetchAPI discarded the server's error body, so the UI substring-matched synthetic status strings and showed "Could not sign in" for everything. It now throws ApiError carrying status and the server's message. - Login answered a missing account faster than a wrong password; it now runs the same scrypt work either way. - Blank email or password is caught client-side instead of surfacing as an opaque 400, and a failed attempt only clears the password on a 401. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
104 lines
2.9 KiB
TypeScript
104 lines
2.9 KiB
TypeScript
import { sql } from "@/lib/db";
|
|
import { hashPassword } from "@/lib/password";
|
|
import { 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+/, "")}`;
|
|
};
|
|
|
|
export async function POST(req: Request) {
|
|
const { name, email, phone, password, role } = await req.json();
|
|
|
|
if (!name?.trim() || !email?.trim() || !password) {
|
|
return Response.json(
|
|
{ error: "Name, email and password are required." },
|
|
{ status: 400 },
|
|
);
|
|
}
|
|
|
|
const normalizedRole = role === "driver" ? "driver" : "rider";
|
|
|
|
if (typeof password !== "string" || password.length < 8) {
|
|
return Response.json(
|
|
{ error: "Password must be at least 8 characters." },
|
|
{ status: 400 },
|
|
);
|
|
}
|
|
|
|
try {
|
|
const existing = await sql<{ id: string; email_verified: boolean }>`
|
|
SELECT id, email_verified FROM users WHERE email = ${email.trim().toLowerCase()}
|
|
`;
|
|
|
|
if (existing[0]?.email_verified) {
|
|
return Response.json(
|
|
{ error: "An account with this email already exists. Please sign in." },
|
|
{ status: 409 },
|
|
);
|
|
}
|
|
|
|
// 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 = 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
|
|
`;
|
|
|
|
const mail = verificationEmail(code);
|
|
const delivered = await sendEmail(
|
|
email.trim().toLowerCase(),
|
|
mail.subject,
|
|
mail.text,
|
|
);
|
|
|
|
return Response.json(
|
|
{
|
|
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 }),
|
|
},
|
|
},
|
|
{ status: 201 },
|
|
);
|
|
} catch (error) {
|
|
console.error("[REGISTER]: ", error);
|
|
return Response.json({ error: "Internal Server Error" }, { status: 500 });
|
|
}
|
|
}
|