[INJICERT-#902]: Integrate inji-verify as library in certify

certify-service/pom.xml

@@ -26,6 +26,19 @@
             <id>danubetech-maven-public</id>
             <url>https://repo.danubetech.com/repository/maven-public/</url>
         </repository>
+        <repository>
+            <id>ossrh-inji</id>
+            <name>CentralRepositoryInji</name>
+            <url>https://central.sonatype.com/repository/maven-snapshots</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>google</id>
+            <name>GoogleMaven</name>
+            <url>https://maven.google.com</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -236,6 +249,17 @@
             <artifactId>kernel-biometrics-api</artifactId>
             <version>1.3.0</version>
         </dependency>
+        <dependency>
+            <groupId>io.inji.verify</groupId>
+            <artifactId>verify-service</artifactId>
+            <version>0.18.2-SNAPSHOT</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>io.inji</groupId>
+                    <artifactId>pixelpass-jar</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
     </dependencies>
 
     <build>

certify-service/src/main/java/io/mosip/certify/CertifyServiceApplication.java

@@ -8,18 +8,20 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.cache.annotation.EnableCaching;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
+import org.springframework.context.annotation.Import;
 import org.springframework.scheduling.annotation.EnableAsync;
 
 @EnableAsync
 @EnableCaching
-@SpringBootApplication(scanBasePackages = "io.mosip.certify,"+
+@Import(io.inji.verify.config.AppConfig.class)
+@SpringBootApplication(scanBasePackages = "io.mosip.certify," +
         "io.mosip.kernel.crypto," +
         "io.mosip.kernel.keymanager.hsm," +
         "io.mosip.kernel.cryptomanager," +
-        "io.mosip.kernel.keymanagerservice.validator,"+
-        "io.mosip.kernel.keymanager,"+
+        "io.mosip.kernel.keymanagerservice.validator," +
+        "io.mosip.kernel.keymanager," +
         "io.mosip.kernel.cryptomanager.util," +
         "io.mosip.kernel.keymanagerservice.helper," +
         "io.mosip.kernel.keymanagerservice.repository," +
@@ -30,11 +32,14 @@
         "io.mosip.kernel.signature.util," +
         "io.mosip.kernel.signature.builder," +
         "io.mosip.kernel.signature.*," +
-        "io.mosip.kernel.pdfgenerator.*,"+
+        "io.mosip.kernel.pdfgenerator.*," +
         "io.mosip.kernel.partnercertservice.service," +
-        "io.mosip.kernel.keymanagerservice.repository,"+
-        "io.mosip.kernel.keymanagerservice.entity,"+
+        "io.mosip.kernel.keymanagerservice.repository," +
+        "io.mosip.kernel.keymanagerservice.entity," +
         "io.mosip.kernel.partnercertservice.helper," +
+        "io.inji.verify.services," +
+        "io.inji.verify.key.impl," +
+        "io.inji.verify.repository," +
         "${mosip.certify.integration.scan-base-package}")
 public class CertifyServiceApplication {
     public static void main(String[] args) {

certify-service/src/main/java/io/mosip/certify/config/AppConfig.java

@@ -34,8 +34,16 @@
 import lombok.extern.slf4j.Slf4j;
 
 @Configuration
-@EnableJpaRepositories(basePackages = {"io.mosip.kernel.keymanagerservice.repository", "io.mosip.certify.repository"})
-@EntityScan(basePackages = {"io.mosip.kernel.keymanagerservice.entity, io.mosip.certify.entity"})
+@EnableJpaRepositories(basePackages = {
+        "io.mosip.kernel.keymanagerservice.repository",
+        "io.mosip.certify.repository",
+        "io.inji.verify.repository"
+})
+@EntityScan(basePackages = {
+        "io.mosip.kernel.keymanagerservice.entity",
+        "io.mosip.certify.entity",
+        "io.inji.verify.models"
+})
 @Slf4j
 public class AppConfig implements ApplicationRunner {
 
@@ -79,10 +87,11 @@ public RestTemplate restTemplate() {
         return new RestTemplate(requestFactory);
     }
 
-    @Bean
+    @Bean("certifyPixelPass")
     public PixelPass pixelPass() {
         return new PixelPass();
     }
+
     @Override
     public void run(ApplicationArguments args) throws Exception {
             initKeys();

certify-service/src/main/java/io/mosip/certify/config/CertifyContextPathOverride.java

@@ -0,0 +1,19 @@
+/*
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at https://mozilla.org/MPL/2.0/.
+ */
+package io.mosip.certify.config;
+import org.springframework.boot.web.server.WebServerFactoryCustomizer;
+import org.springframework.boot.web.servlet.server.ConfigurableServletWebServerFactory;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class CertifyContextPathOverride {
+
+    @Bean
+    public WebServerFactoryCustomizer<ConfigurableServletWebServerFactory> webServerFactoryCustomizer() {
+        return factory -> factory.setContextPath("");
+    }
+}

certify-service/src/main/java/io/mosip/certify/services/CertifyIssuanceServiceImpl.java

@@ -39,6 +39,7 @@
 import org.json.JSONException;
 import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
@@ -88,6 +89,7 @@ public class CertifyIssuanceServiceImpl implements VCIssuanceService {
     private AuditPlugin auditWrapper;
 
     @Autowired
+    @Qualifier("certifyPixelPass")
     private PixelPass pixelPass;
 
     private Map<String, Object> didDocument;