+
{#each [['all', 'All'], ['upcoming', 'Upcoming'], ['ongoing', 'Ongoing'], ['finished', 'Finished']] as [value, label]}
{/each}
-
- {#if filtered.length === 0}
-
- {:else}
-
diff --git a/src/routes/(app)/tournaments/[id]/+page.server.ts b/src/routes/(app)/tournaments/[id]/+page.server.ts
index 20758c1..f683641 100644
--- a/src/routes/(app)/tournaments/[id]/+page.server.ts
+++ b/src/routes/(app)/tournaments/[id]/+page.server.ts
@@ -16,8 +16,6 @@ import { requireAuth } from '$lib/server/permissions';
import type { PageServerLoad, Actions } from './$types';
export const load: PageServerLoad = async ({ params, locals }) => {
- requireAuth(locals);
-
const t = await db.query.tournament.findFirst({
where: eq(tournament.id, params.id),
with: {
@@ -59,17 +57,18 @@ export const load: PageServerLoad = async ({ params, locals }) => {
});
// check if current user is staff
- const isStaff = t.staff.some((s) => s.userId === locals.user!.id);
+ const isStaff = locals.user ? t.staff.some((s) => s.userId === locals.user!.id) : false;
// check if current user is registered
- const userTeams = await db.query.teamMember.findMany({
- where: eq(teamMember.userId, locals.user!.id),
- with: { team: true }
- });
-
- const userRegistration = t.registrations.find((r) =>
- userTeams.some((ut) => ut.teamId === r.teamId)
- );
+ const userTeams = locals.user
+ ? await db.query.teamMember.findMany({
+ where: eq(teamMember.userId, locals.user.id),
+ with: { team: true }
+ })
+ : [];
+ const userRegistration = locals.user
+ ? t.registrations.find((r) => userTeams.some((ut) => ut.teamId === r.teamId))
+ : undefined;
// load mappools for round config (staff only in DRAFT)
let mappools: { id: string; name: string; slotCount: number }[] = [];
diff --git a/src/routes/(app)/tournaments/new/+page.server.ts b/src/routes/(app)/tournaments/new/+page.server.ts
index 72067ce..696b555 100644
--- a/src/routes/(app)/tournaments/new/+page.server.ts
+++ b/src/routes/(app)/tournaments/new/+page.server.ts
@@ -4,7 +4,7 @@ import { createTournament } from '$lib/server/tournament/lifecycle';
import type { Actions, PageServerLoad } from './$types';
export const load: PageServerLoad = async ({ locals }) => {
- requireAuth(locals);
+ if (!locals.user) redirect(302, '/login');
return {};
};
diff --git a/src/routes/(app)/users/[id]/+page.server.ts b/src/routes/(app)/users/[id]/+page.server.ts
new file mode 100644
index 0000000..fc8223b
--- /dev/null
+++ b/src/routes/(app)/users/[id]/+page.server.ts
@@ -0,0 +1,101 @@
+import { db } from '$lib/server/db';
+import { user } from '$lib/server/db/auth.schema';
+import {
+ playerRating,
+ teamMember,
+ matchParticipantPlayer,
+ profileComment
+} from '$lib/server/db/schema';
+import { eq, and, desc } from 'drizzle-orm';
+import { error } from '@sveltejs/kit';
+import { requireAuth } from '$lib/server/permissions';
+import type { PageServerLoad, Actions } from './$types';
+
+export const load: PageServerLoad = async ({ params }) => {
+ const u = await db.query.user.findFirst({
+ where: eq(user.id, params.id)
+ });
+ if (!u) error(404, 'User not found');
+
+ // Player rating
+ const rating = await db.query.playerRating.findFirst({
+ where: eq(playerRating.userId, params.id)
+ });
+
+ // Teams (non-personal)
+ const memberships = await db.query.teamMember.findMany({
+ where: eq(teamMember.userId, params.id),
+ with: { team: true }
+ });
+ const teams = memberships
+ .filter((m) => !m.team.isPersonal)
+ .map((m) => ({ id: m.team.id, name: m.team.name, avatarUrl: m.team.avatarUrl, role: m.role }));
+
+ // Recent matches via matchParticipantPlayer
+ const playerEntries = await db.query.matchParticipantPlayer.findMany({
+ where: eq(matchParticipantPlayer.userId, params.id),
+ with: {
+ participant: {
+ with: {
+ match: {
+ with: {
+ participants: {
+ with: { team: true },
+ orderBy: (p: any, { asc }: any) => [asc(p.slot)]
+ }
+ }
+ }
+ }
+ }
+ }
+ });
+
+ const recentMatches = playerEntries
+ .map((pe) => pe.participant.match)
+ .filter((m) => m.state === 'FINISHED' || m.state === 'CANCELLED')
+ .sort((a, b) => new Date(b.createdAt).getTime() - new Date(a.createdAt).getTime())
+ .slice(0, 20);
+
+ const personalTeam = memberships.find((m) => m.team.isPersonal)?.team;
+
+ // Comments
+ const comments = await db.query.profileComment.findMany({
+ where: and(eq(profileComment.targetType, 'user'), eq(profileComment.targetId, params.id)),
+ with: { author: true },
+ orderBy: desc(profileComment.createdAt)
+ });
+
+ return {
+ profile: {
+ id: u.id,
+ name: u.name,
+ image: u.image,
+ role: u.role,
+ createdAt: u.createdAt
+ },
+ rating: rating ? { elo: rating.elo, wins: rating.wins, losses: rating.losses } : null,
+ teams,
+ recentMatches,
+ personalTeamId: personalTeam?.id ?? null,
+ comments
+ };
+};
+
+export const actions: Actions = {
+ comment: async ({ params, request, locals }) => {
+ const u = requireAuth(locals);
+ const form = await request.formData();
+ const content = form.get('content')?.toString()?.trim();
+ if (!content) return { error: 'Comment cannot be empty' };
+ if (content.length > 1000) return { error: 'Comment too long (max 1000 characters)' };
+
+ await db.insert(profileComment).values({
+ targetType: 'user',
+ targetId: params.id,
+ authorId: u.id,
+ content
+ });
+
+ return { success: true };
+ }
+};
diff --git a/src/routes/(app)/users/[id]/+page.svelte b/src/routes/(app)/users/[id]/+page.svelte
new file mode 100644
index 0000000..a33c434
--- /dev/null
+++ b/src/routes/(app)/users/[id]/+page.svelte
@@ -0,0 +1,154 @@
+
+
+
+ {p.name} — Vash Esports
+
+
+
+
+
+ {#if p.image}
+
+ {:else}
+
+ {p.name.charAt(0).toUpperCase()}
+
+ {/if}
+
+
+
{p.name}
+ {badge.label}
+
+
+ Joined {formatDate(p.createdAt)}
+
+
+
+
+
+ {#if data.rating}
+
+
+
{data.rating.elo}
+
ELO
+
+
+
{data.rating.wins}
+
Wins
+
+
+
{data.rating.losses}
+
Losses
+
+
+ {/if}
+
+
+ {#if data.teams.length > 0}
+
+ {/if}
+
+
+ {#if data.recentMatches.length > 0}
+
+ {/if}
+
+
+
diff --git a/src/routes/api/mappools/+server.ts b/src/routes/api/mappools/+server.ts
index b9b4bfe..0111616 100644
--- a/src/routes/api/mappools/+server.ts
+++ b/src/routes/api/mappools/+server.ts
@@ -1,7 +1,7 @@
import { json } from '@sveltejs/kit';
import { db } from '$lib/server/db';
import { mappool } from '$lib/server/db/schema';
-import { requireAuth, requireRole } from '$lib/server/permissions';
+import { requireAuth, requirePermission, GlobalPermission } from '$lib/server/permissions';
import { createMappoolSchema, parseBody } from '$lib/server/validation';
import type { RequestHandler } from './$types';
@@ -18,7 +18,11 @@ export const GET: RequestHandler = async ({ locals }) => {
// Create a mappool (admin only)
export const POST: RequestHandler = async ({ request, locals }) => {
- requireRole(locals, 'admin', 'Only admins can create mappools');
+ requirePermission(
+ locals,
+ GlobalPermission.MAPPOOL_CREATE,
+ 'Only authorized users can create mappools'
+ );
const body = await request.json();
const { name } = parseBody(createMappoolSchema, body);
diff --git a/src/routes/api/matches/+server.ts b/src/routes/api/matches/+server.ts
index 0863cfd..2a05076 100644
--- a/src/routes/api/matches/+server.ts
+++ b/src/routes/api/matches/+server.ts
@@ -2,7 +2,7 @@
import { json, error } from '@sveltejs/kit';
import { db } from '$lib/server/db';
import { createMatch } from '$lib/server/match/engine';
-import { requireAuth, requireRole } from '$lib/server/permissions';
+import { requireAuth, requirePermission, GlobalPermission } from '$lib/server/permissions';
import { createMatchSchema, parseBody } from '$lib/server/validation';
import type { RequestHandler } from './$types';
@@ -20,7 +20,11 @@ export const GET: RequestHandler = async ({ locals }) => {
};
export const POST: RequestHandler = async ({ request, locals }) => {
- requireRole(locals, 'referee', 'Only referees or admins can create matches');
+ requirePermission(
+ locals,
+ GlobalPermission.MATCH_CREATE,
+ 'Only referees or admins can create matches'
+ );
const body = await request.json();
const { name, config, mappoolId, teams } = parseBody(createMatchSchema, body);
diff --git a/src/routes/api/matches/[id]/lobby/+server.ts b/src/routes/api/matches/[id]/lobby/+server.ts
index 6f0534f..154279b 100644
--- a/src/routes/api/matches/[id]/lobby/+server.ts
+++ b/src/routes/api/matches/[id]/lobby/+server.ts
@@ -1,11 +1,15 @@
// src/routes/api/matches/[id]/lobby/+server.ts
import { json, error } from '@sveltejs/kit';
import { moveToLobby } from '$lib/server/match/engine';
-import { requireRole } from '$lib/server/permissions';
+import { requirePermission, GlobalPermission } from '$lib/server/permissions';
import type { RequestHandler } from './$types';
export const POST: RequestHandler = async ({ params, request, locals }) => {
- requireRole(locals, 'referee', 'Only referees or admins can move matches to lobby');
+ requirePermission(
+ locals,
+ GlobalPermission.MATCH_REFEREE,
+ 'Only referees or admins can move matches to lobby'
+ );
const body = await request.json().catch(() => ({}));
diff --git a/src/routes/api/matches/[id]/pick/+server.ts b/src/routes/api/matches/[id]/pick/+server.ts
index a5a7bc0..f0fa4a7 100644
--- a/src/routes/api/matches/[id]/pick/+server.ts
+++ b/src/routes/api/matches/[id]/pick/+server.ts
@@ -1,7 +1,7 @@
// src/routes/api/matches/[id]/pick/+server.ts
import { json, error } from '@sveltejs/kit';
import { pickMap } from '$lib/server/match/engine';
-import { requireAuth, hasRole } from '$lib/server/permissions';
+import { requireAuth, hasPermission, GlobalPermission } from '$lib/server/permissions';
import { getMatchFull } from '$lib/server/match/helpers';
import { pickMapSchema, parseBody } from '$lib/server/validation';
import type { RequestHandler } from './$types';
@@ -17,7 +17,7 @@ export const POST: RequestHandler = async ({ params, request, locals }) => {
// Find the participant linked to the authenticated user
const participant = match.participants.find((p) => p.players.some((pl) => pl.userId === user.id));
- if (!participant && !hasRole(user.role, 'referee')) {
+ if (!participant && !hasPermission(user.role, GlobalPermission.MATCH_REFEREE)) {
error(403, 'You are not a participant in this match');
}
diff --git a/src/routes/api/matches/[id]/roll/+server.ts b/src/routes/api/matches/[id]/roll/+server.ts
index ba8f2e0..29d097d 100644
--- a/src/routes/api/matches/[id]/roll/+server.ts
+++ b/src/routes/api/matches/[id]/roll/+server.ts
@@ -1,7 +1,7 @@
// src/routes/api/matches/[id]/roll/+server.ts
import { json, error } from '@sveltejs/kit';
import { submitRoll } from '$lib/server/match/engine';
-import { requireAuth, hasRole } from '$lib/server/permissions';
+import { requireAuth, hasPermission, GlobalPermission } from '$lib/server/permissions';
import { getMatchFull } from '$lib/server/match/helpers';
import { submitRollSchema, parseBody } from '$lib/server/validation';
import type { RequestHandler } from './$types';
@@ -17,7 +17,7 @@ export const POST: RequestHandler = async ({ params, request, locals }) => {
// Find the participant linked to the authenticated user
const participant = match.participants.find((p) => p.players.some((pl) => pl.userId === user.id));
- if (!participant && !hasRole(user.role, 'referee')) {
+ if (!participant && !hasPermission(user.role, GlobalPermission.MATCH_REFEREE)) {
error(403, 'You are not a participant in this match');
}
diff --git a/src/routes/api/matches/[id]/rolling/+server.ts b/src/routes/api/matches/[id]/rolling/+server.ts
index 18a6089..7daf058 100644
--- a/src/routes/api/matches/[id]/rolling/+server.ts
+++ b/src/routes/api/matches/[id]/rolling/+server.ts
@@ -1,11 +1,15 @@
// src/routes/api/matches/[id]/rolling/+server.ts
import { json, error } from '@sveltejs/kit';
import { moveToRolling } from '$lib/server/match/engine';
-import { requireRole } from '$lib/server/permissions';
+import { requirePermission, GlobalPermission } from '$lib/server/permissions';
import type { RequestHandler } from './$types';
export const POST: RequestHandler = async ({ params, locals }) => {
- requireRole(locals, 'referee', 'Only referees or admins can move matches to rolling');
+ requirePermission(
+ locals,
+ GlobalPermission.MATCH_REFEREE,
+ 'Only referees or admins can move matches to rolling'
+ );
try {
const m = await moveToRolling(params.id);
diff --git a/src/routes/api/matches/[id]/score/+server.ts b/src/routes/api/matches/[id]/score/+server.ts
index 1edbfc4..8142bda 100644
--- a/src/routes/api/matches/[id]/score/+server.ts
+++ b/src/routes/api/matches/[id]/score/+server.ts
@@ -1,12 +1,16 @@
// src/routes/api/matches/[id]/score/+server.ts
import { json, error } from '@sveltejs/kit';
import { submitGameScores } from '$lib/server/match/engine';
-import { requireRole } from '$lib/server/permissions';
+import { requirePermission, GlobalPermission } from '$lib/server/permissions';
import { submitScoreSchema, parseBody } from '$lib/server/validation';
import type { RequestHandler } from './$types';
export const POST: RequestHandler = async ({ request, locals }) => {
- requireRole(locals, 'referee', 'Only referees or admins can submit scores');
+ requirePermission(
+ locals,
+ GlobalPermission.MATCH_REFEREE,
+ 'Only referees or admins can submit scores'
+ );
const body = await request.json();
const { matchGameId, scores } = parseBody(submitScoreSchema, body);
diff --git a/src/routes/api/search/+server.ts b/src/routes/api/search/+server.ts
new file mode 100644
index 0000000..df10060
--- /dev/null
+++ b/src/routes/api/search/+server.ts
@@ -0,0 +1,56 @@
+import { json } from '@sveltejs/kit';
+import { db } from '$lib/server/db';
+import { user } from '$lib/server/db/auth.schema';
+import { team, mappool, tournament, match } from '$lib/server/db/schema';
+import { ilike, and, eq } from 'drizzle-orm';
+import type { RequestHandler } from './$types';
+
+export const GET: RequestHandler = async ({ url }) => {
+ const q = url.searchParams.get('q')?.trim();
+ if (!q || q.length < 2) return json({ results: {} });
+
+ const pattern = `%${q}%`;
+ const limit = 5;
+
+ const [users, teams, mappools, tournaments, matches] = await Promise.all([
+ db
+ .select({ id: user.id, name: user.name, image: user.image })
+ .from(user)
+ .where(ilike(user.name, pattern))
+ .limit(limit),
+ db
+ .select({ id: team.id, name: team.name, avatarUrl: team.avatarUrl })
+ .from(team)
+ .where(and(ilike(team.name, pattern), eq(team.isPersonal, false)))
+ .limit(limit),
+ db
+ .select({ id: mappool.id, name: mappool.name })
+ .from(mappool)
+ .where(ilike(mappool.name, pattern))
+ .limit(limit),
+ db
+ .select({ id: tournament.id, name: tournament.name, state: tournament.state })
+ .from(tournament)
+ .where(ilike(tournament.name, pattern))
+ .limit(limit),
+ db
+ .select({ id: match.id, name: match.name, state: match.state })
+ .from(match)
+ .where(ilike(match.name, pattern))
+ .limit(limit)
+ ]);
+
+ return json({
+ results: {
+ users: users.map((u) => ({ ...u, type: 'user', href: `/users/${u.id}` })),
+ teams: teams.map((t) => ({ ...t, type: 'team', href: `/teams/${t.id}` })),
+ mappools: mappools.map((m) => ({ ...m, type: 'mappool', href: `/mappools/${m.id}` })),
+ tournaments: tournaments.map((t) => ({
+ ...t,
+ type: 'tournament',
+ href: `/tournaments/${t.id}`
+ })),
+ matches: matches.map((m) => ({ ...m, type: 'match', href: `/matches/${m.id}` }))
+ }
+ });
+};
diff --git a/src/routes/api/tournaments/[id]/+server.ts b/src/routes/api/tournaments/[id]/+server.ts
index 697e3ea..a17ca69 100644
--- a/src/routes/api/tournaments/[id]/+server.ts
+++ b/src/routes/api/tournaments/[id]/+server.ts
@@ -1,8 +1,8 @@
import { json, error } from '@sveltejs/kit';
import { db } from '$lib/server/db';
-import { tournament, tournamentStaff } from '$lib/server/db/schema';
-import { eq, and } from 'drizzle-orm';
-import { requireAuth } from '$lib/server/permissions';
+import { tournament } from '$lib/server/db/schema';
+import { eq } from 'drizzle-orm';
+import { requireTournamentStaffOrAdmin, TournamentPermission } from '$lib/server/permissions';
import { getTournamentFull } from '$lib/server/tournament/lifecycle';
import type { RequestHandler } from './$types';
@@ -13,8 +13,7 @@ export const GET: RequestHandler = async ({ params }) => {
};
export const PATCH: RequestHandler = async ({ params, request, locals }) => {
- const user = requireAuth(locals);
- await requireTournamentStaff(params.id, user.id);
+ await requireTournamentStaffOrAdmin(locals, params.id, TournamentPermission.MANAGE_SETTINGS);
const t = await db.query.tournament.findFirst({
where: eq(tournament.id, params.id)
@@ -55,8 +54,7 @@ export const PATCH: RequestHandler = async ({ params, request, locals }) => {
};
export const DELETE: RequestHandler = async ({ params, locals }) => {
- const user = requireAuth(locals);
- await requireTournamentStaff(params.id, user.id);
+ await requireTournamentStaffOrAdmin(locals, params.id, TournamentPermission.MANAGE_SETTINGS);
const t = await db.query.tournament.findFirst({
where: eq(tournament.id, params.id)
@@ -73,11 +71,3 @@ export const DELETE: RequestHandler = async ({ params, locals }) => {
await cancelTournament(params.id);
return json(await getTournamentFull(params.id));
};
-
-async function requireTournamentStaff(tournamentId: string, userId: string) {
- const staff = await db.query.tournamentStaff.findFirst({
- where: and(eq(tournamentStaff.tournamentId, tournamentId), eq(tournamentStaff.userId, userId))
- });
- if (!staff) error(403, 'Not a staff member of this tournament');
- return staff;
-}
diff --git a/src/routes/api/tournaments/[id]/cancel/+server.ts b/src/routes/api/tournaments/[id]/cancel/+server.ts
index 4cde9ec..16dfcad 100644
--- a/src/routes/api/tournaments/[id]/cancel/+server.ts
+++ b/src/routes/api/tournaments/[id]/cancel/+server.ts
@@ -1,18 +1,10 @@
import { json, error } from '@sveltejs/kit';
-import { db } from '$lib/server/db';
-import { tournamentStaff } from '$lib/server/db/schema';
-import { eq, and } from 'drizzle-orm';
-import { requireAuth } from '$lib/server/permissions';
+import { requireTournamentStaffOrAdmin, TournamentPermission } from '$lib/server/permissions';
import { cancelTournament, getTournamentFull } from '$lib/server/tournament/lifecycle';
import type { RequestHandler } from './$types';
export const POST: RequestHandler = async ({ params, locals }) => {
- const user = requireAuth(locals);
-
- const staff = await db.query.tournamentStaff.findFirst({
- where: and(eq(tournamentStaff.tournamentId, params.id), eq(tournamentStaff.userId, user.id))
- });
- if (!staff) error(403, 'Not a staff member of this tournament');
+ await requireTournamentStaffOrAdmin(locals, params.id, TournamentPermission.MANAGE_SETTINGS);
try {
await cancelTournament(params.id);
diff --git a/src/routes/api/tournaments/[id]/close-registration/+server.ts b/src/routes/api/tournaments/[id]/close-registration/+server.ts
index 66dca17..43a5d4b 100644
--- a/src/routes/api/tournaments/[id]/close-registration/+server.ts
+++ b/src/routes/api/tournaments/[id]/close-registration/+server.ts
@@ -1,18 +1,10 @@
import { json, error } from '@sveltejs/kit';
-import { db } from '$lib/server/db';
-import { tournamentStaff } from '$lib/server/db/schema';
-import { eq, and } from 'drizzle-orm';
-import { requireAuth } from '$lib/server/permissions';
+import { requireTournamentStaffOrAdmin, TournamentPermission } from '$lib/server/permissions';
import { closeRegistration, getTournamentFull } from '$lib/server/tournament/lifecycle';
import type { RequestHandler } from './$types';
export const POST: RequestHandler = async ({ params, locals }) => {
- const user = requireAuth(locals);
-
- const staff = await db.query.tournamentStaff.findFirst({
- where: and(eq(tournamentStaff.tournamentId, params.id), eq(tournamentStaff.userId, user.id))
- });
- if (!staff) error(403, 'Not a staff member of this tournament');
+ await requireTournamentStaffOrAdmin(locals, params.id, TournamentPermission.MANAGE_REGISTRATIONS);
try {
await closeRegistration(params.id);
diff --git a/src/routes/api/tournaments/[id]/finalize-seeding/+server.ts b/src/routes/api/tournaments/[id]/finalize-seeding/+server.ts
index 106bf40..68a7d57 100644
--- a/src/routes/api/tournaments/[id]/finalize-seeding/+server.ts
+++ b/src/routes/api/tournaments/[id]/finalize-seeding/+server.ts
@@ -1,18 +1,10 @@
import { json, error } from '@sveltejs/kit';
-import { db } from '$lib/server/db';
-import { tournamentStaff } from '$lib/server/db/schema';
-import { eq, and } from 'drizzle-orm';
-import { requireAuth } from '$lib/server/permissions';
+import { requireTournamentStaffOrAdmin, TournamentPermission } from '$lib/server/permissions';
import { finalizeSeeding, getTournamentFull } from '$lib/server/tournament/lifecycle';
import type { RequestHandler } from './$types';
export const POST: RequestHandler = async ({ params, locals }) => {
- const user = requireAuth(locals);
-
- const staff = await db.query.tournamentStaff.findFirst({
- where: and(eq(tournamentStaff.tournamentId, params.id), eq(tournamentStaff.userId, user.id))
- });
- if (!staff) error(403, 'Not a staff member of this tournament');
+ await requireTournamentStaffOrAdmin(locals, params.id, TournamentPermission.MANAGE_BRACKET);
try {
await finalizeSeeding(params.id);
diff --git a/src/routes/api/tournaments/[id]/open-registration/+server.ts b/src/routes/api/tournaments/[id]/open-registration/+server.ts
index 6bdca88..f84d165 100644
--- a/src/routes/api/tournaments/[id]/open-registration/+server.ts
+++ b/src/routes/api/tournaments/[id]/open-registration/+server.ts
@@ -1,18 +1,10 @@
import { json, error } from '@sveltejs/kit';
-import { db } from '$lib/server/db';
-import { tournamentStaff } from '$lib/server/db/schema';
-import { eq, and } from 'drizzle-orm';
-import { requireAuth } from '$lib/server/permissions';
+import { requireTournamentStaffOrAdmin, TournamentPermission } from '$lib/server/permissions';
import { openRegistration, getTournamentFull } from '$lib/server/tournament/lifecycle';
import type { RequestHandler } from './$types';
export const POST: RequestHandler = async ({ params, locals }) => {
- const user = requireAuth(locals);
-
- const staff = await db.query.tournamentStaff.findFirst({
- where: and(eq(tournamentStaff.tournamentId, params.id), eq(tournamentStaff.userId, user.id))
- });
- if (!staff) error(403, 'Not a staff member of this tournament');
+ await requireTournamentStaffOrAdmin(locals, params.id, TournamentPermission.MANAGE_REGISTRATIONS);
try {
await openRegistration(params.id);
diff --git a/src/routes/api/tournaments/[id]/qualifiers/+server.ts b/src/routes/api/tournaments/[id]/qualifiers/+server.ts
index 677bd13..5b33f57 100644
--- a/src/routes/api/tournaments/[id]/qualifiers/+server.ts
+++ b/src/routes/api/tournaments/[id]/qualifiers/+server.ts
@@ -4,10 +4,7 @@ import {
getQualifierMappool,
submitQualifierScore
} from '$lib/server/tournament/qualifiers';
-import { db } from '$lib/server/db';
-import { tournamentStaff } from '$lib/server/db/schema';
-import { eq, and } from 'drizzle-orm';
-import { requireAuth } from '$lib/server/permissions';
+import { requireTournamentStaffOrAdmin, TournamentPermission } from '$lib/server/permissions';
import type { RequestHandler } from './$types';
export const GET: RequestHandler = async ({ params }) => {
@@ -20,13 +17,7 @@ export const GET: RequestHandler = async ({ params }) => {
};
export const POST: RequestHandler = async ({ params, request, locals }) => {
- const user = requireAuth(locals);
-
- // only staff can submit qualifier scores (referees run qualifier lobbies)
- const staff = await db.query.tournamentStaff.findFirst({
- where: and(eq(tournamentStaff.tournamentId, params.id), eq(tournamentStaff.userId, user.id))
- });
- if (!staff) error(403, 'Only tournament staff can submit qualifier scores');
+ await requireTournamentStaffOrAdmin(locals, params.id, TournamentPermission.REFEREE_MATCHES);
const body = await request.json();
const { teamId, mappoolSlotId, totalScore, accuracy } = body;
diff --git a/src/routes/api/tournaments/[id]/rounds/+server.ts b/src/routes/api/tournaments/[id]/rounds/+server.ts
index dc36a37..362929b 100644
--- a/src/routes/api/tournaments/[id]/rounds/+server.ts
+++ b/src/routes/api/tournaments/[id]/rounds/+server.ts
@@ -1,8 +1,8 @@
import { json, error } from '@sveltejs/kit';
import { db } from '$lib/server/db';
-import { tournamentRound, tournamentStaff } from '$lib/server/db/schema';
-import { eq, and, asc } from 'drizzle-orm';
-import { requireAuth } from '$lib/server/permissions';
+import { tournamentRound } from '$lib/server/db/schema';
+import { eq, asc } from 'drizzle-orm';
+import { requireTournamentStaffOrAdmin, TournamentPermission } from '$lib/server/permissions';
import type { RequestHandler } from './$types';
export const GET: RequestHandler = async ({ params }) => {
@@ -15,19 +15,13 @@ export const GET: RequestHandler = async ({ params }) => {
};
export const POST: RequestHandler = async ({ params, request, locals }) => {
- const user = requireAuth(locals);
-
- const staff = await db.query.tournamentStaff.findFirst({
- where: and(eq(tournamentStaff.tournamentId, params.id), eq(tournamentStaff.userId, user.id))
- });
- if (!staff) error(403, 'Not a staff member of this tournament');
+ await requireTournamentStaffOrAdmin(locals, params.id, TournamentPermission.MANAGE_ROUNDS);
const body = await request.json();
const { name, abbreviation, bestOf, mappoolId, bracketType, scheduledAt } = body;
if (!name || !bestOf) error(400, 'Missing required fields: name, bestOf');
- // get next round order
const existing = await db.query.tournamentRound.findMany({
where: eq(tournamentRound.tournamentId, params.id)
});
diff --git a/src/routes/api/tournaments/[id]/rounds/[roundId]/+server.ts b/src/routes/api/tournaments/[id]/rounds/[roundId]/+server.ts
index 64362d2..e25f4d2 100644
--- a/src/routes/api/tournaments/[id]/rounds/[roundId]/+server.ts
+++ b/src/routes/api/tournaments/[id]/rounds/[roundId]/+server.ts
@@ -1,17 +1,12 @@
import { json, error } from '@sveltejs/kit';
import { db } from '$lib/server/db';
-import { tournamentRound, tournamentStaff } from '$lib/server/db/schema';
-import { eq, and } from 'drizzle-orm';
-import { requireAuth } from '$lib/server/permissions';
+import { tournamentRound } from '$lib/server/db/schema';
+import { eq } from 'drizzle-orm';
+import { requireTournamentStaffOrAdmin, TournamentPermission } from '$lib/server/permissions';
import type { RequestHandler } from './$types';
export const PATCH: RequestHandler = async ({ params, request, locals }) => {
- const user = requireAuth(locals);
-
- const staff = await db.query.tournamentStaff.findFirst({
- where: and(eq(tournamentStaff.tournamentId, params.id), eq(tournamentStaff.userId, user.id))
- });
- if (!staff) error(403, 'Not a staff member of this tournament');
+ await requireTournamentStaffOrAdmin(locals, params.id, TournamentPermission.MANAGE_ROUNDS);
const body = await request.json();
const updates: Record
= {};
@@ -38,12 +33,7 @@ export const PATCH: RequestHandler = async ({ params, request, locals }) => {
};
export const DELETE: RequestHandler = async ({ params, locals }) => {
- const user = requireAuth(locals);
-
- const staff = await db.query.tournamentStaff.findFirst({
- where: and(eq(tournamentStaff.tournamentId, params.id), eq(tournamentStaff.userId, user.id))
- });
- if (!staff) error(403, 'Not a staff member of this tournament');
+ await requireTournamentStaffOrAdmin(locals, params.id, TournamentPermission.MANAGE_ROUNDS);
await db.delete(tournamentRound).where(eq(tournamentRound.id, params.roundId));
return json({ deleted: true });
diff --git a/src/routes/api/tournaments/[id]/staff/+server.ts b/src/routes/api/tournaments/[id]/staff/+server.ts
index 508faa9..e88a0e2 100644
--- a/src/routes/api/tournaments/[id]/staff/+server.ts
+++ b/src/routes/api/tournaments/[id]/staff/+server.ts
@@ -1,8 +1,8 @@
import { json, error } from '@sveltejs/kit';
import { db } from '$lib/server/db';
import { tournamentStaff } from '$lib/server/db/schema';
-import { eq, and } from 'drizzle-orm';
-import { requireAuth } from '$lib/server/permissions';
+import { eq } from 'drizzle-orm';
+import { requireTournamentStaffOrAdmin, TournamentPermission } from '$lib/server/permissions';
import type { RequestHandler } from './$types';
export const GET: RequestHandler = async ({ params }) => {
@@ -13,15 +13,7 @@ export const GET: RequestHandler = async ({ params }) => {
};
export const POST: RequestHandler = async ({ params, request, locals }) => {
- const user = requireAuth(locals);
-
- // only organizers can add staff
- const actor = await db.query.tournamentStaff.findFirst({
- where: and(eq(tournamentStaff.tournamentId, params.id), eq(tournamentStaff.userId, user.id))
- });
- if (!actor || (actor.role !== 'organizer' && actor.role !== 'admin')) {
- error(403, 'Only organizers can manage staff');
- }
+ await requireTournamentStaffOrAdmin(locals, params.id, TournamentPermission.MANAGE_STAFF);
const body = await request.json();
if (!body.userId || !body.role) error(400, 'Missing userId or role');
@@ -41,7 +33,7 @@ export const POST: RequestHandler = async ({ params, request, locals }) => {
})
.returning();
return json(created, { status: 201 });
- } catch (e: any) {
+ } catch {
error(400, 'User is already a staff member');
}
};
diff --git a/src/routes/api/tournaments/[id]/staff/[staffId]/+server.ts b/src/routes/api/tournaments/[id]/staff/[staffId]/+server.ts
index c6d04a4..f1a6158 100644
--- a/src/routes/api/tournaments/[id]/staff/[staffId]/+server.ts
+++ b/src/routes/api/tournaments/[id]/staff/[staffId]/+server.ts
@@ -1,20 +1,12 @@
-import { json, error } from '@sveltejs/kit';
+import { json } from '@sveltejs/kit';
import { db } from '$lib/server/db';
import { tournamentStaff } from '$lib/server/db/schema';
-import { eq, and } from 'drizzle-orm';
-import { requireAuth } from '$lib/server/permissions';
+import { eq } from 'drizzle-orm';
+import { requireTournamentStaffOrAdmin, TournamentPermission } from '$lib/server/permissions';
import type { RequestHandler } from './$types';
export const DELETE: RequestHandler = async ({ params, locals }) => {
- const user = requireAuth(locals);
-
- const actor = await db.query.tournamentStaff.findFirst({
- where: and(eq(tournamentStaff.tournamentId, params.id), eq(tournamentStaff.userId, user.id))
- });
- if (!actor || (actor.role !== 'organizer' && actor.role !== 'admin')) {
- error(403, 'Only organizers can manage staff');
- }
-
+ await requireTournamentStaffOrAdmin(locals, params.id, TournamentPermission.MANAGE_STAFF);
await db.delete(tournamentStaff).where(eq(tournamentStaff.id, params.staffId));
return json({ deleted: true });
};
diff --git a/src/routes/api/tournaments/[id]/start-qualifiers/+server.ts b/src/routes/api/tournaments/[id]/start-qualifiers/+server.ts
index 509c85f..51ca9dd 100644
--- a/src/routes/api/tournaments/[id]/start-qualifiers/+server.ts
+++ b/src/routes/api/tournaments/[id]/start-qualifiers/+server.ts
@@ -1,21 +1,11 @@
import { json, error } from '@sveltejs/kit';
-import { db } from '$lib/server/db';
-import { tournamentStaff } from '$lib/server/db/schema';
-import { eq, and } from 'drizzle-orm';
-import { requireAuth } from '$lib/server/permissions';
+import { requireTournamentStaffOrAdmin, TournamentPermission } from '$lib/server/permissions';
import { getTournamentFull } from '$lib/server/tournament/lifecycle';
import type { RequestHandler } from './$types';
export const POST: RequestHandler = async ({ params, locals }) => {
- const user = requireAuth(locals);
+ await requireTournamentStaffOrAdmin(locals, params.id, TournamentPermission.MANAGE_BRACKET);
- const staff = await db.query.tournamentStaff.findFirst({
- where: and(eq(tournamentStaff.tournamentId, params.id), eq(tournamentStaff.userId, user.id))
- });
- if (!staff) error(403, 'Not a staff member of this tournament');
-
- // qualifiers are started via closeRegistration when qualifiers are enabled
- // this endpoint is for manually triggering qualifier finalization
const { finalizeQualifiers } = await import('$lib/server/tournament/qualifiers');
try {
+
+ {:else}
+
+ 
-