store additional raw PVP role String

2 files changed, 15 insertions, 3 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationRole.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationRole.java
index 91514ca62..cde4ad7d4 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationRole.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationRole.java
@@ -34,10 +34,12 @@ import java.util.Map;
 public class AuthenticationRole {
 
 	private String roleName = null;
+	private String rawRoleString = null;
 	private List<Entry<String, String>> params = null;
 	
-	public AuthenticationRole(String roleName) {
+	public AuthenticationRole(String roleName, String rawRoleString) {
 		this.roleName = roleName;
+		this.rawRoleString = rawRoleString;
 	}
 	
 	public void addParameter(String key, String value) {
@@ -68,6 +70,16 @@ public class AuthenticationRole {
 		return params.iterator();
 	}
 	
+		
+	/**
+	 * @return the rawRoleString
+	 */
+	public String getRawRoleString() {
+		return rawRoleString;
+	}
+
+
+
 	static class Entry<K,V> implements Map.Entry<K,V> {
 
 		private K key;
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationRoleFactory.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationRoleFactory.java
index 7d4dc6eff..8915b2442 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationRoleFactory.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/data/AuthenticationRoleFactory.java
@@ -40,11 +40,11 @@ public class AuthenticationRoleFactory {
 		
 		if (first < 0) {
 			//no role paramters found
-			role = new AuthenticationRole(pvprole.trim());
+			role = new AuthenticationRole(pvprole.trim(), pvprole.trim());
 			Logger.debug("Add authentication role with name=" + pvprole.trim());
 			
 		} else {
-			role = new AuthenticationRole(pvprole.substring(0, first).trim());	
+			role = new AuthenticationRole(pvprole.substring(0, first).trim(), pvprole.trim());	
 			Logger.debug("Add authentication role with name=" + pvprole.substring(0, first).trim());
 			String params = pvprole.substring(first + 1, pvprole.length() - 1);