regalijan/car-crushers-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make gme edit permissions tied to user ids again

Browse Source
This commit is contained in:
regalijan 2023-10-19 16:49:41 -04:00
parent 3ab93c707b
commit 32387f9c2a
Signed by: regalijan
GPG Key ID: 5D4196DA269EF520
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/routes/mod-queue.tsx
View File

@ -82,6 +82,11 @@ export async function loader({ context }: { context: RequestContext }) {
}); });
return { return {
can_edit_ban_users: [
"165594923586945025",
"289372404541554689",
"396347223736057866",
].includes(currentUser.id),
departments: Object.entries(departments) departments: Object.entries(departments)
.filter((d) => d[1] & currentUser.permissions) .filter((d) => d[1] & currentUser.permissions)
.map((arr) => arr[0]), .map((arr) => arr[0]),

4
functions/api/auth/session.ts
View File

@ -120,10 +120,10 @@ export async function onRequestGet(context: RequestContext) {
const memberData: { [k: string]: any } = await serverMemberReq.json(); const memberData: { [k: string]: any } = await serverMemberReq.json();
if (serverMemberReq.ok) { if (serverMemberReq.ok) {
userData.permissions = GetPermissions(userData.id, memberData.roles); userData.permissions = await GetPermissions(userData.id, memberData.roles);
userData.roles = memberData.roles; userData.roles = memberData.roles;
} else { } else {
userData.permissions = GetPermissions(userData.id); userData.permissions = await GetPermissions(userData.id);
} }
const selectedTokenStart = const selectedTokenStart =

13
functions/permissions.ts
View File

@ -1,4 +1,4 @@
export default function (userid: string, roles?: string[]): number { export default async function (userid: string, roles?: string[], context?: RequestContext): Promise<number> {
let permissions = 0; let permissions = 0;
if (roles?.includes("374851061233614849")) permissions |= 1 << 0; // Administration if (roles?.includes("374851061233614849")) permissions |= 1 << 0; // Administration
@ -7,14 +7,9 @@ export default function (userid: string, roles?: string[]): number {
if (roles?.includes("391986108763996160")) permissions |= 1 << 3; // Events Team if (roles?.includes("391986108763996160")) permissions |= 1 << 3; // Events Team
if (roles?.includes("607697704419852289")) permissions |= 1 << 4; // Events Team Management if (roles?.includes("607697704419852289")) permissions |= 1 << 4; // Events Team Management
if ( if (
[ ["165594923586945025", "289372404541554689", "396347223736057866"].includes(
"165594923586945025", userid
"289372404541554689", ) || (Boolean(await context?.env.DATA.get(`gamemod_${userid}`)))
"320758924850757633",
"396347223736057866",
"704247919259156521",
"891710683371167795",
].includes(userid)
) )
permissions |= 1 << 5; permissions |= 1 << 5;
if ( if (