Webhook url

commons-packet/commons-packet-manager/src/main/java/io/mosip/commons/packet/audit/AuditLogEntry.java

@@ -1,36 +1,30 @@
 package io.mosip.commons.packet.audit;
 
-import java.time.LocalDateTime;
-import java.time.format.DateTimeFormatter;
-
+import io.mosip.commons.packet.constants.LoggerFileConstant;
+import io.mosip.commons.packet.dto.packet.AuditRequestDto;
+import io.mosip.kernel.core.http.RequestWrapper;
+import io.mosip.kernel.core.util.DateUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.context.annotation.Lazy;
 import org.springframework.core.env.Environment;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Component;
 import org.springframework.web.client.RestTemplate;
 
-import io.mosip.commons.packet.constants.LoggerFileConstant;
-import io.mosip.commons.packet.dto.packet.AuditRequestDto;
-import io.mosip.commons.packet.util.PacketManagerLogger;
-import io.mosip.kernel.core.exception.ExceptionUtils;
-import io.mosip.kernel.core.http.RequestWrapper;
-import io.mosip.kernel.core.logger.spi.Logger;
-import io.mosip.kernel.core.util.DateUtils;
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 
 @Component
 public class AuditLogEntry {
 
 	/** The logger. */
-	private final Logger LOGGER = PacketManagerLogger.getLogger(AuditLogEntry.class);
+	private final Logger LOGGER = LoggerFactory.getLogger(AuditLogEntry.class);
 
 	@Autowired
-	@Lazy
-	@Qualifier("restTemplate")
 	private RestTemplate restTemplate;
 
 	@Autowired
@@ -85,8 +79,7 @@ public String addAudit(String description, String eventId,
 					String.class);
 
 		} catch (Exception arae) {
-		    LOGGER.error(PacketManagerLogger.SESSIONID, PacketManagerLogger.REGISTRATIONID,
-		    		null, ExceptionUtils.getStackTrace(arae));  
+			LOGGER.error(arae.getMessage());
 		}
 		LOGGER.debug(LoggerFileConstant.SESSIONID.toString(), LoggerFileConstant.ID.toString(),
 				id,

commons-packet/commons-packet-manager/src/main/java/io/mosip/commons/packet/config/OfflineConfig.java

@@ -9,7 +9,11 @@
 @ConditionalOnProperty(value = "objectstore.crypto.name", havingValue = "OfflinePacketCryptoServiceImpl")
 @ComponentScan(basePackages = {"io.mosip.kernel.cryptomanager.*", "io.mosip.kernel.signature.*",
         "io.mosip.kernel.keymanagerservice.*", "io.mosip.kernel.keymanager.*", "io.mosip.kernel.core.*",
+<<<<<<< HEAD
+        "io.mosip.kernel.keygenerator.*", "io.mosip.kernel.crypto.*", "io.mosip.kernel.clientcrypto.*"})
+=======
         "io.mosip.kernel.keygenerator.*", "io.mosip.kernel.crypto.*", "io.mosip.kernel.clientcrypto.*","io.mosip.kernel.idobjectvalidator.*"})
+>>>>>>> e9c054926c6ba766da66874a8fa9a48245de1332
 @EnableJpaRepositories(basePackages = {"io.mosip.kernel.keymanagerservice.repository.*"})
 public class OfflineConfig {
 

commons-packet/commons-packet-manager/src/main/java/io/mosip/commons/packet/config/PacketManagerConfig.java

@@ -5,32 +5,31 @@
 import io.mosip.commons.packet.spi.IPacketWriter;
 import io.mosip.commons.packet.util.PacketHelper;
 import io.mosip.commons.packet.util.PacketManagerLogger;
+import io.mosip.kernel.auth.defaultadapter.config.RestTemplateInterceptor;
 import io.mosip.kernel.core.logger.spi.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.context.annotation.FilterType;
-import org.springframework.context.annotation.Import;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.util.CollectionUtils;
+import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.PostConstruct;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 @Configuration
 @EnableCaching
-@ComponentScan(excludeFilters = @ComponentScan.Filter(type = FilterType.REGEX, pattern = {
-		"io.mosip.kernel.cbeffutil.impl.CbeffImpl"}), basePackages = {"io.mosip.commons.packet.*", "io.mosip.commons.khazana.*",
-        "io.mosip.kernel.cbeffutil.*", "io.mosip.kernel.auth.*","io.mosip.kernel.idobjectvalidator.*"})
-@Import({OfflineConfig.class})
+@ComponentScan(basePackages = "io.mosip.*")
 public class PacketManagerConfig {
 
     private static final Logger logger = PacketManagerLogger.getLogger(PacketManagerConfig.class);
@@ -50,6 +49,14 @@ public Map<String, String> writerConfiguration() {
         return new HashMap<>();
     }
 
+    @Bean
+    @ConditionalOnMissingBean
+    public RestTemplate restTemplate() {
+        RestTemplate restTemplate = new RestTemplate();
+        restTemplate.setInterceptors(Collections.singletonList(new RestTemplateInterceptor()));
+        return restTemplate;
+    }
+
     /**
      * Validate the reference provider.
      *

commons-packet/commons-packet-manager/src/main/java/io/mosip/commons/packet/constants/PacketUtilityErrorCodes.java

@@ -1,52 +1,43 @@
-package io.mosip.commons.packet.constants;
-
-public enum PacketUtilityErrorCodes {
-
-	UNKNOWN_RESOURCE_EXCEPTION("KER-PUT-001",
-			"Unknown resource provided"),
-	FILE_NOT_FOUND_IN_DESTINATION("KER-PUT-002", "Unable to Find File in Destination Folder"),
-	PACKET_DECRYPTION_FAILURE_EXCEPTION("KER-PUT-003", "Packet decryption failed"),
-	API_NOT_ACCESSIBLE_EXCEPTION("KER-PUT-005", "API not accessible"),
-	SYS_IO_EXCEPTION("KER-PUT-004", "Unable to Find File in Destination Folder"),
-	GET_ALL_IDENTITY_EXCEPTION("KER-PUT-005", "Unable to fetch identity json from all sub packets"),
-	NO_AVAILABLE_PROVIDER("KER-PUT-006", "No available provider for given source and process"),
-	BIOMETRIC_FIELDNAME_NOT_FOUND("KER-PUT-007", "Biometric fieldname is not present inside packet"),
-	GET_ALL_METAINFO_EXCEPTION("KER-PUT-008", "Unable to fetch meta information from all sub packets"),
-	ZIP_PARSING_EXCEPTION("KER-PUT-009", "Unable to parse the zip"),
-	SIGNATURE_EXCEPTION("KER-PUT-010", "Failed to generate digital signature"),
-	DOCUMENT_EXCEPTION("KER-PUT-011", "Failed to get document"),
-	BIOMETRIC_EXCEPTION("KER-PUT-012", "Unable to get biometric"),
-	OS_ADAPTER_EXCEPTION("KER-PUT-013", "No Object store adapter found."),
-	PACKET_KEEPER_GET_ERROR("KER-PUT-014", "Packet keeper exception occured."),
-	PACKET_KEEPER_PUT_ERROR("KER-PUT-015", "Packet keeper exception occured."),
-	PACKET_KEEPER_GETMETA_ERROR("KER-PUT-016", "Packet keeper exception occured."),
-	PACKET_KEEPER_INTEGRITY_ERROR("KER-PUT-017", "Packet keeper exception occured."),
-	CRYPTO_EXCEPTION("KER-PUT-018", "No available crypto service exception."),
-	INTEGRITY_FAILURE("KER-PUT-019", "Packet Integrity check failed."),
-	PACKET_VALIDATION_FAILED("KER-PUT-020", "Packet Validation exception occured."),
-	TAGGING_FAILED("KER-PUT-021", "Failed to add tags."), 
-	TAG_ALREADY_EXIST("KER-PUT-022", "Tag Already Exist."),
-	GET_TAG_EXCEPTION("KER-PUT-023","Failed to get tags"),
-	TAG_NOT_FOUND("KER-PUT-024", "Requested tag not present"),
-	SOURCE_NOT_PRESENT("KER-PUT-025", "Source not present in request."),
-	DELETE_TAGGING_FAILED("KER-PUT-026", "Failed to delete tags.");
-
-
-
-
-	private final String errorCode;
-	private final String errorMessage;
-
-	private PacketUtilityErrorCodes(final String errorCode, final String errorMessage) {
-		this.errorCode = errorCode;
-		this.errorMessage = errorMessage;
-	}
-
-	public String getErrorCode() {
-		return errorCode;
-	}
-
-	public String getErrorMessage() {
-		return errorMessage;
-	}
-}
+package io.mosip.commons.packet.constants;
+
+public enum PacketUtilityErrorCodes {
+
+	UNKNOWN_RESOURCE_EXCEPTION("KER-PUT-001",
+			"Unknown resource provided"),
+	FILE_NOT_FOUND_IN_DESTINATION("KER-PUT-002", "Unable to Find File in Destination Folder"),
+	PACKET_DECRYPTION_FAILURE_EXCEPTION("KER-PUT-003", "Packet decryption failed"),
+	API_NOT_ACCESSIBLE_EXCEPTION("KER-PUT-005", "API not accessible"),
+	SYS_IO_EXCEPTION("KER-PUT-004", "Unable to Find File in Destination Folder"),
+	GET_ALL_IDENTITY_EXCEPTION("KER-PUT-005", "Unable to fetch identity json from all sub packets"),
+	NO_AVAILABLE_PROVIDER("KER-PUT-006", "No available provider for given source and process"),
+	BIOMETRIC_FIELDNAME_NOT_FOUND("KER-PUT-007", "Biometric fieldname is not present inside packet"),
+	GET_ALL_METAINFO_EXCEPTION("KER-PUT-008", "Unable to fetch meta information from all sub packets"),
+	ZIP_PARSING_EXCEPTION("KER-PUT-009", "Unable to parse the zip"),
+	SIGNATURE_EXCEPTION("KER-PUT-010", "Failed to generate digital signature"),
+	DOCUMENT_EXCEPTION("KER-PUT-011", "Failed to get document"),
+	BIOMETRIC_EXCEPTION("KER-PUT-012", "Unable to get biometric"),
+	OS_ADAPTER_EXCEPTION("KER-PUT-013", "No Object store adapter found."),
+	PACKET_KEEPER_GET_ERROR("KER-PUT-014", "Packet keeper exception occured."),
+	PACKET_KEEPER_PUT_ERROR("KER-PUT-015", "Packet keeper exception occured."),
+	PACKET_KEEPER_GETMETA_ERROR("KER-PUT-016", "Packet keeper exception occured."),
+	PACKET_KEEPER_INTEGRITY_ERROR("KER-PUT-017", "Packet keeper exception occured."),
+	CRYPTO_EXCEPTION("KER-PUT-018", "No available crypto service exception."),
+	INTEGRITY_FAILURE("KER-PUT-019", "Packet Integrity check failed.");
+
+
+	private final String errorCode;
+	private final String errorMessage;
+
+	private PacketUtilityErrorCodes(final String errorCode, final String errorMessage) {
+		this.errorCode = errorCode;
+		this.errorMessage = errorMessage;
+	}
+
+	public String getErrorCode() {
+		return errorCode;
+	}
+
+	public String getErrorMessage() {
+		return errorMessage;
+	}
+}

commons-packet/commons-packet-manager/src/main/java/io/mosip/commons/packet/dto/packet/CryptomanagerRequestDto.java

@@ -43,20 +43,4 @@ public class CryptomanagerRequestDto {
 
 	@NotBlank(message = "should not be null or empty")
 	private String data;
-
-	private Boolean prependThumbprint;
-
-	/**
-	 * salt in BASE64 encoding for encrypt/decrypt
-	 */
-
-	@NotBlank(message = "should not be null or empty")
-	private String salt;
-
-	/**
-	 * aad in BASE64 encoding for encrypt/decrypt
-	 */
-
-	@NotBlank(message = "should not be null or empty")
-	private String aad;
 }