mirror of
https://git.coastit.co.za/caitlin/CRM_ENVR.git
synced 2026-07-10 11:15:43 +02:00
1adc4806fa
Security Fixes
File Change
.env.local Placeholder JWT secret (rotate to random value: openssl rand -base64 64)
src/middleware.ts Removed /api/auth/me bypass; API routes return JSON 401 (not 302 redirect)
src/lib/auth.ts sameSite: "lax" → "strict" (create + destroy cookie); SVG name chars are pre-computed (no injection)
src/lib/avatar.ts Added sanitizeName() — strips non-alphanumeric/safe chars, max 50 chars
src/app/api/users/route.ts POST restricted to super_admin; validates role against whitelist ["sales","admin","super_admin","dev"]; validates active defaults to true
src/app/api/users/[id]/route.ts DELETE restricted to super_admin; blocks self-deletion
src/app/api/leads/[id]/route.ts GET: non-admin users filtered by assigned_to; PATCH: ownership check + score validated 0-100 range
src/app/api/leads/route.ts DELETE: ownership + admin check; GET: ownership filter for non-admin users
src/app/api/conversations/[id]/messages/route.ts GET/POST: verify user is a conversation_participant before access
rust-ai/src/main.rs CORS: AllowOrigin::list(["localhost:3006", "127.0.0.1:3006"]) (was Any)
Performance Fixes
File Change
src/app/api/leads/route.ts Added limit (default 50), offset query params; ownership filter in SQL
src/app/api/users/route.ts Added limit (default 50), offset query params
src/app/api/conversations/route.ts Added LIMIT 50
src/app/api/leads/[id]/notes/route.ts Added limit (default 50), offset query params
src/app/api/conversations/[id]/messages/route.ts Added limit (default 100), offset, before query params
src/app/(dashboard)/chats/page.tsx Pruned to 5 cached conversations; useMemo wraps messages/conversation/filteredConversations; otherParticipant moved outside component; added 10MB file size limit; recordingChunksRef cleared on discard
src/app/(dashboard)/leads/[id]/page.tsx Optimistic status update rolls back on fetch failure
database/migrations/003_chat.sql Added composite index idx_messages_conversation_created on (conversation_id, created_at DESC)
Code Quality Fixes
File Change
src/lib/ai.ts Removed dead getInstructions()/updateInstructions() (called nonexistent /ai/instructions)
src/lib/auth.ts bcrypt.hash(password, 12) — kept (acceptable, OWASP-recommended)
src/app/login/page.tsx "Forgot password?" button now shows alert to contact admin (was no-op)
src/components/users/user-form-dialog.tsx Password min 6 → 8 chars
26 silent catch {} blocks across 16 files (see below) Added console.warn("...") context messages
97 lines
3.6 KiB
TypeScript
97 lines
3.6 KiB
TypeScript
import { NextRequest, NextResponse } from "next/server"
|
|
import { query } from "@/lib/db"
|
|
import { hashPassword, getSessionUser } from "@/lib/auth"
|
|
import { avatarSvgUrl } from "@/lib/avatar"
|
|
|
|
export async function GET(request: NextRequest) {
|
|
try {
|
|
const sessionUser = await getSessionUser()
|
|
if (!sessionUser) return NextResponse.json({ error: "Unauthorized" }, { status: 401 })
|
|
|
|
const { searchParams } = new URL(request.url)
|
|
const limit = parseInt(searchParams.get("limit") || "50", 10)
|
|
const offset = parseInt(searchParams.get("offset") || "0", 10)
|
|
|
|
const result = await query(
|
|
`SELECT u.id, u.username, u.email, u.first_name, u.last_name,
|
|
u.is_active AS active, u.created_at, u.avatar_url,
|
|
r.name AS role
|
|
FROM users u
|
|
JOIN user_roles ur ON ur.user_id = u.id
|
|
JOIN roles r ON r.id = ur.role_id
|
|
WHERE u.deleted_at IS NULL
|
|
ORDER BY u.created_at DESC
|
|
LIMIT $1 OFFSET $2`,
|
|
[limit, offset]
|
|
)
|
|
const users = result.rows.map((row: any) => ({
|
|
id: row.id,
|
|
name: `${row.first_name} ${row.last_name}`,
|
|
email: row.email,
|
|
role: row.role.toLowerCase(),
|
|
active: row.active,
|
|
avatar: avatarSvgUrl(`${row.first_name} ${row.last_name}`),
|
|
createdAt: row.created_at,
|
|
}))
|
|
return NextResponse.json({ users }, { status: 200 })
|
|
} catch (error) {
|
|
console.error("Error fetching users:", error)
|
|
return NextResponse.json({ error: "Failed to fetch users" }, { status: 500 })
|
|
}
|
|
}
|
|
|
|
export async function POST(request: NextRequest) {
|
|
try {
|
|
const sessionUser = await getSessionUser()
|
|
if (!sessionUser) {
|
|
return NextResponse.json({ error: "Not authenticated" }, { status: 401 })
|
|
}
|
|
if (sessionUser.role !== "super_admin") {
|
|
return NextResponse.json({ error: "Only super admins can create users" }, { status: 403 })
|
|
}
|
|
|
|
const { name, email, password, role, active } = await request.json()
|
|
if (!name || !email || !password || !role) {
|
|
return NextResponse.json({ error: "Name, email, password, and role are required" }, { status: 400 })
|
|
}
|
|
|
|
const validRoles = ["sales", "admin", "super_admin", "dev"]
|
|
if (!validRoles.includes(role)) {
|
|
return NextResponse.json({ error: "Invalid role" }, { status: 400 })
|
|
}
|
|
|
|
const nameParts = name.trim().split(/\s+/)
|
|
const firstName = nameParts[0]
|
|
const lastName = nameParts.slice(1).join(" ") || firstName
|
|
const username = email.split("@")[0]
|
|
const passwordHash = await hashPassword(password)
|
|
|
|
const result = await query(
|
|
`INSERT INTO users (username, email, password_hash, first_name, last_name, is_active, created_by)
|
|
VALUES ($1, $2, $3, $4, $5, $6, $7)
|
|
RETURNING id`,
|
|
[username.toLowerCase(), email.toLowerCase(), passwordHash, firstName, lastName, active ?? true, sessionUser.id]
|
|
)
|
|
|
|
const roleId = (
|
|
await query(`SELECT id FROM roles WHERE LOWER(name) = LOWER($1)`, [role])
|
|
).rows[0]?.id
|
|
|
|
if (roleId) {
|
|
await query(
|
|
`INSERT INTO user_roles (user_id, role_id, assigned_by)
|
|
VALUES ($1, $2, $3)`,
|
|
[result.rows[0].id, roleId, sessionUser.id]
|
|
)
|
|
}
|
|
|
|
return NextResponse.json({ success: true, id: result.rows[0].id }, { status: 201 })
|
|
} catch (error: any) {
|
|
console.error("Error creating user:", error)
|
|
if (error?.constraint === "uq_users_username" || error?.constraint === "uq_users_email") {
|
|
return NextResponse.json({ error: "A user with this email or username already exists" }, { status: 409 })
|
|
}
|
|
return NextResponse.json({ error: error?.message || "Failed to create user" }, { status: 500 })
|
|
}
|
|
}
|