Avoid setting ?to=/

code-asher · code-asher · commit 71850e312bc9 · 2020-11-10T18:14:18.000-06:00
That's the default so it's extra visual noise.
diff --git a/src/node/routes/domainProxy.ts b/src/node/routes/domainProxy.ts
@@ -55,7 +55,7 @@ router.all("*", (req, res, next) => {
       }
       // Redirect all other pages to the login.
       return redirect(req, res, "login", {
-        to: req.path,
+        to: req.path !== "/" ? req.path : undefined,
       })
     }
 
diff --git a/src/node/routes/pathProxy.ts b/src/node/routes/pathProxy.ts
@@ -1,6 +1,7 @@
 import { Request, Router } from "express"
 import qs from "qs"
 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"
@@ -17,11 +18,11 @@ const getProxyTarget = (req: Request, rewrite: boolean): string => {
 
 router.all("/(:port)(/*)?", (req, res) => {
   if (!authenticated(req)) {
-    // If visiting the root (/proxy/:port and nothing else) redirect to the
-    // login page.
+    // If visiting the root (/:port only) redirect to the login page.
     if (!req.params[0] || req.params[0] === "/") {
+      const to = normalize(`${req.baseUrl}${req.path}`)
       return redirect(req, res, "login", {
-        to: `${req.baseUrl}${req.path}` || "/",
+        to: to !== "/" ? to : undefined,
       })
     }
     throw new HttpError("Unauthorized", HttpCode.Unauthorized)
diff --git a/src/node/routes/vscode.ts b/src/node/routes/vscode.ts
@@ -15,7 +15,8 @@ const vscode = new VscodeProvider()
 router.get("/", async (req, res) => {
   if (!authenticated(req)) {
     return redirect(req, res, "login", {
-      to: req.baseUrl,
+      // req.baseUrl can be blank if already at the root.
+      to: req.baseUrl && req.baseUrl !== "/" ? req.baseUrl : undefined,
     })
   }
 

Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ router.all("*", (req, res, next) => {`
`55`	`55`	`}`
`56`	`56`	`// Redirect all other pages to the login.`
`57`	`57`	`return redirect(req, res, "login", {`
`58`		`- to: req.path,`
	`58`	`+ to: req.path !== "/" ? req.path : undefined,`
`59`	`59`	`})`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,8 @@ const vscode = new VscodeProvider()`
`15`	`15`	`router.get("/", async (req, res) => {`
`16`	`16`	`if (!authenticated(req)) {`
`17`	`17`	`return redirect(req, res, "login", {`
`18`		`- to: req.baseUrl,`
	`18`	`+ // req.baseUrl can be blank if already at the root.`
	`19`	`+ to: req.baseUrl && req.baseUrl !== "/" ? req.baseUrl : undefined,`
`19`	`20`	`})`
`20`	`21`	`}`
`21`	`22`