External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 19:51:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

potentially adding token to websocket url

Browse Source
This commit is contained in:
jaredevantabor
2016-10-20 10:02:28 -07:00
parent bc1561fc67
commit d84912bb2a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/client/src/shared/socket/socket.service.js
View File

@@ -5,8 +5,8 @@
*************************************************/ *************************************************/
import ReconnectingWebSocket from 'reconnectingwebsocket'; import ReconnectingWebSocket from 'reconnectingwebsocket';
export default export default
['$rootScope', '$location', '$log','$state', '$q', ['$rootScope', '$location', '$log','$state', '$q', 'Authorization',
function ($rootScope, $location, $log, $state, $q) { function ($rootScope, $location, $log, $state, $q, Authorization) {
var needsResubscribing = false, var needsResubscribing = false,
socketPromise = $q.defer(); socketPromise = $q.defer();
return { return {
@@ -14,7 +14,8 @@ export default
var self = this, var self = this,
host = window.location.host, host = window.location.host,
protocol, protocol,
url; url,
token = Authorization.getToken();
if($location.protocol() === 'http'){ if($location.protocol() === 'http'){
protocol = 'ws'; protocol = 'ws';
@@ -26,6 +27,7 @@ export default
if (!$rootScope.sessionTimer || ($rootScope.sessionTimer && !$rootScope.sessionTimer.isExpired())) { if (!$rootScope.sessionTimer || ($rootScope.sessionTimer && !$rootScope.sessionTimer.isExpired())) {
// We have a valid session token, so attempt socket connection // We have a valid session token, so attempt socket connection
// url = `${url}?session=${token}`;
$log.debug('Socket connecting to: ' + url); $log.debug('Socket connecting to: ' + url);
self.socket = new ReconnectingWebSocket(url, null, { self.socket = new ReconnectingWebSocket(url, null, {