inform moasession about the mandate auth case

2 files changed, 12 insertions, 2 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
index b356c6f35..87e109e33 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/servlet/PEPSConnectorServlet.java
@@ -68,6 +68,7 @@ import at.gv.util.xsd.xmldsig.X509DataType;
 import eu.stork.oasisdss.api.ApiUtils;

 import eu.stork.oasisdss.profile.DocumentWithSignature;

 import eu.stork.oasisdss.profile.SignResponse;

+import eu.stork.peps.auth.commons.IPersonalAttributeList;

 import eu.stork.peps.auth.commons.PEPSUtil;

 import eu.stork.peps.auth.commons.PersonalAttribute;

 import eu.stork.peps.auth.commons.STORKAuthnRequest;

@@ -179,7 +180,15 @@ public class PEPSConnectorServlet extends AuthServlet {
 

 			////////////// incorporate gender from parameters if not in stork response

 			

-			PersonalAttribute gender = authnResponse.getPersonalAttributeList().get("gender");

+			IPersonalAttributeList attributeList = authnResponse.getPersonalAttributeList();

+			

+			// but first, check if we have a representation case

+			if(STORKResponseProcessor.hasAttribute("mandateContent", attributeList) || STORKResponseProcessor.hasAttribute("representative", attributeList) || STORKResponseProcessor.hasAttribute("represented", attributeList)) {

+				// in a representation case...

+				moaSession.setUseMandate("true");

+				

+				// and check if we have the gender value

+			PersonalAttribute gender = attributeList.get("gender");

 			if(null == gender) {

 				String gendervalue = (String) request.getParameter("gender");

 				if(null != gendervalue) {

@@ -192,6 +201,7 @@ public class PEPSConnectorServlet extends AuthServlet {
 					authnResponse.getPersonalAttributeList().add(gender);

 				}

 			}

+			}

 			

 			//////////////////////////////////////////////////////////////////////////

 			

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java
index 57843d0f3..c5f0dbd49 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/stork/STORKResponseProcessor.java
@@ -86,7 +86,7 @@ public class STORKResponseProcessor {
 	 * @param attributeList the attribute list

 	 * @return true, if successful

 	 */

-	private static boolean hasAttribute(String attributeName, IPersonalAttributeList attributeList) {

+	public static boolean hasAttribute(String attributeName, IPersonalAttributeList attributeList) {

 		try {

 			getAttributeValue(attributeName, attributeList);

 			return true;