External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-17 14:27:42 -02:30
Code Issues Packages Projects Releases Wiki Activity

Fix socket reconnect logic when browser is refreshed after token has expired

Browse Source
This commit is contained in:
Matthew Jones
2015-03-05 11:40:29 -05:00
parent e653e9561a
commit 6034e6108a
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/static/js/app.js
View File

@@ -652,7 +652,9 @@ var tower = angular.module('Tower', [
if($rootScope.dashboardInterval){ if($rootScope.dashboardInterval){
window.clearInterval($rootScope.dashboardInterval); window.clearInterval($rootScope.dashboardInterval);
} }
sock.socket.socket.disconnect(); if (sock) {
sock.socket.socket.disconnect();
}
$location.path('/login'); $location.path('/login');
} }
} else { } else {

11
awx/ui/static/js/shared/Socket.js
View File

@@ -100,8 +100,15 @@ angular.module('SocketIO', ['AuthService', 'Utilities'])
}); });
}); });
self.socket.on('connect_failed', function(reason) { self.socket.on('connect_failed', function(reason) {
var r = reason || 'connection refused by host'; var r = reason || 'connection refused by host',
$log.error('Socket connection failed: ' + r); token_actual = Authorization.getToken();
$log.debug('Socket connection failed: ' + r);
if (token_actual === token) {
self.socket.socket.disconnect();
}
self.scope.$apply(function () { self.scope.$apply(function () {
self.scope.socketStatus = 'error'; self.scope.socketStatus = 'error';
self.scope.socketTip = getSocketTip(self.scope.socketStatus); self.scope.socketTip = getSocketTip(self.scope.socketStatus);