Merge branch 'master' of https://github.com/browngraphicslab/Dash-Web into script_documents

1 files changed, 8 insertions, 2 deletions

diff --git a/src/server/index.ts b/src/server/index.ts
index 8b040c926..f26c8a6ab 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -106,12 +106,17 @@ function routeSetter({ isRelease, addSupervisedRoute, logRegistrationOutcome }:
         method: Method.GET,
         subscription: ["/home", new RouteSubscriber("doc").add("docId")],
         secureHandler: serve,
-        publicHandler: ({ req, ...remaining }) => {
+        publicHandler: ({ req, res, ...remaining }) => {
             const { originalUrl: target } = req;
             const sharing = qs.parse(qs.extract(req.originalUrl), { sort: false }).sharing === "true";
             const docAccess = target.startsWith("/doc/");
+            // since this is the public handler, there's no meaning of '/home' to speak of
+            // since there's no user logged in, so the only viable operation
+            // for a guest is to look at a shared document
             if (sharing && docAccess) {
-                serve({ req, ...remaining });
+                serve({ req, res, ...remaining });
+            } else {
+                res.redirect("/login");
             }
         }
     });
@@ -148,5 +153,6 @@ export async function launchServer() {
 if (process.env.RELEASE) {
     (sessionAgent = new DashSessionAgent()).launch();
 } else {
+    (Database.Instance as Database.Database).doConnect();
     launchServer();
 }