projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Initial RBAC plugin display. Included about and debug page not rendering fix
[osm/UI.git]
/
skyquake
/
plugins
/
accounts
/
api
/
accounts.js
diff --git
a/skyquake/plugins/accounts/api/accounts.js
b/skyquake/plugins/accounts/api/accounts.js
index
ec74f51
..
cc34f39
100644
(file)
--- a/
skyquake/plugins/accounts/api/accounts.js
+++ b/
skyquake/plugins/accounts/api/accounts.js
@@
-93,12
+93,12
@@
function getAccount(req) {
_.extend(
requestHeaders,
id ? constants.HTTP_HEADERS.accept.data : constants.HTTP_HEADERS.accept.collection, {
_.extend(
requestHeaders,
id ? constants.HTTP_HEADERS.accept.data : constants.HTTP_HEADERS.accept.collection, {
- 'Authorization': req.
get('Authorization')
+ 'Authorization': req.
session && req.session.authorization
}
);
request({
}
);
request({
- url: u
rl + '?deep'
,
+ url: u
tils.projectContextUrl(req, url + '?deep')
,
type: 'GET',
headers: requestHeaders,
forever: constants.FOREVER_ON,
type: 'GET',
headers: requestHeaders,
forever: constants.FOREVER_ON,
@@
-160,10
+160,10
@@
function updateAccount(req) {
_.extend(requestHeaders,
constants.HTTP_HEADERS.accept.data,
constants.HTTP_HEADERS.content_type.data, {
_.extend(requestHeaders,
constants.HTTP_HEADERS.accept.data,
constants.HTTP_HEADERS.content_type.data, {
- 'Authorization': req.
get('Authorization')
+ 'Authorization': req.
session && req.session.authorization
});
request({
});
request({
- url: u
rl
,
+ url: u
tils.projectContextUrl(req, url)
,
method: method,
headers: requestHeaders,
forever: constants.FOREVER_ON,
method: method,
headers: requestHeaders,
forever: constants.FOREVER_ON,
@@
-194,10
+194,10
@@
function deleteAccount(req) {
_.extend(requestHeaders,
constants.HTTP_HEADERS.accept.data,
constants.HTTP_HEADERS.content_type.data, {
_.extend(requestHeaders,
constants.HTTP_HEADERS.accept.data,
constants.HTTP_HEADERS.content_type.data, {
- 'Authorization': req.
get('Authorization')
+ 'Authorization': req.
session && req.session.authorization
});
request({
});
request({
- url: u
rl
,
+ url: u
tils.projectContextUrl(req, url)
,
method: 'DELETE',
headers: requestHeaders,
forever: constants.FOREVER_ON,
method: 'DELETE',
headers: requestHeaders,
forever: constants.FOREVER_ON,
@@
-238,13
+238,13
@@
function refreshAccountConnectionStatus (req) {
var headers = _.extend({},
constants.HTTP_HEADERS.accept.data,
constants.HTTP_HEADERS.content_type.data, {
var headers = _.extend({},
constants.HTTP_HEADERS.accept.data,
constants.HTTP_HEADERS.content_type.data, {
- 'Authorization': req.
get('Authorization')
+ 'Authorization': req.
session && req.session.authorization
}
);
return new Promise(function(resolve, reject) {
request({
}
);
return new Promise(function(resolve, reject) {
request({
- uri: utils.
confdPort(api_server) + '/api/operations/' + rpcInfo[Type].rpc
,
+ uri: utils.
projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/' + rpcInfo[Type].rpc)
,
method: 'POST',
headers: headers,
forever: constants.FOREVER_ON,
method: 'POST',
headers: headers,
forever: constants.FOREVER_ON,