Release to develop

docker-compose/README.md

@@ -3,14 +3,10 @@
 This is the docker-compose setup to run 
 
 - **mimoto-service** which act as BFF for Inji mobile and backend for Inji web.
-- **inji-web** and **inji-web-proxy** for frontend
+- **inji-web** for frontend
 
 This is not for production use.
 
-## Navigate to inji-web-proxy folder and Build the inji-web-proxy image locally.
-
-> cd inji-web-proxy && docker build -t inji-web-proxy:local .
-
 ## Navigate to inji-web folder and Build the inji-web image locally.
 
 > docker build -t inji-web:local .

docker-compose/config/mimoto-default.properties

@@ -30,7 +30,7 @@ mosip.inji.warningDomainName=${mosip.api.public.url}
 #timeout for vc download api via openid4vci flow in milliseconds
 mosip.inji.openId4VCIDownloadVCTimeout=30000
 # inji documentation url
-mosip.inji.aboutInjiUrl=https://docs.mosip.io/inji/inji-mobile-wallet/overview
+mosip.inji.aboutInjiUrl=https://docs.inji.io/inji-wallet/inji-mobile
 # minimum storage space required for making audit entry in MB
 mosip.inji.minStorageRequiredForAuditEntry=2
 # minimum storage space required for downloading / receiving vc in MB
@@ -260,7 +260,7 @@ mosip.openid.issuers=mimoto-issuers-config.json
 mosip.openid.htmlTemplate=credential-template.html
 mosip.oidc.client.assertion.type=urn:ietf:params:oauth:client-assertion-type:jwt-bearer
 mosip.oidc.p12.filename=oidckeystore.p12
-mosip.oidc.p12.password=mosip123
+mosip.oidc.p12.password=xy4gh6swa2i
 mosip.oidc.p12.path=certs/
 
 
@@ -270,14 +270,14 @@ mosip.oidc.p12.path=certs/
 mosip.openid.verifiers=mimoto-trusted-verifiers.json
 
 #Inji Web Config
-mosip.inji.web.url=https://injiweb.collab.mosip.net
-mosip.inji.web.redirect.url=https://injiweb.collab.mosip.net/authorize
+mosip.inji.web.url=http://localhost:3004
+mosip.inji.web.redirect.url=${mosip.inji.web.url}/authorize
 mosip.inji.qr.data.size.limit=10000
 mosip.inji.qr.code.height=650
 mosip.inji.qr.code.width=650
 
 #OVP Config
-mosip.inji.ovp.qrdata.pattern=INJI_OVP://https://injiweb.collab.mosip.net/authorize?response_type=vp_token&resource=%s&presentation_definition=%s
+mosip.inji.ovp.qrdata.pattern=INJI_OVP://http://localhost:${server.port}/v1/mimoto/authorize?response_type=vp_token&resource=%s&presentation_definition=%s
 mosip.inji.ovp.redirect.url.pattern=%s#vp_token=%s&presentation_submission=%s
 mosip.inji.ovp.error.redirect.url.pattern=%s?error=%s&error_description=%s
 

docker-compose/config/mimoto-trusted-verifiers.json

@@ -2,7 +2,7 @@
   "verifiers": [
     {
       "client_id": "https://injiverify.collab.mosip.net",
-      "redirect_uri": [
+      "redirect_uris": [
         "https://injiverify.collab.mosip.net/redirect"
       ]
     }

docker-compose/docker-compose.yml

@@ -4,7 +4,7 @@ services:
 
   mimoto-service:
     container_name: 'mimoto-service'
-    image: 'mosipid/mimoto:0.14.0'
+    image: 'mosipqa/mimoto:0.15.x'
     user: root
     ports:
       - '8099:8099'
@@ -29,5 +29,6 @@ services:
       - ./config/mimoto-default.properties:/home/mosip/mimoto-default.properties
       - ./config/mimoto-issuers-config.json:/home/mosip/mimoto-issuers-config.json
       - ./config/mimoto-trusted-verifiers.json:/home/mosip/mimoto-trusted-verifiers.json
+      - ./config/credential-template.html:/home/mosip/credential-template.html
     depends_on:
       - mimoto-service

helm/inji-web/templates/configmap.yaml

@@ -21,6 +21,7 @@ data:
     http {
       access_log /var/log/nginx/access1.log;
       error_log /var/log/nginx/error1.log;
+
       server {
         listen {{ .Values.inji_web.inji_web_port }};
         server_name  localhost;

inji-web-test/src/test/java/stepdefinitions/StepDef.java

@@ -14,6 +14,7 @@
 import utils.GlobelConstants;
 
 import java.util.Set;
+import java.util.concurrent.TimeUnit;
 
 
 public class StepDef {
@@ -81,12 +82,9 @@ public void user_click_on_verify_button() {
     }
 
     @Then("User verify Download Success text displayed")
-    public void user_verify_download_success_text_displayed() {
-        try {
-            Thread.sleep(3000);
-        } catch (InterruptedException e) {
-            throw new RuntimeException(e);
-        }
+    public void user_verify_download_success_text_displayed() throws InterruptedException {
+        Thread.sleep(10000);
+        baseTest.getDriver().manage().timeouts().implicitlyWait(30, TimeUnit.SECONDS);
         Assert.assertTrue(homePage.isSuccessMessageDisplayed());
     }
 

inji-web/nginx.conf

@@ -13,8 +13,11 @@ server {
         root /home/mosip;
         autoindex on;
     }
-
-
+    # Serve credential-template.html from /home/mosip when accessing /credential-template.html
+    location = /credential-template.html {
+        root /home/mosip;  # Serve from /home/mosip specifically for this file
+        index credential-template.html;  # Serve this file as the index
+    }
     # Proxy API requests to mimoto-service
     location /v1/mimoto/ {
         proxy_pass http://mimoto-service:8099/v1/mimoto/;

inji-web/package.json

@@ -13,6 +13,7 @@
     "@types/react-outside-click-handler": "^1.3.3",
     "@types/react-redux": "^7.1.33",
     "autoprefixer": "^9.8.6",
+    "cross-env": "^7.0.3",
     "crypto-js": "^4.2.0",
     "i18next": "^23.11.2",
     "postcss-cli": "^11.0.0",
@@ -33,7 +34,7 @@
     "web-vitals": "^2.1.4"
   },
   "scripts": {
-    "start": "set PORT=3001 && react-scripts start",
+    "start": "cross-env PORT=3004 react-scripts start",
     "build": "CI=false react-scripts build",
     "test": "react-scripts test --silent --testPathPattern=__tests__",
     "eject": "react-scripts eject",

inji-web/public/env.config.js

@@ -4,5 +4,5 @@ window._env_ = {
     DEFAULT_FAVICON: "favicon.ico",
     DEFAULT_TITLE: "Inji Wallet",
     DEFAULT_FONT_URL: "https://fonts.googleapis.com/css?family=Inter",
-    MIMOTO_HOST: "http://localhost:3010"
+    MIMOTO_HOST: "http://localhost:8099/v1/mimoto"
 };