Merge pull request #148 from mosip/develop

[Release 08-12-2023] Helm and Mimoto Issuers Config Changes
mosip · Dec 8, 2023 · 4fc4efb · 4fc4efb
2 parents fc98391 + 90596b7
commit 4fc4efb
Show file tree

Hide file tree

Showing 7 changed files with 118 additions and 14 deletions.
diff --git a/.github/workflows/chart-lint-publish.yml b/.github/workflows/chart-lint-publish.yml
@@ -40,7 +40,7 @@ on:
       - MOSIP*
       - release*
     paths:
-      - 'charts/**'
+      - './helm/**'
 
 jobs:
   chart-lint-publish:
@@ -59,4 +59,4 @@ jobs:
       LINTING_HEALTH_CHECK_SCHEMA_YAML_URL: "https://raw.githubusercontent.com/mosip/kattu/master/.github/helm-lint-configs/health-check-schema.yaml"
     secrets:
       TOKEN: ${{ secrets.ACTION_PAT }}
-      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
+      SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }}
diff --git a/.talismanrc b/.talismanrc
@@ -10,7 +10,7 @@ fileignoreconfig:
 - filename: src/main/java/io/mosip/mimoto/exception/BiometricException.java
   checksum: e99050f4618224a32d378df776a177a1e0cf87089dfcc2ea542cb05c74c7d88b
 - filename: src/test/java/io/mosip/mimoto/controller/InjiControllerTest.java
-  checksum: 2ed11df9c90f52e7a6b9e9c31c462393e492f57493c6ec8f1492078fd16ce9ba
+  checksum: c4e28436cb04004d9cb4e1492a1d013eac076936a3fa3a99d35bfb137f27c37b
 - filename: src/test/java/io/mosip/mimoto/util/JoseUtilTest.java
   checksum: 5c407e9011599fb6ff95820fff6a3a4b781c7b95875937c629893d1a8cb08fa0
 - filename: src/test/java/io/mosip/mimoto/service/CredentialShareServiceTest.java
@@ -24,9 +24,9 @@ fileignoreconfig:
 - filename: docs/images/id_pass_logo.svg
   checksum: 81b14da4f42f335cf6a3094489844962b92fc629c89691487558c71c3d44a915
 - filename: README.md
-  checksum: b01438ae6897d9a2d311ca6f68cc839cb4d8252b29d9fa7d41a0362aaecf0065
+  checksum: f3e7693f4f554640b93c82e438d28d015f8c09be622c22ac6847e528830968f6
 - filename: .github/workflows/push-trigger.yml
-  checksum: 98fb3ab2510d2361cdca7cbd4a57afd88e9afa1ff5c4ee6d4b7930a8f565b1ab
+  checksum: e809aa956d4d0cde78118bfa518e824f128aa67ef5b1e79983b8feaa40b3690d
 - filename: helm/mimoto/install.sh
   checksum: d5f2e121664dc1b3d8769a36b481ddb44a4f41f410df8c55a5467f4fd53a8a99
 - filename: src/main/java/io/mosip/mimoto/controller/CredentialShareController.java
@@ -62,7 +62,7 @@ fileignoreconfig:
 - filename: src/main/java/io/mosip/mimoto/util/RestApiClient.java
   checksum: 77b8afdefbb1f8ff56e140836e6713d150ac48f99c6778e43bc2854e5fcd4732
 - filename: src/main/java/io/mosip/mimoto/util/JoseUtil.java
-  checksum: 1a9b48b950b17c14c32c2ee0c8ad0448d63da887dfb7eb82f4f0bf0b71fdeafa
+  checksum: 65c4d7f9d4f28e7e4e5376e4f6cdce8b49b485c3ea2ab214f72d018d5d73b6aa
 - filename: src/main/java/io/mosip/mimoto/util/CryptoUtil.java
   checksum: fc4b7bd41ca63b2060854e218eb50689f77162dc51c45e95f51ec0272bd3585a
 - filename: src/main/java/io/mosip/mimoto/util/CryptoCoreUtil.java

diff --git a/README.md b/README.md
@@ -15,9 +15,21 @@ mvn clean package
 mvn spring-boot:run -Dspring.profiles.active=local
 ```
 
-## Deploy
+## Deployment
 
 ### Install
+
+1. Execute Onboarder install script 
+
+```
+cd partner-onboarder
+./install.sh
+```
+* During the execution of the `install.sh` script, a prompt appears requesting information for the S3 bucket, including its name and URL.
+* Once the job is completed, log in to S3 and check the reports. There should not be any failures.
+
+2. Execute mimoto install script
+
 ```
 cd helm/mimoto
 ./install.sh

diff --git a/src/main/java/io/mosip/mimoto/dto/DisplayDTO.java b/src/main/java/io/mosip/mimoto/dto/DisplayDTO.java
@@ -11,5 +11,9 @@ public class DisplayDTO {
     @Expose
     LogoDTO logo;
     @Expose
+    String title;
+    @Expose
+    String description;
+    @Expose
     String language;
 }
diff --git a/src/main/java/io/mosip/mimoto/util/JoseUtil.java b/src/main/java/io/mosip/mimoto/util/JoseUtil.java
@@ -153,13 +153,13 @@ public String getJWT(String clientId) {
         String keyStorePathWithFileName = keyStorePath + fileName;
         Date issuedAt = Date.from(Instant.now());
         Date expiresAt = Date.from(Instant.now().plusMillis(120000));
-        KeyStore.PrivateKeyEntry privateKeyEntry= null;
+        RSAPrivateKey privateKey = null;
         try {
-            privateKeyEntry = cryptoCoreUtil.loadP12(keyStorePathWithFileName, alias, cyptoPassword);
+            KeyStore.PrivateKeyEntry privateKeyEntry = cryptoCoreUtil.loadP12(keyStorePathWithFileName, alias, cyptoPassword);
+            privateKey = (RSAPrivateKey) privateKeyEntry.getPrivateKey();
         } catch (IOException e) {
            logger.error("Exception happened while loading the p12 file for invoking token call.");
         }
-        RSAPrivateKey privateKey = (RSAPrivateKey) privateKeyEntry.getPrivateKey();
         return JWT.create()
                 .withHeader(header)
                 .withIssuer(clientId)

diff --git a/src/main/resources/mimoto-issuers-config.json b/src/main/resources/mimoto-issuers-config.json
@@ -9,7 +9,49 @@
             "url": "https://api.dev1.mosip.net/inji/digit-icon.png",
             "alt_text": "digits-logo"
           },
+          "title": "Download via UIN, VID, AID",
+          "description": "Enter your national ID to download your card.",
           "language": "en"
+        },
+        {
+          "name": "UIN, VID, AID",
+          "logo": {
+            "url": "https://api.dev1.mosip.net/inji/digit-icon.png",
+            "alt_text": "أرقام الشعار"
+          },
+          "title": "التنزيل عبر UIN, VID, AID",
+          "description": "أدخل رقم الهوية الوطنية الخاص بك لتنزيل بطاقتك.",
+          "language": "ar"
+        },
+        {
+          "name": "UIN, VID, AID",
+          "logo": {
+            "url": "https://api.dev1.mosip.net/inji/digit-icon.png",
+            "alt_text": "अंक-लोगो"
+          },
+          "title": "UIN, VID, AID के माध्यम से डाउनलोड करे",
+          "description": "अपना कार्ड डाउनलोड करने के लिए अपनी राष्ट्रीय आईडी दर्ज करें।",
+          "language": "hi"
+        },
+        {
+          "name": "UIN, VID, AID",
+          "logo": {
+            "url": "https://api.dev1.mosip.net/inji/digit-icon.png",
+            "alt_text": "ಅಂಕೆಗಳು-ಲೋಗೋ"
+          },
+          "title": "UIN, VID, AID ಮೂಲಕ ಡೌನ್‌ಲೋಡ್ ಮಾಡಿ",
+          "description": "ನಿಮ್ಮ ಕಾರ್ಡ್ ಅನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು ನಿಮ್ಮ ರಾಷ್ಟ್ರೀಯ ID ಅನ್ನು ನಮೂದಿಸಿ.",
+          "language": "kn"
+        },
+        {
+          "name": "UIN, VID, AID",
+          "logo": {
+            "url": "https://api.dev1.mosip.net/inji/digit-icon.png",
+            "alt_text": "இலக்கங்கள்-லோகோ"
+          },
+          "title": "UIN, VID, AID மூலம் பதிவிறக்கவும்",
+          "description": "உங்கள் கார்டைப் பதிவிறக்க உங்கள் தேசிய ஐடியை உள்ளிடவும்.",
+          "language": "ta"
         }
       ],
       "protocol": "OTP"
@@ -23,20 +65,65 @@
             "url": "https://esignet.dev1.mosip.net/logo.png",
             "alt_text": "esignet-logo"
           },
+          "title": "Download via e-Signet",
+          "description": "Enter your national ID to download your card.",
           "language": "en"
+        },
+        {
+          "name": "e-Signet",
+          "logo": {
+            "url": "https://esignet.dev1.mosip.net/logo.png",
+            "alt_text": "esignet-logo"
+          },
+          "title": "e-Signet التنزيل عبر",
+          "description": "أدخل رقم الهوية الوطنية الخاص بك لتنزيل بطاقتك.",
+          "language": "ar"
+        },
+        {
+          "name": "e-Signet",
+          "logo": {
+            "url": "https://esignet.dev1.mosip.net/logo.png",
+            "alt_text": "esignet-लोगो"
+          },
+          "title": "ई-हस्ताक्षर के माध्यम से डाउनलोड करें",
+          "description": "अपना कार्ड डाउनलोड करने के लिए अपनी राष्ट्रीय आईडी दर्ज करें।",
+          "language": "hi"
+        },
+        {
+          "name": "e-Signet",
+          "logo": {
+            "url": "https://esignet.dev1.mosip.net/logo.png",
+            "alt_text": "esignet-ಲೋಗೋ"
+          },
+          "title": "ಇ-ಸಿಗ್ನೆಟ್ ಮೂಲಕ ಡೌನ್ಲೋಡ್ ಮಾಡಿ",
+          "description": "ನಿಮ್ಮ ಕಾರ್ಡ್ ಅನ್ನು ಡೌನ್‌ಲೋಡ್ ಮಾಡಲು ನಿಮ್ಮ ರಾಷ್ಟ್ರೀಯ ID ಅನ್ನು ನಮೂದಿಸಿ.",
+          "language": "kn"
+        },
+        {
+          "name": "e-Signet",
+          "logo": {
+            "url": "https://esignet.dev1.mosip.net/logo.png",
+            "alt_text": "esignet-லோகோ"
+          },
+          "title": "இ-சிக்னெட் மூலம் பதிவிறக்கம் செய்யவும்",
+          "description": "உங்கள் கார்டைப் பதிவிறக்க உங்கள் தேசிய ஐடியை உள்ளிடவும்.",
+          "language": "ta"
         }
       ],
       "protocol": "OpenId4VCI",
       "client_id": "7-*****************IWRDAg1x-M",
-      "scopes_supported": ["mosip_identity_vc_ldp"],
-      "additional_headers": { "Accept": "application/json" },
+      "scopes_supported": [
+        "mosip_identity_vc_ldp"
+      ],
+      "additional_headers": {
+        "Accept": "application/json"
+      },
       ".well-known": null,
       "redirect_uri": "io.mosip.residentapp.inji://oauthredirect",
       "authorization_endpoint": "https://esignet.dev1.mosip.net/authorize",
       "token_endpoint": "https://api.dev1.mosip.net/residentmobileapp/get-token",
       "credential_endpoint": "https://api-internal.dev1.mosip.net/v1/esignet/vci/credential",
       "credential_audience": "https://esignet.dev1.mosip.net/v1/esignet"
     }
-
   ]
 }
diff --git a/src/test/java/io/mosip/mimoto/controller/InjiControllerTest.java b/src/test/java/io/mosip/mimoto/controller/InjiControllerTest.java
@@ -17,7 +17,6 @@
 import io.mosip.mimoto.exception.ApiNotAccessibleException;
 import io.mosip.mimoto.exception.ApisResourceAccessException;
 import io.mosip.mimoto.exception.BaseUncheckedException;
-import io.mosip.mimoto.exception.PlatformErrorMessages;
 import io.mosip.mimoto.model.Event;
 import io.mosip.mimoto.model.EventModel;
 import io.mosip.mimoto.service.RestClientService;
@@ -131,6 +130,8 @@ static IssuerDTO getIssuerDTO(String issuerName) {
         logo.setAlt_text("logo-url");
         DisplayDTO display = new DisplayDTO();
         display.setName(issuerName);
+        display.setTitle("Download via " + issuerName);
+        display.setDescription(issuerName + " description");
         display.setLanguage("en");
         display.setLogo(logo);
         IssuerDTO issuer = new IssuerDTO();