Use baseUrl when redirecting from domain proxy

code-asher · code-asher · commit 5499a3d12562 · 2020-11-12T11:23:52.000-06:00
This will make the route more robust since it'll work under more than
just the root.
diff --git a/src/node/routes/domainProxy.ts b/src/node/routes/domainProxy.ts
@@ -1,5 +1,6 @@
 import { Request, Router } from "express"
 import { HttpCode, HttpError } from "../../common/http"
+import { normalize } from "../../common/util"
 import { authenticated, ensureAuthenticated, redirect } from "../http"
 import { proxy } from "../proxy"
 import { Router as WsRouter } from "../wsRouter"
@@ -54,8 +55,9 @@ router.all("*", (req, res, next) => {
         return next()
       }
       // Redirect all other pages to the login.
+      const to = normalize(`${req.baseUrl}${req.path}`)
       return redirect(req, res, "login", {
-        to: req.path !== "/" ? req.path : undefined,
+        to: to !== "/" ? to : undefined,
       })
     }
 
