chore: test fix

Sphereon-Opensource · Dec 21, 2023 · a504fb2 · a504fb2
1 parent c44107f
commit a504fb2
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 22 deletions.
diff --git a/packages/client/lib/OpenID4VCIClient.ts b/packages/client/lib/OpenID4VCIClient.ts
@@ -60,7 +60,7 @@ export class OpenID4VCIClient {
     clientId,
     kid,
     alg,
-    credentialIssuer
+    credentialIssuer,
   }: {
     credentialOffer?: CredentialOfferRequestWithBaseUrl;
     kid?: string;
@@ -69,12 +69,11 @@ export class OpenID4VCIClient {
     credentialIssuer?: string;
   }) {
     this._credentialOffer = credentialOffer;
-    const issuer =
-      credentialIssuer ?? (credentialOffer ? getIssuerFromCredentialOfferPayload(credentialOffer.credential_offer) : undefined);
+    const issuer = credentialIssuer ?? (credentialOffer ? getIssuerFromCredentialOfferPayload(credentialOffer.credential_offer) : undefined);
     if (!issuer) {
-      throw Error('No credential issuer supplied or deduced from offer')
+      throw Error('No credential issuer supplied or deduced from offer');
     }
-    this._credentialIssuer = issuer
+    this._credentialIssuer = issuer;
     this._kid = kid;
     this._alg = alg;
     this._clientId = clientId;
@@ -154,7 +153,7 @@ export class OpenID4VCIClient {
       const creds = this.credentialOffer.credential_offer.credentials;
 
       authorizationDetails = creds
-        .flatMap((cred) => (typeof cred === 'string' ? this.getCredentialsSupported(true) : cred as CredentialSupported))
+        .flatMap((cred) => (typeof cred === 'string' ? this.getCredentialsSupported(true) : (cred as CredentialSupported)))
         .map((cred) => {
           return {
             ...cred,

diff --git a/packages/client/lib/__tests__/EBSIE2E.spec.test.ts b/packages/client/lib/__tests__/EBSIE2E.spec.test.ts
@@ -1,15 +1,15 @@
-import { Alg, CodeChallengeMethod, Jwt } from '@sphereon/oid4vci-common'
-import { toJwk } from '@sphereon/ssi-sdk-ext.key-utils'
-import { CredentialMapper } from '@sphereon/ssi-types'
+import { Alg, CodeChallengeMethod, Jwt } from '@sphereon/oid4vci-common';
+import { toJwk } from '@sphereon/ssi-sdk-ext.key-utils';
+import { CredentialMapper } from '@sphereon/ssi-types';
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 //@ts-ignore
-import { from } from '@trust/keyto'
-import { fetch } from 'cross-fetch'
-import debug from 'debug'
-import { base64url, importJWK, JWK, SignJWT } from 'jose'
-import * as u8a from 'uint8arrays'
+import { from } from '@trust/keyto';
+import { fetch } from 'cross-fetch';
+import debug from 'debug';
+import { base64url, importJWK, JWK, SignJWT } from 'jose';
+import * as u8a from 'uint8arrays';
 
-import { OpenID4VCIClient } from '..'
+import { OpenID4VCIClient } from '..';
 
 export const UNIT_TEST_TIMEOUT = 30000;
 
@@ -60,17 +60,21 @@ describe('OID4VCI-Client using Sphereon issuer should', () => {
       uri: offer,
       kid,
       alg: Alg.ES256,
-      clientId: DID_URL_ENCODED
+      clientId: DID_URL_ENCODED,
     });
     expect(client.credentialOffer).toBeDefined();
     expect(client.endpointMetadata).toBeDefined();
     expect(client.getCredentialEndpoint()).toEqual(`${ISSUER_URL}/credential`);
     expect(client.getAccessTokenEndpoint()).toEqual(`${AUTH_URL}/token`);
 
     if (credentialType !== 'CTWalletCrossPreAuthorised') {
-      const url = client.createAuthorizationRequestUrl({redirectUri: 'openid4vc%3A', codeChallenge: 'mE2kPHmIprOqtkaYmESWj35yz-PB5vzdiSu0tAZ8sqs', codeChallengeMethod: CodeChallengeMethod.SHA256})
-      const result = await fetch(url)
-      console.log(result.text())
+      const url = client.createAuthorizationRequestUrl({
+        redirectUri: 'openid4vc%3A',
+        codeChallenge: 'mE2kPHmIprOqtkaYmESWj35yz-PB5vzdiSu0tAZ8sqs',
+        codeChallengeMethod: CodeChallengeMethod.SHA256,
+      });
+      const result = await fetch(url);
+      console.log(result.text());
     }
 
     const accessToken = await client.acquireAccessToken({ pin: '0891' });
@@ -90,7 +94,7 @@ describe('OID4VCI-Client using Sphereon issuer should', () => {
       },
       kid,
     });
-    console.log(JSON.stringify(credentialResponse, null, 2))
+    console.log(JSON.stringify(credentialResponse, null, 2));
     expect(credentialResponse.credential).toBeDefined();
     const wrappedVC = CredentialMapper.toWrappedVerifiableCredential(credentialResponse.credential!);
     expect(format.startsWith(wrappedVC.format)).toEqual(true);
@@ -99,7 +103,7 @@ describe('OID4VCI-Client using Sphereon issuer should', () => {
   it(
     'succeed in a full flow with the client using OpenID4VCI version 11 and jwt_vc_json',
     async () => {
-      await test('CTWalletCrossPreAuthorised')
+      await test('CTWalletCrossPreAuthorised');
       // await test('CTWalletCrossInTime');
     },
     UNIT_TEST_TIMEOUT,

diff --git a/packages/client/lib/__tests__/OpenID4VCIClient.spec.ts b/packages/client/lib/__tests__/OpenID4VCIClient.spec.ts
@@ -68,6 +68,11 @@ describe('OpenID4VCIClient should', () => {
     expect(scope?.[0]).toBe('openid');
   });
   it('throw an error if no scope and no authorization_details is provided', async () => {
+    nock(MOCK_URL).get(/.*/).reply(200, {});
+    nock(MOCK_URL).get(WellKnownEndpoints.OAUTH_AS).reply(404, {});
+    nock(MOCK_URL).get(WellKnownEndpoints.OPENID_CONFIGURATION).reply(404, {});
+    // Use a client with issuer only to trigger the error
+    client = await OpenID4VCIClient.fromCredentialIssuer({ credentialIssuer: 'https://server.example.com' });
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
     client._endpointMetadata?.credentialIssuerMetadata.authorization_endpoint = `${MOCK_URL}v1/auth/authorize`;

diff --git a/packages/common/lib/functions/IssuerMetadataUtils.ts b/packages/common/lib/functions/IssuerMetadataUtils.ts
@@ -43,7 +43,7 @@ export function getSupportedCredential(opts?: {
   }
   const { version, types } = opts ?? { version: OpenId4VCIVersion.VER_1_0_11 };
   if (version === OpenId4VCIVersion.VER_1_0_08 || !Array.isArray(issuerMetadata.credentials_supported)) {
-    credentialsSupported = credentialsSupportedV8ToV11((issuerMetadata as IssuerMetadataV1_0_08).credentials_supported);
+    credentialsSupported = credentialsSupportedV8ToV11((issuerMetadata as IssuerMetadataV1_0_08).credentials_supported ?? {});
   } else {
     credentialsSupported = (issuerMetadata as CredentialIssuerMetadata).credentials_supported;
   }