Variables renamed in projectManagementAPI.js

[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 3238aec..25fcebe 100644 (file)
--- a/skyquake/framework/core/modules/api/projectManagementAPI.js
+++ b/skyquake/framework/core/modules/api/projectManagementAPI.js
@@ -107,13 +107,11 @@ ProjectManagement.update = function(req) {
     var self = this;
     var api_server = req.query['api_server'];
     var bodyData = req.body;
-    data = {
-        "project":[bodyData]
-    }
+    data = bodyData['project-config']
     var updateTasks = [];
 
-    var updateUser = rp({
-                uri: utils.confdPort(api_server) + '/api/config/project',
+    var updateProject= rp({
+                uri: utils.confdPort(api_server) + '/api/config/project/' + bodyData.name + '/project-config',
                 method: 'PUT',
                 headers: _.extend({}, constants.HTTP_HEADERS.accept.data, {
                     'Authorization': req.session && req.session.authorization
@@ -123,7 +121,7 @@ ProjectManagement.update = function(req) {
                 rejectUnauthorized: false,
                 resolveWithFullResponse: true
             });
-    updateTasks.push(updateUser)
+    updateTasks.push(updateProject)
     return new Promise(function(resolve, reject) {
         Promise.all([
             updateTasks
@@ -178,14 +176,18 @@ ProjectManagement.delete = function(req) {
 }
 
 
-ProjectManagement.getPlatform = function(req) {
+ProjectManagement.getPlatform = function(req, userId) {
     var self = this;
     var api_server = req.query['api_server'];
-
+    var user = req.params['userId'] || userId;
     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({
-                uri: utils.confdPort(api_server) + '/api/operational/rbac-platform-config',
+                uri: url,
                 method: 'GET',
                 headers: _.extend({}, constants.HTTP_HEADERS.accept.data, {
                     'Authorization': req.session && req.session.authorization
@@ -198,7 +200,11 @@ ProjectManagement.getPlatform = function(req) {
             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
 
@@ -220,9 +226,10 @@ ProjectManagement.updatePlatform = function(req) {
     var api_server = req.query['api_server'];
     var bodyData = req.body;
     data = bodyData;
+    data.user = JSON.parse(data.user)
     var updateTasks = [];
 
-    var updateUser = rp({
+    var updatePlatform = rp({
                 uri: utils.confdPort(api_server) + '/api/config/rbac-platform-config',
                 method: 'PUT',
                 headers: _.extend({}, constants.HTTP_HEADERS.accept.data, {
@@ -233,7 +240,7 @@ ProjectManagement.updatePlatform = function(req) {
                 rejectUnauthorized: false,
                 resolveWithFullResponse: true
             });
-    updateTasks.push(updateUser)
+    updateTasks.push(updatePlatform)
     return new Promise(function(resolve, reject) {
         Promise.all([
             updateTasks