SMTP: - Add connection/greeting/socket timeouts so a stalled Gmail connection no longer hangs sign-up - Wrap sendMail in try/catch and fall back to logging the code - Derive secure from port (465 implicit TLS vs 587 STARTTLS) - Strip whitespace from the Gmail app password - Document SMTP_HOST/SMTP_PORT in .env.example and environment.d.ts Password reset (new): - POST /(api)/auth/forgot-password emails a 6-digit code and does not reveal whether the address is registered - POST /(api)/auth/reset-password validates the code, sets the new password, verifies the email, and signs the user in - password_reset_codes table added to seed-db.mjs - "Forgot password?" flow on the mobile sign-in screen User deletion (new): - DELETE /(api)/admin/users/[id], owner-only, blocks self-deletion - Delete button with confirmation on the dashboard Users page Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
354 lines
10 KiB
TypeScript
354 lines
10 KiB
TypeScript
import { Link, router } from "expo-router";
|
|
import { useState } from "react";
|
|
import {
|
|
Alert,
|
|
Image,
|
|
KeyboardAvoidingView,
|
|
Platform,
|
|
ScrollView,
|
|
Text,
|
|
TouchableOpacity,
|
|
View,
|
|
} from "react-native";
|
|
import ReactNativeModal from "react-native-modal";
|
|
|
|
import { CustomButton } from "@/components/custom-button";
|
|
import { InputField } from "@/components/input-field";
|
|
import { OAuth } from "@/components/oauth";
|
|
import { icons, images } from "@/constants";
|
|
import { fetchAPI } from "@/lib/fetch";
|
|
import { useSession } from "@/lib/session";
|
|
|
|
const ROLES = [
|
|
{
|
|
value: "rider",
|
|
title: "I need a ride",
|
|
description: "Book rides and get where you're going",
|
|
},
|
|
{
|
|
value: "driver",
|
|
title: "I want to drive",
|
|
description: "Offer rides and earn money with your car",
|
|
},
|
|
] as const;
|
|
|
|
type Role = (typeof ROLES)[number]["value"];
|
|
|
|
const SignUp = () => {
|
|
const { setSession } = useSession();
|
|
|
|
const [role, setRole] = useState<Role>("rider");
|
|
const [form, setForm] = useState({
|
|
name: "",
|
|
email: "",
|
|
phone: "",
|
|
password: "",
|
|
});
|
|
|
|
const [verification, setVerification] = useState({
|
|
state: "default",
|
|
error: "",
|
|
code: "",
|
|
devCode: "",
|
|
});
|
|
|
|
const onSignUpPress = async () => {
|
|
if (!form.name.trim() || !form.email.trim() || !form.password) {
|
|
Alert.alert(
|
|
"Missing information",
|
|
"Please fill in your name, email and password.",
|
|
);
|
|
return;
|
|
}
|
|
|
|
if (form.phone.trim() && !/^[0-9\s\-()+.]+$/.test(form.phone)) {
|
|
Alert.alert(
|
|
"Invalid phone number",
|
|
"Enter a valid Lebanese number, e.g. 70 123 456.",
|
|
);
|
|
return;
|
|
}
|
|
|
|
try {
|
|
const response = await fetchAPI("/(api)/auth/register", {
|
|
method: "POST",
|
|
headers: { "Content-Type": "application/json" },
|
|
body: JSON.stringify({
|
|
name: form.name,
|
|
email: form.email,
|
|
phone: form.phone.trim(),
|
|
password: form.password,
|
|
role,
|
|
}),
|
|
});
|
|
|
|
setVerification((prevVerification) => ({
|
|
...prevVerification,
|
|
state: "pending",
|
|
devCode:
|
|
(response as { data?: { devCode?: string } })?.data?.devCode ?? "",
|
|
}));
|
|
|
|
setForm((prevForm) => ({
|
|
...prevForm,
|
|
password: "",
|
|
}));
|
|
} catch (err: any) {
|
|
setForm((prevForm) => ({
|
|
...prevForm,
|
|
password: "",
|
|
}));
|
|
Alert.alert("Error", err?.message ?? "Could not create your account.");
|
|
}
|
|
};
|
|
|
|
const onPressVerify = async () => {
|
|
try {
|
|
const response = await fetchAPI("/(api)/auth/verify", {
|
|
method: "POST",
|
|
headers: { "Content-Type": "application/json" },
|
|
body: JSON.stringify({ email: form.email, code: verification.code }),
|
|
});
|
|
|
|
await setSession(response.data);
|
|
setVerification((prevVerification) => ({
|
|
...prevVerification,
|
|
state: "success",
|
|
}));
|
|
} catch (err: any) {
|
|
setVerification((prevVerification) => ({
|
|
...prevVerification,
|
|
error: err?.message?.includes("400")
|
|
? "Invalid or expired verification code."
|
|
: err?.message ?? "Verification failed.",
|
|
state: "failed",
|
|
}));
|
|
}
|
|
};
|
|
|
|
return (
|
|
<KeyboardAvoidingView
|
|
className="flex-1 bg-white"
|
|
behavior={Platform.OS === "ios" ? "padding" : "height"}
|
|
keyboardVerticalOffset={Platform.OS === "ios" ? 40 : 0}
|
|
>
|
|
<ScrollView
|
|
className="flex-1 bg-white"
|
|
keyboardShouldPersistTaps="handled"
|
|
contentContainerStyle={{ flexGrow: 1 }}
|
|
showsVerticalScrollIndicator={false}
|
|
>
|
|
<View className="flex-1 bg-white">
|
|
<View className="relative w-full h-[250px]">
|
|
<Image
|
|
source={images.signUpCar}
|
|
alt="Car"
|
|
className="z-0 w-full h-[250px]"
|
|
resizeMode="contain"
|
|
/>
|
|
|
|
<Text className="text-2xl text-black font-JakartaSemiBold absolute bottom-5 left-5">
|
|
Create Your Account
|
|
</Text>
|
|
</View>
|
|
|
|
<View className="p-5">
|
|
<Text className="text-lg font-JakartaSemiBold mb-3">
|
|
How will you use Waseel?
|
|
</Text>
|
|
<View className="flex-row gap-3 mb-4">
|
|
{ROLES.map((option) => {
|
|
const selected = role === option.value;
|
|
return (
|
|
<TouchableOpacity
|
|
key={option.value}
|
|
onPress={() => setRole(option.value)}
|
|
activeOpacity={0.8}
|
|
className={`flex-1 justify-center rounded-2xl border p-4 ${
|
|
selected
|
|
? "border-primary-500 bg-primary-500/10"
|
|
: "border-neutral-100 bg-neutral-100"
|
|
}`}
|
|
>
|
|
<Image
|
|
source={option.value === "driver" ? icons.dollar : icons.map}
|
|
alt={`${option.title} icon`}
|
|
className="h-7 w-7 mb-2"
|
|
resizeMode="contain"
|
|
/>
|
|
<Text
|
|
className={`text-[15px] font-JakartaBold ${
|
|
selected ? "text-primary-500" : "text-black"
|
|
}`}
|
|
>
|
|
{option.title}
|
|
</Text>
|
|
<Text className="text-xs text-neutral-400 font-Jakarta mt-1">
|
|
{option.description}
|
|
</Text>
|
|
</TouchableOpacity>
|
|
);
|
|
})}
|
|
</View>
|
|
|
|
<InputField
|
|
label="Name"
|
|
placeholder="Karim Haddad"
|
|
icon={icons.person}
|
|
value={form.name}
|
|
onChangeText={(value) =>
|
|
setForm((prevForm) => ({
|
|
...prevForm,
|
|
name: value,
|
|
}))
|
|
}
|
|
autoCapitalize="words"
|
|
/>
|
|
|
|
<InputField
|
|
label="Email"
|
|
placeholder="karim@email.com"
|
|
icon={icons.email}
|
|
value={form.email}
|
|
onChangeText={(value) =>
|
|
setForm((prevForm) => ({
|
|
...prevForm,
|
|
email: value,
|
|
}))
|
|
}
|
|
keyboardType="email-address"
|
|
/>
|
|
|
|
<InputField
|
|
label="Phone (optional)"
|
|
placeholder="70 123 456"
|
|
icon={icons.chat}
|
|
value={form.phone}
|
|
onChangeText={(value) =>
|
|
setForm((prevForm) => ({
|
|
...prevForm,
|
|
phone: value,
|
|
}))
|
|
}
|
|
keyboardType="phone-pad"
|
|
/>
|
|
|
|
<InputField
|
|
label="Password"
|
|
placeholder="••••••••"
|
|
icon={icons.lock}
|
|
secureTextEntry
|
|
value={form.password}
|
|
onChangeText={(value) =>
|
|
setForm((prevForm) => ({
|
|
...prevForm,
|
|
password: value,
|
|
}))
|
|
}
|
|
/>
|
|
|
|
<CustomButton
|
|
title="Sign Up"
|
|
onPress={onSignUpPress}
|
|
className="mt-6"
|
|
/>
|
|
|
|
<OAuth title="Sign up with Google" />
|
|
|
|
<Link
|
|
href="/sign-in"
|
|
className="text-base text-center text-general-200 mt-10"
|
|
>
|
|
<Text>Already have an account? </Text>
|
|
<Text className="text-primary-500">Sign in</Text>
|
|
</Link>
|
|
</View>
|
|
|
|
<ReactNativeModal
|
|
onModalHide={() =>
|
|
setVerification((prevVerification) => ({
|
|
...prevVerification,
|
|
state: "success",
|
|
}))
|
|
}
|
|
isVisible={verification.state === "pending"}
|
|
>
|
|
<View className="bg-white px-7 py-9 rounded-2xl min-h-[300px]">
|
|
<Text className="text-2xl font-JakartaExtraBold mb-2">
|
|
Verification
|
|
</Text>
|
|
|
|
<Text className="font-Jakarta mb-5">
|
|
We've sent a verification code to {form.email}
|
|
</Text>
|
|
|
|
{verification.devCode ? (
|
|
<View className="bg-amber-50 border border-amber-300 rounded-xl p-3 mb-5">
|
|
<Text className="text-sm text-amber-700 font-Jakarta">
|
|
Email delivery is not configured on this server. Your
|
|
verification code is{" "}
|
|
<Text className="font-JakartaBold">{verification.devCode}</Text>
|
|
</Text>
|
|
</View>
|
|
) : null}
|
|
|
|
<InputField
|
|
label="Code"
|
|
icon={icons.lock}
|
|
placeholder="••••••"
|
|
value={verification.code}
|
|
maxLength={6}
|
|
secureTextEntry
|
|
keyboardType="numeric"
|
|
onChangeText={(code) =>
|
|
setVerification((prevVerification) => ({
|
|
...prevVerification,
|
|
code,
|
|
}))
|
|
}
|
|
/>
|
|
|
|
{verification.error && (
|
|
<Text className="text-rose-500 text-sm mt-1">
|
|
{verification.error}
|
|
</Text>
|
|
)}
|
|
|
|
<CustomButton
|
|
title="Verify Email"
|
|
onPress={onPressVerify}
|
|
className="mt-5 bg-emerald-500"
|
|
/>
|
|
</View>
|
|
</ReactNativeModal>
|
|
<ReactNativeModal isVisible={verification.state === "success"}>
|
|
<View className="bg-white px-7 py-9 rounded-2xl min-h-[300px]">
|
|
<Image
|
|
source={images.check}
|
|
alt="Check"
|
|
className="w-[110px] h-[110px] mx-auto my-5"
|
|
/>
|
|
|
|
<Text className="text-3xl font-JakartaBold text-center">
|
|
Verified
|
|
</Text>
|
|
|
|
<Text className="text-base text-gray-400 font-Jakarta text-center mt-2">
|
|
You've succesfully verified your account.
|
|
</Text>
|
|
|
|
<CustomButton
|
|
title="Browse Home"
|
|
onPress={() => router.push("/")}
|
|
className="mt-5"
|
|
/>
|
|
</View>
|
|
</ReactNativeModal>
|
|
</View>
|
|
</ScrollView>
|
|
</KeyboardAvoidingView>
|
|
);
|
|
};
|
|
|
|
export default SignUp;
|