;
+ for (const [key, value] of Object.entries(parsed || {})) {
+ if (!value || typeof value !== 'object') continue;
+ const expiresAt = Number(value.expiresAt || 0);
+ const attempts = Number(value.attempts || 0);
+ const codeHash = String(value.codeHash || '');
+ if (!codeHash || !Number.isFinite(expiresAt) || !Number.isFinite(attempts)) continue;
+ records.set(key, { codeHash, expiresAt, attempts });
+ }
+ } catch {
+ // Ignore corrupt persistence and continue with empty in-memory store.
+ }
+}
+
+function persistRecords(): void {
+ try {
+ const dir = path.dirname(STORE_FILE);
+ if (!fs.existsSync(dir)) fs.mkdirSync(dir, { recursive: true });
+ const payload = Object.fromEntries(records.entries());
+ fs.writeFileSync(STORE_FILE, JSON.stringify(payload), 'utf8');
+ } catch {
+ // Persistence best effort in local/dev context.
+ }
+}
function hashCode(code: string): string {
return crypto.createHash('sha256').update(code).digest('hex');
@@ -22,11 +55,18 @@ function keyFor(email: string, flow: VerificationFlow): string {
function cleanupExpired(): void {
const now = Date.now();
+ let changed = false;
for (const [key, record] of records.entries()) {
- if (record.expiresAt <= now) records.delete(key);
+ if (record.expiresAt <= now) {
+ records.delete(key);
+ changed = true;
+ }
}
+ if (changed) persistRecords();
}
+loadRecords();
+
export function createVerificationCode(input: { email: string; flow: VerificationFlow }) {
cleanupExpired();
const email = input.email.toLowerCase().trim();
@@ -39,6 +79,7 @@ export function createVerificationCode(input: { email: string; flow: Verificatio
expiresAt,
attempts: 0,
});
+ persistRecords();
return {
code,
@@ -57,20 +98,24 @@ export function consumeVerificationCode(input: { email: string; flow: Verificati
if (record.expiresAt <= Date.now()) {
records.delete(key);
+ persistRecords();
return { ok: false, reason: 'EXPIRED' };
}
if (record.attempts >= MAX_ATTEMPTS) {
records.delete(key);
+ persistRecords();
return { ok: false, reason: 'TOO_MANY_ATTEMPTS' };
}
if (record.codeHash !== hashCode(input.code.trim())) {
record.attempts += 1;
records.set(key, record);
+ persistRecords();
return { ok: false, reason: 'INVALID_CODE' };
}
records.delete(key);
+ persistRecords();
return { ok: true };
}
diff --git a/src/lib/server/gateway.ts b/src/lib/server/gateway.ts
index de6e32c..24059e7 100644
--- a/src/lib/server/gateway.ts
+++ b/src/lib/server/gateway.ts
@@ -2,6 +2,12 @@ const gatewayBase = (process.env.NEXT_PUBLIC_API_URL || process.env.PUBLIC_API_U
export function gatewayUrl(path: string) {
const normalized = path.startsWith('/') ? path : `/${path}`;
+ if (gatewayBase.endsWith('/api')) {
+ if (normalized === '/api') return gatewayBase;
+ if (normalized.startsWith('/api/')) {
+ return `${gatewayBase}${normalized.slice(4)}`;
+ }
+ }
return `${gatewayBase}${normalized}`;
}
diff --git a/src/routes/api/runtime/onboarding/schema.ts b/src/routes/api/runtime/onboarding/schema.ts
index 6cdcfb1..92fc685 100644
--- a/src/routes/api/runtime/onboarding/schema.ts
+++ b/src/routes/api/runtime/onboarding/schema.ts
@@ -1,9 +1,10 @@
-const RUST_API_URL = import.meta.env.VITE_RUST_API_URL || 'http://localhost:8080';
+import { gatewayUrl, withAuthHeaders } from '~/lib/server/gateway';
export async function GET({ request }: { request: Request }) {
try {
const url = new URL(request.url);
const roleKey = String(url.searchParams.get('roleKey') || '').trim().toUpperCase();
+ const schemaId = String(url.searchParams.get('schemaId') || '').trim();
if (!roleKey) {
return new Response(JSON.stringify({ success: false, error: 'roleKey is required' }), {
@@ -12,17 +13,80 @@ export async function GET({ request }: { request: Request }) {
});
}
- const configRes = await fetch(`${RUST_API_URL}/api/admin/onboarding-config/by-key/${roleKey}`);
- if (!configRes.ok) {
- return new Response(JSON.stringify({ success: false, error: 'Onboarding config not found for this role' }), {
- status: configRes.status,
+ const roleKeyCandidates = Array.from(
+ new Set([
+ roleKey,
+ roleKey.replace(/_/g, ''),
+ roleKey.replace(/_/g, '-'),
+ ].filter(Boolean)),
+ );
+
+ const authHeaders = withAuthHeaders(request, { Accept: 'application/json', 'x-portal-target': 'public' });
+ let lastStatus = 404;
+ let lastError = `Onboarding config not found for role ${roleKey}.`;
+ let schemaJson: any = null;
+ const rustBase = (import.meta.env.VITE_RUST_API_URL || 'http://localhost:8080').replace(/\/+$/, '');
+
+ for (const candidate of roleKeyCandidates) {
+ const endpoints = Array.from(
+ new Set([
+ gatewayUrl(`/admin/onboarding-config/by-key/${encodeURIComponent(candidate)}`),
+ `${rustBase}/api/admin/onboarding-config/by-key/${encodeURIComponent(candidate)}`,
+ `${rustBase}/admin/onboarding-config/by-key/${encodeURIComponent(candidate)}`,
+ ]),
+ );
+
+ for (const endpoint of endpoints) {
+ let configRes: Response;
+ try {
+ configRes = await fetch(endpoint, {
+ method: 'GET',
+ headers: authHeaders,
+ cache: 'no-store',
+ });
+ } catch (error: any) {
+ lastStatus = 503;
+ lastError = `Onboarding backend unavailable. Could not reach ${endpoint}. Start gateway/backend services and retry.`;
+ continue;
+ }
+
+ const config = await configRes.json().catch(() => ({}));
+ if (!configRes.ok) {
+ lastStatus = configRes.status || lastStatus;
+ lastError = String(config?.error || config?.message || lastError);
+ continue;
+ }
+
+ const parsedSchema = config?.schema_json || config?.schemaJson || null;
+ if (!parsedSchema) {
+ lastStatus = 500;
+ lastError = `Runtime onboarding schema is missing for role ${candidate}.`;
+ continue;
+ }
+
+ schemaJson = parsedSchema;
+ break;
+ }
+
+ if (schemaJson) break;
+ }
+
+ if (!schemaJson) {
+ const errorMessage = lastStatus === 503
+ ? lastError
+ : `${lastError} (role=${roleKey}${schemaId ? `, schemaId=${schemaId}` : ''})`;
+
+ return new Response(JSON.stringify({
+ success: false,
+ error: errorMessage,
+ ...(schemaId ? { schemaId } : {}),
+ }), {
+ status: lastStatus,
headers: { 'Content-Type': 'application/json' },
});
}
- const config = await configRes.json();
-
- return new Response(JSON.stringify({ success: true, data: config.schema_json }), {
+ return new Response(JSON.stringify({ success: true, data: schemaJson }), {
status: 200,
headers: { 'Content-Type': 'application/json' },
});
diff --git a/src/routes/api/users/auth/check-email.ts b/src/routes/api/users/auth/check-email.ts
index ac05770..4b595fe 100644
--- a/src/routes/api/users/auth/check-email.ts
+++ b/src/routes/api/users/auth/check-email.ts
@@ -1,4 +1,9 @@
-const RUST_API_URL = import.meta.env.VITE_RUST_API_URL || 'http://localhost:8080';
+const API_BASE = (
+ process.env.NEXT_PUBLIC_API_URL
+ || process.env.PUBLIC_API_URL
+ || import.meta.env.VITE_RUST_API_URL
+ || 'http://localhost:3005/api'
+).replace(/\/+$/, '');
export async function POST({ request }: { request: Request }) {
try {
@@ -12,7 +17,7 @@ export async function POST({ request }: { request: Request }) {
});
}
- const res = await fetch(`${RUST_API_URL}/api/auth/check-email`, {
+ const res = await fetch(`${API_BASE}/auth/check-email`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({ email }),
@@ -31,8 +36,15 @@ export async function POST({ request }: { request: Request }) {
headers: { 'Content-Type': 'application/json' },
});
} catch (error: any) {
- return new Response(JSON.stringify({ success: false, error: error?.message || 'Internal Server Error' }), {
- status: 500,
+ const message = String(error?.message || '');
+ const unavailable = message.toLowerCase().includes('fetch failed') || message.toLowerCase().includes('econnrefused');
+ return new Response(JSON.stringify({
+ success: false,
+ error: unavailable
+ ? `Auth backend unavailable at ${API_BASE}. Start Rust gateway/service and retry.`
+ : (error?.message || 'Internal Server Error'),
+ }), {
+ status: unavailable ? 503 : 500,
headers: { 'Content-Type': 'application/json' },
});
}
diff --git a/src/routes/api/users/auth/login.ts b/src/routes/api/users/auth/login.ts
index 5b0a35b..a3c411e 100644
--- a/src/routes/api/users/auth/login.ts
+++ b/src/routes/api/users/auth/login.ts
@@ -1,4 +1,9 @@
-const RUST_API_URL = import.meta.env.VITE_RUST_API_URL || 'http://localhost:8080';
+const API_BASE = (
+ process.env.NEXT_PUBLIC_API_URL
+ || process.env.PUBLIC_API_URL
+ || import.meta.env.VITE_RUST_API_URL
+ || 'http://localhost:3005/api'
+).replace(/\/+$/, '');
export async function POST({ request }: { request: Request }) {
try {
@@ -10,7 +15,7 @@ export async function POST({ request }: { request: Request }) {
password: payload.password,
};
- const res = await fetch(`${RUST_API_URL}/api/auth/login`, {
+ const res = await fetch(`${API_BASE}/auth/login`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(rustPayload)
@@ -33,8 +38,15 @@ export async function POST({ request }: { request: Request }) {
});
} catch (error: any) {
- return new Response(JSON.stringify({ success: false, error: error?.message || 'Internal Server Error' }), {
- status: 500,
+ const message = String(error?.message || '');
+ const unavailable = message.toLowerCase().includes('fetch failed') || message.toLowerCase().includes('econnrefused');
+ return new Response(JSON.stringify({
+ success: false,
+ error: unavailable
+ ? `Auth backend unavailable at ${API_BASE}. Start Rust gateway/service and retry.`
+ : (error?.message || 'Internal Server Error'),
+ }), {
+ status: unavailable ? 503 : 500,
headers: { 'Content-Type': 'application/json' },
});
}
diff --git a/src/routes/api/users/auth/register.ts b/src/routes/api/users/auth/register.ts
index 6135a4f..087c2a0 100644
--- a/src/routes/api/users/auth/register.ts
+++ b/src/routes/api/users/auth/register.ts
@@ -1,4 +1,9 @@
-const RUST_API_URL = import.meta.env.VITE_RUST_API_URL || 'http://localhost:8080';
+const API_BASE = (
+ process.env.NEXT_PUBLIC_API_URL
+ || process.env.PUBLIC_API_URL
+ || import.meta.env.VITE_RUST_API_URL
+ || 'http://localhost:3005/api'
+).replace(/\/+$/, '');
export async function POST({ request }: { request: Request }) {
try {
@@ -6,16 +11,27 @@ export async function POST({ request }: { request: Request }) {
// Convert to Rust expected format
let roleKey = payload.intent === 'company' ? 'COMPANY' : 'CUSTOMER';
- if (payload.intent === 'jobseeker') roleKey = 'JOBSEEKER';
+ if (payload.intent === 'job_seeker' || payload.intent === 'job-seeker' || payload.intent === 'jobseeker') roleKey = 'JOB_SEEKER';
if (payload.intent === 'professional') roleKey = 'PHOTOGRAPHER'; // default fallback for now if none specified
+ const firstName = String(payload.firstName || payload.first_name || '').trim();
+ const lastName = String(payload.lastName || payload.last_name || '').trim();
+ const fullName = [firstName, lastName].filter(Boolean).join(' ').trim()
+ || String(payload.name || payload.full_name || '').trim();
+ if (!fullName) {
+ return new Response(JSON.stringify({ success: false, error: 'Full name is required' }), {
+ status: 400,
+ headers: { 'Content-Type': 'application/json' },
+ });
+ }
const rustPayload = {
+ full_name: fullName,
email: payload.email,
password: payload.password,
role_key: roleKey
};
- const res = await fetch(`${RUST_API_URL}/api/auth/register`, {
+ const res = await fetch(`${API_BASE}/auth/register`, {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify(rustPayload)
@@ -38,8 +54,15 @@ export async function POST({ request }: { request: Request }) {
});
} catch (error: any) {
- return new Response(JSON.stringify({ success: false, error: error?.message || 'Internal Server Error' }), {
- status: 500,
+ const message = String(error?.message || '');
+ const unavailable = message.toLowerCase().includes('fetch failed') || message.toLowerCase().includes('econnrefused');
+ return new Response(JSON.stringify({
+ success: false,
+ error: unavailable
+ ? `Auth backend unavailable at ${API_BASE}. Start Rust gateway/service and retry.`
+ : (error?.message || 'Internal Server Error'),
+ }), {
+ status: unavailable ? 503 : 500,
headers: { 'Content-Type': 'application/json' },
});
}
diff --git a/src/routes/api/users/auth/verify-email.ts b/src/routes/api/users/auth/verify-email.ts
new file mode 100644
index 0000000..ed2352f
--- /dev/null
+++ b/src/routes/api/users/auth/verify-email.ts
@@ -0,0 +1,43 @@
+import { gatewayUrl } from '~/lib/server/gateway';
+
+export async function POST({ request }: { request: Request }) {
+ try {
+ const body = await request.json().catch(() => ({}));
+ const otp = String(body?.otp || '').trim();
+
+ if (!otp) {
+ return new Response(
+ JSON.stringify({ success: false, error: 'OTP is required' }),
+ { status: 400, headers: { 'Content-Type': 'application/json' } },
+ );
+ }
+
+ const res = await fetch(gatewayUrl('/api/auth/verify-email'), {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ otp }),
+ });
+
+ const data = await res.json().catch(() => ({}));
+ if (!res.ok) {
+ return new Response(
+ JSON.stringify({
+ success: false,
+ error: data?.error || data?.message || 'Failed to verify email',
+ code: data?.code || null,
+ }),
+ { status: res.status, headers: { 'Content-Type': 'application/json' } },
+ );
+ }
+
+ return new Response(
+ JSON.stringify({ success: true, message: data?.message || 'Email verified successfully' }),
+ { status: 200, headers: { 'Content-Type': 'application/json' } },
+ );
+ } catch (error: any) {
+ return new Response(
+ JSON.stringify({ success: false, error: error?.message || 'Internal Server Error' }),
+ { status: 500, headers: { 'Content-Type': 'application/json' } },
+ );
+ }
+}
diff --git a/src/routes/api/users/auth/verify.ts b/src/routes/api/users/auth/verify.ts
index df1a522..0af12bd 100644
--- a/src/routes/api/users/auth/verify.ts
+++ b/src/routes/api/users/auth/verify.ts
@@ -61,6 +61,8 @@ export async function POST({ request }: { request: Request }) {
? 'Invalid verification code'
: result.reason === 'TOO_MANY_ATTEMPTS'
? 'Too many attempts. Please request a new code.'
+ : result.reason === 'NOT_FOUND'
+ ? 'Verification session not found. Please request a new code.'
: 'Verification code expired. Please request a new code.';
return new Response(JSON.stringify({ success: false, message }), {
diff --git a/src/routes/auth/register/index.tsx b/src/routes/auth/register/index.tsx
index c9fbca2..5465d7b 100644
--- a/src/routes/auth/register/index.tsx
+++ b/src/routes/auth/register/index.tsx
@@ -208,7 +208,43 @@ export default function RegisterPage() {
const exists = await checkEmailExists(email());
if (exists) {
- setError('This email is already registered. Please sign in or use another email.');
+ const normalizedEmail = email().trim().toLowerCase();
+ const fullName = `${firstName().trim()} ${lastName().trim()}`.trim();
+
+ // Keep pending credentials so verification page can auto-login after OTP.
+ window.localStorage.setItem(
+ PENDING_REGISTER_KEY,
+ JSON.stringify({
+ firstName: firstName().trim(),
+ lastName: lastName().trim(),
+ name: fullName,
+ email: normalizedEmail,
+ password: password(),
+ userType: getRegistrationExtras(resolvedIntent).userType,
+ intent: resolvedIntent,
+ redirect: resolvedRedirect(),
+ }),
+ );
+
+ // Existing account may be unverified; resend backend OTP and continue.
+ const resendResponse = await fetch('/api/users/auth/verification/resend-otp', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ email: normalizedEmail }),
+ });
+ const resendPayload = await resendResponse.json().catch(() => ({}));
+ if (!resendResponse.ok || !resendPayload?.success) {
+ setError('This email is already registered. Please sign in or use another email.');
+ return;
+ }
+
+ const next = new URLSearchParams({
+ email: normalizedEmail,
+ flow: 'register',
+ intent: resolvedIntent || 'customer',
+ redirect: resolvedRedirect(),
+ });
+ navigate(`/auth/verification?${next.toString()}`);
return;
}
@@ -251,31 +287,32 @@ export default function RegisterPage() {
const normalizedEmail = email().trim().toLowerCase();
saveCanonicalIntent(resolvedIntent);
- const verificationResponse = await fetch('/api/users/auth/verification/request-code', {
+ const fullName = `${firstName().trim()} ${lastName().trim()}`.trim();
+ const registerResponse = await fetch('/api/users/auth/register', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
- body: JSON.stringify({ email: normalizedEmail, flow: 'register' }),
+ body: JSON.stringify({
+ firstName: firstName().trim(),
+ lastName: lastName().trim(),
+ name: fullName,
+ email: normalizedEmail,
+ password: password(),
+ userType: getRegistrationExtras(resolvedIntent).userType,
+ intent: resolvedIntent,
+ }),
});
- const verificationPayload = await verificationResponse.json().catch(() => ({}));
- if (!verificationResponse.ok || !verificationPayload?.success) {
- setError(verificationPayload?.error || verificationPayload?.message || 'Failed to send verification code.');
- setLoading(false);
+ const registerPayload = await registerResponse.json().catch(() => ({}));
+ if (!registerResponse.ok || !registerPayload?.success) {
+ setError(registerPayload?.error || registerPayload?.message || 'Registration failed.');
return;
}
- const debugCode = String(verificationPayload?.data?.debugCode || '').trim();
- if (debugCode) {
- window.localStorage.setItem(
- DEV_VERIFICATION_CODE_KEY,
- JSON.stringify({ email: normalizedEmail, flow: 'register', code: debugCode, createdAt: Date.now() }),
- );
- }
-
- const fullName = `${firstName().trim()} ${lastName().trim()}`.trim();
window.localStorage.setItem(
PENDING_REGISTER_KEY,
JSON.stringify({
+ firstName: firstName().trim(),
+ lastName: lastName().trim(),
name: fullName,
email: normalizedEmail,
password: password(),
diff --git a/src/routes/auth/verification/index.tsx b/src/routes/auth/verification/index.tsx
index fd95abd..f49c8b7 100644
--- a/src/routes/auth/verification/index.tsx
+++ b/src/routes/auth/verification/index.tsx
@@ -9,6 +9,8 @@ const PENDING_REGISTER_KEY = 'nxtgauge_pending_register_v1';
const DEV_VERIFICATION_CODE_KEY = 'nxtgauge_dev_verification_code_v1';
type PendingRegisterPayload = {
+ firstName?: string;
+ lastName?: string;
name: string;
email: string;
password: string;
@@ -47,6 +49,10 @@ function readDevVerificationCode(email: string, flow: string): string {
}
}
+function getApiErrorMessage(payload: any): string {
+ return String(payload?.error || payload?.message || payload?.code || '').trim();
+}
+
export default function VerificationPage() {
const navigate = useNavigate();
const [search] = useSearchParams();
@@ -61,6 +67,24 @@ export default function VerificationPage() {
const resolvedIntent = createMemo(() => intent() || readCanonicalIntent());
const registerTarget = createMemo(() => (resolvedIntent() ? intentToOnboardingPath(resolvedIntent()) : '/dashboard'));
+ const chooseRoleTarget = createMemo(() => {
+ const params = new URLSearchParams();
+ if (resolvedIntent()) params.set('intent', String(resolvedIntent()));
+ const profession = String(search.profession || '').trim();
+ if (profession) params.set('profession', profession);
+ const qs = params.toString();
+ return `/users/choose-role${qs ? `?${qs}` : ''}`;
+ });
+ const backHref = createMemo(() => {
+ const params = new URLSearchParams();
+ if (resolvedIntent()) params.set('intent', String(resolvedIntent()));
+ if (redirect()) params.set('redirect', String(redirect()));
+ const profession = String(search.profession || '').trim();
+ if (profession) params.set('profession', profession);
+ const qs = params.toString();
+ if (flow() === 'register') return `/auth/register${qs ? `?${qs}` : ''}`;
+ return `/auth/login${qs ? `?${qs}` : ''}`;
+ });
const [otp, setOtp] = createSignal(Array.from({ length: OTP_LENGTH }, () => ''));
const [timer, setTimer] = createSignal(30);
@@ -99,25 +123,7 @@ export default function VerificationPage() {
}
try {
- const registerResponse = await fetch('/api/users/auth/register', {
- method: 'POST',
- headers: { 'Content-Type': 'application/json' },
- body: JSON.stringify({
- name: pending.name,
- email: pending.email,
- password: pending.password,
- ...(typeof pending.userType === 'number' ? { userType: pending.userType } : {}),
- }),
- });
-
- const registerPayload = await registerResponse.json().catch(() => ({}));
- if (!registerResponse.ok || !registerPayload?.success) {
- setError(String(registerPayload?.error || registerPayload?.message || 'Registration failed.'));
- setLoading(false);
- return;
- }
-
- // Auto login right after
+ // Auto login after successful backend OTP verification
const loginResponse = await fetch('/api/users/auth/login', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
@@ -127,7 +133,8 @@ export default function VerificationPage() {
const loginPayload = await loginResponse.json().catch(() => ({}));
if (!loginResponse.ok || !loginPayload?.success) {
- setError('Email verified and account created. Please sign in to continue.');
+ const loginError = getApiErrorMessage(loginPayload);
+ setError(loginError || 'Email verified and account created. Please sign in to continue.');
setLoading(false);
return;
}
@@ -139,11 +146,11 @@ export default function VerificationPage() {
window.localStorage.removeItem(PENDING_REGISTER_KEY);
window.localStorage.removeItem(DEV_VERIFICATION_CODE_KEY);
- navigate(pending.redirect || redirect() || registerTarget(), { replace: true });
+ navigate(chooseRoleTarget(), { replace: true });
return;
} catch (err: any) {
- setError('Registration failed: ' + err.message);
+ setError('Login failed: ' + err.message);
setLoading(false);
return;
}
@@ -172,14 +179,20 @@ export default function VerificationPage() {
setInfo('');
try {
- const response = await fetch('/api/users/auth/verify', {
- method: 'POST',
- headers: { 'Content-Type': 'application/json' },
- body: JSON.stringify({ email: email(), code, flow: flow() }),
- });
+ const response = flow() === 'register'
+ ? await fetch('/api/users/auth/verify-email', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ otp: code }),
+ })
+ : await fetch('/api/users/auth/verify', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ email: email(), code, flow: flow() }),
+ });
const payload = await response.json().catch(() => ({}));
if (!response.ok || !payload?.success) {
- setError(payload?.message || payload?.error || 'Invalid verification code.');
+ setError(getApiErrorMessage(payload) || 'Invalid verification code.');
setLoading(false);
return;
}
@@ -198,15 +211,21 @@ export default function VerificationPage() {
setInfo('');
try {
- const response = await fetch('/api/users/auth/verification/request-code', {
- method: 'POST',
- headers: { 'Content-Type': 'application/json' },
- body: JSON.stringify({ email: email(), flow: flow() }),
- });
+ const response = flow() === 'register'
+ ? await fetch('/api/users/auth/verification/resend-otp', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ email: email() }),
+ })
+ : await fetch('/api/users/auth/verification/request-code', {
+ method: 'POST',
+ headers: { 'Content-Type': 'application/json' },
+ body: JSON.stringify({ email: email(), flow: flow() }),
+ });
const payload = await response.json().catch(() => ({}));
if (!response.ok || !payload?.success) {
- setError(payload?.message || payload?.error || 'Failed to resend verification code.');
+ setError(getApiErrorMessage(payload) || 'Failed to resend verification code.');
setIsResending(false);
return;
}
@@ -267,9 +286,12 @@ export default function VerificationPage() {
+ Back
- Back to Sign In
+
+ Back to {flow() === 'register' ? Sign Up : Sign In}
+
diff --git a/src/routes/onboarding.tsx b/src/routes/onboarding.tsx
index 33af456..74908f4 100644
--- a/src/routes/onboarding.tsx
+++ b/src/routes/onboarding.tsx
@@ -1,8 +1,10 @@
import { createMemo, createSignal, For, onMount, Show } from 'solid-js';
import { useSearchParams } from '@solidjs/router';
import { authState } from '~/lib/auth';
-import type { RuntimeOnboardingConfig, RuntimeOnboardingField, UploadedFileMeta } from '~/lib/runtime/types';
+import type { RuntimeOnboardingConfig, RuntimeOnboardingField, RuntimeOption, UploadedFileMeta } from '~/lib/runtime/types';
import { evaluateVisibility, normalizeRoleKey, schemaIdFromInput } from '~/lib/onboarding-flow';
+import { isValidEmail } from '~/lib/form-validation';
+import PublicBackground from '~/components/PublicBackground';
function isEmptyValue(value: unknown) {
if (value == null) return true;
@@ -11,34 +13,126 @@ function isEmptyValue(value: unknown) {
return false;
}
+function parseBoolean(value: unknown): boolean {
+ if (typeof value === 'boolean') return value;
+ if (typeof value === 'number') return value === 1;
+ if (typeof value === 'string') {
+ const normalized = value.trim().toLowerCase();
+ return normalized === 'true' || normalized === '1' || normalized === 'yes';
+ }
+ return false;
+}
+
+const ROLE_SKILL_OPTIONS: Record = {
+ DEVELOPER: ['JavaScript', 'TypeScript', 'React', 'SolidJS', 'Node.js', 'Rust', 'PostgreSQL', 'Docker'],
+ PHOTOGRAPHER: ['Portrait Photography', 'Wedding Photography', 'Event Photography', 'Photo Editing', 'Studio Lighting', 'Product Photography'],
+ MAKEUP_ARTIST: ['Bridal Makeup', 'Party Makeup', 'Editorial Makeup', 'Airbrush Makeup', 'Skincare Prep', 'Hairstyling'],
+ TUTOR: ['Mathematics', 'Science', 'English', 'Coding', 'Test Preparation', 'Language Training'],
+ VIDEO_EDITOR: ['Adobe Premiere Pro', 'Final Cut Pro', 'DaVinci Resolve', 'Motion Graphics', 'Color Grading', 'Short-form Content'],
+ GRAPHIC_DESIGNER: ['Brand Identity', 'Logo Design', 'Social Media Design', 'UI Design', 'Typography', 'Illustration'],
+ SOCIAL_MEDIA_MANAGER: ['Content Strategy', 'Content Calendar', 'Community Management', 'Performance Analytics', 'Paid Campaigns', 'Copywriting'],
+ FITNESS_TRAINER: ['Weight Training', 'Fat Loss', 'Functional Training', 'Mobility', 'Nutrition Basics', 'Online Coaching'],
+ CATERING_SERVICES: ['Wedding Catering', 'Corporate Catering', 'Live Counters', 'Menu Planning', 'Bulk Orders', 'Event Logistics'],
+ COMPANY: ['Hiring', 'Team Management', 'Project Planning', 'Operations', 'Client Communication', 'Growth Strategy'],
+ JOB_SEEKER: ['Communication', 'Problem Solving', 'Teamwork', 'Time Management', 'Project Ownership', 'Adaptability'],
+ CUSTOMER: ['Home Services', 'Event Services', 'Education Services', 'Tech Services', 'Beauty Services', 'Fitness Services'],
+};
+
+function skillOptionsForRole(roleKey: string): RuntimeOption[] {
+ const normalized = String(roleKey || '').trim().toUpperCase();
+ const options = ROLE_SKILL_OPTIONS[normalized] || [];
+ return options.map((entry) => ({ label: entry, value: entry }));
+}
+
+function isSkillFieldCandidate(fieldId: unknown, fieldLabel: unknown): boolean {
+ const id = String(fieldId || '').toLowerCase();
+ const label = String(fieldLabel || '').toLowerCase();
+ return id.includes('skill') || label.includes('skill');
+}
+
+function isWorkModeFieldCandidate(fieldId: unknown, fieldLabel: unknown): boolean {
+ const id = String(fieldId || '').toLowerCase();
+ const label = String(fieldLabel || '').toLowerCase();
+ return id.includes('work_mode') || id.includes('workmode') || label.includes('work mode');
+}
+
+function isAlwaysEditableField(fieldId: unknown): boolean {
+ const id = String(fieldId || '').trim().toLowerCase();
+ return id === 'preferred_role';
+}
+
+function isForcedTextField(fieldId: unknown): boolean {
+ const id = String(fieldId || '').trim().toLowerCase();
+ return id === 'preferred_role';
+}
+
function validateField(field: RuntimeOnboardingField, value: unknown): string | null {
- if (field.required && isEmptyValue(value)) return `${field.label} is required.`;
+ if (field.required && isEmptyValue(value)) {
+ if (field.type === 'checkbox') return 'Please enable this option.';
+ if (field.type === 'file') return 'Please upload the file.';
+ if (field.type === 'select') return 'Please select an option.';
+ if (field.type === 'date') return 'Please select the date.';
+ return 'Please fill this field.';
+ }
if (isEmptyValue(value)) return null;
if (field.type === 'number') {
const numeric = Number(value);
- if (Number.isNaN(numeric)) return `${field.label} must be a number.`;
- if (typeof field.validation?.min === 'number' && numeric < field.validation.min) return `${field.label} must be at least ${field.validation.min}.`;
- if (typeof field.validation?.max === 'number' && numeric > field.validation.max) return `${field.label} must be at most ${field.validation.max}.`;
+ if (Number.isNaN(numeric)) return 'Please enter a valid number.';
+ if (typeof field.validation?.min === 'number' && numeric < field.validation.min) return `Please enter a value of at least ${field.validation.min}.`;
+ if (typeof field.validation?.max === 'number' && numeric > field.validation.max) return `Please enter a value of at most ${field.validation.max}.`;
}
if (typeof value === 'string') {
+ if (field.type === 'email' && !isValidEmail(value)) {
+ return 'Please enter a valid email address (e.g., user@example.com).';
+ }
+ if (field.type === 'tel') {
+ const telRegex = /^\+?[0-9\s\-()]{7,20}$/;
+ if (!telRegex.test(value.trim())) {
+ return 'Please enter a valid phone number.';
+ }
+ }
+ if (field.type === 'url') {
+ try {
+ const parsed = new URL(value);
+ if (!/^https?:$/.test(parsed.protocol)) return 'Please enter a URL starting with http:// or https://.';
+ } catch {
+ return 'Please enter a valid URL.';
+ }
+ }
+ if (field.type === 'date' && Number.isNaN(Date.parse(value))) {
+ return 'Please select a valid date.';
+ }
if (typeof field.validation?.minLength === 'number' && value.length < field.validation.minLength) {
- return `${field.label} must be at least ${field.validation.minLength} characters.`;
+ if (field.type === 'textarea') return `Please fill the description, min ${field.validation.minLength} characters.`;
+ return `Please enter at least ${field.validation.minLength} characters.`;
}
if (typeof field.validation?.maxLength === 'number' && value.length > field.validation.maxLength) {
- return `${field.label} must be at most ${field.validation.maxLength} characters.`;
+ return `Please enter no more than ${field.validation.maxLength} characters.`;
}
if (field.validation?.pattern && !new RegExp(field.validation.pattern).test(value)) {
- return `${field.label} format is invalid.`;
+ return 'Please enter a valid value.';
+ }
+ }
+
+ if (field.type === 'select') {
+ const options = (field.options || []).map((opt) => opt.value);
+ if (field.multiple) {
+ const values = Array.isArray(value) ? value : [];
+ const invalid = values.find((entry) => !options.includes(String(entry)));
+ if (invalid) return 'Please select a valid option.';
+ } else {
+ const selected = String(value || '');
+ if (selected && !options.includes(selected)) return 'Please select a valid option.';
}
}
if (field.type === 'file') {
const files = value as UploadedFileMeta[] | undefined;
const length = files?.length || 0;
- if (field.required && length === 0) return `${field.label} is required.`;
- if (typeof field.maxFiles === 'number' && length > field.maxFiles) return `${field.label} allows only ${field.maxFiles} file(s).`;
+ if (field.required && length === 0) return 'Please upload the file.';
+ if (typeof field.maxFiles === 'number' && length > field.maxFiles) return `Please upload at most ${field.maxFiles} file(s).`;
}
return null;
@@ -79,11 +173,19 @@ function normalizeSchemaPayload(payload: any, schemaId: string, roleKey: string)
...(field?.validation && typeof field.validation === 'object' ? field.validation : {}),
};
+ const roleSkills = skillOptionsForRole(roleKey);
+ const shouldForceSkillSelect = isSkillFieldCandidate(field?.id, field?.label);
+ const useSkillOptions = shouldForceSkillSelect && roleSkills.length > 0;
+ const useWorkModeSelect = isWorkModeFieldCandidate(field?.id, field?.label) && Array.isArray(options) && options.length > 0;
+ const forceText = isForcedTextField(field?.id);
+
return {
...field,
- type,
- options,
- readOnly: Boolean(field?.readOnly ?? field?.readonly),
+ type: forceText ? 'text' : ((useSkillOptions || useWorkModeSelect) ? 'select' : type),
+ options: forceText ? undefined : (useSkillOptions ? roleSkills : options),
+ readOnly: isAlwaysEditableField(field?.id) ? false : parseBoolean(field?.readOnly ?? field?.readonly),
+ multiple: forceText ? false : (useSkillOptions ? true : (useWorkModeSelect ? false : parseBoolean(field?.multiple))),
+ ...(useSkillOptions ? { placeholder: 'Select one or more options' } : {}),
validation: Object.keys(validation).length > 0 ? validation : undefined,
};
}) : [];
@@ -109,6 +211,7 @@ export default function OnboardingPage() {
const [schema, setSchema] = createSignal(null);
const [values, setValues] = createSignal>({});
const [errors, setErrors] = createSignal>({});
+ const [touched, setTouched] = createSignal>({});
const [stepIndex, setStepIndex] = createSignal(0);
const [statusMessage, setStatusMessage] = createSignal('');
const [submitted, setSubmitted] = createSignal(false);
@@ -126,6 +229,16 @@ export default function OnboardingPage() {
if (fromQuery) return fromQuery;
return schemaIdFromInput(effectiveRoleKey(), requestedProfession());
});
+ const userIdentity = createMemo(() => {
+ const fullName = String(authState().runtime_config?.user?.full_name || '').trim();
+ if (!fullName) return { fullName: '', firstName: '', lastName: '' };
+ const parts = fullName.split(/\s+/).filter(Boolean);
+ const firstName = parts[0] || '';
+ const lastName = parts.slice(1).join(' ');
+ return { fullName, firstName, lastName };
+ });
+ const isManagedNameField = (fieldId: string) => ['full_name', 'first_name', 'last_name'].includes(fieldId);
+ const isLockedProfileField = (fieldId: string) => ['full_name', 'first_name', 'last_name', 'city'].includes(fieldId);
onMount(async () => {
try {
@@ -155,7 +268,14 @@ export default function OnboardingPage() {
const initialValues: Record = {};
normalized.steps.forEach((step) => {
step.fields.forEach((field) => {
- if (field.defaultValue !== undefined) initialValues[field.id] = field.defaultValue;
+ if (field.id === 'full_name') initialValues[field.id] = userIdentity().fullName;
+ else if (field.id === 'first_name') initialValues[field.id] = userIdentity().firstName;
+ else if (field.id === 'last_name') initialValues[field.id] = userIdentity().lastName;
+ else if (field.multiple && Array.isArray(field.defaultValue)) initialValues[field.id] = field.defaultValue;
+ else if (field.multiple && typeof field.defaultValue === 'string') {
+ initialValues[field.id] = field.defaultValue.split(',').map((entry) => entry.trim()).filter(Boolean);
+ }
+ else if (field.defaultValue !== undefined) initialValues[field.id] = field.defaultValue;
else if (field.multiple) initialValues[field.id] = [];
else initialValues[field.id] = field.type === 'checkbox' ? false : '';
});
@@ -176,6 +296,8 @@ export default function OnboardingPage() {
if (profileResponse.ok && profilePayload?.success) {
setProfileStatus(String(profilePayload?.data?.profileStatus || ''));
}
+ } catch (error: any) {
+ setStatusMessage(String(error?.message || 'Unable to load onboarding flow right now.'));
} finally {
setLoading(false);
}
@@ -199,6 +321,38 @@ export default function OnboardingPage() {
if (total === 0) return '0 / 0';
return `${Math.min(stepIndex() + 1, total)} / ${total}`;
});
+ const progressPercent = createMemo(() => {
+ const total = visibleSteps().length;
+ if (total <= 0) return 0;
+ const current = Math.min(stepIndex() + 1, total);
+ return Math.round((current / total) * 100);
+ });
+
+ const roleWelcome = createMemo(() => {
+ const role = String(schema()?.roleKey || '').toUpperCase();
+ if (role === 'COMPANY') {
+ return {
+ title: "Let's build your company profile",
+ subtitle: 'A few quick details and you will be ready to post opportunities.',
+ };
+ }
+ if (role === 'JOB_SEEKER' || role === 'JOBSEEKER') {
+ return {
+ title: "Let's shape your job profile",
+ subtitle: 'Share your details so we can match you with better opportunities.',
+ };
+ }
+ if (role === 'CUSTOMER') {
+ return {
+ title: "Let's get your request journey started",
+ subtitle: 'Tell us what you need, and we will help you connect with trusted professionals.',
+ };
+ }
+ return {
+ title: "Let's build your professional profile",
+ subtitle: 'Add your details once and start receiving stronger, relevant opportunities.',
+ };
+ });
const setFieldValue = (fieldId: string, next: unknown) => {
setValues((prev) => ({ ...prev, [fieldId]: next }));
@@ -209,10 +363,84 @@ export default function OnboardingPage() {
});
};
+ const validateSingleField = (field: RuntimeOnboardingField, nextValue: unknown) => {
+ if (isLockedProfileField(field.id)) return true;
+ const message = validateField(field, nextValue);
+ setErrors((prev) => {
+ const copy = { ...prev };
+ if (message) copy[field.id] = message;
+ else delete copy[field.id];
+ return copy;
+ });
+ return !message;
+ };
+
+ const markFieldTouched = (fieldId: string) => {
+ setTouched((prev) => ({ ...prev, [fieldId]: true }));
+ };
+
+ const markCurrentStepTouched = () => {
+ const marks: Record = {};
+ visibleFields().forEach((field) => {
+ marks[field.id] = true;
+ });
+ setTouched((prev) => ({ ...prev, ...marks }));
+ };
+
+ const handleFieldInput = (field: RuntimeOnboardingField, nextValue: unknown) => {
+ setFieldValue(field.id, nextValue);
+ if (touched()[field.id]) validateSingleField(field, nextValue);
+ };
+
+ const handleFieldBlur = (field: RuntimeOnboardingField, nextValue?: unknown) => {
+ markFieldTouched(field.id);
+ validateSingleField(field, nextValue ?? values()[field.id]);
+ };
+
+ const validationNote = (field: RuntimeOnboardingField) => {
+ if (isLockedProfileField(field.id)) return null;
+ const value = values()[field.id];
+ const hasValue = !isEmptyValue(value);
+ const message = validateField(field, value);
+ if (message) return { text: message, tone: 'error' as const };
+
+ if (!hasValue) {
+ if (field.type === 'select') return { text: 'Please select an option.', tone: 'hint' as const };
+ if (field.type === 'date') return { text: 'Please select the date.', tone: 'hint' as const };
+ if (field.type === 'file') return { text: 'Please upload the file.', tone: 'hint' as const };
+ if (field.type === 'checkbox') return { text: 'Please enable this option.', tone: 'hint' as const };
+ if (field.type === 'textarea') return { text: 'Please fill the description.', tone: 'hint' as const };
+ return { text: 'Please fill this field.', tone: 'hint' as const };
+ }
+
+ if (field.type === 'email') return { text: 'Valid email format', tone: 'ok' as const };
+ if (field.type === 'url') return { text: 'Valid URL format', tone: 'ok' as const };
+ if (field.type === 'tel') return { text: 'Valid phone format', tone: 'ok' as const };
+ if (field.type === 'date') return { text: 'Great, date looks good', tone: 'ok' as const };
+ if (field.type === 'number') return { text: 'Great, that looks good', tone: 'ok' as const };
+ if (field.type === 'checkbox') return { text: 'Option enabled', tone: 'ok' as const };
+ if (field.type === 'file') {
+ const files = Array.isArray(value) ? value : [];
+ return { text: `${files.length} file(s) selected`, tone: 'ok' as const };
+ }
+ if (field.type === 'select') {
+ if (field.multiple) {
+ const selected = Array.isArray(value) ? value : [];
+ return { text: `${selected.length} option(s) selected`, tone: 'ok' as const };
+ }
+ return { text: 'Option selected', tone: 'ok' as const };
+ }
+ if (typeof value === 'string' && field.validation?.minLength) {
+ return { text: `${value.length} characters entered`, tone: 'ok' as const };
+ }
+ return { text: 'Looks good', tone: 'ok' as const };
+ };
+
const validateCurrentStep = () => {
const fieldList = visibleFields();
const nextErrors: Record = {};
fieldList.forEach((field) => {
+ if (isManagedNameField(field.id)) return;
const message = validateField(field, values()[field.id]);
if (message) nextErrors[field.id] = message;
});
@@ -236,6 +464,7 @@ export default function OnboardingPage() {
};
const goNext = async () => {
+ markCurrentStepTouched();
if (!validateCurrentStep()) {
setStatusMessage('Please fix the highlighted fields.');
return;
@@ -254,6 +483,7 @@ export default function OnboardingPage() {
};
const submit = async () => {
+ markCurrentStepTouched();
if (!validateCurrentStep()) {
setStatusMessage('Please fix the highlighted fields.');
return;
@@ -261,13 +491,20 @@ export default function OnboardingPage() {
const currentSchema = schema();
if (!currentSchema) return;
+ const payloadData = {
+ ...values(),
+ ...(userIdentity().fullName ? { full_name: userIdentity().fullName } : {}),
+ ...(userIdentity().firstName ? { first_name: userIdentity().firstName } : {}),
+ ...(userIdentity().lastName ? { last_name: userIdentity().lastName } : {}),
+ };
+
const response = await fetch('/api/runtime/onboarding/complete', {
method: 'POST',
headers: { 'Content-Type': 'application/json' },
body: JSON.stringify({
roleKey: currentSchema.roleKey,
requiresApproval: true,
- dataJson: values(),
+ dataJson: payloadData,
}),
});
const payload = await response.json().catch(() => ({}));
@@ -281,35 +518,99 @@ export default function OnboardingPage() {
const renderField = (field: RuntimeOnboardingField) => {
const value = values()[field.id];
+ const lockedIdentityField = isLockedProfileField(field.id);
+ const fieldReadOnly = lockedIdentityField && !isAlwaysEditableField(field.id);
if (field.type === 'textarea') {
return (