Merge pull request #3151 from jaredevantabor/O-auth

Make check for idle session more specific
This commit is contained in:
Jared Tabor
2016-07-27 14:22:42 -07:00
committed by GitHub

View File

@@ -872,7 +872,7 @@ var tower = angular.module('Tower', [
} else { } else {
var lastUser = $cookieStore.get('current_user'), var lastUser = $cookieStore.get('current_user'),
timestammp = Store('sessionTime'); timestammp = Store('sessionTime');
if(lastUser && lastUser.id && timestammp && timestammp[lastUser.id]){ if(lastUser && lastUser.id && timestammp && timestammp[lastUser.id] && timestammp[lastUser.id].loggedIn){
var stime = timestammp[lastUser.id].time, var stime = timestammp[lastUser.id].time,
now = new Date().getTime(); now = new Date().getTime();
if ((stime - now) <= 0) { if ((stime - now) <= 0) {