From 9a0787aafb623ce0aa043419533b51378f56e070 Mon Sep 17 00:00:00 2001
From: Bob Zeleznik <zzzman@gmail.com>
Date: Tue, 3 Dec 2019 14:02:12 -0500
Subject: fixes to rich text embedded notes & focus behavior.  fixes to compile
 errors in passport/routemanager/Initiatlization

---
 src/server/Initialization.ts                 | 2 +-
 src/server/RouteManager.ts                   | 2 +-
 src/server/authentication/config/passport.ts | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'src/server')

diff --git a/src/server/Initialization.ts b/src/server/Initialization.ts
index 74770153d..d257b9575 100644
--- a/src/server/Initialization.ts
+++ b/src/server/Initialization.ts
@@ -40,7 +40,7 @@ export default async function InitializeServer(options: InitializationOptions) {
 
     server.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}`);
-- 
cgit v1.2.3-70-g09d2