aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Wilkins <samwilkins333@gmail.com>2020-04-17 08:30:16 -0700
committerSam Wilkins <samwilkins333@gmail.com>2020-04-17 08:30:16 -0700
commiteaffd29f3837a9f5834488511b5b6c6283c13dee (patch)
treeb339d805fd437a01c0e9f2ea6b36fc2a5f65edc0
parent0736662068dbeb02a8a9dda84bc0ac523650d8c6 (diff)
fixed home / doc access serving logic
-rw-r--r--src/server/index.ts9
1 files changed, 7 insertions, 2 deletions
diff --git a/src/server/index.ts b/src/server/index.ts
index 1d7520b1c..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");
}
}
});