From c87024c06941920f1df689d54d82cc309891e3d2 Mon Sep 17 00:00:00 2001 From: bobzel Date: Tue, 25 Jul 2023 13:31:54 -0400 Subject: upadted browndash components version to fix popup closing. fixed server initialization to not redirect to home except for corsProxy's. fixes issue with login getting redirected to /home when requesting /css/main and /favicon. --- src/server/server_Initialization.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/server/server_Initialization.ts') diff --git a/src/server/server_Initialization.ts b/src/server/server_Initialization.ts index 805da1d43..c38ee8ac9 100644 --- a/src/server/server_Initialization.ts +++ b/src/server/server_Initialization.ts @@ -234,8 +234,10 @@ function proxyServe(req: any, requrl: string, response: any) { function registerEmbeddedBrowseRelativePathHandler(server: express.Express) { server.use('*', (req, res) => { const relativeUrl = req.originalUrl; - if (!req.user) res.redirect('/home'); // When no user is logged in, we interpret a relative URL as being a reference to something they don't have access to and redirect to /home - else if (!res.headersSent && req.headers.referer?.includes('corsProxy')) { + // if (req.originalUrl === '/css/main.css' || req.originalUrl === '/favicon.ico') res.end(); + // else + if (!res.headersSent && req.headers.referer?.includes('corsProxy')) { + if (!req.user) res.redirect('/home'); // When no user is logged in, we interpret a relative URL as being a reference to something they don't have access to and redirect to /home // a request for something by a proxied referrer means it must be a relative reference. So construct a proxied absolute reference here. try { const proxiedRefererUrl = decodeURIComponent(req.headers.referer); // (e.g., http://localhost:/corsProxy/https://en.wikipedia.org/wiki/Engelbart) -- cgit v1.2.3-70-g09d2