X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=blobdiff_plain;f=skyquake%2Fplugins%2Faccounts%2Fapi%2Fconfig_agent%2FconfigAgent.js;h=ebca59a2ee1bcfb6a142efd2b0317303c6fc9580;hp=8d1734b16c0396e42e7a2ec03d916d346e884449;hb=28412d0042632687d765d239cbb3ff0523a131b9;hpb=f2dc2462571800e62cba969964de621dca09299c diff --git a/skyquake/plugins/accounts/api/config_agent/configAgent.js b/skyquake/plugins/accounts/api/config_agent/configAgent.js index 8d1734b16..ebca59a2e 100644 --- a/skyquake/plugins/accounts/api/config_agent/configAgent.js +++ b/skyquake/plugins/accounts/api/config_agent/configAgent.js @@ -37,11 +37,11 @@ ConfigAgentAccount.get = function(req) { var requestHeaders = {}; _.extend(requestHeaders, constants.HTTP_HEADERS.accept.collection, { - 'Authorization': req.get('Authorization') + 'Authorization': req.session && req.session.authorization }); request({ - url: utils.confdPort(api_server) + '/api/operational/config-agent/account', + url: utils.projectContextUrl(req, utils.confdPort(api_server) + '/api/operational/config-agent/account'), type: 'GET', headers: requestHeaders, forever: constants.FOREVER_ON, @@ -77,11 +77,11 @@ ConfigAgentAccount.get = function(req) { var requestHeaders = {}; _.extend(requestHeaders, constants.HTTP_HEADERS.accept.data, { - 'Authorization': req.get('Authorization') + 'Authorization': req.session && req.session.authorization }); request({ - url: utils.confdPort(api_server) + '/api/operational/config-agent/account/' + id, + url: utils.projectContextUrl(req, utils.confdPort(api_server) + '/api/operational/config-agent/account/' + id), type: 'GET', headers: requestHeaders, forever: constants.FOREVER_ON, @@ -130,11 +130,11 @@ ConfigAgentAccount.create = function(req) { _.extend(requestHeaders, constants.HTTP_HEADERS.accept.data, constants.HTTP_HEADERS.content_type.data, { - 'Authorization': req.get('Authorization') + 'Authorization': req.session && req.session.authorization }); request({ - url: utils.confdPort(api_server) + '/api/config/config-agent', + url: utils.projectContextUrl(req, utils.confdPort(api_server) + '/api/config/config-agent'), method: 'POST', headers: requestHeaders, forever: constants.FOREVER_ON, @@ -169,11 +169,11 @@ ConfigAgentAccount.update = function(req) { _.extend(requestHeaders, constants.HTTP_HEADERS.accept.data, constants.HTTP_HEADERS.content_type.data, { - 'Authorization': req.get('Authorization') + 'Authorization': req.session && req.session.authorization }); request({ - url: utils.confdPort(api_server) + '/api/config/config-agent/account/' + id, + url: utils.projectContextUrl(req, utils.confdPort(api_server) + '/api/config/config-agent/account/' + id), method: 'PUT', headers: requestHeaders, forever: constants.FOREVER_ON, @@ -211,10 +211,10 @@ ConfigAgentAccount.delete = function(req) { var requestHeaders = {}; _.extend(requestHeaders, constants.HTTP_HEADERS.accept.data, { - 'Authorization': req.get('Authorization') + 'Authorization': req.session && req.session.authorization }); request({ - url: utils.confdPort(api_server) + '/api/config/config-agent/account/' + id, + url: utils.projectContextUrl(req, utils.confdPort(api_server) + '/api/config/config-agent/account/' + id), method: 'DELETE', headers: requestHeaders, forever: constants.FOREVER_ON,