From 5355a802c32cad8b0e3b3f7d0fd5728809ee504e Mon Sep 17 00:00:00 2001 From: jaredevantabor Date: Tue, 31 Jan 2017 14:23:32 -0800 Subject: [PATCH] removing token from websocket connection url --- awx/ui/client/src/shared/socket/socket.service.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/awx/ui/client/src/shared/socket/socket.service.js b/awx/ui/client/src/shared/socket/socket.service.js index b636cc1db8..b03d32cacf 100644 --- a/awx/ui/client/src/shared/socket/socket.service.js +++ b/awx/ui/client/src/shared/socket/socket.service.js @@ -5,8 +5,8 @@ *************************************************/ import ReconnectingWebSocket from 'reconnectingwebsocket'; export default -['$rootScope', '$location', '$log','$state', '$q', 'i18n', 'Authorization', - function ($rootScope, $location, $log, $state, $q, i18n, Authorization) { +['$rootScope', '$location', '$log','$state', '$q', 'i18n', + function ($rootScope, $location, $log, $state, $q, i18n) { var needsResubscribing = false, socketPromise = $q.defer(); return { @@ -14,8 +14,7 @@ export default var self = this, host = window.location.host, protocol, - url, - token = Authorization.getToken(); + url; if($location.protocol() === 'http'){ protocol = 'ws'; @@ -26,8 +25,7 @@ export default url = `${protocol}://${host}/websocket/`; if (!$rootScope.sessionTimer || ($rootScope.sessionTimer && !$rootScope.sessionTimer.isExpired())) { - // We have a valid session token, so attempt socket connection - url = `${url}?token=${token}`; + $log.debug('Socket connecting to: ' + url); self.socket = new ReconnectingWebSocket(url, null, {