chore: made tests pass again

Author: sanderPostma

packages/callback-example/lib/__tests__/issuerCallback.spec.ts

@@ -1,11 +1,7 @@
 import { KeyObject } from 'crypto'
 
 import { uuidv4 } from '@sphereon/oid4vc-common'
-import {
-  CredentialRequestClientBuilder,
-  CredentialRequestClientBuilderV1_0_15,
-  ProofOfPossessionBuilder
-} from '@sphereon/oid4vci-client'
+import { CredentialRequestClientBuilderV1_0_15, ProofOfPossessionBuilder } from '@sphereon/oid4vci-client'
 import {
   Alg,
   CNonceState,
@@ -21,7 +17,6 @@ import {
 } from '@sphereon/oid4vci-common'
 import {
   AuthorizationServerMetadataBuilder,
-  CredentialDataSupplierResult,
   CredentialSupportedBuilderV1_15,
   MemoryStates,
   VcIssuer,
@@ -172,7 +167,7 @@ describe('issuerCallback', () => {
     })
 
     const nonces = new MemoryStates<CNonceState>()
-    await nonces.set('test_value', { cNonce: 'test_value', createdAt: +new Date(), issuerState: 'existing-state' })
+    await nonces.set('test_value', { cNonce: 'test_value', createdAt: +new Date() })
     vcIssuer = new VcIssuerBuilder()
       .withAuthorizationServers('https://authorization-server')
       .withCredentialEndpoint('https://credential-endpoint')
@@ -309,6 +304,10 @@ describe('issuerCallback', () => {
 
     const credentialResponse = await vcIssuer.issueCredential({
       credentialRequest: credentialRequest,
+      issuerCorrelation: {
+        preAuthorizedCode: 'test_code',
+        issuerState: 'existing-state'
+      },
       credential,
       responseCNonce: state,
       credentialSignerCallback: getIssuerCallbackV1_0_15(credential, credentialRequest, didKey.keyPairs, didKey.didDocument.verificationMethod[0].id)

packages/issuer/lib/VcIssuer.ts

@@ -691,24 +691,21 @@ export class VcIssuer {
       const issuer_state = 'issuer_state' in credentialRequest && credentialRequest.issuer_state
         ? credentialRequest.issuer_state : issuerCorrelation.issuerState
       if (!nonce && !issuer_state) {
-        throw Error('No nonce was found in the Proof of Possession')
+        throw Error('No nonce or issuer_state was found in the Proof of Possession')
       }
-      let createdAt: number
+
+      let createdAt: number = +new Date()
       let cNonceState: CNonceState | undefined
       if (nonce) {
         cNonceState = await this.cNonces.getAsserted(nonce)
-/*
-        preAuthorizedCode = cNonceState.preAuthorizedCode
-        issuerState = cNonceState.issuerState
-*/
         createdAt = cNonceState.createdAt
-      } else if (issuer_state) {
+      }
+      if (issuer_state) {
         const session = await this._credentialOfferSessions.getAsserted(issuer_state as string)
         issuerState = issuer_state as string | undefined
         createdAt = session.createdAt
-      } else {
-        throw Error('No nonce or issuer_state was found in the Proof of Possession')
       }
+
       // The verify callback should set the correct values, but let's look at the JWT ourselves to to be sure
       const alg = jwtVerifyResult.alg ?? header.alg
       const kid = jwtVerifyResult.kid ?? header.kid