Highlight valid SSO sessions (#1735)

lemonldap-ng-manager/site/coffee/sessions.coffee

@@ -353,14 +353,23 @@ llapp.controller 'SessionsExplorerCtrl', ['$scope', '$translator', '$location',
 		d = new Date(s * 1000)
 		return d.toLocaleString()
 
-	$scope.isValid = (epoch) ->
+	$scope.isValid = (epoch, type) ->
+		path = $location.path()
 		now = Date.now() / 1000
-		valid = now - epoch < $scope.sessionTTL
-		console.log "session epoch", epoch
-		console.log "current date", now
-		console.log "sessions TTL", sessionTTL
-		console.log "Valid ?", valid
-		return valid
+		console.log "Path", path
+		console.log "Session epoch", epoch
+		console.log "Current date", now
+		console.log "Session TTL", sessionTTL
+		isValid = now - epoch < sessionTTL || $location.path().match(/^\/persistent/)
+		if type == 'msg'
+			console.log "Return msg"
+			if isValid then return "info" else return "warning"
+		else if type == 'style'
+			console.log "Return style"
+			if isValid then return {} else return {'color': '#627990', 'font-style': 'italic'}
+		else
+			console.log "Return isValid"
+			return isValid
 
 	$scope.strToLocaleDate = (s) ->
 		arrayDate = s.match /^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})$/
@@ -459,6 +468,8 @@ llapp.controller 'SessionsExplorerCtrl', ['$scope', '$translator', '$location',
 	$scope.init = ->
 		$scope.waiting = true
 		$scope.data = []
+		$scope.currentScope = null
+		$scope.currentSession = null
 		$q.all [
 			$translator.init $scope.lang
 			$scope.updateTree '', $scope.data, 0, 0

lemonldap-ng-manager/site/htdocs/static/js/sessions.js

@@ -433,15 +433,36 @@
         d = new Date(s * 1000);
         return d.toLocaleString();
       };
-      $scope.isValid = function(epoch) {
-        var now, valid;
+      $scope.isValid = function(epoch, type) {
+        var isValid, now, path;
+        path = $location.path();
         now = Date.now() / 1000;
-        valid = now - epoch < $scope.sessionTTL;
-        console.log("session epoch", epoch);
-        console.log("current date", now);
-        console.log("sessions TTL", sessionTTL);
-        console.log("Valid ?", valid);
-        return valid;
+        console.log("Path", path);
+        console.log("Session epoch", epoch);
+        console.log("Current date", now);
+        console.log("Session TTL", sessionTTL);
+        isValid = now - epoch < sessionTTL || $location.path().match(/^\/persistent/);
+        if (type === 'msg') {
+          console.log("Return msg");
+          if (isValid) {
+            return "info";
+          } else {
+            return "warning";
+          }
+        } else if (type === 'style') {
+          console.log("Return style");
+          if (isValid) {
+            return {};
+          } else {
+            return {
+              'color': '#627990',
+              'font-style': 'italic'
+            };
+          }
+        } else {
+          console.log("Return isValid");
+          return isValid;
+        }
       };
       $scope.strToLocaleDate = function(s) {
         var arrayDate, d;
@@ -522,6 +543,8 @@
       $scope.init = function() {
         $scope.waiting = true;
         $scope.data = [];
+        $scope.currentScope = null;
+        $scope.currentSession = null;
         $q.all([$translator.init($scope.lang), $scope.updateTree('', $scope.data, 0, 0)]).then(function() {
           return $scope.waiting = false;
         }, function(resp) {

lemonldap-ng-manager/site/templates/sessions.tpl

@@ -69,9 +69,12 @@
           <h1 class="panel-title text-center">{{translate("sessionTitle")}} {{currentSession.id}}</h1>
         </div>
         <div class="panel-body">
-          <div class="alert alert-info">
+          <div class="alert alert-{{isValid(currentSession._utime, 'msg')}}">
             <strong>{{translate("sessionStartedAt")}}</strong>
             {{localeDate(currentSession._utime)}}
+            <span ng-if="!isValid(currentSession._utime)">
+              <b>*** {{translate("sessionExpired")}} ***</b>
+            </span>
           </div>
           <div ng-model="currentSession.nodes">
             <div ng-repeat="node in currentSession.nodes" ng-include="'session_attr.html'"></div>
@@ -118,12 +121,7 @@
         <a class="btn btn-node btn-sm" ng-click="displaySession(this)">
           <span class="glyphicon glyphicon-eye-open"></span>
         </a>
-        <span ng-if="isValid(node.date)">
-          <span id="s-{{node.session}}" ng-click="displaySession(this)">{{localeDate(node.date)}}</span>
-        </span>
-        <span ng-if="!isValid(node.date)">
-          <span id="s-{{node.session}}" ng-click="displaySession(this)" ng-style="{color: '#337Ab7'}">{{localeDate(node.date)}}</span>
-        </span>
+        <span id="s-{{node.session}}" ng-click="displaySession(this)" ng-style="isValid(node.date, 'style')">{{localeDate(node.date)}} </span>
       </span>
     </div>
     <ol ui-tree-nodes="" ng-model="node.nodes" ng-class="{hidden: collapsed}">