From 2f6b209174d0c8da228c469a1d7d067fdf758d86 Mon Sep 17 00:00:00 2001 From: Brad Rydzewski <brad.rydzewski@gmail.com> Date: Wed, 15 Oct 2014 08:46:37 -0700 Subject: [PATCH] adding auth_token to ws request --- server/app/index.html | 2 +- server/app/scripts/services/feed.js | 3 ++- server/app/scripts/services/stdout.js | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/server/app/index.html b/server/app/index.html index f6d51842f..fe60da6bc 100644 --- a/server/app/index.html +++ b/server/app/index.html @@ -6,7 +6,7 @@ <meta name="viewport" content="width=device-width, user-scalable=no"> <title></title> - <link rel="shortcut icon" href="/favicon.ico" /> + <link rel="shortcut icon" href="/static/favicon.ico" /> <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/pure/0.5.0/pure-min.css" /> <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/pure/0.5.0/grids-responsive-min.css" /> <link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" /> diff --git a/server/app/scripts/services/feed.js b/server/app/scripts/services/feed.js index 07cb1b77e..8d3e085ba 100644 --- a/server/app/scripts/services/feed.js +++ b/server/app/scripts/services/feed.js @@ -2,8 +2,9 @@ angular.module('app').service('feed', ['$http', '$window', function($http, $window) { + var token = localStorage.getItem('access_token'); var proto = ($window.location.protocol == 'https:' ? 'wss' : 'ws'); - var route = [proto, "://", $window.location.host, '/api/stream/user'].join(''); + var route = [proto, "://", $window.location.host, '/api/stream/user?access_token=', token].join(''); var wsCallback = undefined; var ws = new WebSocket(route); diff --git a/server/app/scripts/services/stdout.js b/server/app/scripts/services/stdout.js index 5fc439d0b..894e26165 100644 --- a/server/app/scripts/services/stdout.js +++ b/server/app/scripts/services/stdout.js @@ -3,12 +3,13 @@ angular.module('app').service('stdout', ['$window', function($window) { var callback = undefined; var websocket = undefined; + var token = localStorage.getItem('access_token'); this.subscribe = function(path, _callback) { callback = _callback; var proto = ($window.location.protocol == 'https:' ? 'wss' : 'ws'); - var route = [proto, "://", $window.location.host, '/api/stream/stdout/', path].join(''); + var route = [proto, "://", $window.location.host, '/api/stream/stdout/', path, '?access_token=', token].join(''); websocket = new WebSocket(route); websocket.onmessage = function(event) {