diff options
Diffstat (limited to 'src/server')
| -rw-r--r-- | src/server/Initialization.ts | 2 | ||||
| -rw-r--r-- | src/server/RouteManager.ts | 2 | ||||
| -rw-r--r-- | src/server/authentication/config/passport.ts | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/server/Initialization.ts b/src/server/Initialization.ts index 1fb949221..a41e2fea0 100644 --- a/src/server/Initialization.ts +++ b/src/server/Initialization.ts @@ -40,7 +40,7 @@ export default async function InitializeServer(options: InitializationOptions) { app.use("*", ({ user, originalUrl }, _res, next) => { if (!originalUrl.includes("Heartbeat")) { - const userEmail = user?.email; + const userEmail = user && ("email" in user) ? user["email"] : undefined; if (userEmail) { timeMap[userEmail] = Date.now(); } diff --git a/src/server/RouteManager.ts b/src/server/RouteManager.ts index 347be1952..41204964e 100644 --- a/src/server/RouteManager.ts +++ b/src/server/RouteManager.ts @@ -92,7 +92,7 @@ export default class RouteManager { try { await toExecute(args); } catch (e) { - console.log(red(target), user?.email ?? "<user logged out>"); + console.log(red(target), user && ("email" in user) ? "<user logged out>" : undefined); if (onError) { onError({ ...core, error: e }); } else { diff --git a/src/server/authentication/config/passport.ts b/src/server/authentication/config/passport.ts index 2271109a5..0ced99b0d 100644 --- a/src/server/authentication/config/passport.ts +++ b/src/server/authentication/config/passport.ts @@ -40,7 +40,7 @@ export let isAuthenticated = (req: Request, res: Response, next: NextFunction) = export let isAuthorized = (req: Request, res: Response, next: NextFunction) => { const provider = req.path.split("/").slice(-1)[0]; - if (_.find(req.user?.tokens, { kind: provider })) { + if (_.find(req.user && "tokens" in req.user ? req.user["tokens"] : undefined, { kind: provider })) { next(); } else { res.redirect(`/auth/${provider}`); |