1 files changed, 85 insertions, 19 deletions

diff --git a/ecomp-portal-FE-common/client/app/services/role/role.service.js b/ecomp-portal-FE-common/client/app/services/role/role.service.js
index ee2cd536..a84afdfb 100644
--- a/ecomp-portal-FE-common/client/app/services/role/role.service.js
+++ b/ecomp-portal-FE-common/client/app/services/role/role.service.js
@@ -1,26 +1,45 @@
 /*-
- * ================================================================================
- * ECOMP Portal
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property
- * ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * ============LICENSE_START==========================================
+ * ONAP Portal
+ * ===================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ===================================================================
+ *
+ * Unless otherwise specified, all software contained herein is licensed
+ * under the Apache License, Version 2.0 (the "License");
+ * you may not use this software except in compliance with the License.
  * You may obtain a copy of the License at
- * 
- *      http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
+ *             http://www.apache.org/licenses/LICENSE-2.0
+ *
  * Unless required by applicable law or agreed to in writing, software
  * distributed under the License is distributed on an "AS IS" BASIS,
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  * See the License for the specific language governing permissions and
  * limitations under the License.
- * ================================================================================
+ *
+ * Unless otherwise specified, all documentation contained herein is licensed
+ * under the Creative Commons License, Attribution 4.0 Intl. (the "License");
+ * you may not use this documentation except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *             https://creativecommons.org/licenses/by/4.0/
+ *
+ * Unless required by applicable law or agreed to in writing, documentation
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * ============LICENSE_END============================================
+ *
+ * ECOMP is a trademark and service mark of AT&T Intellectual Property.
  */
 app.factory('RoleService', function ($http, $q, conf,uuid4) {
+	var manageRoleDetails = {};
 	return {
-		getRoles: function() {
-			return $http.get(conf.api.getRoles,{
+		getRoles(appId) {
+			return $http.get(conf.api.getRoles.replace(':appId', appId),{
                 cache: false,
                 headers: {
                     'X-ECOMP-RequestID':uuid4.generate()
@@ -39,8 +58,8 @@ app.factory('RoleService', function ($http, $q, conf,uuid4) {
 			});
 		},
 		
-		saveRoleFunction: function() {
-			return $http.post(conf.api.saveRoleFuncion)
+		saveRoleFunction(appId) {
+			return $http.post(conf.api.saveRoleFuncion.replace(':appId', appId))
 			.then(function(response) {
 				if (typeof response.data === 'object') {
 					return response.data;
@@ -54,8 +73,8 @@ app.factory('RoleService', function ($http, $q, conf,uuid4) {
 			});
 		},
 		
-		getRoleFunctionList: function() {
-			return $http.get(conf.api.getRoleFunctions,{
+		getRoleFunctionList(appId) {
+			return $http.get(conf.api.getRoleFunctions.replace(':appId', appId),{
                 cache: false,
                 headers: {
                     'X-ECOMP-RequestID':uuid4.generate()
@@ -166,9 +185,9 @@ app.factory('RoleService', function ($http, $q, conf,uuid4) {
 			});
 		},
 		
-		getRole: function(roleId) {
+		getRole: function(appId, roleId) {
 			
-			return $http.get(conf.api.getRole + '?role_id=' + roleId,{
+			return $http.get(conf.api.getRole + '/' + appId + '/' + roleId,{    
                 cache: false,
                 headers: {
                     'X-ECOMP-RequestID':uuid4.generate()
@@ -185,6 +204,53 @@ app.factory('RoleService', function ($http, $q, conf,uuid4) {
 				// something went wrong
 				return $q.reject(response.data);
 			});
+		},
+		
+		saveRole(appId) {
+			return $http.post(conf.api.saveRole.replace(':appId', appId))
+			.then(function(response) {
+				if (typeof response.data === 'object') {
+					return response.data;
+				} else {
+					return $q.reject(response.data);
+				}
+
+			}, function(response) {
+				// something went wrong
+				return $q.reject(response.data);
+			});
+		},
+		
+		getCentralizedApps: function(userId) {
+			
+			return $http.get(conf.api.centralizedApps + '?userId=' + userId,{
+                cache: false,
+                headers: {
+                    'X-ECOMP-RequestID':uuid4.generate()
+                }
+            })
+			.then(function(response) {
+				if (typeof response.data === 'object') {
+					return response.data;
+				} else {
+					return $q.reject(response.data);
+				}
+	
+			}, function(response) {
+				// something went wrong
+				return $q.reject(response.data);
+			});
+		},
+		
+		setManageRoleDetails:function(apps, id){
+			manageRoleDetails = {
+					apps: apps,
+					id: id
+			}
+		},
+		
+		getManageRoleDetails: function(){
+			return manageRoleDetails;
 		}
 	};
 });