X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fcontroller%2FRoleManageController.java;h=4b983d8d85ac2dd380019ea6fdea57a5bbe36bc5;hb=c2ebd5a44d02a2c7b38bda521b961f488e26bbfa;hp=ead2ee9bc48ac7a9aae9919810aa5030f7bf7c6b;hpb=858fda6824501c6d40a7fc5a130d2c04510c5231;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/RoleManageController.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/RoleManageController.java
index ead2ee9b..4b983d8d 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/RoleManageController.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/controller/RoleManageController.java
@@ -164,7 +164,7 @@ public class RoleManageController extends EPRestrictedBaseController {
 			EPApp requestedApp = appService.getApp(appId);
 			if (isAuthorizedUser(user, requestedApp)) {
 				fieldsValidation(requestedApp);
-				if (requestedApp.getCentralAuth()) {
+				if (requestedApp.getRolesInAAF()) {
 					List<CentralV2Role> answer = null;
 					Map<String, Object> model = new HashMap<>();
 					ObjectMapper mapper = new ObjectMapper();
@@ -242,7 +242,7 @@ public class RoleManageController extends EPRestrictedBaseController {
 			requestedApp = appService.getApp(appId);
 			if (isAuthorizedUser(user, requestedApp)) {
 				fieldsValidation(requestedApp);
-				if (requestedApp.getCentralAuth()) {
+				if (requestedApp.getRolesInAAF()) {
 					externalRequestFieldsValidator = externalAccessRolesService.deleteDependencyRoleRecord(roleId,
 							requestedApp.getUebKey(), user.getOrgUserId());
 					boolean deleteResponse = externalRequestFieldsValidator.isResult();
@@ -305,7 +305,7 @@ public class RoleManageController extends EPRestrictedBaseController {
 			EPApp requestedApp = appService.getApp(appId);
 			if (isAuthorizedUser(user, requestedApp)) {
 				fieldsValidation(requestedApp);
-				if (requestedApp != null && requestedApp.getCentralAuth().equals(true)) {
+				if (requestedApp != null && requestedApp.getRolesInAAF().equals(true)) {
 					ObjectMapper mapper = new ObjectMapper();
 					mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
 					JsonNode root = mapper.readTree(request.getReader());
@@ -448,7 +448,7 @@ public class RoleManageController extends EPRestrictedBaseController {
 			EPApp requestedApp = appService.getApp(appId);
 			if (isAuthorizedUser(user, requestedApp)) {
 				fieldsValidation(requestedApp);
-				if (requestedApp.getCentralAuth()) {
+				if (requestedApp.getRolesInAAF()) {
 					CentralV2Role answer = externalAccessRolesService.getRoleInfo(roleId, requestedApp.getUebKey());
 					logger.info(EELFLoggerDelegate.applicationLogger, "role_id" + roleId);
 					Map<String, Object> model = new HashMap<>();
@@ -481,7 +481,7 @@ public class RoleManageController extends EPRestrictedBaseController {
 			EPApp requestedApp = appService.getApp(appId);
 			if (isAuthorizedUser(user, requestedApp)) {
 				fieldsValidation(requestedApp);
-				if (requestedApp.getCentralAuth()) {
+				if (requestedApp.getRolesInAAF()) {
 					List<CentralV2RoleFunction> answer = null;
 					Map<String, Object> model = new HashMap<>();
 					ObjectMapper mapper = new ObjectMapper();
@@ -523,7 +523,7 @@ public class RoleManageController extends EPRestrictedBaseController {
 			EPApp requestedApp = appService.getApp(appId);
 			if (isAuthorizedUser(user, requestedApp)) {
 				fieldsValidation(requestedApp);
-				if (requestedApp.getCentralAuth() && roleFunc!=null) {
+				if (requestedApp.getRolesInAAF() && roleFunc!=null) {
 					String code = roleFunc.getType() + PIPE + roleFunc.getCode() + PIPE + roleFunc.getAction();
 					CentralV2RoleFunction domainRoleFunction = externalAccessRolesService.getRoleFunction(code,
 							requestedApp.getUebKey());
@@ -622,7 +622,7 @@ public class RoleManageController extends EPRestrictedBaseController {
 			EPApp requestedApp = appService.getApp(appId);
 			if (isAuthorizedUser(user, requestedApp)) {
 				fieldsValidation(requestedApp);
-				if (requestedApp.getCentralAuth()) {
+				if (requestedApp.getRolesInAAF()) {
 					ObjectMapper mapper = new ObjectMapper();
 					String data = roleFunc;
 					boolean getDelFuncResponse = false;
@@ -809,7 +809,7 @@ public class RoleManageController extends EPRestrictedBaseController {
 			throw new InvalidApplicationException("Invalid credentials");
 		}
 		if (!appInfo.isEmpty() && EcompPortalUtils.checkIfRemoteCentralAccessAllowed()
-				&& appInfo.get(0).getCentralAuth()) {
+				&& appInfo.get(0).getRolesInAAF()) {
 			ResponseEntity<String> response = externalAccessRolesService.getNameSpaceIfExists(appInfo.get(0));
 			if (response.getStatusCode().value() == HttpServletResponse.SC_NOT_FOUND)
 				throw new InvalidApplicationException("Invalid NameSpace");