1 files changed, 6 insertions, 2 deletions
diff --git a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/builder/Pvp2AssertionBuilder.java b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/builder/Pvp2AssertionBuilder.java
index 261f7b2b..bbe1d95f 100644
--- a/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/builder/Pvp2AssertionBuilder.java
+++ b/eaaf_modules/eaaf_module_pvp2_idp/src/main/java/at/gv/egiz/eaaf/modules/pvp2/idp/impl/builder/Pvp2AssertionBuilder.java
@@ -22,8 +22,10 @@ package at.gv.egiz.eaaf.modules.pvp2.idp.impl.builder;
 import java.security.MessageDigest;
 import java.time.Instant;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Set;
 
 import javax.naming.ConfigurationException;
 
@@ -159,7 +161,7 @@ public class Pvp2AssertionBuilder implements PvpConstants {
           reqAuthnContext.getAuthnContextClassRefs();
 
       // get matching mode from authn. request      
-      String loaMatchingMode = pendingReq.getServiceProviderConfiguration().getLoAMatchingMode();
+      String loaMatchingMode = oaParam.getLoAMatchingMode();
       if (StringUtils.isEmpty(loaMatchingMode)) {
         loaMatchingMode = EaafConstants.EIDAS_LOA_MATCHING_MINIMUM;
         
@@ -172,7 +174,9 @@ public class Pvp2AssertionBuilder implements PvpConstants {
         authnContextClassRef.setURI(authData.getEidasQaaLevel());
 
       } else {
-        final List<String> eidasLoaFromRequest = new ArrayList<>();
+        final Set<String> eidasLoaFromRequest = new HashSet<>();
+        eidasLoaFromRequest.addAll(oaParam.getRequiredLoA());
+        
         for (final AuthnContextClassRef authnClassRef : reqAuthnContextClassRefIt) {
           final String qaa_uri = authnClassRef.getURI();