change STORK QAA to eIDAS LoA

1 files changed, 14 insertions, 6 deletions

diff --git a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
index e865c4ed6..8472d7c06 100644
--- a/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
+++ b/id/server/moa-id-commons/src/main/java/at/gv/egovernment/moa/id/commons/config/ConfigurationMigrationUtils.java
@@ -32,6 +32,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
+import at.gv.egovernment.moa.id.commons.MOAIDConstants;
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.AttributeProviderPlugin;
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.AuthComponentGeneral;
 import at.gv.egovernment.moa.id.commons.db.dao.config.deprecated.AuthComponentOA;
@@ -354,10 +355,11 @@ public class ConfigurationMigrationUtils {
 					else
 						result.put(MOAIDConfigurationConstants.SERVICE_AUTH_STORK_ENABLED, Boolean.FALSE.toString());
 
-					if (config.getQaa() != null)
-						result.put(MOAIDConfigurationConstants.SERVICE_AUTH_STORK_MINQAALEVEL, config.getQaa().toString());
+					if (config.geteIDAS_LOA() != null)
+						result.put(MOAIDConfigurationConstants.SERVICE_AUTH_STORK_MINQAALEVEL, config.geteIDAS_LOA());
 					else
-						result.put(MOAIDConfigurationConstants.SERVICE_AUTH_STORK_MINQAALEVEL, "4");
+						result.put(MOAIDConfigurationConstants.SERVICE_AUTH_STORK_MINQAALEVEL, 
+								MOAIDConstants.eIDAS_LOA_HIGH);
 
 					
 					// fetch vidp config					
@@ -963,7 +965,7 @@ public class ConfigurationMigrationUtils {
             // transfer the incoming data to the database model
             stork.setStorkLogonEnabled(Boolean.parseBoolean(oa.get(MOAIDConfigurationConstants.SERVICE_AUTH_STORK_ENABLED)));
             if (MiscUtil.isNotEmpty(oa.get(MOAIDConfigurationConstants.SERVICE_AUTH_STORK_MINQAALEVEL)))
-            	stork.setQaa(Integer.valueOf(oa.get(MOAIDConfigurationConstants.SERVICE_AUTH_STORK_MINQAALEVEL)));
+            	stork.seteIDAS_LOA(oa.get(MOAIDConfigurationConstants.SERVICE_AUTH_STORK_MINQAALEVEL));
                         
             if (MiscUtil.isNotEmpty(oa.get(MOAIDConfigurationConstants.PREFIX_MOAID_SERVICES)) 
             		&& oa.get(MOAIDConfigurationConstants.PREFIX_MOAID_SERVICES).equals(MOAIDConfigurationConstants.PREFIX_VIDP)) 
@@ -1468,11 +1470,11 @@ public class ConfigurationMigrationUtils {
 
 					try {
 						result.put(MOAIDConfigurationConstants.GENERAL_AUTH_STORK_QAA, 
-								String.valueOf(stork.getQualityAuthenticationAssuranceLevel()));
+								stork.getGeneral_eIDAS_LOA());
 						
 					} catch(NullPointerException e) {
 						result.put(MOAIDConfigurationConstants.GENERAL_AUTH_STORK_QAA, 
-								String.valueOf(4));
+								MOAIDConstants.eIDAS_LOA_HIGH);
 					}
 				}
 			
@@ -1715,6 +1717,12 @@ public class ConfigurationMigrationUtils {
 					
 				}
 
+				//set eIDAS default LoA from general configuration
+				String eIDASDefaultLOA = moaconfig.get(MOAIDConfigurationConstants.GENERAL_AUTH_STORK_QAA);
+				if (MiscUtil.isNotEmpty(eIDASDefaultLOA))
+					stork.setGeneral_eIDAS_LOA(eIDASDefaultLOA);
+				
+					
 		           Map<String, StorkAttribute> attrMap = new HashMap<String, StorkAttribute>();
 		            Map<String, CPEPS> cpepsMap = new HashMap<String, CPEPS>();