1 files changed, 24 insertions, 4 deletions
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
index 31ba64be0..d16e85084 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameter.java
@@ -57,6 +57,7 @@ import at.gv.egovernment.moa.id.commons.db.dao.config.BKUSelectionCustomizationT
 import at.gv.egovernment.moa.id.commons.db.dao.config.BKUURLS;
 import at.gv.egovernment.moa.id.commons.db.dao.config.IdentificationNumber;
 import at.gv.egovernment.moa.id.commons.db.dao.config.Mandates;
+import at.gv.egovernment.moa.id.commons.db.dao.config.MandatesProfileNameItem;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OAPVP2;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OASAML1;
 import at.gv.egovernment.moa.id.commons.db.dao.config.OASSO;
@@ -222,13 +223,32 @@ public List<String> getTransformsInfos() {
 /**
  * @return the mandateProfiles
  */
-public String getMandateProfiles() {
+public List<String> getMandateProfiles() {
 	
 	Mandates mandates = oa_auth.getMandates();
 	
-	if (mandates != null)
-		return mandates.getProfiles();
-	else
+	List<String> list = new ArrayList<String>();
+	
+	if (mandates != null) {
+		String oldProfilList = mandates.getProfiles();		
+		
+		List<MandatesProfileNameItem> profileList = mandates.getProfileNameItems();
+		for (MandatesProfileNameItem el : profileList) {
+			list.add(el.getItem());
+			
+		}
+
+		//only for RC1 
+		if (MiscUtil.isNotEmpty(oldProfilList)) {
+	        String profilesArray[] = oldProfilList.split(",");  	 		 
+	        for(int i = 0; i < profilesArray.length; i++) {
+	      	  list.add(profilesArray[i].trim());
+	        }
+		}
+		
+		return list;
+		
+	} else
 		return null;
 }