fix: fixed some issue in the IssuerMetadataUtils

Sphereon-Opensource · May 21, 2024 · 8a6c16f · 8a6c16f
1 parent 354e8ad
commit 8a6c16f
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 18 deletions.
diff --git a/packages/client/lib/__tests__/AccessTokenClient.spec.ts b/packages/client/lib/__tests__/AccessTokenClient.spec.ts
@@ -223,8 +223,8 @@ describe('AccessTokenClient should', () => {
     const response: OpenIDResponse<AccessTokenResponse> = await accessTokenClient.acquireAccessToken({
       credentialOffer: INITIATION_TEST,
       pin: '1234',
-    })
-    expect(response.successBody).toBeDefined()
+    });
+    expect(response.successBody).toBeDefined();
   });
 
   it('get error if no as, issuer and metadata values are present', async () => {

diff --git a/packages/client/lib/__tests__/SdJwt.spec.ts b/packages/client/lib/__tests__/SdJwt.spec.ts
@@ -108,9 +108,9 @@ describe('sd-jwt vc', () => {
           'urn:ietf:params:oauth:grant-type:pre-authorized_code': {
             'pre-authorized_code': '123',
             tx_code: {
-              input_mode: "text",
+              input_mode: 'text',
               length: 3,
-      },
+            },
           },
         },
       });

diff --git a/packages/client/lib/__tests__/data/VciDataFixtures.ts b/packages/client/lib/__tests__/data/VciDataFixtures.ts
@@ -869,12 +869,24 @@ const mockData: VciMockDataStructure = {
                 text_color: '#00526e',
               },
               {
+                background_color: '#e6f2f5',
+                background_image: {
+                  alt_text: 'KvK gestylede achtergrond',
+                  url: 'https://mijnkvk.acc.credenco.com/kvk_card_background.png',
+                },
                 locale: 'nl-NL',
                 name: 'Bevoegdheid uittreksel',
+                text_color: '#00526e',
               },
               {
+                background_color: '#e6f2f5',
+                background_image: {
+                  alt_text: 'KvK styled card Background',
+                  url: 'https://mijnkvk.acc.credenco.com/kvk_card_background.png',
+                },
                 locale: 'en-US',
                 name: 'Authorized representative',
+                text_color: '#00526e',
               },
             ],
             format: 'jwt_vc_json',
@@ -976,12 +988,24 @@ const mockData: VciMockDataStructure = {
                 text_color: '#00526e',
               },
               {
+                background_color: '#e6f2f5',
+                background_image: {
+                  alt_text: 'KvK gestylede achtergrond',
+                  url: 'https://mijnkvk.acc.credenco.com/kvk_card_background.png',
+                },
                 locale: 'nl-NL',
                 name: 'KVK Registratie',
+                text_color: '#00526e',
               },
               {
+                background_color: '#e6f2f5',
+                background_image: {
+                  alt_text: 'KvK styled card Background',
+                  url: 'https://mijnkvk.acc.credenco.com/kvk_card_background.png',
+                },
                 locale: 'en-US',
                 name: 'Chamber of Commerce Registration',
+                text_color: '#00526e',
               },
             ],
             format: 'jwt_vc_json',
@@ -1035,14 +1059,26 @@ const mockData: VciMockDataStructure = {
                 text_color: '#00526e',
               },
               {
+                background_color: '#e6f2f5',
+                background_image: {
+                  alt_text: 'KvK gestylede achtergrond',
+                  url: 'https://mijnkvk.acc.credenco.com/kvk_card_background.png',
+                },
                 description: 'Rechtspersonen en Samenwerkingsverbanden Identificatienummer',
                 locale: 'nl-NL',
                 name: 'RSIN',
+                text_color: '#00526e',
               },
               {
+                background_color: '#e6f2f5',
+                background_image: {
+                  alt_text: 'KvK styled card Background',
+                  url: 'https://mijnkvk.acc.credenco.com/kvk_card_background.png',
+                },
                 description: 'Identification number for legal entities and associations',
                 locale: 'en-US',
                 name: 'RSIN',
+                text_color: '#00526e',
               },
             ],
             format: 'jwt_vc_json',
@@ -1331,12 +1367,24 @@ const mockData: VciMockDataStructure = {
                 text_color: '#00526e',
               },
               {
+                background_color: '#e6f2f5',
+                background_image: {
+                  alt_text: 'KvK gestylede achtergrond',
+                  url: 'https://mijnkvk.acc.credenco.com/kvk_card_background.png',
+                },
                 locale: 'nl-NL',
                 name: 'Bevoegdheid uittreksel',
+                text_color: '#00526e',
               },
               {
+                background_color: '#e6f2f5',
+                background_image: {
+                  alt_text: 'KvK styled card Background',
+                  url: 'https://mijnkvk.acc.credenco.com/kvk_card_background.png',
+                },
                 locale: 'en-US',
-                name: 'Power of Attorney',
+                name: 'Authorized representative',
+                text_color: '#00526e',
               },
             ],
             format: 'jwt_vc_json',

diff --git a/packages/common/lib/functions/IssuerMetadataUtils.ts b/packages/common/lib/functions/IssuerMetadataUtils.ts
@@ -38,31 +38,33 @@ export function getSupportedCredential(opts?: {
   issuerMetadata?: CredentialIssuerMetadata | IssuerMetadata;
   version: OpenId4VCIVersion;
   types?: string | string[];
-  format?: (OID4VCICredentialFormat | string) | (OID4VCICredentialFormat | string)[];
+  format?: OID4VCICredentialFormat | string | (OID4VCICredentialFormat | string)[];
 }): Record<string, CredentialConfigurationSupportedV1_0_13> {
   const { issuerMetadata, types, format } = opts ?? {};
 
   if (!issuerMetadata || !issuerMetadata.credential_configurations_supported) {
     return {};
   }
 
-  const configurations = issuerMetadata.credential_configurations_supported;
-  const formats = Array.isArray(format) ? format : format ? [format] : [];
-  const normalizedTypes = Array.isArray(types) ? types : types ? [types] : [];
+  const configurationIds: string[] = Object.keys(issuerMetadata.credential_configurations_supported);
+  const normalizedTypes: string[] = Array.isArray(types) ? types : types ? [types] : [];
+  const normalizedFormats: string[] = Array.isArray(format) ? format : format ? [format] : [];
+
+  return configurationIds.reduce((filteredConfigs, id) => {
+    const config = (issuerMetadata.credential_configurations_supported as Record<string, CredentialConfigurationSupportedV1_0_13>)[id];
 
-  const filteredConfigs: Record<string, CredentialConfigurationSupportedV1_0_13> = {};
-  Object.entries(configurations).forEach(([key, value]) => {
-    const isTypeMatch = normalizedTypes.length === 0 || normalizedTypes.includes(key);
-    const isFormatMatch = formats.length === 0 || formats.includes(value.format);
+    const isTypeMatch = normalizedTypes.length === 0 || normalizedTypes.includes(id);
+    const isFormatMatch = normalizedFormats.length === 0 || normalizedFormats.includes(config.format);
 
     if (isTypeMatch && isFormatMatch) {
-      filteredConfigs[key] = value;
+      filteredConfigs[id] = config;
     }
-  });
 
-  return filteredConfigs;
+    return filteredConfigs;
+  }, {} as Record<string, CredentialConfigurationSupportedV1_0_13>);
 }
 
+
 export function getTypesFromCredentialSupported(
   credentialSupported: CredentialConfigurationSupported,
   opts?: { filterVerifiableCredential: boolean },

diff --git a/packages/issuer/lib/functions/CredentialOfferUtils.ts b/packages/issuer/lib/functions/CredentialOfferUtils.ts
@@ -3,11 +3,12 @@ import {
   CredentialOfferPayloadV1_0_13,
   CredentialOfferSession,
   CredentialOfferV1_0_13,
-  Grant, GrantUrnIetf,
+  Grant,
+  GrantUrnIetf,
   IssuerMetadataV1_0_13,
   PIN_VALIDATION_ERROR,
   TxCode,
-  UniformCredentialOffer
+  UniformCredentialOffer,
 } from '@sphereon/oid4vci-common'
 import { v4 as uuidv4 } from 'uuid'