Closes sismics#216: redirect to login if not connected

saltict · Mar 22, 2018 · 785ad7f · 785ad7f
1 parent 5d9b87d
commit 785ad7f
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 23 deletions.
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
@@ -203,7 +203,6 @@ public void findByCriteria(PaginatedList<DocumentDto> paginatedList, DocumentCri
         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
@@ -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
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
@@ -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
@@ -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;
   })
 });
diff --git 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>