Merge branch 'mosip:develop' into develop

Infosys · Dec 19, 2024 · d398411 · d398411
2 parents e713ecc + 6276e95
commit d398411
Show file tree

Hide file tree

Showing 11 changed files with 60 additions and 67 deletions.
diff --git a/docker-compose/config/mimoto-default.properties b/docker-compose/config/mimoto-default.properties
@@ -41,12 +41,12 @@ mosip.inji.minStorageRequired=2
 
 # START bootstrap.properties
 
-spring.cloud.config.uri=http://nginx/
+spring.cloud.config.uri=http://inji-web:3004/
 spring.cloud.config.name=mimoto,inji
 spring.application.name=mimoto
 
 #config.server.file.storage.uri=https://raw.githubusercontent.com/mosip/mosip-config/collab1/
-config.server.file.storage.uri=http://nginx/
+config.server.file.storage.uri=http://inji-web:3004/
 
 management.endpoint.health.show-details=always
 management.endpoints.web.exposure.include=info,health,refresh

diff --git a/docker-compose/config/mimoto-issuers-config.json b/docker-compose/config/mimoto-issuers-config.json
@@ -1,7 +1,7 @@
 {
   "issuers": [
     {
-      "credential_issuer": "Mosip",
+      "issuer_id": "Mosip",
       "protocol": "OpenId4VCI",
       "display": [
         {
@@ -72,11 +72,13 @@
       "proxy_token_endpoint": "https://esignet-mosipid.collab.mosip.net/v1/esignet/oauth/v2/token",
       "client_alias": "mpartner-default-test-mosipid",
       "qr_code_type": "OnlineSharing",
-      "enabled": "true",
-      "wellknown_endpoint": "https://injicertify-mosipid.collab.mosip.net/v1/certify/issuance/.well-known/openid-credential-issuer"
+      "wellknown_endpoint": "https://injicertify-mosipid.collab.mosip.net/v1/certify/issuance/.well-known/openid-credential-issuer",
+      "credential_issuer": "https://injicertify-mosipid.collab.mosip.net",
+      "enabled": "true"
+
     },
     {
-      "credential_issuer": "StayProtected",
+      "issuer_id": "StayProtected",
       "protocol": "OpenId4VCI",
       "display": [
         {
@@ -97,11 +99,12 @@
       "proxy_token_endpoint": "https://esignet-insurance.dev1.mosip.net/v1/esignet/oauth/v2/token",
       "client_alias": "esignet-sunbird-partner",
       "qr_code_type": "OnlineSharing",
-      "enabled": "true",
-      "wellknown_endpoint": "https://injicertify-insurance.dev1.mosip.net/v1/certify/issuance/.well-known/openid-credential-issuer"
+      "wellknown_endpoint": "https://injicertify-insurance.dev1.mosip.net/v1/certify/issuance/.well-known/openid-credential-issuer",
+      "credential_issuer": "https://injicertify-insurance.dev1.mosip.net",
+      "enabled": "true"
     },
     {
-      "credential_issuer": "Mock",
+      "issuer_id": "Mock",
       "protocol": "OpenId4VCI",
       "display": [
         {
@@ -122,8 +125,9 @@
       "proxy_token_endpoint": "https://esignet-mock.collab.mosip.net/v1/esignet/oauth/v2/token",
       "client_alias": "mpartner-mock-testing",
       "qr_code_type": "OnlineSharing",
-      "enabled": "true",
-      "wellknown_endpoint": "https://injicertify-mock.collab.mosip.net/v1/certify/issuance/.well-known/openid-credential-issuer"
+      "wellknown_endpoint": "https://injicertify-mock.collab.mosip.net/v1/certify/issuance/.well-known/openid-credential-issuer",
+      "credential_issuer": "https://injicertify-mock.collab.mosip.net",
+      "enabled": "true"
     }
   ]
 }
diff --git a/docker-compose/docker-compose.yml b/docker-compose/docker-compose.yml
@@ -1,16 +1,6 @@
 version: '3.8'
 
 services:
-  nginx:
-    container_name: nginx
-    image: nginx:alpine
-    ports:
-      - '80:80'
-    volumes:
-      - ./config/mimoto-issuers-config.json:/config/server/mimoto-issuers-config.json
-      - ./config/mimoto-trusted-verifiers.json:/config/server/mimoto-trusted-verifiers.json
-      - ./config/credential-template.html:/config/server/credential-template.html
-      - ./nginx.conf:/etc/nginx/nginx.conf
 
   mimoto-service:
     container_name: 'mimoto-service'
@@ -25,32 +15,19 @@ services:
       - SPRING_CONFIG_LOCATION=/home/mosip/
     volumes:
       - ./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
       - ./certs/oidckeystore.p12:/home/mosip/certs/oidckeystore.p12
-    depends_on:
-      - nginx
-
-  inji-web-proxy:
-    container_name: 'inji-web-proxy'
-    image: inji-web-proxy:local
-    ports:
-      - '3010:3010'
-    environment:
-      - MIMOTO_HOST=http://mimoto-service:8099/v1/mimoto
-      - PORT=3010
-    depends_on:
-      - mimoto-service
 
   inji-web:
     container_name: 'inji-web'
     image: inji-web:local
     ports:
-      - '3001:3004'
+      - '3004:3004'
     environment:
       - DEFAULT_LANG=en
-      - MIMOTO_HOST=http://localhost:3010
+      - MIMOTO_HOST=http://localhost:3004/v1/mimoto
+    volumes:
+      - ./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
     depends_on:
-      - inji-web-proxy
-
-
+      - mimoto-service
diff --git a/docker-compose/nginx.conf b/docker-compose/nginx.conf
diff --git a/inji-web/nginx.conf b/inji-web/nginx.conf
@@ -1,20 +1,44 @@
 server {
     listen 3004;
+    # Serve static files, if any
+    # Default location for normal static files
     location / {
         root   /usr/share/nginx/html;
         index  index.html index.htm;
         try_files $uri $uri/ /index.html;
     }
 
-
-    location /mimoto/ {
-        proxy_pass http://192.168.2.186:8089/; 
+    # Serve files from /home/mosip with autoindex enabled
+    location ~* \.json$ {
+        root /home/mosip;
+        autoindex on;
     }
 
 
+    # Proxy API requests to mimoto-service
+    location /v1/mimoto/ {
+        proxy_pass http://mimoto-service:8099/v1/mimoto/;
+        proxy_set_header Host $host;
+        proxy_set_header X-Real-IP $remote_addr;
+        proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto $scheme;
+        proxy_http_version 1.1;
+        proxy_set_header Connection "";
+
+        # Add CORS headers
+        add_header 'Access-Control-Allow-Origin' '*' always;
+        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
+        add_header 'Access-Control-Allow-Headers' 'Content-Type, Authorization, Cache-Control' always;
+
+        # Handle OPTIONS requests (for pre-flight checks)
+        if ($request_method = 'OPTIONS') {
+            return 204;
+        }
+    }
+
     error_page   500 502 503 504  /50x.html;
 
     location = /50x.html {
-    root   /usr/share/nginx/html;
+        root   /usr/share/nginx/html;
     }
 }
diff --git a/inji-web/src/__tests__/pages/RedirectionPage.test.tsx b/inji-web/src/__tests__/pages/RedirectionPage.test.tsx
@@ -22,7 +22,7 @@ describe('Testing the Layout of RedirectionPage', () => {
   mockUseFetch();
   test('Check if the layout is matching with the snapshots', () => {
     mockUseFetchhook.mockReturnValue({ state: 'DONE', fetchRequest: jest.fn() });
-    (getActiveSession as jest.Mock).mockReturnValue({ selectedIssuer: { credential_issuer: 'issuer1', display: [{ name: 'Test Issuer' }] } });
+    (getActiveSession as jest.Mock).mockReturnValue({ selectedIssuer: { issuer_id: 'issuer1', display: [{ name: 'Test Issuer' }] } });
     const { asFragment } = renderWithRouter(<RedirectionPage />);
     expect(asFragment()).toMatchSnapshot();
   });
@@ -33,7 +33,7 @@ describe('Testing the Functionality of RedirectionPage', () => {
     mockusei18n();
     mockUseFetch();
     jest.clearAllMocks();
-    (getActiveSession as jest.Mock).mockReturnValue({ selectedIssuer: { credential_issuer: 'issuer1', display: [{ name: 'Test Issuer' }] } });
+    (getActiveSession as jest.Mock).mockReturnValue({ selectedIssuer: { issuer_id: 'issuer1', display: [{ name: 'Test Issuer' }] } });
   });
 
   test('Check if NavBar component is rendered', () => {

diff --git a/inji-web/src/__tests__/utils/api.test.tsx b/inji-web/src/__tests__/utils/api.test.tsx
@@ -83,7 +83,7 @@ describe('Testing API Class', () => {
       name: 'Issuer Name',
       desc: 'Issuer Description',
       protocol: 'OpenId4VCI',
-      credential_issuer: 'issuer123',
+      issuer_id: 'issuer123',
       authorization_endpoint: 'http://auth.server/authorize',
       credentials_endpoint: 'http://credentials.endpoint',
       display: [

diff --git a/inji-web/src/components/Issuers/Issuer.tsx b/inji-web/src/components/Issuers/Issuer.tsx
@@ -15,7 +15,7 @@ export const Issuer: React.FC<IssuerProps> = ({issuer, index}) => {
                  url={issuerDisplayObject?.logo.url}
                  title={issuerDisplayObject?.name}
                  description={issuerDisplayObject?.description}
-                 onClick={() => navigate(`/issuers/${issuer.credential_issuer}`)}/>
+                 onClick={() => navigate(`/issuers/${issuer.issuer_id}`)}/>
     </React.Fragment>
 }
 
diff --git a/inji-web/src/pages/RedirectionPage.tsx b/inji-web/src/pages/RedirectionPage.tsx
@@ -35,7 +35,7 @@ export const RedirectionPage: React.FC = () => {
                 const code = searchParams.get("code") ?? "";
                 const urlState = searchParams.get("state") ?? "";
                 const codeVerifier = activeSessionInfo?.codeVerifier;
-                const issuerId = activeSessionInfo?.selectedIssuer?.credential_issuer ?? "";
+                const issuerId = activeSessionInfo?.selectedIssuer?.issuer_id ?? "";
                 const certificateId = activeSessionInfo?.certificateId;
                 const vcStorageExpiryLimitInTimes = activeSessionInfo?.vcStorageExpiryLimitInTimes ?? "-1";
 
@@ -87,7 +87,7 @@ export const RedirectionPage: React.FC = () => {
     }
 
     return <div data-testid="Redirection-Page-Container">
-        {activeSessionInfo?.selectedIssuer?.credential_issuer && <NavBar title={displayObject?.name ?? ""} search={false} link={`/issuers/${activeSessionInfo?.selectedIssuer?.credential_issuer}`}/>}
+        {activeSessionInfo?.selectedIssuer?.issuer_id && <NavBar title={displayObject?.name ?? ""} search={false} link={`/issuers/${activeSessionInfo?.selectedIssuer?.issuer_id}`}/>}
         {loadStatusOfRedirection()}
     </div>
 }
diff --git a/inji-web/src/test-utils/mockObjects.tsx b/inji-web/src/test-utils/mockObjects.tsx
@@ -126,7 +126,7 @@ export const mockIssuerObject = {
         name: 'Test Issuer',
         desc: 'Test Description',
         protocol: 'OTP' as 'OTP', // Explicitly set the type to 'OTP' or 'OpenId4VCI'
-        credential_issuer: 'test-issuer',
+        issuer_id: 'test-issuer',
         authorization_endpoint: 'https://auth.test.com',
         credentials_endpoint: 'https://credentials.test.com',
         display: [{
@@ -154,7 +154,7 @@ export const mockIssuerObjectList =  [
         name: 'Issuer 1',
         desc: 'Description 1',
         protocol: 'OpenId4VCI',
-        credential_issuer: 'issuer1',
+        issuer_id: 'issuer1',
         authorization_endpoint: 'https://issuer1.com/auth',
         credentials_endpoint: 'https://issuer1.com/credentials',
         display: [
@@ -179,7 +179,7 @@ export const mockIssuerObjectList =  [
         name: 'Issuer 2',
         desc: 'Description 2',
         protocol: 'OpenId4VCI',
-        credential_issuer: 'issuer2',
+        issuer_id: 'issuer2',
         authorization_endpoint: 'https://issuer2.com/auth',
         credentials_endpoint: 'https://issuer2.com/credentials',
         display: [

diff --git a/inji-web/src/types/data.d.ts b/inji-web/src/types/data.d.ts
@@ -47,7 +47,7 @@ export type IssuerObject = {
     name: string;
     desc: string;
     protocol: 'OTP' | 'OpenId4VCI';
-    credential_issuer: string,
+    issuer_id: string,
     authorization_endpoint: string;
     credentials_endpoint: string;
     display: DisplayArrayObject[];