Skip to content

Error message validation for GetCertificate API [MOSIP-23028] #1169

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

Open
GOKULRAJ136 wants to merge 5 commits into
base: release-1.3.x
Choose a base branch
from
Open

Error message validation for GetCertificate API [MOSIP-23028] #1169

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9bd6fc1
Error message validation for GetCertificate API [MOSIP-23028]
GOKULRAJ136 Jan 30, 2025
9ffc6f7
added proper error code
GOKULRAJ136 Jan 30, 2025
20b8ad0
Merge branch 'release-1.3.x' into dev-1.3.x
GOKULRAJ136 Feb 3, 2025
be7ba3e
Merge branch 'release-1.3.x' into dev-1.3.x
GOKULRAJ136 Mar 27, 2025
e95193e
Merge remote-tracking branch 'upstream/release-1.3.x' into dev-1.3.x
GOKULRAJ136 Sep 22, 2025
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
3 changes: 2 additions & 1 deletion ...ncdata-service/src/main/java/io/mosip/kernel/syncdata/constant/AdminServiceErrorCode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ public enum AdminServiceErrorCode {
INVALID_TIMESTAMP_EXCEPTION("KER-ADM-102", "Timestamp cannot be future date"),
LAST_UPDATED_PARSE_EXCEPTION("KER-ADM-103", "Error occurred while parsing lastUpdated timestamp"),
SYNC_JOB_DEF_FETCH_EXCEPTION("KER-ADM-104", "Error while fetching sync job def details"),
DATA_NOT_FOUND_EXCEPTION("KER-ADM-105", "data not found for sync job def");
DATA_NOT_FOUND_EXCEPTION("KER-ADM-105", "data not found for sync job def"),
VALIDATION_ERROR ("KER-ADM-106", "Validation error while fetching Certificate");

private final String errorCode;
private final String errorMessage;
Expand Down
14 changes: 12 additions & 2 deletions ...ervice/src/main/java/io/mosip/kernel/syncdata/exception/SyncInvalidArgumentException.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package io.mosip.kernel.syncdata.exception;

import java.util.List;

import io.mosip.kernel.core.exception.BaseUncheckedException;
import io.mosip.kernel.core.exception.ServiceError;

import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

public class SyncInvalidArgumentException extends BaseUncheckedException {

/**
Expand All @@ -20,6 +22,7 @@ public class SyncInvalidArgumentException extends BaseUncheckedException {
* @param list The error list.
*/
public SyncInvalidArgumentException(List<ServiceError> list) {
super(constructMessage(list));
this.list = list;
}

Expand All @@ -32,4 +35,11 @@ public List<ServiceError> getList() {
return list;
}

private static String constructMessage(List<ServiceError> list) {
return list.stream()
.map(ServiceError::getMessage)
.filter(Objects::nonNull)
.collect(Collectors.joining(", "));
}

}
7 changes: 4 additions & 3 deletions ...cdata-service/src/main/java/io/mosip/kernel/syncdata/service/helper/KeymanagerHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import io.mosip.kernel.core.exception.ExceptionUtils;
import io.mosip.kernel.core.http.RequestWrapper;
import io.mosip.kernel.core.http.ResponseWrapper;
Expand Down Expand Up @@ -56,8 +55,7 @@ public KeyPairGenerateResponseDto getCertificate(String applicationId, Optional<
try {
UriComponentsBuilder builder = UriComponentsBuilder.fromUriString(certificateUrl);
builder.queryParam("applicationId", applicationId);
if (referenceId.isPresent())
builder.queryParam("referenceId", referenceId.get());
referenceId.ifPresent(id -> builder.queryParam("referenceId", id));
ResponseEntity<String> responseEntity = restTemplate.getForEntity(builder.build().toUri(), String.class);

ResponseWrapper<KeyPairGenerateResponseDto> resp = objectMapper.readValue(responseEntity.getBody(),
Expand All @@ -67,6 +65,9 @@ public KeyPairGenerateResponseDto getCertificate(String applicationId, Optional<
throw new SyncInvalidArgumentException(resp.getErrors());

return resp.getResponse();
} catch (SyncInvalidArgumentException e) {
LOGGER.warn("Validation error while fetching Certificate: {}", e.getMessage());
throw new SyncDataServiceException(AdminServiceErrorCode.VALIDATION_ERROR.getErrorCode(), e.getMessage(), e);
} catch (Exception e) {
LOGGER.error("Failed to fetch Certificate from keymanager", e);
throw new SyncDataServiceException(AdminServiceErrorCode.INTERNAL_SERVER_ERROR.getErrorCode(),
Expand Down