chore: fixed decodeJsonProperties & tests

Author: sanderPostma

packages/client/lib/CredentialOfferClient.ts

@@ -47,15 +47,17 @@ export class CredentialOfferClient {
       if (uri.includes('credential_offer_uri')) {
         const uriObj = getURIComponentsAsArray(uri) as unknown as Record<string, string> // FIXME
         const credentialOfferUri = uriObj['credential_offer_uri']
-        const response = await fetch(credentialOfferUri)
+        const response = await fetch(decodeURIComponent(credentialOfferUri))
         if (!(response && response.status >= 200 && response.status < 400)) {
           return Promise.reject(`the credential offer URI endpoint call was not successful. http code ${response.status} - reason ${response.statusText}`)
         }
 
         if (response.headers.get('Content-Type')?.startsWith('application/json') === false) {
           return Promise.reject('the credential offer URI endpoint did not return content type application/json')
         }
-        credentialOffer = decodeJsonProperties(await response.json()) as CredentialOfferV1_0_11 | CredentialOfferV1_0_13
+        credentialOffer = {
+          credential_offer: decodeJsonProperties(await response.json())
+        } as CredentialOfferV1_0_11 | CredentialOfferV1_0_13
       } else {
         credentialOffer = convertURIToJsonObject(uri, {
           // It must have the '=' sign after credential_offer otherwise the uri will get split at openid_credential_offer

packages/client/lib/__tests__/MetadataClient.spec.ts

@@ -1,4 +1,9 @@
-import { getIssuerFromCredentialOfferPayload, PRE_AUTH_GRANT_LITERAL, WellKnownEndpoints } from '@sphereon/oid4vci-common';
+import {
+  AuthorizationServerMetadata,
+  getIssuerFromCredentialOfferPayload,
+  PRE_AUTH_GRANT_LITERAL,
+  WellKnownEndpoints
+} from '@sphereon/oid4vci-common'
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import nock from 'nock';
@@ -299,6 +304,25 @@ describe.skip('Metadataclient with SpruceId should', () => {
 });
 
 describe('Metadataclient with Credenco should', () => {
+  beforeEach(() => {
+    const mockData = getMockData('credenco')
+    if (!mockData?.metadata?.openid4vci_metadata) {
+      throw new Error('Credenco mock data not found or invalid structure')
+    }
+    nock('https://mijnkvk.acc.credenco.com')
+      .get('/.well-known/openid-credential-issuer')
+      .reply(200, mockData.metadata.openid4vci_metadata)
+    nock('https://mijnkvk.acc.credenco.com').get('/.well-known/openid-configuration').reply(404)
+    const authMetadata: AuthorizationServerMetadata = {
+      authorization_endpoint: 'https://mijnkvk.acc.credenco.com',
+      "pre-authorized_grant_anonymous_access_supported": true,
+      issuer: 'https://issuer.research.identiproof.io',
+      token_endpoint: 'https://mijnkvk.acc.credenco.com/token',
+      response_types_supported: ['token']
+    }
+    nock('https://mijnkvk.acc.credenco.com').get('/.well-known/oauth-authorization-server').reply(200, JSON.stringify(authMetadata));
+  })
+
   it('succeed without OID4VCI and with OIDC metadata', async () => {
     const metadata = await MetadataClient.retrieveAllMetadata('https://mijnkvk.acc.credenco.com/');
     expect(metadata.credential_endpoint).toEqual('https://mijnkvk.acc.credenco.com/credential');

packages/issuer/lib/VcIssuer.ts

@@ -51,6 +51,7 @@ import {
   System,
   W3CVerifiableCredential
 } from '@sphereon/ssi-types'
+import ShortUUID from 'short-uuid'
 
 import {
   assertValidPinNumber,
@@ -66,10 +67,11 @@ import {
   CredentialSignerCallback
 } from './types'
 
-import uuid from 'short-uuid'
 
 import { LOG } from './index'
 
+const shortUUID = ShortUUID()
+
 export class VcIssuer<DIDDoc extends object> {
   private readonly _issuerMetadata: CredentialIssuerMetadataOptsV1_0_13
   private readonly _authorizationServerMetadata: AuthorizationServerMetadata
@@ -230,7 +232,7 @@ export class VcIssuer<DIDDoc extends object> {
       if (!this.uris) {
         throw Error('No URI state manager set, whilst apparently credential offer URIs are being used')
       }
-      const credentialOfferCorrelationId = uuid.uuid() // TODO allow to be supplied
+      const credentialOfferCorrelationId = shortUUID.generate()// TODO allow to be supplied
       credentialOfferObject.credential_offer_uri = opts.credentialOfferUri ?? `${issuerPayloadUri}/${credentialOfferCorrelationId}` // TODO how is this going to work with auth code flow?
       await this.uris.set(credentialOfferObject.credential_offer_uri, {
         uri: credentialOfferObject.credential_offer_uri,

packages/issuer/lib/__tests__/VcIssuer.spec.ts

@@ -722,9 +722,9 @@ describe('VcIssuer without did', () => {
       baseUri: 'issuer-example.com'
     })
 
-    expect(result.uri).toMatch(/http:\/\/issuer-example\.com\?credential_offer_uri=https%3A%2F%2Fexample\.com%2Fapi%2Fcredentials%3Fid%3D[\w-]+/)
+    expect(result.uri).toMatch(/http:\/\/issuer-example\.com\?credential_offer_uri=https%3A%2F%2Fexample\.com%2Fapi%2Fcredentials%2F[\w-]+/)
     expect(result.session).toBeDefined()
-    expect(result.session.credentialOffer.credential_offer_uri).toMatch(/https:\/\/example\.com\/api\/credentials\?id=[\w-]+/)
+    expect(result.session.credentialOffer.credential_offer_uri).toMatch(/https:\/\/example\.com\/api\/credentials\/[\w-]+/)
   })
 
   it('should throw error if issuePayloadPath is missing with by_uri_reference mode', async () => {

packages/oid4vci-common/lib/functions/Encoding.ts

@@ -98,34 +98,35 @@ export function convertURIToJsonObject(uri: string, opts?: DecodeURIAsJsonOpts):
 }
 
 export function decodeJsonProperties(parts: string[] | string[][]): unknown {
-  const json: { [s: string]: unknown } | ArrayLike<unknown> = {};
+  const result: { [s: string]: unknown } | ArrayLike<unknown> = {};
   for (const key in parts) {
     const value = parts[key];
     if (!value) {
       continue;
     }
     if (Array.isArray(value)) {
-      // if (value.length > 1) {
-      json[decodeURIComponent(key)] = value.map((v) => decodeURIComponent(v));
-      /*} else {
-        json[decodeURIComponent(key)] = decodeURIComponent(value[0]);
-      }*/
+      result[decodeURIComponent(key)] = value.map((v) => decodeURIComponent(v));
+      continue
     }
+
     const isBool = typeof value == 'boolean';
     const isNumber = typeof value == 'number';
     const isString = typeof value == 'string';
+    const isObject = typeof value == 'object';
     if (isBool || isNumber) {
-      json[decodeURIComponent(key)] = value;
+      result[decodeURIComponent(key)] = value;
     } else if (isString) {
       const decoded = decodeURIComponent(value);
       if (decoded.startsWith('{') && decoded.endsWith('}')) {
-        json[decodeURIComponent(key)] = JSON.parse(decoded);
+        result[decodeURIComponent(key)] = JSON.parse(decoded);
       } else {
-        json[decodeURIComponent(key)] = decoded;
+        result[decodeURIComponent(key)] = decoded;
       }
+    } else if(isObject) {
+      result[decodeURIComponent(key)] = decodeJsonProperties(value)
     }
   }
-  return json;
+  return result;
 }
 
 /**