Skip to content

Commit

Permalink
hotfix: permissions issue (probably), 500 toSorted() & add E-codes to…
Browse files Browse the repository at this point in the history 
… permission errors

37 minutes
  • Loading branch information
@c0repwn3r
c0repwn3r committed Oct 13, 2024
1 parent 8c263a1 commit faad247
Show file tree
Hide file tree
Showing 15 changed files with 38 additions and 32 deletions.
8 changes: 4 additions & 4 deletions src/lib/auth.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ export async function loadUserData(
redirect(
307,
"/",
{ type: "error", message: "You need to be logged in for that" },
{ type: "error", message: "You need to be logged in for that. (E-618f)" },
cookies,
);
}
Expand All @@ -43,7 +43,7 @@ export async function loadUserData(
redirect(
307,
"/",
{ type: "error", message: "You need to be logged in for that" },
{ type: "error", message: "You need to be logged in for that. (E-33cc)" },
cookies,
);
}
Expand All @@ -63,7 +63,7 @@ export async function loadUserData(
redirect(
307,
"/",
{ type: "error", message: "You need to be logged in for that." },
{ type: "error", message: "You need to be logged in for that. (E-66dc)" },
cookies,
);
}
Expand All @@ -72,7 +72,7 @@ export async function loadUserData(

for (const facility of user.facilities) {
if (facility.facilityId === inFacility) {
roles = facility.roles;
roles.push(...facility.roles);
if (facility.assignmentType === "DivisionalStaff") {
roles.push({
id: ulid(),
Expand Down
2 changes: 1 addition & 1 deletion src/routes/(hq)/[id]/manage/+page.server.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export const load: PageServerLoad = async ({ params, cookies }) => {
redirect(
307,
`/${params.id}`,
{ type: "error", message: "You don't have permission for that." },
{ type: "error", message: "You don't have permission for that. (E-9d53)" },
cookies,
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/routes/(hq)/[id]/manage/createrole/+page.server.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const load: PageServerLoad = async ({ params, cookies }) => {
redirect(
307,
`/${params.id}`,
{ type: "error", message: "You don't have permission for that." },
{ type: "error", message: "You don't have permission for that. (E-1cb6)" },
cookies,
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/routes/(hq)/[id]/manage/editrole/[roleId]/+page.server.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const load: PageServerLoad = async ({ params, cookies }) => {
redirect(
307,
`/${params.id}`,
{ type: "error", message: "You don't have permission for that." },
{ type: "error", message: "You don't have permission for that. (E-9fce)" },
cookies,
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/routes/(hq)/[id]/roster/+page.server.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ export const actions = {
redirect(
301,
"/",
{ type: "error", message: "You need to be logged in for that" },
{ type: "error", message: "You need to be logged in for that. (E-9fce)" },
event,
);
}
Expand Down
16 changes: 8 additions & 8 deletions src/routes/(hq)/[id]/training/[sessionId]/+page.server.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const load: PageServerLoad = async ({ params, parent, cookies }) => {
return redirect(
307,
`/${params.id}/training`,
{ type: "error", message: "You don't have permission to view that." },
{ type: "error", message: "You don't have permission to view that. (E-8bec)" },
cookies,
);
}
Expand All @@ -47,7 +47,7 @@ export const load: PageServerLoad = async ({ params, parent, cookies }) => {
return redirect(
307,
`/${params.id}/training`,
{ type: "error", message: "You don't have permission to view that." },
{ type: "error", message: "You don't have permission to view that. (E-5220)" },
cookies,
);
}
Expand Down Expand Up @@ -105,7 +105,7 @@ export const actions: Actions = {
return redirect(
307,
`/${event.params.id}/training`,
{ type: "error", message: "You don't have permission to view that." },
{ type: "error", message: "You don't have permission to view that. (E-e6fe)" },
event.cookies,
);
}
Expand All @@ -117,7 +117,7 @@ export const actions: Actions = {
return redirect(
307,
`/${event.params.id}/training`,
{ type: "error", message: "You don't have permission to view that." },
{ type: "error", message: "You don't have permission to view that. (E-a89a)" },
event.cookies,
);
}
Expand Down Expand Up @@ -149,7 +149,7 @@ export const actions: Actions = {
return redirect(
307,
`/${event.params.id}/training`,
{ type: "error", message: "You don't have permission to view that." },
{ type: "error", message: "You don't have permission to view that. (E-7423)" },
event.cookies,
);
}
Expand All @@ -160,7 +160,7 @@ export const actions: Actions = {
return redirect(
307,
`/${event.params.id}/training`,
{ type: "error", message: "You don't have permission to view that." },
{ type: "error", message: "You don't have permission to view that. (E-d9ea)" },
event.cookies,
);
}
Expand Down Expand Up @@ -199,7 +199,7 @@ export const actions: Actions = {
return redirect(
307,
`/${event.params.id}/training`,
{ type: "error", message: "You don't have permission to view that." },
{ type: "error", message: "You don't have permission to view that. (E-c915)" },
event.cookies,
);
}
Expand All @@ -210,7 +210,7 @@ export const actions: Actions = {
return redirect(
307,
`/${event.params.id}/training`,
{ type: "error", message: "You don't have permission to view that." },
{ type: "error", message: "You don't have permission to view that. (E-0e00)" },
event.cookies,
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/routes/(hq)/[id]/training/plans/+page.server.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export const load: PageServerLoad = async ({ params, cookies }) => {
redirect(
307,
`/${params.id}`,
{ type: "error", message: "You don't have permission to do that." },
{ type: "error", message: "You don't have permission to do that. (E-b74c)" },
cookies,
);
}
Expand Down
4 changes: 2 additions & 2 deletions src/routes/(hq)/[id]/training/plans/[planId]/members/+page.server.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const load: PageServerLoad = async ({ cookies, params }) => {
redirect(
307,
`/${params.id}`,
{ type: "error", message: "You don't have permission to do that." },
{ type: "error", message: "You don't have permission to do that. (E-9af2)" },
cookies,
);
}
Expand All @@ -42,7 +42,7 @@ export const actions: Actions = {
redirect(
307,
`/${event.params.id}/training`,
{ type: "error", message: "You don't have permission to do that." },
{ type: "error", message: "You don't have permission to do that. (E-51f3)" },
event.cookies,
);
}
Expand Down
6 changes: 3 additions & 3 deletions src/routes/(hq)/[id]/training/plans/requests/+page.server.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export const load: PageServerLoad = async ({ cookies, params }) => {
redirect(
307,
`/${params.id}`,
{ type: "error", message: "You don't have permission to do that." },
{ type: "error", message: "You don't have permission to do that. (E-d011)" },
cookies,
);
}
Expand All @@ -37,7 +37,7 @@ export const actions: Actions = {
redirect(
307,
`/${event.params.id}/training`,
{ type: "error", message: "You don't have permission to do that." },
{ type: "error", message: "You don't have permission to do that. (E-c996)" },
event.cookies,
);
}
Expand Down Expand Up @@ -75,7 +75,7 @@ export const actions: Actions = {
redirect(
307,
`/${event.params.id}/training`,
{ type: "error", message: "You don't have permission to do that." },
{ type: "error", message: "You don't have permission to do that. (E-254d)" },
event.cookies,
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/routes/(hq)/[id]/training/requests/+page.server.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ export const load: PageServerLoad = async ({ params, cookies }) => {
redirect(
307,
`/${params.id}`,
{ type: "error", message: "You don't have permission to do that." },
{ type: "error", message: "You don't have permission to do that. (E-66d6)" },
cookies,
);
}
Expand Down
10 changes: 8 additions & 2 deletions src/routes/(hq)/[id]/training/requests/+page.svelte
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,14 @@
);
}
const store = writable(data.requests.toSorted(sortArrayByWaitingPeriod));
$: $store = data.requests.toSorted(sortArrayByWaitingPeriod);
function mToSorted(i: (typeof data.requests)): (typeof data.requests) {
const res = [...i];
res.sort(sortArrayByWaitingPeriod);
return res;
}
const store = writable(mToSorted(data.requests));
$: $store = mToSorted(data.requests);
const table = createTable(store);
const columns = table.createColumns([
Expand Down
2 changes: 1 addition & 1 deletion src/routes/(hq)/[id]/training/transcript/[studentId]/+page.server.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ export const load: PageServerLoad = async ({ params, cookies }) => {
redirect(
307,
`/${params.id}`,
{ type: "error", message: "You don't have permission to do that." },
{ type: "error", message: "You don't have permission to do that. (E-1f2e)" },
cookies,
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/routes/(hq)/[id]/tvc/+page.server.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export const load: PageServerLoad = async ({ params, cookies }) => {
redirect(
307,
`/${params.id}`,
{ type: "error", message: "You don't have permission for that." },
{ type: "error", message: "You don't have permission for that. (E-cf2c)" },
cookies,
);
}
Expand Down
4 changes: 2 additions & 2 deletions src/routes/(hq)/[id]/tvc/cases/[caseId]/+page.server.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export const load: PageServerLoad = async ({ parent, cookies, params }) => {
return redirect(
301,
`/${params.id}`,
{ type: "error", message: "You don't have permission to view that." },
{ type: "error", message: "You don't have permission to view that. (E-fc39)" },
cookies,
);
}
Expand Down Expand Up @@ -128,7 +128,7 @@ export const actions: Actions = {
redirect(
307,
event.url,
{ type: "error", message: "You can't comment on a closed case." },
{ type: "error", message: "You can't comment on a closed case. (E-2e31)" },
event.cookies,
);
}
Expand Down
6 changes: 3 additions & 3 deletions src/routes/(hq)/switch_hq/+layout.server.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const load: LayoutServerLoad = async ({ cookies }) => {
redirect(
301,
"/",
{ type: "error", message: "You need to be logged in for that" },
{ type: "error", message: "You need to be logged in for that. (E-9241)" },
cookies,
);
}
Expand All @@ -19,7 +19,7 @@ export const load: LayoutServerLoad = async ({ cookies }) => {
redirect(
301,
"/",
{ type: "error", message: "You need to be logged in for that" },
{ type: "error", message: "You need to be logged in for that. (E-fe98)" },
cookies,
);
}
Expand All @@ -40,7 +40,7 @@ export const load: LayoutServerLoad = async ({ cookies }) => {
redirect(
307,
"/",
{ type: "error", message: "You need to be logged in for that." },
{ type: "error", message: "You need to be logged in for that. (E-cc73)" },
cookies,
);
}
Expand Down

0 comments on commit faad247

Please sign in to comment.