diff --git a/src/server/gsheets/localDb.ts b/src/server/gsheets/localDb.ts index 2de23ca..723d50f 100644 --- a/src/server/gsheets/localDb.ts +++ b/src/server/gsheets/localDb.ts @@ -273,9 +273,6 @@ function anonimizedDb(_s: States): States { } function idADev(v: Volunteer | PreVolunteer): boolean { - if (((v as Volunteer)?.roles || []).includes("dev")) { - console.log(v.lastname) - } return ((v as Volunteer)?.roles || []).includes("dev") } diff --git a/src/server/gsheets/volunteers.ts b/src/server/gsheets/volunteers.ts index 3a00b15..691e0c7 100644 --- a/src/server/gsheets/volunteers.ts +++ b/src/server/gsheets/volunteers.ts @@ -48,7 +48,7 @@ export const volunteerLogin = expressAccessor.get(async (list, b } } - const jwt = await getJwt(volunteer.id) + const jwt = await getJwt(volunteer.id, volunteer.roles) return { id: volunteer.id, diff --git a/src/server/index.ts b/src/server/index.ts index 5e884f5..62e6b93 100755 --- a/src/server/index.ts +++ b/src/server/index.ts @@ -1,5 +1,5 @@ import path from "path" -import express, { RequestHandler } from "express" +import express, { RequestHandler, Request, Response, NextFunction } from "express" import logger from "morgan" import cookieParser from "cookie-parser" import compression from "compression" @@ -66,6 +66,15 @@ if (__DEV__) devServer(app) app.use(express.json()) app.use(cookieParser()) +// Anonymized DB download +app.get( + "/OUpere3yzML8da8abw5Tyeef2P0LJOetmdDHfKZC0T2CU/dbAnonymized.json", + async (_request: Request, response: Response, _next: NextFunction): Promise => { + const file = path.resolve(`access/dbAnonymized.json`) + response.download(file) + } +) + /** * APIs */ diff --git a/src/server/secure.ts b/src/server/secure.ts index e4a141c..2fe2024 100644 --- a/src/server/secure.ts +++ b/src/server/secure.ts @@ -64,9 +64,9 @@ async function getSecret() { return cachedSecret } -export async function getJwt(id: number): Promise { +export async function getJwt(id: number, roles: string[]): Promise { const jwt = sign( - { id }, + { id, roles }, await getSecret() // __TEST__ // ? undefined