From d1d12663a7722d10ac830c51a5e0da75cc6e08ae Mon Sep 17 00:00:00 2001
From: garrettmills <shout@garrettmills.dev>
Date: Wed, 4 Nov 2020 20:58:09 -0600
Subject: [PATCH] Fix root route parsing to exclude base

---
 app/FrontendUnit.js            | 4 ++++
 frontend/src/module/routing.js | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/FrontendUnit.js b/app/FrontendUnit.js
index 79d93d3..35365bf 100644
--- a/app/FrontendUnit.js
+++ b/app/FrontendUnit.js
@@ -21,6 +21,10 @@ class FrontendUnit extends Unit {
         app.express.use('/app', [
             this.canon.get('middleware::auth:UserOnly'),
             (req, res, next) => {
+                if ( !req.user ) {
+                    return res.redirect('/auth/login')
+                }
+
                 const allowed_extensions = [
                     '.html', '.js', '.css', '.svg', '.ttf', '.jpg', '.png',
                     '.jpeg', '.webmanifest', '.json', '.eot', '.svg', '.cur',
diff --git a/frontend/src/module/routing.js b/frontend/src/module/routing.js
index b50ed0f..8a462d5 100644
--- a/frontend/src/module/routing.js
+++ b/frontend/src/module/routing.js
@@ -29,7 +29,8 @@ class Router {
     constructor() {
         try {
             const route = location.href.split(APP_BASE_PATH).filter(Boolean)[0].split(/[#?]/)[0]
-            if ( route ) {
+            if ( route && !route.toLowerCase().includes('http://') && !route.toLowerCase().includes('https://') ) {
+                console.log('resume route', route)
                 this.navigate(route, {})
             }
         } catch (e) {}