diff --git a/src/services/AuthService.ts b/src/services/AuthService.ts index 1b53103..6ff77f6 100644 --- a/src/services/AuthService.ts +++ b/src/services/AuthService.ts @@ -48,7 +48,7 @@ export default class AuthService { throw user.log.error("AuthService", "getToken: token timed out"); } } else { - throw user.log.error("AuthService", "getToken: no token available"); + throw user.log.error("AuthService", "getToken: no active tokens"); } } } diff --git a/src/services/Server.ts b/src/services/Server.ts index 00224e5..d44e20c 100644 --- a/src/services/Server.ts +++ b/src/services/Server.ts @@ -200,17 +200,21 @@ export default class Server { command: string, ) { if (process.env.FAIRPOST_USER_AUTH === "fairpost") { + const baseCookie = { + httpOnly: true, + secure: process.env.FAIRPOST_SESSION_SECURE !== "false", + sameSite: (process.env.FAIRPOST_SESSION_SAMESITE ?? "strict") as + | "strict" + | "lax" + | "none", + path: "/", + }; if (["login", "refresh-token"].includes(command)) { const token = await AuthService.getToken(user); response.setHeader( "Set-Cookie", cookie.serialize("FairpostSession", token, { - httpOnly: true, - secure: process.env.FAIRPOST_SESSION_SECURE !== "false", - sameSite: (process.env.FAIRPOST_SESSION_SAMESITE ?? "strict") as - | "strict" - | "lax" - | "none", + ...baseCookie, maxAge: +(process.env.FAIRPOST_SESSION_TIMEOUT ?? 60 * 60), }), ); @@ -219,13 +223,8 @@ export default class Server { response.setHeader( "Set-Cookie", cookie.serialize("FairpostSession", "", { - httpOnly: true, - secure: process.env.FAIRPOST_SESSION_SECURE === "false", - sameSite: (process.env.FAIRPOST_SESSION_SAMESITE ?? "strict") as - | "strict" - | "lax" - | "none", - maxAge: +(process.env.FAIRPOST_SESSION_TIMEOUT ?? 60 * 60), + ...baseCookie, + maxAge: 0, }), ); }