fixed a bit

This commit is contained in:
bobbert committed 2025-03-11 21:50:59 +00:00
1 parent 494f42a4c3
commit 26869d790e
2 files changed
+76 -54

No files matched your search

+12 -1
View File
@@ -23,6 +23,13 @@ export default function Register() {
body: JSON.stringify({ username, password }), body: JSON.stringify({ username, password }),
}); });
if (!response.ok) {
const result = await response.json();
setError(result.error || "Failed to register");
setIsLoading(false);
return;
}
const result = await response.json(); const result = await response.json();
if (result.error) { if (result.error) {
@@ -44,7 +51,11 @@ export default function Register() {
} }
} }
} catch (err) { } catch (err) {
setError("An unexpected error occurred"); if (err instanceof SyntaxError) {
setError("Unexpected response from server");
} else {
setError("An unexpected error occurred");
}
console.error(err); console.error(err);
setIsLoading(false); setIsLoading(false);
} }
+64 -53
View File
@@ -1,59 +1,70 @@
import { query, queryOne, run } from '../../../../lib/db'; import { queryOne, run } from "../../../../lib/db";
import { getServerSession } from 'next-auth/next'; import { getServerSession } from "next-auth/next";
import { authOptions } from '../../auth/[...nextauth]/route'; import { authOptions } from "../../auth/[...nextauth]/route";
import { nanoid } from 'nanoid'; import { nanoid } from "nanoid";
export async function POST(request) { export async function POST(request) {
try { try {
const session = await getServerSession(authOptions); const session = await getServerSession(authOptions);
// Debugging: Log the session // Debugging: Log the session
console.log('Session:', session); console.log("Session:", session);
if (!session) { if (!session) {
return Response.json({ success: false, error: 'Unauthorised' }, { status: 401 }); return new Response(
} JSON.stringify({ success: false, error: "Unauthorised" }),
{ status: 401 }
// Ensure the user is not an admin );
if (session.user.role === 'admin') {
return Response.json({ success: false, error: 'Admins cannot create teams' }, { status: 403 });
}
const { name, userId } = await request.json();
if (!name || name.trim() === '') {
return Response.json({ success: false, error: 'Team name is required' });
}
// Generate a unique team code (6 characters)
const teamCode = nanoid(6).toUpperCase();
// Insert the new team
const result = await run(
'INSERT INTO teams (name, code) VALUES (?, ?)',
[name, teamCode]
);
if (!result || !result.lastID) {
return Response.json({ success: false, error: 'Failed to create team' });
}
// Update the user's team_id
await run(
'UPDATE users SET team_id = ? WHERE id = ?',
[result.lastID, userId]
);
return Response.json({
success: true,
teamId: result.lastID,
teamCode
});
} catch (error) {
console.error('Create team error:', error);
return Response.json({
success: false,
error: 'Failed to create team: ' + error.message
});
} }
// Ensure the user is not an admin
if (session.user.role === "admin") {
return new Response(
JSON.stringify({ success: false, error: "Admins cannot create teams" }),
{ status: 403 }
);
}
const { name, userId } = await request.json();
if (!name || name.trim() === "") {
return new Response(
JSON.stringify({ success: false, error: "Team name is required" }),
{ status: 400 }
);
}
// Generate a unique team code (6 characters)
const teamCode = nanoid(6).toUpperCase();
// Insert the new team
const result = await run("INSERT INTO teams (name, code) VALUES (?, ?)", [
name,
teamCode,
]);
// Fetch the newly created team ID
const newTeam = await queryOne("SELECT id FROM teams WHERE code = ?", [
teamCode,
]);
// Update the user's team_id
await run("UPDATE users SET team_id = ? WHERE id = ?", [
newTeam.id,
userId,
]);
// Update the session with the new teamId
session.user.teamId = newTeam.id;
return new Response(JSON.stringify({ success: true, teamId: newTeam.id }), {
status: 201,
});
} catch (error) {
console.error("Team creation error:", error);
return new Response(
JSON.stringify({ success: false, error: "Failed to create team" }),
{ status: 500 }
);
}
} }