From d33b88defc70149ca658e47ce9f53950f94a4546 Mon Sep 17 00:00:00 2001 From: Kaif Siddique <74772315+kaifk468@users.noreply.github.com> Date: Tue, 14 May 2024 21:01:11 +0530 Subject: [PATCH] [ES-842] cherry pick the chages to skip id-field while Validatio of challenge request (#699) * add logic to skip id-field check with challenge Signed-off-by: Mohd Kaif Siddique * added id-field into test.properties Signed-off-by: Mohd Kaif Siddique --------- Signed-off-by: Mohd Kaif Siddique Co-authored-by: Mohd Kaif Siddique --- .../api/validator/AuthChallengeFactorFormatValidator.java | 5 ++++- .../src/test/resources/application-test.properties | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/esignet-integration-api/src/main/java/io/mosip/esignet/api/validator/AuthChallengeFactorFormatValidator.java b/esignet-integration-api/src/main/java/io/mosip/esignet/api/validator/AuthChallengeFactorFormatValidator.java index 3ee7a9e5e..fb368ab46 100644 --- a/esignet-integration-api/src/main/java/io/mosip/esignet/api/validator/AuthChallengeFactorFormatValidator.java +++ b/esignet-integration-api/src/main/java/io/mosip/esignet/api/validator/AuthChallengeFactorFormatValidator.java @@ -39,6 +39,9 @@ public class AuthChallengeFactorFormatValidator implements ConstraintValidator> fieldDetailList; + @Value("${mosip.esignet.authenticator.default.auth-factor.kba.individual-id-field}") + private String idField; + @Override public boolean isValid(AuthChallenge authChallenge, ConstraintValidatorContext context) { String authFactor = authChallenge.getAuthFactorType(); @@ -82,7 +85,7 @@ private boolean validateChallenge(String challenge) { } private boolean isValid(Map fieldDetail, Map challengeMap) { - if(fieldDetail.get("type").equals("text")) { + if(fieldDetail.get("type").equals("text") && !fieldDetail.get("id").equals(idField)) { String value = challengeMap.get(fieldDetail.get("id")); if(!StringUtils.hasText(value)) return false; diff --git a/esignet-service/src/test/resources/application-test.properties b/esignet-service/src/test/resources/application-test.properties index bea734eed..d23abbd04 100644 --- a/esignet-service/src/test/resources/application-test.properties +++ b/esignet-service/src/test/resources/application-test.properties @@ -258,7 +258,7 @@ mosip.esignet.ui.config.key-values={'sbi.env': 'Developer', 'sbi.timeout.DISC': 'sbi.capture.count.iris': 1, 'sbi.capture.score.face': 70, 'sbi.capture.score.finger':70, 'sbi.capture.score.iris':70 } mosip.esignet.authenticator.default.auth-factor.kba.field-details={{'id':'policyNumber', 'type':'text', 'format':'', 'maxLength': 50, 'regex': '^\\s*[+-]?(\\d+|\\d*\\.\\d+|\\d+\\.\\d*)([Ee][+-]?\\d*)?\\s*$'},{'id':'fullName', 'type':'text', 'format':'', 'maxLength': 50, 'regex': '^[A-Za-z\\s]{1,}[\\.]{0,1}[A-Za-z\\s]{0,}$'},{'id':'dob', 'type':'date', 'format':'dd/mm/yyyy'}} - +mosip.esignet.authenticator.default.auth-factor.kba.individual-id-field=policyNumber ##---------------------------------------------------------------------------------------------------------------------- spring.autoconfigure.exclude[0]=org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration