projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
edit descriptor model for composer rbac fix
[osm/UI.git]
/
skyquake
/
framework
/
core
/
api_utils
/
sockets.js
diff --git
a/skyquake/framework/core/api_utils/sockets.js
b/skyquake/framework/core/api_utils/sockets.js
index
5e0b25b
..
2e6779c
100644
(file)
--- a/
skyquake/framework/core/api_utils/sockets.js
+++ b/
skyquake/framework/core/api_utils/sockets.js
@@
-33,6
+33,7
@@
var url = require('url');
var sockjs = require('sockjs');
var websocket_multiplex = require('websocket-multiplex');
var utils = require('./utils.js');
var sockjs = require('sockjs');
var websocket_multiplex = require('websocket-multiplex');
var utils = require('./utils.js');
+var configurationAPI = require('../modules/api/configuration.js');
var Subscriptions = function() {
var Subscriptions = function() {
@@
-91,7
+92,6
@@
Subscriptions.prototype.subscribe = function(req, callback) {
var a = url.resolve(origin, req.baseUrl);
var b = url.resolve(a, URL);
URL = b;
var a = url.resolve(origin, req.baseUrl);
var b = url.resolve(a, URL);
URL = b;
- console.log('DEBUG URL IS', URL);
} else {
protocol = protocol[1]
}
} else {
protocol = protocol[1]
}
@@
-278,12
+278,12
@@
function PollingSocket(url, req, interval, config) {
self.isClosed = false;
var requestHeaders = {};
_.extend(requestHeaders, {
self.isClosed = false;
var requestHeaders = {};
_.extend(requestHeaders, {
-
'Authorization': req.get('Authorization
')
+
Cookie: req.get('Cookie
')
});
var pollServer = function() {
Request({
});
var pollServer = function() {
Request({
- url: u
rl
,
+ url: u
tils.projectContextUrl(req, url)
,
method: config.method || 'GET',
headers: requestHeaders,
json: config.payload,
method: config.method || 'GET',
headers: requestHeaders,
json: config.payload,