rename eIDAS LoA constants

3 files changed, 26 insertions, 8 deletions

diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java
index b6f78119c..b60162f35 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/auth/builder/AuthenticationDataBuilder.java
@@ -224,7 +224,7 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
 						authData.setQAALevel(currentLoA);
 						authData.seteIDASLoA(loaLevelMapper.mapSTORKQAAToeIDASQAA(currentLoA));
 
-					} else if (currentLoA.startsWith(EAAFConstants.EIDAS_QAA_PREFIX)) {
+					} else if (currentLoA.startsWith(EAAFConstants.EIDAS_LOA_PREFIX)) {
 						authData.setQAALevel(loaLevelMapper.mapeIDASQAAToSTORKQAA(currentLoA));
 						authData.seteIDASLoA(currentLoA);
 										
@@ -242,9 +242,9 @@ public class AuthenticationDataBuilder extends AbstractAuthenticationDataBuilder
 			
 			//if no QAA level is set in MOASession then set default QAA level  
 			if (MiscUtil.isEmpty(authData.getEIDASQAALevel())) {														
-				Logger.info("No QAA level found. Set to default level " + EAAFConstants.EIDAS_QAA_LOW);
+				Logger.info("No QAA level found. Set to default level " + EAAFConstants.EIDAS_LOA_LOW);
 				authData.setQAALevel(PVPConstants.STORK_QAA_PREFIX + "1");
-				authData.seteIDASLoA(EAAFConstants.EIDAS_QAA_LOW);
+				authData.seteIDASLoA(EAAFConstants.EIDAS_LOA_LOW);
 						
 			}
 	
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameterDecorator.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameterDecorator.java
index 97d1e7132..6ecba5820 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameterDecorator.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/OAAuthParameterDecorator.java
@@ -59,6 +59,7 @@ import java.util.Set;
 
 import org.apache.commons.lang.SerializationUtils;
 
+import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
 import at.gv.egiz.eaaf.core.api.idp.ISPConfiguration;
 import at.gv.egiz.eaaf.core.impl.utils.KeyValueUtils;
 import at.gv.egovernment.moa.id.auth.exception.BuildException;
@@ -940,10 +941,18 @@ public String getUniqueIdentifier() {
 
 
 @Override
-public String getMinimumLevelOfAssurence() {
-	return getQaaLevel();
+public List<String> getRequiredLoA() {
+	String loa = getQaaLevel();
+	if (loa != null)
+		return Arrays.asList(loa);
+	else 
+		return null;
 }
 
+@Override
+public String getLoAMatchingMode() {
+	return EAAFConstants.EIDAS_LOA_MATCHING_MINIMUM;
+}
 
 @Override
 public String getConfigurationValue(String key) {
@@ -981,5 +990,4 @@ public boolean isConfigurationValue(String key, boolean defaultValue) {
 	
 }
 
-
 }
diff --git a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/data/DynamicOAAuthParameters.java b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/data/DynamicOAAuthParameters.java
index 76a53ee40..86235a26d 100644
--- a/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/data/DynamicOAAuthParameters.java
+++ b/id/server/idserverlib/src/main/java/at/gv/egovernment/moa/id/config/auth/data/DynamicOAAuthParameters.java
@@ -24,10 +24,12 @@ package at.gv.egovernment.moa.id.config.auth.data;
 
 import java.io.Serializable;
 import java.security.PrivateKey;
+import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
+import at.gv.egiz.eaaf.core.api.data.EAAFConstants;
 import at.gv.egovernment.moa.id.commons.api.IOAAuthParameters;
 import at.gv.egovernment.moa.id.commons.api.data.SAML1ConfigurationParameters;
 import at.gv.egovernment.moa.id.commons.api.data.StorkAttribute;
@@ -555,8 +557,11 @@ public class DynamicOAAuthParameters implements IOAAuthParameters, Serializable{
 	}
 
 	@Override
-	public String getMinimumLevelOfAssurence() {
-		return getQaaLevel();
+	public List<String> getRequiredLoA() {
+		if (getQaaLevel() != null)
+			return Arrays.asList(getQaaLevel());
+		else 
+			return null;
 	}
 
 	@Override
@@ -577,5 +582,10 @@ public class DynamicOAAuthParameters implements IOAAuthParameters, Serializable{
 		return false;
 	}
 
+	@Override
+	public String getLoAMatchingMode() {
+		return EAAFConstants.EIDAS_LOA_MATCHING_MINIMUM;
+	}
+
 	
 }