X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=blobdiff_plain;f=skyquake%2Fframework%2Fcore%2Fmodules%2Fapi%2FuserManagementAPI.js;fp=skyquake%2Fframework%2Fcore%2Fmodules%2Fapi%2FuserManagementAPI.js;h=19bb85447b5e1f60744209d826a1269adebbdc5e;hp=e88a5dca7f3d2dbc8d43d3e50e20fc94d1d81bf6;hb=abf00ef39ee93f2a7ff05a4432eb3a50a88a487e;hpb=168f7b61f09549d4bf25ecd0805435b2cc3a5243 diff --git a/skyquake/framework/core/modules/api/userManagementAPI.js b/skyquake/framework/core/modules/api/userManagementAPI.js index e88a5dca7..19bb85447 100644 --- a/skyquake/framework/core/modules/api/userManagementAPI.js +++ b/skyquake/framework/core/modules/api/userManagementAPI.js @@ -33,7 +33,7 @@ UserManagement.get = function(req) { return new Promise(function(resolve, reject) { Promise.all([ rp({ - uri: utils.confdPort(api_server) + '/api/operational/user-config/users', + uri: utils.confdPort(api_server) + '/api/operational/user-config/user', method: 'GET', headers: _.extend({}, constants.HTTP_HEADERS.accept.data, { 'Authorization': req.session && req.session.authorization @@ -46,7 +46,7 @@ UserManagement.get = function(req) { var response = {}; response['data'] = {}; if (result[0].body) { - response['data']['users'] = JSON.parse(result[0].body)['rw-user:users']; + response['data']['user'] = JSON.parse(result[0].body)['rw-user:user']; } response.statusCode = constants.HTTP_RESPONSE_CODES.SUCCESS.OK @@ -62,12 +62,30 @@ UserManagement.get = function(req) { }); }); }; + +UserManagement.getProfile = function(req) { + var self = this; + var api_server = req.query['api_server']; + return new Promise(function(resolve, reject) { + var response = {}; + response['data'] = { + userId: req.session.userdata.username, + projectId: req.session.projectId + }; + // if (result[0].body) { + // response['data']['users'] = JSON.parse(result[0].body)['rw-user:users']; + // } + response.statusCode = constants.HTTP_RESPONSE_CODES.SUCCESS.OK + + resolve(response); + }); +}; UserManagement.create = function(req) { var self = this; var api_server = req.query['api_server']; var data = req.body; data = { - "users":[data] + "user":[data] } return new Promise(function(resolve, reject) { Promise.all([ @@ -107,7 +125,7 @@ UserManagement.update = function(req) { var api_server = req.query['api_server']; var bodyData = req.body; data = { - "users":[bodyData] + "user":[bodyData] } var updateTasks = []; if(bodyData.hasOwnProperty('old-password')) { @@ -174,7 +192,7 @@ UserManagement.delete = function(req) { var domain = req.params.domain; var api_server = req.query["api_server"]; var requestHeaders = {}; - var url = `${utils.confdPort(api_server)}/api/config/user-config/users/${username},${domain}` + var url = `${utils.confdPort(api_server)}/api/config/user-config/user/${username},${domain}` return new Promise(function(resolve, reject) { _.extend(requestHeaders, constants.HTTP_HEADERS.accept.data,