remove mobileBKU and add an additional third BKU

3 files changed, 11 insertions, 27 deletions

diff --git a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralMOAIDConfigurationTask.java b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralMOAIDConfigurationTask.java
index f66b4359f..e229b6ef4 100644
--- a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralMOAIDConfigurationTask.java
+++ b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/GeneralMOAIDConfigurationTask.java
@@ -59,10 +59,10 @@ public class GeneralMOAIDConfigurationTask extends AbstractTaskValidator impleme
 		temp.add(KeyValueUtils.removePrefixFromKey(MOAIDConfigurationConstants.GENERAL_PUBLICURLPREFIX, MOAIDConfigurationConstants.PREFIX_MOAID_GENERAL));		
 		temp.add(KeyValueUtils.removePrefixFromKey(MOAIDConfigurationConstants.GENERAL_DEFAULTS_BKU_HANDY, MOAIDConfigurationConstants.PREFIX_MOAID_GENERAL));
 		temp.add(KeyValueUtils.removePrefixFromKey(MOAIDConfigurationConstants.GENERAL_DEFAULTS_BKU_LOCAL, MOAIDConfigurationConstants.PREFIX_MOAID_GENERAL));
-		temp.add(KeyValueUtils.removePrefixFromKey(MOAIDConfigurationConstants.GENERAL_DEFAULTS_BKU_ONLINE, MOAIDConfigurationConstants.PREFIX_MOAID_GENERAL));
+		temp.add(KeyValueUtils.removePrefixFromKey(MOAIDConfigurationConstants.GENERAL_DEFAULTS_BKU_THIRD, MOAIDConfigurationConstants.PREFIX_MOAID_GENERAL));
 		temp.add(KeyValueUtils.removePrefixFromKey(MOAIDConfigurationConstants.GENERAL_DEFAULTS_TEMPLATES_HANDY, MOAIDConfigurationConstants.PREFIX_MOAID_GENERAL));
 		temp.add(KeyValueUtils.removePrefixFromKey(MOAIDConfigurationConstants.GENERAL_DEFAULTS_TEMPLATES_LOCAL, MOAIDConfigurationConstants.PREFIX_MOAID_GENERAL));
-		temp.add(KeyValueUtils.removePrefixFromKey(MOAIDConfigurationConstants.GENERAL_DEFAULTS_TEMPLATES_ONLINE, MOAIDConfigurationConstants.PREFIX_MOAID_GENERAL));
+		temp.add(KeyValueUtils.removePrefixFromKey(MOAIDConfigurationConstants.GENERAL_DEFAULTS_TEMPLATES_THIRD, MOAIDConfigurationConstants.PREFIX_MOAID_GENERAL));
 		
 		temp.add(KeyValueUtils.removePrefixFromKey(MOAIDConfigurationConstants.GENERAL_AUTH_AUTHBLOCK_TRANSFORMATION_BASE64, MOAIDConfigurationConstants.PREFIX_MOAID_GENERAL));		
 		temp.add(KeyValueUtils.removePrefixFromKey(MOAIDConfigurationConstants.GENERAL_AUTH_AUTHBLOCK_TRANSFORMATION_BASE64, MOAIDConfigurationConstants.PREFIX_MOAID_GENERAL));
@@ -239,12 +239,12 @@ public class GeneralMOAIDConfigurationTask extends AbstractTaskValidator impleme
 			
 		}
 		
-		check = input.get(KeyValueUtils.removePrefixFromKey(MOAIDConfigurationConstants.GENERAL_DEFAULTS_BKU_ONLINE, getKeyPrefix()));
+		check = input.get(KeyValueUtils.removePrefixFromKey(MOAIDConfigurationConstants.GENERAL_DEFAULTS_BKU_THIRD, getKeyPrefix()));
 		if (MiscUtil.isNotEmpty(check)) {
 			if (!ValidationHelper.validateURL(check)) {
 				log.info("Not valid Online-BKU URL");
 				errors.add(new ValidationObjectIdentifier(
-						MOAIDConfigurationConstants.GENERAL_DEFAULTS_BKU_ONLINE, 
+						MOAIDConfigurationConstants.GENERAL_DEFAULTS_BKU_THIRD, 
 						"Default BKUs - Online",
 						LanguageHelper.getErrorString("validation.general.bku.online.valid")));
 			}
@@ -411,18 +411,18 @@ public class GeneralMOAIDConfigurationTask extends AbstractTaskValidator impleme
 			}
 		}
 		
-		check = input.get(KeyValueUtils.removePrefixFromKey(MOAIDConfigurationConstants.GENERAL_DEFAULTS_TEMPLATES_ONLINE, getKeyPrefix()));
+		check = input.get(KeyValueUtils.removePrefixFromKey(MOAIDConfigurationConstants.GENERAL_DEFAULTS_TEMPLATES_THIRD, getKeyPrefix()));
 		if (MiscUtil.isEmpty(check)) {
 			log.info("Empty SLRequestTemplate Online-BKU");
 			errors.add(new ValidationObjectIdentifier(
-					MOAIDConfigurationConstants.GENERAL_DEFAULTS_TEMPLATES_ONLINE, 
+					MOAIDConfigurationConstants.GENERAL_DEFAULTS_TEMPLATES_THIRD, 
 					"Default SL-Templates - Online ",
 					LanguageHelper.getErrorString("validation.general.slrequest.online.empty")));
 		} else {
 			if (ValidationHelper.isNotValidIdentityLinkSigner(check)) {
 				log.info("SLRequestTemplate Online-BKU is not valid");
 				errors.add(new ValidationObjectIdentifier(
-						MOAIDConfigurationConstants.GENERAL_DEFAULTS_TEMPLATES_ONLINE, 
+						MOAIDConfigurationConstants.GENERAL_DEFAULTS_TEMPLATES_THIRD, 
 						"Default SL-Templates - Online",
 						LanguageHelper.getErrorString("validation.general.slrequest.online.valid")));
 			}
diff --git a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesAuthenticationInformationTask.java b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesAuthenticationInformationTask.java
index dcbee8e1d..05467c3bc 100644
--- a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesAuthenticationInformationTask.java
+++ b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesAuthenticationInformationTask.java
@@ -144,12 +144,12 @@ public class ServicesAuthenticationInformationTask extends AbstractTaskValidator
 					LanguageHelper.getErrorString("validation.general.bku.local.valid")));
 		}
 		
-		check = input.get(MOAIDConfigurationConstants.SERVICE_AUTH_BKU_ONLINE);
+		check = input.get(MOAIDConfigurationConstants.SERVICE_AUTH_BKU_THIRD);
 		if (MiscUtil.isNotEmpty(check) &&
 				!ValidationHelper.validateURL(check)) {
 			log.info("Not valid Online-BKU URL");
 			errors.add(new ValidationObjectIdentifier(
-					MOAIDConfigurationConstants.SERVICE_AUTH_BKU_ONLINE, 
+					MOAIDConfigurationConstants.SERVICE_AUTH_BKU_THIRD, 
 					"BKU - Online",
 					LanguageHelper.getErrorString("validation.general.bku.online.valid")));
 		}
@@ -159,7 +159,7 @@ public class ServicesAuthenticationInformationTask extends AbstractTaskValidator
 		if (MiscUtil.isEmpty(check)) {
 			log.info("Empty KeyBoxIdentifier");
 			errors.add(new ValidationObjectIdentifier(
-					MOAIDConfigurationConstants.SERVICE_AUTH_BKU_ONLINE, 
+					MOAIDConfigurationConstants.SERVICE_AUTH_BKU_THIRD, 
 					"BKU - KeyBoxIdentifier",
 					LanguageHelper.getErrorString("validation.general.keyboxidentifier.empty")));
 			
@@ -167,7 +167,7 @@ public class ServicesAuthenticationInformationTask extends AbstractTaskValidator
 			if (!MOAIDConfigurationConstants.ALLOWED_KEYBOXIDENTIFIER.contains(check)) {
 				log.info("Not valid KeyBoxIdentifier " + check);
 				errors.add(new ValidationObjectIdentifier(
-						MOAIDConfigurationConstants.SERVICE_AUTH_BKU_ONLINE, 
+						MOAIDConfigurationConstants.SERVICE_AUTH_BKU_THIRD, 
 						"BKU - KeyBoxIdentifier",
 						LanguageHelper.getErrorString("validation.general.keyboxidentifier.valid")));
 			}
diff --git a/id/moa-id-webgui/src/main/resources/gui/types/general.json b/id/moa-id-webgui/src/main/resources/gui/types/general.json
index f12b71eea..d45a4d5f1 100644
--- a/id/moa-id-webgui/src/main/resources/gui/types/general.json
+++ b/id/moa-id-webgui/src/main/resources/gui/types/general.json
@@ -458,22 +458,6 @@
                       }
                 }
             }
-        },
-        "reversion.log": {
-            "id": "http://www.egiz.gv.at/dynUI/general/reversion/log",
-            "type": "object",
-            "title": "Revision Logging",
-            "description": "Default Revisions-Logging",
-            "options": {
-    						"collapsed": true
-    				},
-            "properties": {
-                "eventcodes": {
-            				"id": "http://www.egiz.gv.at/dynUI/general/reversion/log/eventcodes",
-            				"type": "string",
-            				"title": "EventCodes (CSV)"
-                }
-            }
         }                                           
     },
     "required": ["publicURLPrefix"]