projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Bug 209"
[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
cf0e404
..
d26b566
100644
(file)
--- a/
skyquake/plugins/accounts/api/accounts.js
+++ b/
skyquake/plugins/accounts/api/accounts.js
@@
-98,7
+98,7
@@
function getAccount(req) {
);
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,
@@
-163,7
+163,7
@@
function updateAccount(req) {
'Authorization': req.session && req.session.authorization
});
request({
'Authorization': req.session && req.session.authorization
});
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,
@@
-197,7
+197,7
@@
function deleteAccount(req) {
'Authorization': req.session && req.session.authorization
});
request({
'Authorization': req.session && req.session.authorization
});
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,
@@
-241,10
+241,14
@@
function refreshAccountConnectionStatus (req) {
'Authorization': req.session && req.session.authorization
}
);
'Authorization': req.session && req.session.authorization
}
);
+ var uri = utils.projectContextUrl(req, utils.confdPort(api_server) + '/api/operations/' + rpcInfo[Type].rpc);
+
+ jsonData['input'] = utils.addProjectContextToRPCPayload(req, uri, jsonData['input']);
+
return new Promise(function(resolve, reject) {
request({
return new Promise(function(resolve, reject) {
request({
- uri: u
tils.confdPort(api_server) + '/api/operations/' + rpcInfo[Type].rpc
,
+ uri: u
ri
,
method: 'POST',
headers: headers,
forever: constants.FOREVER_ON,
method: 'POST',
headers: headers,
forever: constants.FOREVER_ON,