diff --git a/src/server/lib/auth.ts b/src/server/lib/auth.ts index 899c215..365c82b 100644 --- a/src/server/lib/auth.ts +++ b/src/server/lib/auth.ts @@ -59,16 +59,20 @@ export function tokenFor(req: express.Request) { ) } +function getToken(token:string) { + return AuthTokens.find(e => e.token == token && Date.now() < e.expire) +} + export function validate(token:string) { - return AuthTokens.find(e => e.token == token && Date.now() < e.expire)?.account + return getToken(token)?.account } export function getType(token:string): TokenType | undefined { - return AuthTokens.find(e => e.token == token && Date.now() < e.expire)?.type + return getToken(token)?.type } export function getPermissions(token:string): TokenPermission[] | undefined { - return AuthTokens.find(e => e.token == token && Date.now() < e.expire)?.tokenPermissions + return getToken(token)?.tokenPermissions } export function tokenTimer(token:AuthToken) { diff --git a/src/server/lib/middleware.ts b/src/server/lib/middleware.ts index bcb2bc6..9a1a542 100644 --- a/src/server/lib/middleware.ts +++ b/src/server/lib/middleware.ts @@ -41,12 +41,12 @@ export const requiresPermissions = function(...tokenPermissions: auth.TokenPermi if (!permissions) ServeError(res, 403, "insufficient permissions") else { - for (let v in tokenPermissions) + for (let v of tokenPermissions) { if (!permissions.includes(v as auth.TokenPermission)) { ServeError(res,403,"insufficient permissions") return } - + } next() }