taken latest changes from 1.2.0-rc2 (mosip#56)

* Created 1.2.0-rc2 (mosip#23) Co-authored-by: Monobikash Das <M1045447@mindtree.com> * MOSIP-15420: Upgraded swagger2.0 to openapi3.0 for packet manager service (mosip#31) Resolved merge conflict * Added logger and fixed test cases (mosip#32) Co-authored-by: Monobikash Das <M1045447@mindtree.com> * MOSIP-15420: Generated openapi.json for packet manager service (mosip#34) * MOSIP-15420: Upgraded swagger2.0 to openapi3.0 for packet manager service Resolved merge conflict * MOSIP-15420: Generated openapi.json for packet manager service Resolved merge conflicts * MOSIP-18453 : improved usage of caching (mosip#36) Co-authored-by: Monobikash Das <M1045447@mindtree.com> * Added sonar_analysis * MOSIP-18450 : added exception for objects not available in minio (mosip#37) * MOSIP-18450 : added exception for objects not available in minio * Added sonar_analysis * MOSIP-18910 : fixed refNumber issue in DocumentDto * MOSIP-18450 : added exception for objects not available in minio * MOSIP-18910 : fixed refNumber issue in DocumentDto * initial change * MOSIP-18450 : added exception for objects not available in minio * MOSIP-18910 : fixed refNumber issue in DocumentDto * initial change * MOSIP-18793 :Added afterburner + fixes Co-authored-by: Monobikash Das <M1045447@mindtree.com> Co-authored-by: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com> Co-authored-by: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com> Co-authored-by: Admin <Admin@MONOBIKASH> * Mosip:15286 Changed openapi.json name. * updated the Sonar_analysis code and removed the Dskiptests * updated the Sonar_analysis code and removed the Dskiptests * added gpg keys * changes for real bio * Merged with 1.2.0-rc2 * changes for real bio * Auth role issue fixed (mosip#46) * MOR-147 : multithreading issue for create packet api (mosip#52) Co-authored-by: Admin <Admin@MONOBIKASH> * selfTokenRestTemplate fix for regclient Co-authored-by: Monobikash Das <M1045447@mindtree.com> Co-authored-by: kameshsr <47484458+kameshsr@users.noreply.github.com> Co-authored-by: Rakshitha650 <76676196+Rakshitha650@users.noreply.github.com> Co-authored-by: Mandeep Dhiman <46880392+mandeepdhiman123@users.noreply.github.com> Co-authored-by: Admin <Admin@MONOBIKASH> Co-authored-by: Rakshith650 <rakshitham38@gmail.com> Co-authored-by: Sasikumar Ganesan <gsasikumar@gmail.com> Signed-off-by: Sowmya Ujjappa Banakar <sowmya.61022006@ltimindtree.com>
sowmya695 · Mar 6, 2024 · 97a66ab · 97a66ab
1 parent 55836f1
commit 97a66ab
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/.github/workflows/push_trigger.yml b/.github/workflows/push_trigger.yml
@@ -197,7 +197,7 @@ jobs:
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} # required
         if: failure() # Pick up events even if the job fails or is canceled.
-
+        
   sonar_analysis:
     runs-on: ubuntu-latest
     steps:

diff --git a/...ket-manager/src/main/java/io/mosip/commons/packet/impl/OnlinePacketCryptoServiceImpl.java b/...ket-manager/src/main/java/io/mosip/commons/packet/impl/OnlinePacketCryptoServiceImpl.java
@@ -21,6 +21,7 @@
 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.ApplicationContext;
 import org.springframework.http.HttpEntity;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.ResponseEntity;
@@ -97,7 +98,7 @@ public byte[] sign(byte[] packet) {
                     .parse(DateUtils.getUTCCurrentDateTimeString(DATETIME_PATTERN), format);
             request.setRequesttime(localdatetime);
             HttpEntity<RequestWrapper<TpmSignRequestDto>> httpEntity = new HttpEntity<>(request);
-            ResponseEntity<String> response = restTemplate.exchange(keymanagerCsSignUrl, HttpMethod.POST, httpEntity,
+            ResponseEntity<String> response = getRestTemplate().exchange(keymanagerCsSignUrl, HttpMethod.POST, httpEntity,
                     String.class);
             LinkedHashMap responseMap = (LinkedHashMap) mapper.readValue(response.getBody(), LinkedHashMap.class).get("response");
             if (responseMap != null && responseMap.size() > 0)
@@ -143,7 +144,7 @@ public byte[] encrypt(String refId, byte[] packet) {
             request.setVersion(APPLICATION_VERSION);
             HttpEntity<RequestWrapper<CryptomanagerRequestDto>> httpEntity = new HttpEntity<>(request);
 
-            ResponseEntity<String> response = restTemplate.exchange(cryptomanagerEncryptUrl, HttpMethod.POST, httpEntity, String.class);
+            ResponseEntity<String> response = getRestTemplate().exchange(cryptomanagerEncryptUrl, HttpMethod.POST, httpEntity, String.class);
             CryptomanagerResponseDto responseObject = mapper.readValue(response.getBody(), CryptomanagerResponseDto.class);
             if (responseObject != null &&
                     responseObject.getErrors() != null && !responseObject.getErrors().isEmpty()) {
@@ -213,7 +214,7 @@ public byte[] decrypt(String refId, byte[] packet) {
             request.setVersion(APPLICATION_VERSION);
             HttpEntity<RequestWrapper<CryptomanagerRequestDto>> httpEntity = new HttpEntity<>(request);
 
-            ResponseEntity<String> response = restTemplate.exchange(cryptomanagerDecryptUrl, HttpMethod.POST, httpEntity, String.class);
+            ResponseEntity<String> response = getRestTemplate().exchange(cryptomanagerDecryptUrl, HttpMethod.POST, httpEntity, String.class);
 
             CryptomanagerResponseDto responseObject = mapper.readValue(response.getBody(), CryptomanagerResponseDto.class);
 
@@ -270,7 +271,7 @@ public boolean verify(String refId, byte[] packet, byte[] signature) {
                     .parse(DateUtils.getUTCCurrentDateTimeString(DATETIME_PATTERN), format);
             request.setRequesttime(localdatetime);
             HttpEntity<RequestWrapper<TpmSignVerifyRequestDto>> httpEntity = new HttpEntity<>(request);
-            ResponseEntity<String> response = restTemplate.exchange(keymanagerCsverifysignUrl, HttpMethod.POST, httpEntity,
+            ResponseEntity<String> response = getRestTemplate().exchange(keymanagerCsverifysignUrl, HttpMethod.POST, httpEntity,
                     String.class);
             LinkedHashMap responseMap = (LinkedHashMap) mapper.readValue(response.getBody(), LinkedHashMap.class).get("response");//.get("signature");
             if (responseMap != null && responseMap.size() > 0) {
@@ -297,7 +298,7 @@ public boolean verify(String refId, byte[] packet, byte[] signature) {
 
 	private String getPublicKey(String refId) throws IOException {
         String machineId = refId.split("_")[1];
-		ResponseEntity<String> response = restTemplate.exchange(syncdataGetTpmKeyUrl+machineId, HttpMethod.GET, null,
+		ResponseEntity<String> response = getRestTemplate().exchange(syncdataGetTpmKeyUrl+machineId, HttpMethod.GET, null,
                 String.class);
 		 LinkedHashMap responseMap = (LinkedHashMap) mapper.readValue(response.getBody(), LinkedHashMap.class).get("response");//.get("signature");
 		 if (responseMap != null && responseMap.size() > 0)
@@ -308,4 +309,12 @@ private String getPublicKey(String refId) throws IOException {
              throw new SignatureException();
          }
 	}
+
+    private RestTemplate getRestTemplate() {
+        if (this.restTemplate == null) {
+            this.restTemplate = (RestTemplate)this.applicationContext.getBean("selfTokenRestTemplate");
+        }
+
+        return this.restTemplate;
+    }
 }