From 2daed784e006d449de5b6151f6e109ab2a829749 Mon Sep 17 00:00:00 2001
From: Thomas <>
Date: Tue, 30 Mar 2021 15:08:07 +0200
Subject: add mandate functionality into eIDAS out-going process

---
 .../tasks/ReceiveFromIdAustriaSystemTask.java      | 29 ++++++++++++++++------
 1 file changed, 22 insertions(+), 7 deletions(-)

(limited to 'eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/tasks/ReceiveFromIdAustriaSystemTask.java')

diff --git a/eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/tasks/ReceiveFromIdAustriaSystemTask.java b/eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/tasks/ReceiveFromIdAustriaSystemTask.java
index 5dc04800..2141fee8 100644
--- a/eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/tasks/ReceiveFromIdAustriaSystemTask.java
+++ b/eidas_modules/authmodule_id-austria/src/main/java/at/asitplus/eidas/specific/modules/auth/idaustria/tasks/ReceiveFromIdAustriaSystemTask.java
@@ -1,7 +1,6 @@
 package at.asitplus.eidas.specific.modules.auth.idaustria.tasks;
 
 import java.io.IOException;
-import java.util.List;
 import java.util.Set;
 
 import javax.naming.ConfigurationException;
@@ -211,7 +210,7 @@ public class ReceiveFromIdAustriaSystemTask extends AbstractAuthServletTask {
   private void getAuthDataFromInterfederation(AssertionAttributeExtractor extractor)
       throws EaafBuilderException, ConfigurationException {
 
-    final List<String> requiredEidasNodeAttributes =
+    final Set<String> requiredEidasNodeAttributes =
         IdAustriaAuthConstants.DEFAULT_REQUIRED_PVP_ATTRIBUTE_NAMES;
     try {
       // check if all attributes are include
@@ -238,7 +237,7 @@ public class ReceiveFromIdAustriaSystemTask extends AbstractAuthServletTask {
             extractor.getSingleAttributeValue(attrName));
 
       }
-
+      
       // set foreigner flag
       session.setForeigner(false);
 
@@ -248,7 +247,9 @@ public class ReceiveFromIdAustriaSystemTask extends AbstractAuthServletTask {
       // set IssuerInstant from Assertion
       session.setIssueInstant(extractor.getAssertionIssuingDate());
 
-      // TODO: add mandates if SEMPER are integrated
+      // set mandate flag
+      session.setUseMandates(checkIfMandateInformationIsAvailable(extractor));
+      
 
     } catch (final EaafException | IOException e) {
       throw new EaafBuilderException(ERROR_PVP_06, null, e.getMessage(), e);
@@ -256,6 +257,20 @@ public class ReceiveFromIdAustriaSystemTask extends AbstractAuthServletTask {
     }
   }
 
+  
+  /**
+   * Check if mandate information is available.
+   * 
+   * @param extractor Assertion from ID Austria system.
+   * @return <code>true</code> if mandate was used, otherwise <code>false</code>
+   */
+  private boolean checkIfMandateInformationIsAvailable(AssertionAttributeExtractor extractor) {
+    boolean isMandateIncluded = extractor.containsAttribute(PvpAttributeDefinitions.MANDATE_TYPE_NAME);
+    log.debug("Response from ID-Austria system contains mandate information. Switch to mandate-mode ... ");
+    return isMandateIncluded;
+    
+  }
+
   private void validateResponseAttributes(AssertionAttributeExtractor extractor)
       throws EaafAuthenticationException {
     final String bpkTarget = extractor.getSingleAttributeValue(
@@ -295,14 +310,14 @@ public class ReceiveFromIdAustriaSystemTask extends AbstractAuthServletTask {
       log.trace("Find bPK attribute. Extract eIDAS identifier ... ");
       session.setGenericDataToSession(MsProxyServiceConstants.ATTR_EIDAS_PERSONAL_IDENTIFIER,
           extractBpkFromResponse(attrValue));
-
-    } else {
+      
+    } else {      
       session.setGenericDataToSession(attrName, attrValue);
 
     }
 
   }
-
+  
   private String extractBpkFromResponse(String pvpBpkAttrValue) {
     final String[] split = pvpBpkAttrValue.split(":", 2);
     if (split.length == 2) {
-- 
cgit v1.2.3