From d1a572b986616206ebb577ea345f2abf7e9d269c Mon Sep 17 00:00:00 2001 From: Thomas Lenz Date: Tue, 1 Sep 2015 10:29:04 +0200 Subject: fix VIDP configuration - VIDP config could also be a public service in case of an attribute provider endpoint --- .../task/impl/ServicesProtocolSTORKTask.java | 27 ++++++++++++++-------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesProtocolSTORKTask.java b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesProtocolSTORKTask.java index d4e80bed9..c7a74d1a1 100644 --- a/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesProtocolSTORKTask.java +++ b/id/moa-id-webgui/src/main/java/at/gv/egovernment/moa/id/config/webgui/validation/task/impl/ServicesProtocolSTORKTask.java @@ -171,18 +171,25 @@ public class ServicesProtocolSTORKTask extends AbstractTaskValidator implements throws ConfigurationTaskValidationException { List errors = new ArrayList(); - //check V-IDP specific Target configurations - String isBusinessService = input.get(MOAIDConfigurationConstants.SERVICE_BUSINESSSERVICE); - if (!Boolean.parseBoolean(isBusinessService)) { - log.info("STORK V-IDP only allowed as business Service."); - errors.add(new ValidationObjectIdentifier( - MOAIDConfigurationConstants.SERVICE_BUSINESSSERVICE, - "BusinessService", - "STORK V-IDP only allowed as business Service.")); - } + //TODO: add in further version + //STORK MIS attribute provider requires PublicService Target and therefore VIDP config is actually used. + +// //check V-IDP specific Target configurations +// String isBusinessService = input.get(MOAIDConfigurationConstants.SERVICE_BUSINESSSERVICE); +// if (!Boolean.parseBoolean(isBusinessService)) { +// log.info("STORK V-IDP only allowed as business Service."); +// errors.add(new ValidationObjectIdentifier( +// MOAIDConfigurationConstants.SERVICE_BUSINESSSERVICE, +// "BusinessService", +// "STORK V-IDP only allowed as business Service.")); +// } String identificationType = input.get(MOAIDConfigurationConstants.SERVICE_AUTH_TARGET_BUSINESS_TYPE); - if (MiscUtil.isEmpty(identificationType) || + //TODO: add in further version + //STORK MIS attribute provider requires PublicService Target and therefore VIDP config is actually used. +// if (MiscUtil.isEmpty(identificationType) || +// !MOAIDConfigurationConstants.IDENIFICATIONTYPE_STORK.equals(identificationType)) { + if (MiscUtil.isNotEmpty(identificationType) && !MOAIDConfigurationConstants.IDENIFICATIONTYPE_STORK.equals(identificationType)) { log.info("STORK V-IDP only allowes identification numbers with STORK prefix."); errors.add(new ValidationObjectIdentifier( -- cgit v1.2.3