mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2024-12-23 08:56:29 +00:00
adding auth_token to ws request
This commit is contained in:
parent
d0afc3df94
commit
2f6b209174
3 changed files with 5 additions and 3 deletions
|
@ -6,7 +6,7 @@
|
||||||
<meta name="viewport" content="width=device-width, user-scalable=no">
|
<meta name="viewport" content="width=device-width, user-scalable=no">
|
||||||
<title></title>
|
<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/pure-min.css" />
|
||||||
<link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/pure/0.5.0/grids-responsive-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" />
|
<link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.1.0/css/font-awesome.min.css" />
|
||||||
|
|
|
@ -2,8 +2,9 @@
|
||||||
|
|
||||||
angular.module('app').service('feed', ['$http', '$window', function($http, $window) {
|
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 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 wsCallback = undefined;
|
||||||
var ws = new WebSocket(route);
|
var ws = new WebSocket(route);
|
||||||
|
|
|
@ -3,12 +3,13 @@
|
||||||
angular.module('app').service('stdout', ['$window', function($window) {
|
angular.module('app').service('stdout', ['$window', function($window) {
|
||||||
var callback = undefined;
|
var callback = undefined;
|
||||||
var websocket = undefined;
|
var websocket = undefined;
|
||||||
|
var token = localStorage.getItem('access_token');
|
||||||
|
|
||||||
this.subscribe = function(path, _callback) {
|
this.subscribe = function(path, _callback) {
|
||||||
callback = _callback;
|
callback = _callback;
|
||||||
|
|
||||||
var proto = ($window.location.protocol == 'https:' ? 'wss' : 'ws');
|
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 = new WebSocket(route);
|
||||||
websocket.onmessage = function(event) {
|
websocket.onmessage = function(event) {
|
||||||
|
|
Loading…
Reference in a new issue