Merge branch 'master' of https://github.com/getferdi/ferdi-server

2 files changed, 27 insertions, 18 deletions

diff --git a/start/kernel.js b/start/kernel.js
index b54fc29..077151a 100644
--- a/start/kernel.js
+++ b/start/kernel.js
@@ -54,6 +54,7 @@ const namedMiddleware = {
 const serverMiddleware = [
   'Adonis/Middleware/Static',
   'Adonis/Middleware/Cors',
+  'App/Middleware/HandleDoubleSlash',
 ];
 
 Server
diff --git a/start/routes.js b/start/routes.js
index b5674fd..6385ca5 100644
--- a/start/routes.js
+++ b/start/routes.js
@@ -60,24 +60,32 @@ Route.group(() => {
 }).prefix('v1');
 
 // User dashboard
-Route.group(() => {
-  // Auth
-  Route.get('login', ({ view }) => view.render('dashboard.login')).middleware('guest');
-  Route.post('login', 'DashboardController.login').middleware('guest');
-
-  // Dashboard
-  Route.get('account', 'DashboardController.account').middleware('auth:session');
-  Route.post('account', 'DashboardController.edit').middleware('auth:session');
-  Route.get('data', 'DashboardController.data').middleware('auth:session');
-  Route.get('export', 'DashboardController.export').middleware('auth:session');
-  Route.post('transfer', 'DashboardController.import').middleware('auth:session');
-  Route.get('transfer', ({ view }) => view.render('dashboard.transfer')).middleware('auth:session');
-  Route.get('delete', ({ view }) => view.render('dashboard.delete')).middleware('auth:session');
-  Route.post('delete', 'DashboardController.delete').middleware('auth:session');
-  Route.get('logout', 'DashboardController.logout').middleware('auth:session');
-
-  Route.get('*', ({ response }) => response.redirect('/user/account'));
-}).prefix('user').middleware('shield');
+if (Env.get('IS_DASHBOARD_ENABLED') != 'false') {
+  Route.group(() => {
+    // Auth
+    Route.get('login', ({ view }) => view.render('dashboard.login')).middleware('guest');
+    Route.post('login', 'DashboardController.login').middleware('guest');
+  
+    // Dashboard
+    Route.get('account', 'DashboardController.account').middleware('auth:session');
+    Route.post('account', 'DashboardController.edit').middleware('auth:session');
+    Route.get('data', 'DashboardController.data').middleware('auth:session');
+    Route.get('export', 'DashboardController.export').middleware('auth:session');
+    Route.post('transfer', 'DashboardController.import').middleware('auth:session');
+    Route.get('transfer', ({ view }) => view.render('dashboard.transfer')).middleware('auth:session');
+    Route.get('delete', ({ view }) => view.render('dashboard.delete')).middleware('auth:session');
+    Route.post('delete', 'DashboardController.delete').middleware('auth:session');
+    Route.get('logout', 'DashboardController.logout').middleware('auth:session');
+  
+    Route.get('*', ({ response }) => response.redirect('/user/account'));
+  }).prefix('user').middleware('shield');
+} else {
+  Route.group(() => {
+    Route.get('*', ({
+      response,
+    }) => response.send('The user dashboard is disabled on this server\n\nIf you are the server owner, please set IS_DASHBOARD_ENABLED to true to enable the dashboard.'))
+  }).prefix('user');
+}
 
 // Recipe creation
 Route.post('new', 'RecipeController.create');