X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-BE-common%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fportalapp%2Fportal%2Fservice%2FExternalAccessRolesService.java;h=53a7a5f5b7ba13afc629ba65e49937ccfea5d6ab;hb=83de9db899ebf7ec87220670d6f5cf35a10d087b;hp=2f72bab2fb38a1050213ecec05c1821b444f031f;hpb=c4fa171c0cc8f1e227f6042387fdd2c5b56bd2dd;p=portal.git

diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesService.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesService.java
index 2f72bab2..53a7a5f5 100644
--- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesService.java
+++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/ExternalAccessRolesService.java
@@ -33,13 +33,14 @@
  *
  * ============LICENSE_END============================================
  *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * 
  */
 package org.onap.portalapp.portal.service;
 
 import java.io.IOException;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.hibernate.Session;
 import org.json.JSONArray;
@@ -49,15 +50,18 @@ import org.onap.portalapp.portal.domain.EPApp;
 import org.onap.portalapp.portal.domain.EPRole;
 import org.onap.portalapp.portal.domain.EPUser;
 import org.onap.portalapp.portal.domain.ExternalRoleDetails;
+import org.onap.portalapp.portal.ecomp.model.UploadRoleFunctionExtSystem;
 import org.onap.portalapp.portal.exceptions.InvalidUserException;
+import org.onap.portalapp.portal.exceptions.RoleFunctionException;
 import org.onap.portalapp.portal.transport.CentralRole;
 import org.onap.portalapp.portal.transport.CentralRoleFunction;
 import org.onap.portalapp.portal.transport.CentralUser;
 import org.onap.portalapp.portal.transport.CentralV2Role;
 import org.onap.portalapp.portal.transport.ExternalRequestFieldsValidator;
 import org.onap.portalsdk.core.domain.Role;
-import org.onap.portalsdk.core.domain.RoleFunction;
+import org.onap.portalsdk.core.restful.domain.EcompRole;
 import org.onap.portalsdk.core.restful.domain.EcompUser;
+import org.springframework.http.HttpEntity;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.client.HttpClientErrorException;
 
@@ -240,7 +244,7 @@ public interface ExternalAccessRolesService {
 	 * @param upload
 	 * @throws Exception
 	 */
-	public void bulkUploadPartnerFunctions(String uebkey, List<RoleFunction> upload) throws Exception;
+	public Integer bulkUploadPartnerFunctions(String uebkey) throws Exception;
 
 	/** 
 	 * It uploads partner application role functions into external auth system
@@ -260,7 +264,7 @@ public interface ExternalAccessRolesService {
 	Integer bulkUploadRolesFunctions(String uebkey) throws Exception;
 	
 	/**
-	 *  It syncs the roles and rolefunctions to the ecomp DB from AAF
+	 *  It syncs the roles and rolefunctions to the ONAP DB from AAF
 	 * @param app
 	 * @throws Exception
 	 */
@@ -282,7 +286,7 @@ public interface ExternalAccessRolesService {
 	 * @param roleList
 	 * @throws Exception
 	 */
-	void bulkUploadPartnerRoleFunctions(String uebkey, List<Role> roleList) throws Exception;
+	Integer bulkUploadPartnerRoleFunctions(String uebkey) throws Exception;
 
 	/**
 	 * it deletes all dependency role records 
@@ -386,7 +390,7 @@ public interface ExternalAccessRolesService {
 	 * @param app
 	 * @return List of EPRole objects
 	 */
-	Map<String, EPRole> getCurrentRolesInDB(EPApp app);
+	Map<String, EPRole> getAppRoleNamesWithUnderscoreMap(EPApp app);
     
 	
 	/**
@@ -411,13 +415,6 @@ public interface ExternalAccessRolesService {
 	 */
 	public JSONArray getAppRolesJSONFromExtAuthSystem(EPApp app) throws Exception;
 	
-	/**
-	 * It encodes the function code  based on Hex encoding
-	 * @param funCode
-	 * 
-	 */
-	public String encodeFunctionCode(String funCode);
-	
 	/**
 	 * 
 	 * It returns list of ExternalRoleDetails which is converted from JSON array of roles
@@ -452,5 +449,66 @@ public interface ExternalAccessRolesService {
 	 * @return String action
 	 */
 	String getFunctionCodeAction(String roleFuncItem);
+	
+	/**
+	 * 
+	 * Adds function to role in external auth system
+	 * 
+	 * @param data
+	 * @param app
+	 */
+	void bulkUploadRoleFunc(UploadRoleFunctionExtSystem data, EPApp app) throws Exception;
+
+	/**
+	 * 
+	 * Syncs user roles from external auth system to ecomp portal 
+	 * 
+	 * @param orgUserId
+	 * @throws Exception 
+	 */
+	public void syncApplicationUserRolesFromExtAuthSystem(String orgUserId) throws Exception;
+
+	/**
+	 * 
+	 * Gets all user roles from external auth system
+	 * 
+	 * @param orgUserId
+	 * @param getUserRolesEntity
+	 * @return user roles from external auth system 
+	 */
+	ResponseEntity<String> getUserRolesFromExtAuthSystem(String orgUserId, HttpEntity<String> getUserRolesEntity) throws Exception;
+
+	/**
+	 * 
+	 * Updates app role description in external auth system
+	 * 
+	 * @param uebkey
+	 * @return number of updates
+	 */
+	public Integer updateAppRoleDescription(String uebkey);
+
+	/**
+	 * Creates centralRoleObject
+	 * @param app
+	 * @param roleInfo
+	 * @param roleList
+	 * @param params
+	 * @return returns List<CentralV2Role>
+	 * @throws RoleFunctionException
+	 */
+	public List<CentralV2Role> createCentralRoleObject(List<EPApp> app, List<EPRole> roleInfo,
+			List<CentralV2Role> roleList, Map<String, Long> params) throws RoleFunctionException;
+	
+	/**
+	 * 
+	 * @param uebkey
+	 * @param loginId
+	 * @param CurrentUserRoles
+	 * @return returns list of user roles
+	 * @throws Exception
+	 */
+	public List<EcompRole> missingUserApplicationRoles(String uebkey, String loginId, Set<EcompRole> CurrentUserRoles) throws Exception;
+
+	List<EPRole> getPortalAppRoleInfo(Long roleId);
 
 }