From 785ad7f3a1a2fc22660407bc01609b20032eee23 Mon Sep 17 00:00:00 2001
From: Benjamin Gamard <b.gamard@sismics.com>
Date: Thu, 22 Mar 2018 15:05:24 +0100
Subject: [PATCH] Closes #216: redirect to login if not connected

---
 .../sismics/docs/core/dao/jpa/DocumentDao.java |  1 -
 docs-web/src/main/webapp/src/app/docs/app.js   |  3 +--
 .../webapp/src/app/docs/controller/Main.js     | 18 ------------------
 .../src/app/docs/controller/Navigation.js      |  9 +++++++++
 .../app/docs/controller/settings/Settings.js   |  2 +-
 docs-web/src/main/webapp/src/index.html        |  1 -
 6 files changed, 11 insertions(+), 23 deletions(-)
 delete mode 100644 docs-web/src/main/webapp/src/app/docs/controller/Main.js

diff --git a/docs-core/src/main/java/com/sismics/docs/core/dao/jpa/DocumentDao.java b/docs-core/src/main/java/com/sismics/docs/core/dao/jpa/DocumentDao.java
index 97343c68..5e962264 100644
--- a/docs-core/src/main/java/com/sismics/docs/core/dao/jpa/DocumentDao.java
+++ b/docs-core/src/main/java/com/sismics/docs/core/dao/jpa/DocumentDao.java
@@ -203,7 +203,6 @@ public class DocumentDao {
         Map<String, Object> parameterMap = new HashMap<>();
         List<String> criteriaList = new ArrayList<>();
 
-        // TODO Simplify SELECT clause for count(*)
         StringBuilder sb = new StringBuilder("select distinct d.DOC_ID_C c0, d.DOC_TITLE_C c1, d.DOC_DESCRIPTION_C c2, d.DOC_CREATEDATE_D c3, d.DOC_LANGUAGE_C c4, ");
         sb.append(" s.count c5, ");
         sb.append(" f.count c6, ");
diff --git a/docs-web/src/main/webapp/src/app/docs/app.js b/docs-web/src/main/webapp/src/app/docs/app.js
index 63638fbf..f51918e7 100644
--- a/docs-web/src/main/webapp/src/app/docs/app.js
+++ b/docs-web/src/main/webapp/src/app/docs/app.js
@@ -23,8 +23,7 @@ angular.module('docs',
       url: '',
       views: {
         'page': {
-          templateUrl: 'partial/docs/main.html',
-          controller: 'Main'
+          templateUrl: 'partial/docs/main.html'
         }
       }
     })
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/Main.js b/docs-web/src/main/webapp/src/app/docs/controller/Main.js
deleted file mode 100644
index 5dc8ad0d..00000000
--- a/docs-web/src/main/webapp/src/app/docs/controller/Main.js
+++ /dev/null
@@ -1,18 +0,0 @@
-'use strict';
-
-/**
- * Main controller.
- */
-angular.module('docs').controller('Main', function($scope, $rootScope, $state, User) {
-  User.userInfo().then(function(data) {
-    if (data.anonymous) {
-      $state.go('login', {}, {
-        location: 'replace'
-      });
-    } else {
-      $state.go('document.default', {}, {
-        location: 'replace'
-      });
-    }
-  });
-});
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/Navigation.js b/docs-web/src/main/webapp/src/app/docs/controller/Navigation.js
index a7a45c8f..60a901d0 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/Navigation.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/Navigation.js
@@ -6,6 +6,15 @@
 angular.module('docs').controller('Navigation', function($scope, $state, $rootScope, User) {
   User.userInfo().then(function(data) {
     $rootScope.userInfo = data;
+    if (data.anonymous) {
+      $state.go('login', {}, {
+        location: 'replace'
+      });
+    } else {
+      $state.go('document.default', {}, {
+        location: 'replace'
+      });
+    }
   });
 
   /**
diff --git a/docs-web/src/main/webapp/src/app/docs/controller/settings/Settings.js b/docs-web/src/main/webapp/src/app/docs/controller/settings/Settings.js
index 4a1f5748..bc797f2d 100644
--- a/docs-web/src/main/webapp/src/app/docs/controller/settings/Settings.js
+++ b/docs-web/src/main/webapp/src/app/docs/controller/settings/Settings.js
@@ -6,6 +6,6 @@
 angular.module('docs').controller('Settings', function($scope, User) {
   // Flag if the user is admin
   User.userInfo().then(function(data) {
-    $scope.isAdmin = data.base_functions.indexOf('ADMIN') != -1;
+    $scope.isAdmin = data.base_functions.indexOf('ADMIN') !== -1;
   })
 });
\ No newline at end of file
diff --git a/docs-web/src/main/webapp/src/index.html b/docs-web/src/main/webapp/src/index.html
index 9230d5af..63d44847 100644
--- a/docs-web/src/main/webapp/src/index.html
+++ b/docs-web/src/main/webapp/src/index.html
@@ -48,7 +48,6 @@
     <script src="lib/angular.qrcode.js" type="text/javascript"></script>
     <script src="lib/angular.timeago.js" type="text/javascript"></script>
     <script src="app/docs/app.js" type="text/javascript"></script>
-    <script src="app/docs/controller/Main.js" type="text/javascript"></script>
     <script src="app/docs/controller/Login.js" type="text/javascript"></script>
     <script src="app/docs/controller/ModalPasswordLost.js" type="text/javascript"></script>
     <script src="app/docs/controller/ModalFeedback.js" type="text/javascript"></script>