First untested version of refactor eIDAS module, which uses eIDAS SAMLEngine v1.1 from JoinUp

1 files changed, 11 insertions, 11 deletions

diff --git a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EIDASData.java b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EIDASData.java
index 4dffba575..7647b4cab 100644
--- a/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EIDASData.java
+++ b/id/server/modules/moa-id-module-eIDAS/src/main/java/at/gv/egovernment/moa/id/protocols/eidas/EIDASData.java
@@ -7,9 +7,9 @@ import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Component;
 
-import at.gv.egovernment.moa.id.auth.modules.eidas.utils.MOAPersonalAttributeList;
 import at.gv.egovernment.moa.id.moduls.RequestImpl;
-import eu.eidas.auth.commons.EIDASAuthnRequest;
+import eu.eidas.auth.commons.attribute.ImmutableAttributeMap;
+import eu.eidas.auth.commons.protocol.IAuthenticationRequest;
 
 @Component("EIDASData")
 @Scope(value = BeanDefinition.SCOPE_PROTOTYPE)
@@ -19,10 +19,10 @@ public class EIDASData extends RequestImpl {
 	private static final long serialVersionUID = 8765755670214923910L;
 	
 	/** The attributes requested by the eIDaS. */
-	private MOAPersonalAttributeList attributes;
+	private ImmutableAttributeMap attributes;
 
 	/** The incoming eIDaS SAML2 AuthnRequest. */
-	private EIDASAuthnRequest authnRequest;
+	private IAuthenticationRequest authnRequest;
 
 	/** The ip address of the requester. */
 	private String remoteIPAddress;
@@ -40,17 +40,17 @@ public class EIDASData extends RequestImpl {
 	 *
 	 * @return the requested attributes
 	 */
-	public MOAPersonalAttributeList getEidasRequestedAttributes() {
-		return (MOAPersonalAttributeList) attributes.clone();
+	public ImmutableAttributeMap getEidasRequestedAttributes() {
+		return attributes;
 	}
 
 	/**
 	 * Sets the eidas requested attributes.
 	 *
-	 * @param personalAttributeList the requested attributes
+	 * @param immutableAttributeMap the requested attributes
 	 */
-	public void setEidasRequestedAttributes(MOAPersonalAttributeList personalAttributeList) {
-		attributes = personalAttributeList;
+	public void setEidasRequestedAttributes(ImmutableAttributeMap immutableAttributeMap) {
+		attributes = immutableAttributeMap;
 	}
 
 	/**
@@ -58,7 +58,7 @@ public class EIDASData extends RequestImpl {
 	 *
 	 * @return the eidas request
 	 */
-	public EIDASAuthnRequest getEidasRequest() {
+	public IAuthenticationRequest getEidasRequest() {
 		return authnRequest;
 	}
 	
@@ -67,7 +67,7 @@ public class EIDASData extends RequestImpl {
 	 *
 	 * @param request the new eidas request
 	 */
-	public void setEidasRequest(EIDASAuthnRequest request) {
+	public void setEidasRequest(IAuthenticationRequest request) {
 		authnRequest = request;  
 	}