Changes in error message and merge resolve conflict

Signed-off-by: Neha Farheen <[email protected]>
mosip · Feb 8, 2024 · c4467f8 · c4467f8
2 parents 13a5850 + 9391e35
commit c4467f8
Show file tree

Hide file tree

Showing 4 changed files with 518 additions and 4 deletions.
diff --git a/...ation-core/src/main/java/io/mosip/authentication/core/constant/IdAuthCommonConstants.java b/...ation-core/src/main/java/io/mosip/authentication/core/constant/IdAuthCommonConstants.java
@@ -464,6 +464,8 @@ public final class IdAuthCommonConstants {
 	public static final String POLICY_DATA = "policy_data";
 
 	public static final String MISP_LIC_DATA = "misp_lic_data";
+
+	public static final String UNABLE_TO_IDENTIFY_ID = "Unable to identify the entered %s. Please try after few minutes";
 
 	private IdAuthCommonConstants() {
 	}

diff --git a/...e/src/main/java/io/mosip/authentication/core/constant/IdAuthenticationErrorConstants.java b/...e/src/main/java/io/mosip/authentication/core/constant/IdAuthenticationErrorConstants.java
@@ -65,9 +65,7 @@ public enum IdAuthenticationErrorConstants {
 			"Please capture biometrics within %s seconds of previous biometric capture"),
 	INVALID_BIO_DIGITALID_TIMESTAMP("IDA-MLC-031", "DigitalId of Biometrics not captured within %s seconds of previous biometrics",
 			"Please capture DigitalId of biometrics within %s seconds of previous biometric capture"),
-
-	UNABLE_TO_IDENTIFY_ID("IDA-MLC-032", "Unable to identify the entered %s. Please try after few minutes"),
-
+
 	DEMOGRAPHIC_DATA_MISMATCH_LANG("IDA-DEA-001", "Demographic data %s in %s did not match",
 				"Please re-enter your %s in %s"),
 	DEMO_DATA_MISMATCH("IDA-DEA-001", "Demographic data %s did not match", "Please re-enter your %s"),

diff --git a/...tion-service/src/main/java/io/mosip/authentication/service/controller/AuthController.java b/...tion-service/src/main/java/io/mosip/authentication/service/controller/AuthController.java
@@ -165,7 +165,7 @@ public AuthResponseDTO authenticateIndividual(@Validated @RequestBody AuthReques
 				if (IdAuthenticationErrorConstants.ID_NOT_AVAILABLE.getErrorCode().equals(e.getErrorCode())) {
 					ondemandTemplateEventPublisher.notify(authrequestdto, request.getHeader("signature"), partner, e,
 							authrequestdto.getMetadata());
-					e.getErrorTexts().add(0, IdAuthenticationErrorConstants.UNABLE_TO_IDENTIFY_ID.getErrorMessage());
+					e.getErrorTexts().add(0, IdAuthCommonConstants.UNABLE_TO_IDENTIFY_ID);
 				}
 				auditHelper.auditExceptionForAuthRequestedModules(AuditEvents.AUTH_REQUEST_RESPONSE, authrequestdto, e);
 				IdaRequestResponsConsumerUtil.setIdVersionToObjectWithMetadata(requestWithMetadata, e);