mirror of
https://github.com/ZwareBear/awx.git
synced 2026-05-15 15:58:38 -05:00
socket disconnect on session timeout
the UI was trying to reconnect to the socket server using the previous session's auth token. I'm forcing a disconnect now when the session times out and i added 'force new conection' to true in the socket configuration so that when a new session starts it doesn't use the old auth token.
This commit is contained in:
@@ -598,7 +598,7 @@ var tower = angular.module('Tower', [
|
||||
|
||||
// monitor socket status
|
||||
checkCount = 0;
|
||||
setInterval(function() {
|
||||
$rootScope.dashboardInterval = setInterval(function() {
|
||||
if (sock.checkStatus() === 'error' || checkCount > 5) {
|
||||
// there's an error or we're stuck in a 'connecting' state. attempt to reconnect
|
||||
$log.debug('socket status: ' + sock.checkStatus());
|
||||
@@ -646,8 +646,13 @@ var tower = angular.module('Tower', [
|
||||
$location.path('/login');
|
||||
}
|
||||
} else if ($rootScope.sessionTimer.isExpired()) {
|
||||
// gets here on timeout
|
||||
if (next.templateUrl !== (urlPrefix + 'partials/login.html')) {
|
||||
$rootScope.sessionTimer.expireSession();
|
||||
if($rootScope.dashboardInterval){
|
||||
window.clearInterval($rootScope.dashboardInterval);
|
||||
}
|
||||
sock.socket.socket.disconnect();
|
||||
$location.path('/login');
|
||||
}
|
||||
} else {
|
||||
@@ -797,4 +802,3 @@ var tower = angular.module('Tower', [
|
||||
]);
|
||||
|
||||
export default tower;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user