Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mosip 30687 on demand template extraction changes for exception #1182

Merged
merged 6 commits into from
Feb 7, 2024
Merged

Mosip 30687 on demand template extraction changes for exception #1182

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e101f5e
MOSIP-30687 partner data changed
Feb 6, 2024
0838f41
MOSIP-30687 partner data changed
Feb 6, 2024
6f4ebd1
Merge branch 'develop' of https://github.com/mosip/id-authentication …
Feb 6, 2024
94f4f03
MOSIP-30687 changes done for ondemand
Feb 7, 2024
d7fb625
Merge branch 'develop' of https://github.com/mosip/id-authentication …
Feb 7, 2024
c123c3b
MOSIP-30687 changes done for exception
Feb 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions ...e/src/main/java/io/mosip/authentication/core/constant/IdAuthenticationErrorConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public enum IdAuthenticationErrorConstants {
IDENTITYTYPE_NOT_ALLOWED("IDA-MLC-015", "Identity Type - %s not configured for the country"),
INVALID_TXNID_BIO("IDA-MLC-016", "Transaction ID parameters in the request does not match"),
INVALID_USERID( "IDA-MLC-017","Invalid UserID"),
ID_NOT_AVAILABLE("IDA-MLC-018", "%s not available in database"),
ID_NOT_AVAILABLE("IDA-MLC-018", "Unable to identify the entered %s. Please try after few minutes"),
AUTH_TYPE_LOCKED("IDA-MLC-019", "%s Auth Type is Locked for the UIN"),
FAILED_TO_ENCRYPT("IDA-MLC-020", "Unable to encrypt data"),
FAILED_TO_FETCH_KEY("IDA-MLC-021", "Failed to fetch key from HSM"),
Expand All @@ -66,8 +66,6 @@ public enum IdAuthenticationErrorConstants {
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"),
Expand Down
5 changes: 0 additions & 5 deletions ...p-service/src/main/java/io/mosip/authentication/otp/service/controller/OTPController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,11 +162,6 @@ public OtpResponseDTO generateOTP(@Valid @RequestBody OtpRequestDTO otpRequestDt
if (IdAuthenticationErrorConstants.ID_NOT_AVAILABLE.getErrorCode().equals(e.getErrorCode())) {
ondemandTemplateEventPublisher.notify(otpRequestDto, request.getHeader("signature"), partner, e,
otpRequestDto.getMetadata());
throw new IdAuthenticationBusinessException(
IdAuthenticationErrorConstants.UNABLE_TO_IDENTIFY_ID.getErrorCode(),
String.format(IdAuthenticationErrorConstants.UNABLE_TO_IDENTIFY_ID.getErrorMessage(),
otpRequestDto.getIndividualIdType()),
e);
}
auditHelper.audit(AuditModules.OTP_REQUEST, AuditEvents.OTP_TRIGGER_REQUEST_RESPONSE , otpRequestDto.getTransactionID(),
IdType.getIDTypeOrDefault(otpRequestDto.getIndividualIdType()), e);
Expand Down
6 changes: 0 additions & 6 deletions ...tion-service/src/main/java/io/mosip/authentication/service/controller/AuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,13 +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.addInfo(IdAuthenticationErrorConstants.UNABLE_TO_IDENTIFY_ID.getErrorCode(),
String.format(IdAuthenticationErrorConstants.UNABLE_TO_IDENTIFY_ID.getErrorMessage(),
authrequestdto.getIndividualIdType()));
throw e;

}

auditHelper.auditExceptionForAuthRequestedModules(AuditEvents.AUTH_REQUEST_RESPONSE, authrequestdto, e);
IdaRequestResponsConsumerUtil.setIdVersionToObjectWithMetadata(requestWithMetadata, e);
e.putMetadata(IdAuthCommonConstants.TRANSACTION_ID, authrequestdto.getTransactionID());
Expand Down
10 changes: 0 additions & 10 deletions ...rvice/src/main/java/io/mosip/authentication/service/kyc/controller/KycAuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -201,11 +201,6 @@ public EKycAuthResponseDTO processKyc(@Validated @RequestBody EkycAuthRequestDTO
if (IdAuthenticationErrorConstants.ID_NOT_AVAILABLE.getErrorCode().equals(e.getErrorCode())) {
ondemandTemplateEventPublisher.notify(ekycAuthRequestDTO, request.getHeader("signature"), partner,
e, ekycAuthRequestDTO.getMetadata());
throw new IdAuthenticationBusinessException(
IdAuthenticationErrorConstants.UNABLE_TO_IDENTIFY_ID.getErrorCode(),
String.format(IdAuthenticationErrorConstants.UNABLE_TO_IDENTIFY_ID.getErrorMessage(),
ekycAuthRequestDTO.getIndividualIdType()),
e);
}
auditHelper.auditExceptionForAuthRequestedModules(AuditEvents.EKYC_REQUEST_RESPONSE, ekycAuthRequestDTO, e);
IdaRequestResponsConsumerUtil.setIdVersionToObjectWithMetadata(requestWrapperWithMetadata, e);
Expand Down Expand Up @@ -288,11 +283,6 @@ public KycAuthResponseDTO processKycAuth(@Validated @RequestBody KycAuthRequestD
if (IdAuthenticationErrorConstants.ID_NOT_AVAILABLE.getErrorCode().equals(e.getErrorCode())) {
ondemandTemplateEventPublisher.notify(authRequestDTO, request.getHeader("signature"), partner, e,
authRequestDTO.getMetadata());
throw new IdAuthenticationBusinessException(
IdAuthenticationErrorConstants.UNABLE_TO_IDENTIFY_ID.getErrorCode(),
String.format(IdAuthenticationErrorConstants.UNABLE_TO_IDENTIFY_ID.getErrorMessage(),
authRequestDTO.getIndividualIdType()),
e);
}
auditHelper.auditExceptionForAuthRequestedModules(AuditEvents.KYC_REQUEST_RESPONSE, authRequestDTO, e);
IdaRequestResponsConsumerUtil.setIdVersionToObjectWithMetadata(requestWrapperWithMetadata, e);
Expand Down
Loading