diff options
author | Bob Zeleznik <zzzman@gmail.com> | 2020-03-17 02:54:53 -0400 |
---|---|---|
committer | Bob Zeleznik <zzzman@gmail.com> | 2020-03-17 02:54:53 -0400 |
commit | 1b21c5234a179df337ad51f55c9f82b9d7022c25 (patch) | |
tree | 1ccbd7f2f36acea5146989150674793bbc023f83 /src/server/RouteManager.ts | |
parent | e9a16afa46af3ecec0bd7b58f9ca13b85d62a860 (diff) |
cleaned up relative web page paths.
Diffstat (limited to 'src/server/RouteManager.ts')
-rw-r--r-- | src/server/RouteManager.ts | 38 |
1 files changed, 6 insertions, 32 deletions
diff --git a/src/server/RouteManager.ts b/src/server/RouteManager.ts index c88f3bb51..a8680c0c9 100644 --- a/src/server/RouteManager.ts +++ b/src/server/RouteManager.ts @@ -94,11 +94,9 @@ export default class RouteManager { sub instanceof RouteSubscriber && RouteManager.routes.push(sub.root); }); const isRelease = this._isRelease; - let redirected = ""; const supervised = async (req: Request, res: Response) => { let { user } = req; const { originalUrl: target } = req; - console.log("TARGET: " + target); if (process.env.DB === "MEM" && !user) { user = { id: "guest", email: "", userDocumentId: "guestDocId" }; } @@ -128,37 +126,13 @@ export default class RouteManager { res.redirect("/login"); } } - if (!res.headersSent && req.headers.referer?.includes("corsProxy")) { - const url = decodeURIComponent(req.headers.referer!); - const start = url.match(/.*corsProxy\//)![0]; - const original = url.replace(start, ""); - const theurl = original.match(/http[s]?:\/\/[^\/]*/)![0]; - const newdirect = start + encodeURIComponent(theurl + target); - console.log("REDIRECT: " + (theurl + target)); - res.redirect(newdirect); - } - else if (!res.headersSent) { - const which2 = RouteManager.routes.findIndex(r => (r !== "/" || r === target) && target.startsWith(r)); - const which = Array.from(registered.keys()).findIndex(r => (r !== "/" || r === target) && target.startsWith(r)); - console.log("WHICH = " + (which === -1 ? "" : Array.from(registered.keys())[which])); - if (which !== -1) { - setTimeout(() => { - console.log("handled:" + target); - if (!res.headersSent) { - console.log(red(`Initiating fallback for ${target}. Please remove dangling promise from route handler`)); - const warning = `request to ${target} fell through - this is a fallback response`; - res.send({ warning }); - } - }, 1000); - } - else { - console.log("unhandled:" + target); - res.end(); + setTimeout(() => { + if (!res.headersSent) { + console.log(red(`Initiating fallback for ${target}. Please remove dangling promise from route handler`)); + const warning = `request to ${target} fell through - this is a fallback response`; + res.send({ warning }); } - } else { - console.log("pre-sent:" + target); - res.end(); - } + }, 1000); }; const subscribe = (subscriber: RouteSubscriber | string) => { let route: string; |