X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=blobdiff_plain;f=skyquake%2Fframework%2Fcore%2Fmodules%2Fapi%2FuserManagementAPI.js;h=873ab19331efeefaa9242640d897a7bba9fd0ad4;hp=cf33313ef7f8f1e7a8303c60a10c4f1d938e8308;hb=bb11c05914869028a39a685cf5bf2ec347f299a1;hpb=ba19ffdfd442c7ebe66f482b90f6bc65a0e9b8be diff --git a/skyquake/framework/core/modules/api/userManagementAPI.js b/skyquake/framework/core/modules/api/userManagementAPI.js index cf33313ef..873ab1933 100644 --- a/skyquake/framework/core/modules/api/userManagementAPI.js +++ b/skyquake/framework/core/modules/api/userManagementAPI.js @@ -25,6 +25,7 @@ var Promise = require('promise'); var constants = require('../../api_utils/constants'); var utils = require('../../api_utils/utils'); var _ = require('lodash'); +var ProjectManagementAPI = require('./projectManagementAPI.js'); UserManagement.get = function(req) { var self = this; @@ -33,10 +34,10 @@ 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.get('Authorization') + 'Authorization': req.session && req.session.authorization }), forever: constants.FOREVER_ON, rejectUnauthorized: false, @@ -46,7 +47,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 +63,103 @@ 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 = {}; + var userId = req.session.userdata.username + response['data'] = { + userId: userId, + projectId: req.session.projectId + }; + UserManagement.getUserInfo(req, userId).then(function(result) { + response.statusCode = constants.HTTP_RESPONSE_CODES.SUCCESS.OK; + response.data.data =result.data + resolve(response); + }, function(error) { + console.log('Error retrieving getUserInfo'); + response.statusCode = constants.HTTP_RESPONSE_CODES.ERROR.INTERNAL_SERVER_ERROR; + reject(response); + }) + + }); +}; +UserManagement.getUserInfo = function(req, userId, domain) { + var self = this; + var api_server = req.query['api_server']; + var id = req.params['userId'] || userId; + var domain = req.params['domainId'] || domain; + var response = {}; + return new Promise(function(resolve, reject) { + if (id) { + var getProjects = ProjectManagementAPI.get(req) + var getPlatformUser = ProjectManagementAPI.getPlatform(req, id) + Promise.all([ + getProjects, + getPlatformUser + ]).then(function(result) { + var userData = { + platform: { + role: { + + } + }, + project: { + /** + * [projectId] : { + * data: [project object], + * role: { + * [roleId]: true + * } + * } + */ + } + } + //Build project roles + var projects = result[0].data.project; + var userProjects = []; + projects && projects.map(function(p, i) { + var users = p['project-config'] && p['project-config'].user; + users && users.map(function(u) { + if(u['user-name'] == id) { + userData.project[p.name] = { + data: p, + role: {} + } + u.role.map(function(r) { + userData.project[p.name].role[r.role] = true + }); + } + }) + }); + //Build platform roles + var platformRoles = result[1].data.platform && result[1].data.platform.role; + platformRoles && platformRoles.map(function(r) { + userData.platform.role[r.role] = true + }); + response.data = userData; + response.statusCode = constants.HTTP_RESPONSE_CODES.SUCCESS.OK + resolve(response); + }) + } else { + var errorMsg = 'userId not specified in UserManagement.getUserInfo'; + console.error(errorMsg); + response.statusCode = constants.HTTP_RESPONSE_CODES.ERROR.BAD_REQUEST; + response.error = errorMsg; + reject(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([ @@ -75,7 +167,7 @@ UserManagement.create = function(req) { uri: utils.confdPort(api_server) + '/api/config/user-config', method: 'POST', headers: _.extend({}, constants.HTTP_HEADERS.accept.data, { - 'Authorization': req.get('Authorization') + 'Authorization': req.session && req.session.authorization }), forever: constants.FOREVER_ON, json: data, @@ -102,6 +194,71 @@ UserManagement.create = function(req) { }); }); }; +UserManagement.update = function(req) { + var self = this; + var api_server = req.query['api_server']; + var bodyData = req.body; + data = { + "user":[bodyData] + } + var updateTasks = []; + if(bodyData.hasOwnProperty('old-password')) { + var changePW = rp({ + uri: utils.confdPort(api_server) + '/api/operations/change-password', + method: 'POST', + headers: _.extend({}, constants.HTTP_HEADERS.accept.data, { + 'Authorization': req.session && req.session.authorization + }), + forever: constants.FOREVER_ON, + json: { + "input": { + 'user-name' : bodyData['user-name'], + 'user-domain' : bodyData['user-domain'], + 'old-password' : bodyData['old-password'], + 'new-password' : bodyData['new-password'], + 'confirm-password' : bodyData['confirm-password'], + } + }, + rejectUnauthorized: false, + resolveWithFullResponse: true + }); + updateTasks.push(changePW); + }; + var updateUser = rp({ + uri: utils.confdPort(api_server) + '/api/config/user-config', + method: 'PUT', + headers: _.extend({}, constants.HTTP_HEADERS.accept.data, { + 'Authorization': req.session && req.session.authorization + }), + forever: constants.FOREVER_ON, + json: data, + rejectUnauthorized: false, + resolveWithFullResponse: true + }); + updateTasks.push(updateUser) + return new Promise(function(resolve, reject) { + Promise.all([ + updateTasks + ]).then(function(result) { + var response = {}; + response['data'] = {}; + if (result[0].body) { + response['data'] = result[0].body; + } + response.statusCode = constants.HTTP_RESPONSE_CODES.SUCCESS.OK + + resolve(response); + }).catch(function(error) { + var response = {}; + console.log('Problem with UserManagement.passwordChange', error); + response.statusCode = error.statusCode || 500; + response.errorMessage = { + error: 'Failed to passwordChange user' + error + }; + reject(response); + }); + }); +}; UserManagement.delete = function(req) { var self = this; @@ -109,12 +266,12 @@ 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, constants.HTTP_HEADERS.content_type.data, { - 'Authorization': req.get('Authorization') + 'Authorization': req.session && req.session.authorization }); rp({ url: url,