aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java8
-rw-r--r--id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java33
2 files changed, 24 insertions, 17 deletions
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java
index e16020782..d6ede8fbf 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/data/GeneralMOAIDConfig.java
@@ -185,8 +185,12 @@ public class GeneralMOAIDConfig {
moaspssAuthTrustProfile = authblock.getTrustProfileID();
List<String> list = authblock.getVerifyTransformsInfoProfileID();
- for (String el : list)
- moaspssAuthTransformations += el + LINE_DELIMITER + "\n";
+ if (list.size() == 1)
+ moaspssAuthTransformations += list.get(0);
+ else {
+ for (String el : list)
+ moaspssAuthTransformations += el + LINE_DELIMITER + "\n";
+ }
}
VerifyIdentityLink idl = moaspss.getVerifyIdentityLink();
diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
index fcf74a534..3723a09e9 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/MOAConfigValidator.java
@@ -160,21 +160,24 @@ public class MOAConfigValidator {
log.info("Empty MoaspssAuthTransformation");
errors.add(LanguageHelper.getErrorString("validation.general.moasp.auth.transformation.empty"));
} else {
- check = StringHelper.formatText(check);
- String[] list = check.split(GeneralMOAIDConfig.LINE_DELIMITER);
- int i=1;
- for(String el : list) {
- if (ValidationHelper.containsPotentialCSSCharacter(el, false)) {
- log.info("IdentityLinkSigners is not valid: " + el);
- errors.add(LanguageHelper.getErrorString("validation.general.moasp.auth.transformation.valid",
- new Object[] {i, ValidationHelper.getPotentialCSSCharacter(false)} ));
-
- } else {
- if (MiscUtil.isNotEmpty(el.trim()))
- authtranslist.add(el.trim());
- }
- i++;
- }
+
+ //is only required if more then one transformation is in use
+// check = StringHelper.formatText(check);
+// String[] list = check.split(GeneralMOAIDConfig.LINE_DELIMITER);
+// int i=1;
+// for(String el : list) {
+// if (ValidationHelper.containsPotentialCSSCharacter(el, false)) {
+// log.info("IdentityLinkSigners is not valid: " + el);
+// errors.add(LanguageHelper.getErrorString("validation.general.moasp.auth.transformation.valid",
+// new Object[] {i, ValidationHelper.getPotentialCSSCharacter(false)} ));
+//
+// } else {
+// if (MiscUtil.isNotEmpty(el.trim()))
+// authtranslist.add(el.trim());
+// }
+// i++;
+// }
+ authtranslist.add(check.trim());
}
form.setAuthTransformList(authtranslist);