Adds rate limiting to /api/auth/login and /api/auth/register and removes
their wide-open CORS allowlist.
Rate limiting (@upstash/ratelimit + @upstash/redis):
- 5 attempts per 15-minute sliding window per IP, prefix "tcgvault:auth"
- new lib/rate-limit.js, lazy singleton, single source of truth
- reads KV_REST_API_URL / KV_REST_API_TOKEN (Vercel Upstash Marketplace
convention — auto-provisioned, no manual env-var setup needed)
- fail-closed in production if env vars are missing (better to error
one login than silently disable brute-force protection on live)
- fail-open in dev/test if env vars are missing (single console.warn)
- fail-open on Upstash backend outage (defense-in-depth — don't lock
the entire userbase out if Upstash is down)
- IP extracted from x-forwarded-for first hop, with socket fallback;
NOT req.body.email (rotates) or Authorization header (absent on
unauthenticated login)
CORS:
- Removed Access-Control-Allow-Origin: * + companion headers + OPTIONS
preflight from login.js and register.js
- These are first-party endpoints called from the same-origin SPA; the
"*" allowlist was a development convenience that shipped to prod
- verify.js is OUT OF SCOPE per architect's "cors-tighten" deferral
(see convoy plan § Architect's calls)
Other handler ordering preserved verbatim per brief: method gate first,
then rate-limit check (returns 429 with Retry-After header), then the
existing try/catch + body parsing + DB work.
Pre-merge requirements: KV_REST_API_URL + KV_REST_API_TOKEN must be set
in Vercel Production (already done — Upstash marketplace integration
auto-provisioned both, confirmed by maintainer 2026-05-23).
Convoy: fix-auth-bypass / Brief 4
Co-authored-by: Cursor <cursoragent@cursor.com>
161 lines
No EOL
4.9 KiB
JavaScript
161 lines
No EOL
4.9 KiB
JavaScript
import bcrypt from 'bcryptjs';
|
|
import { sql } from '@vercel/postgres';
|
|
import { generateUniqueSlug } from '../../../lib/slug-utils.js';
|
|
import { generateToken } from '../auth-utils.js';
|
|
import { checkAuthRateLimit } from '../../../lib/rate-limit.js';
|
|
|
|
export default async function handler(req, res) {
|
|
if (req.method !== 'POST') {
|
|
return res.status(405).json({ error: 'Method not allowed' });
|
|
}
|
|
|
|
const { allowed, reset } = await checkAuthRateLimit(req);
|
|
if (!allowed) {
|
|
res.setHeader('Retry-After', Math.ceil((reset - Date.now()) / 1000));
|
|
return res.status(429).json({ error: 'Too many attempts. Try again later.' });
|
|
}
|
|
|
|
try {
|
|
const { email, password, firstName, lastName, username, profileImage } = req.body;
|
|
|
|
// Validate required fields
|
|
if (!email || !password || !firstName || !lastName || !username) {
|
|
return res.status(400).json({ error: 'All fields are required' });
|
|
}
|
|
|
|
if (password.length < 6) {
|
|
return res.status(400).json({ error: 'Password must be at least 6 characters' });
|
|
}
|
|
|
|
// Validate username
|
|
if (username.length < 3) {
|
|
return res.status(400).json({ error: 'Username must be at least 3 characters' });
|
|
}
|
|
|
|
if (!/^[a-zA-Z0-9_]+$/.test(username)) {
|
|
return res.status(400).json({ error: 'Username can only contain letters, numbers, and underscores' });
|
|
}
|
|
|
|
// Check if user already exists (email or username)
|
|
const existingUser = await sql`
|
|
SELECT id FROM users WHERE email = ${email} OR username = ${username}
|
|
`;
|
|
|
|
if (existingUser.rows.length > 0) {
|
|
// Check which field conflicts
|
|
const conflictUser = await sql`
|
|
SELECT email, username FROM users WHERE email = ${email} OR username = ${username}
|
|
`;
|
|
|
|
const conflict = conflictUser.rows[0];
|
|
if (conflict.email === email) {
|
|
return res.status(409).json({ error: 'Email already exists' });
|
|
} else {
|
|
return res.status(409).json({ error: 'Username already taken' });
|
|
}
|
|
}
|
|
|
|
// Hash password
|
|
const hashedPassword = await bcrypt.hash(password, 12);
|
|
|
|
// Create user with all fields
|
|
const result = await sql`
|
|
INSERT INTO users (
|
|
email,
|
|
password,
|
|
first_name,
|
|
last_name,
|
|
username,
|
|
profile_image_url,
|
|
role
|
|
)
|
|
VALUES (
|
|
${email},
|
|
${hashedPassword},
|
|
${firstName},
|
|
${lastName},
|
|
${username},
|
|
${profileImage || null},
|
|
${'user'}
|
|
)
|
|
RETURNING id, email, first_name, last_name, username, profile_image_url, role, created_at
|
|
`;
|
|
|
|
const user = result.rows[0];
|
|
|
|
// Create the automatic "All My Cards" collection for the new user
|
|
try {
|
|
// Get existing slugs to ensure uniqueness
|
|
const existingSlugsData = await sql`SELECT slug FROM collections WHERE slug IS NOT NULL`;
|
|
const existingSlugs = (existingSlugsData.rows || []).map(row => row.slug);
|
|
|
|
// Generate unique slug for "All My Cards"
|
|
const uniqueSlug = await generateUniqueSlug("All My Cards", existingSlugs);
|
|
|
|
// Create the special collection
|
|
const collectionResult = await sql`
|
|
INSERT INTO collections (
|
|
name,
|
|
description,
|
|
tcg,
|
|
is_public,
|
|
user_id,
|
|
slug,
|
|
is_system_collection,
|
|
created_at,
|
|
updated_at
|
|
)
|
|
VALUES (
|
|
'All My Cards',
|
|
'Automatically contains all cards you mark as owned. This collection cannot be deleted or made public.',
|
|
'All',
|
|
false,
|
|
${user.id},
|
|
${uniqueSlug},
|
|
true,
|
|
CURRENT_TIMESTAMP,
|
|
CURRENT_TIMESTAMP
|
|
)
|
|
RETURNING id
|
|
`;
|
|
|
|
const collection = collectionResult.rows[0];
|
|
|
|
// Create owner permission for the collection
|
|
await sql`
|
|
INSERT INTO collection_permissions (collection_id, user_id, role, status, created_at)
|
|
VALUES (${collection.id}, ${user.id}, 'owner', 'active', CURRENT_TIMESTAMP)
|
|
`;
|
|
|
|
console.log(`✅ Created "All My Cards" collection for user ${user.email} (ID: ${collection.id})`);
|
|
} catch (collectionError) {
|
|
console.error('Error creating "All My Cards" collection:', collectionError);
|
|
// Don't fail the registration if collection creation fails
|
|
}
|
|
|
|
// Generate JWT token
|
|
const token = generateToken({ id: user.id, email: user.email, role: user.role });
|
|
|
|
// Return user data without password
|
|
const userResponse = {
|
|
id: user.id,
|
|
email: user.email,
|
|
firstName: user.first_name,
|
|
lastName: user.last_name,
|
|
username: user.username,
|
|
profileImage: user.profile_image_url,
|
|
role: user.role,
|
|
createdAt: user.created_at
|
|
};
|
|
|
|
res.status(201).json({
|
|
success: true,
|
|
user: userResponse,
|
|
token
|
|
});
|
|
|
|
} catch (error) {
|
|
console.error('Registration error:', error);
|
|
res.status(500).json({ error: 'Internal server error' });
|
|
}
|
|
}
|