From 9c7c8c568ba83e0730e7667e09a221bc2e79afe2 Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Mon, 27 Oct 2014 10:16:58 +0100 Subject: store additional raw PVP role String --- .../at/gv/egovernment/moa/id/data/AuthenticationRole.java | 14 +++++++++++++- .../egovernment/moa/id/data/AuthenticationRoleFactory.java | 4 ++-- 2 files changed, 15 insertions(+), 3 deletions(-) (limited to 'id/server/idserverlib/src/main/java') 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> 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 implements Map.Entry { 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); -- cgit v1.2.3