Merge branch 'master' into eleanor-gptdraw

1 files changed, 5 insertions, 2 deletions

diff --git a/src/server/server_Initialization.ts b/src/server/server_Initialization.ts
index 4dcb32f8b..1bd495965 100644
--- a/src/server/server_Initialization.ts
+++ b/src/server/server_Initialization.ts
@@ -108,7 +108,7 @@ function registerEmbeddedBrowseRelativePathHandler(server: express.Express) {
             // detect search query and use default search engine
             res.redirect(req.headers.referer + 'corsProxy/' + encodeURIComponent('http://www.google.com' + relativeUrl));
         } else {
-            res.end();
+            res.status(404).json({ error: 'no such file or endpoint: try /home /logout /login' });
         }
     });
 }
@@ -247,6 +247,10 @@ export default async function InitializeServer(routeSetter: RouteSetter) {
     const app = buildWithMiddleware(express());
     const compiler = webpack(config as webpack.Configuration);
 
+    // Default route
+    app.get('/', (req, res) => {
+        res.redirect(req.user ? '/home' : '/login'); //res.send('This is the default route.');
+    });
     // route table managed by express.  routes are tested sequentially against each of these map rules.  when a match is found, the handler is called to process the request
     app.use(wdm(compiler, { publicPath: config.output.publicPath }));
     app.use(whm(compiler));
@@ -259,7 +263,6 @@ export default async function InitializeServer(routeSetter: RouteSetter) {
     isRelease && !SSL.Loaded && SSL.exit();
     routeSetter(new RouteManager(app, isRelease)); // this sets up all the regular supervised routes (things like /home, download/upload api's, pdf, search, session, etc)
     registerEmbeddedBrowseRelativePathHandler(app); // this allows renered web pages which internally have relative paths to find their content
-
     isRelease && process.env.serverPort && (resolvedPorts.server = Number(process.env.serverPort));
     const server = isRelease ? createServer(SSL.Credentials, app) : app;
     await new Promise<void>(resolve => {