projects
/
osm
/
UI.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Row striping for platform roles, users, and projects
[osm/UI.git]
/
skyquake
/
framework
/
core
/
modules
/
api
/
projectManagementAPI.js
diff --git
a/skyquake/framework/core/modules/api/projectManagementAPI.js
b/skyquake/framework/core/modules/api/projectManagementAPI.js
index
5ba3659
..
195f457
100644
(file)
--- a/
skyquake/framework/core/modules/api/projectManagementAPI.js
+++ b/
skyquake/framework/core/modules/api/projectManagementAPI.js
@@
-104,16
+104,21
@@
ProjectManagement.create = function(req) {
});
};
ProjectManagement.update = function(req) {
});
};
ProjectManagement.update = function(req) {
+ //"rw-project:project"
var self = this;
var api_server = req.query['api_server'];
var bodyData = req.body;
var self = this;
var api_server = req.query['api_server'];
var bodyData = req.body;
- data = {
- "project":[bodyData]
+ var data = {
+ "rw-project:project" : {
+ "name": bodyData.name,
+ "description": bodyData.description,
+ "project-config": bodyData['project-config']
+ }
}
var updateTasks = [];
}
var updateTasks = [];
- var update
User
= rp({
- uri: utils.confdPort(api_server) + '/api/config/project',
+ var update
Project
= rp({
+ uri: utils.confdPort(api_server) + '/api/config/project
/
',
method: 'PUT',
headers: _.extend({}, constants.HTTP_HEADERS.accept.data, {
'Authorization': req.session && req.session.authorization
method: 'PUT',
headers: _.extend({}, constants.HTTP_HEADERS.accept.data, {
'Authorization': req.session && req.session.authorization
@@
-123,7
+128,7
@@
ProjectManagement.update = function(req) {
rejectUnauthorized: false,
resolveWithFullResponse: true
});
rejectUnauthorized: false,
resolveWithFullResponse: true
});
- updateTasks.push(update
User
)
+ updateTasks.push(update
Project
)
return new Promise(function(resolve, reject) {
Promise.all([
updateTasks
return new Promise(function(resolve, reject) {
Promise.all([
updateTasks
@@
-178,17
+183,21
@@
ProjectManagement.delete = function(req) {
}
}
-ProjectManagement.getPlatform = function(req) {
+ProjectManagement.getPlatform = function(req
, userId
) {
var self = this;
var api_server = req.query['api_server'];
var self = this;
var api_server = req.query['api_server'];
-
+ var user = req.params['userId'] || userId;
return new Promise(function(resolve, reject) {
return new Promise(function(resolve, reject) {
+ var url = utils.confdPort(api_server) + '/api/operational/rbac-platform-config';
+ if(user) {
+ url = url + '/user/' + user;
+ }
Promise.all([
rp({
Promise.all([
rp({
- uri: u
tils.confdPort(api_server) + '/api/operational/rbac-platform-config'
,
+ uri: u
rl
,
method: 'GET',
headers: _.extend({}, constants.HTTP_HEADERS.accept.data, {
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,
}),
forever: constants.FOREVER_ON,
rejectUnauthorized: false,
@@
-198,7
+207,11
@@
ProjectManagement.getPlatform = function(req) {
var response = {};
response['data'] = {};
if (result[0].body) {
var response = {};
response['data'] = {};
if (result[0].body) {
- response['data']['platform'] = JSON.parse(result[0].body)['rw-rbac-platform:rbac-platform-config'];
+ if(user) {
+ response['data']['platform'] = JSON.parse(result[0].body)['rw-rbac-platform:user'];
+ } else {
+ response['data']['platform'] = JSON.parse(result[0].body)['rw-rbac-platform:rbac-platform-config'];
+ }
}
response.statusCode = constants.HTTP_RESPONSE_CODES.SUCCESS.OK
}
response.statusCode = constants.HTTP_RESPONSE_CODES.SUCCESS.OK
@@
-220,20
+233,21
@@
ProjectManagement.updatePlatform = function(req) {
var api_server = req.query['api_server'];
var bodyData = req.body;
data = bodyData;
var api_server = req.query['api_server'];
var bodyData = req.body;
data = bodyData;
+ data.user = JSON.parse(data.user)
var updateTasks = [];
var updateTasks = [];
- var update
User
= rp({
+ var update
Platform
= rp({
uri: utils.confdPort(api_server) + '/api/config/rbac-platform-config',
method: 'PUT',
headers: _.extend({}, constants.HTTP_HEADERS.accept.data, {
uri: utils.confdPort(api_server) + '/api/config/rbac-platform-config',
method: 'PUT',
headers: _.extend({}, constants.HTTP_HEADERS.accept.data, {
- 'Authorization': req.
get('Authorization')
+ 'Authorization': req.
session && req.session.authorization
}),
forever: constants.FOREVER_ON,
json: data,
rejectUnauthorized: false,
resolveWithFullResponse: true
});
}),
forever: constants.FOREVER_ON,
json: data,
rejectUnauthorized: false,
resolveWithFullResponse: true
});
- updateTasks.push(update
User
)
+ updateTasks.push(update
Platform
)
return new Promise(function(resolve, reject) {
Promise.all([
updateTasks
return new Promise(function(resolve, reject) {
Promise.all([
updateTasks