feat: Add SIOP OID4VP module to OID4VC packages

Sphereon-Opensource · Jan 21, 2024 · 4d3bf69 · 4d3bf69
1 parent 5bfdb41
commit 4d3bf69
Show file tree

Hide file tree

Showing 170 changed files with 25,149 additions and 315 deletions.
diff --git a/lerna.json b/lerna.json
@@ -2,7 +2,7 @@
   "packages": [
     "packages/*"
   ],
-  "version": "0.8.1",
+  "version": "0.10.0",
   "npmClient": "pnpm",
   "command": {
     "publish": {

diff --git a/package.json b/package.json
@@ -20,10 +20,12 @@
     "publish:unstable": "lerna publish --conventional-prerelease --force-publish --canary --no-git-tag-version --include-merged-tags --preid unstable --pre-dist-tag unstable --yes --registry https://registry.npmjs.org"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "resolutions": {
-    "node-fetch": "2.6.12"
+    "node-fetch": "2.6.12",
+    "isomorphic-webcrypto": "npm:@sphereon/isomorphic-webcrypto@^2.4.0-unstable.4",
+    "eslint>strip-ansi": "6.0.1"
   },
   "prettier": {
     "endOfLine": "auto",
@@ -43,7 +45,7 @@
     "prettier": "^3.0.1",
     "rimraf": "^5.0.1",
     "ts-jest": "^29.1.1",
-    "typescript": "4.9.5"
+    "typescript": "^5.3.3"
   },
   "keywords": [
     "Sphereon",

diff --git a/packages/callback-example/lib/IssuerCallback.ts b/packages/callback-example/lib/IssuerCallback.ts
@@ -3,7 +3,7 @@ import { Ed25519Signature2020 } from '@digitalcredentials/ed25519-signature-2020
 import { Ed25519VerificationKey2020 } from '@digitalcredentials/ed25519-verification-key-2020'
 import { securityLoader } from '@digitalcredentials/security-document-loader'
 import vc from '@digitalcredentials/vc'
-import { CredentialRequestV1_0_11 } from '@sphereon/oid4vci-common'
+import { CredentialRequestV1_0_11 } from '@sphereon/oid4vc-common'
 import { CredentialIssuanceInput } from '@sphereon/oid4vci-issuer'
 import { W3CVerifiableCredential } from '@sphereon/ssi-types'
 

diff --git a/packages/callback-example/lib/__tests__/issuerCallback.spec.ts b/packages/callback-example/lib/__tests__/issuerCallback.spec.ts
@@ -1,6 +1,5 @@
 import { KeyObject } from 'crypto'
 
-import { CredentialRequestClient, CredentialRequestClientBuilder, ProofOfPossessionBuilder } from '@sphereon/oid4vci-client'
 import {
   Alg,
   CNonceState,
@@ -11,8 +10,9 @@ import {
   JwtVerifyResult,
   OpenId4VCIVersion,
   ProofOfPossession,
-} from '@sphereon/oid4vci-common'
-import { CredentialOfferSession } from '@sphereon/oid4vci-common/dist'
+} from '@sphereon/oid4vc-common'
+import { CredentialOfferSession } from '@sphereon/oid4vc-common/dist'
+import { CredentialRequestClient, CredentialRequestClientBuilder, ProofOfPossessionBuilder } from '@sphereon/oid4vci-client'
 import { CredentialSupportedBuilderV1_11, VcIssuer, VcIssuerBuilder } from '@sphereon/oid4vci-issuer'
 import { MemoryStates } from '@sphereon/oid4vci-issuer'
 import { CredentialDataSupplierResult } from '@sphereon/oid4vci-issuer/dist/types'

diff --git a/packages/callback-example/package.json b/packages/callback-example/package.json
@@ -16,9 +16,9 @@
     "@digitalcredentials/security-document-loader": "^1.0.0",
     "@digitalcredentials/vc": "^5.0.0",
     "@sphereon/oid4vci-client": "workspace:*",
-    "@sphereon/oid4vci-common": "workspace:*",
+    "@sphereon/oid4vc-common": "workspace:*",
     "@sphereon/oid4vci-issuer": "workspace:*",
-    "@sphereon/ssi-types": "0.17.6-unstable.69",
+    "@sphereon/ssi-types": "0.18.1",
     "jose": "^4.10.0"
   },
   "devDependencies": {

diff --git a/packages/client/lib/AccessTokenClient.ts b/packages/client/lib/AccessTokenClient.ts
@@ -14,7 +14,7 @@ import {
   TokenErrorResponse,
   toUniformCredentialOfferRequest,
   UniformCredentialOfferPayload,
-} from '@sphereon/oid4vci-common';
+} from '@sphereon/oid4vc-common';
 import { ObjectUtils } from '@sphereon/ssi-types';
 import Debug from 'debug';
 

diff --git a/packages/client/lib/AuthorizationDetailsBuilder.ts b/packages/client/lib/AuthorizationDetailsBuilder.ts
@@ -1,4 +1,4 @@
-import { AuthorizationDetails, AuthorizationDetailsJwtVcJson, OID4VCICredentialFormat } from '@sphereon/oid4vci-common';
+import { AuthorizationDetails, AuthorizationDetailsJwtVcJson, OID4VCICredentialFormat } from '@sphereon/oid4vc-common';
 
 //todo: refactor this builder to be able to create ldp details as well
 export class AuthorizationDetailsBuilder {

diff --git a/packages/client/lib/CredentialOfferClient.ts b/packages/client/lib/CredentialOfferClient.ts
@@ -7,7 +7,7 @@ import {
   determineSpecVersionFromURI,
   OpenId4VCIVersion,
   toUniformCredentialOfferRequest,
-} from '@sphereon/oid4vci-common';
+} from '@sphereon/oid4vc-common';
 import Debug from 'debug';
 
 import { convertJsonToURI, convertURIToJsonObject } from './functions';

diff --git a/packages/client/lib/CredentialRequestClient.ts b/packages/client/lib/CredentialRequestClient.ts
@@ -10,7 +10,7 @@ import {
   ProofOfPossession,
   UniformCredentialRequest,
   URL_NOT_VALID,
-} from '@sphereon/oid4vci-common';
+} from '@sphereon/oid4vc-common';
 import { CredentialFormat } from '@sphereon/ssi-types';
 import Debug from 'debug';
 

diff --git a/packages/client/lib/CredentialRequestClientBuilder.ts b/packages/client/lib/CredentialRequestClientBuilder.ts
@@ -10,7 +10,7 @@ import {
   OID4VCICredentialFormat,
   OpenId4VCIVersion,
   UniformCredentialOfferRequest,
-} from '@sphereon/oid4vci-common';
+} from '@sphereon/oid4vc-common';
 import { CredentialFormat } from '@sphereon/ssi-types';
 
 import { CredentialOfferClient } from './CredentialOfferClient';

diff --git a/packages/client/lib/MetadataClient.ts b/packages/client/lib/MetadataClient.ts
@@ -8,7 +8,7 @@ import {
   getIssuerFromCredentialOfferPayload,
   OpenIDResponse,
   WellKnownEndpoints,
-} from '@sphereon/oid4vci-common';
+} from '@sphereon/oid4vc-common';
 import Debug from 'debug';
 
 import { getJson } from './functions';

diff --git a/packages/client/lib/OpenID4VCIClient.ts b/packages/client/lib/OpenID4VCIClient.ts
@@ -19,7 +19,7 @@ import {
   ProofOfPossessionCallbacks,
   PushedAuthorizationResponse,
   ResponseType,
-} from '@sphereon/oid4vci-common';
+} from '@sphereon/oid4vc-common';
 import { CredentialFormat } from '@sphereon/ssi-types';
 import Debug from 'debug';
 

diff --git a/packages/client/lib/ProofOfPossessionBuilder.ts b/packages/client/lib/ProofOfPossessionBuilder.ts
@@ -10,7 +10,7 @@ import {
   ProofOfPossession,
   ProofOfPossessionCallbacks,
   Typ,
-} from '@sphereon/oid4vci-common';
+} from '@sphereon/oid4vc-common';
 
 import { createProofOfPossession } from './functions';
 

diff --git a/packages/client/lib/__tests__/AccessTokenClient.spec.ts b/packages/client/lib/__tests__/AccessTokenClient.spec.ts
@@ -1,4 +1,4 @@
-import { AccessTokenRequest, AccessTokenResponse, GrantTypes, OpenIDResponse, WellKnownEndpoints } from '@sphereon/oid4vci-common';
+import { AccessTokenRequest, AccessTokenResponse, GrantTypes, OpenIDResponse, WellKnownEndpoints } from '@sphereon/oid4vc-common';
 import nock from 'nock';
 
 import { AccessTokenClient } from '../AccessTokenClient';

diff --git a/packages/client/lib/__tests__/AuthorizationDetailsBuilder.spec.ts b/packages/client/lib/__tests__/AuthorizationDetailsBuilder.spec.ts
@@ -1,4 +1,4 @@
-import { OID4VCICredentialFormat } from '@sphereon/oid4vci-common';
+import { OID4VCICredentialFormat } from '@sphereon/oid4vc-common';
 
 import { AuthorizationDetailsBuilder } from '../AuthorizationDetailsBuilder';
 

diff --git a/packages/client/lib/__tests__/AuthzFlowType.spec.ts b/packages/client/lib/__tests__/AuthzFlowType.spec.ts
@@ -1,4 +1,4 @@
-import { AuthzFlowType, CredentialOfferPayload } from '@sphereon/oid4vci-common';
+import { AuthzFlowType, CredentialOfferPayload } from '@sphereon/oid4vc-common';
 
 //todo: this file is just testing v9, we probably want to add v11 tests here as well
 describe('Authorization Flow Type determination', () => {

diff --git a/packages/client/lib/__tests__/CredentialRequestClient.spec.ts b/packages/client/lib/__tests__/CredentialRequestClient.spec.ts
@@ -10,7 +10,7 @@ import {
   ProofOfPossession,
   URL_NOT_VALID,
   WellKnownEndpoints,
-} from '@sphereon/oid4vci-common';
+} from '@sphereon/oid4vc-common';
 import * as jose from 'jose';
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore

diff --git a/packages/client/lib/__tests__/CredentialRequestClientBuilder.spec.ts b/packages/client/lib/__tests__/CredentialRequestClientBuilder.spec.ts
@@ -8,7 +8,7 @@ import {
   OpenId4VCIVersion,
   ProofOfPossession,
   UniformCredentialRequest,
-} from '@sphereon/oid4vci-common';
+} from '@sphereon/oid4vc-common';
 import * as jose from 'jose';
 
 import { CredentialRequestClientBuilder, ProofOfPossessionBuilder } from '..';

diff --git a/packages/client/lib/__tests__/EBSIE2E.spec.test.ts b/packages/client/lib/__tests__/EBSIE2E.spec.test.ts
@@ -1,4 +1,4 @@
-import { Alg, CodeChallengeMethod, Jwt } from '@sphereon/oid4vci-common';
+import { Alg, CodeChallengeMethod, Jwt } from '@sphereon/oid4vc-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

diff --git a/packages/client/lib/__tests__/IT.spec.ts b/packages/client/lib/__tests__/IT.spec.ts
@@ -6,7 +6,7 @@ import {
   OpenId4VCIVersion,
   ProofOfPossession,
   WellKnownEndpoints,
-} from '@sphereon/oid4vci-common';
+} from '@sphereon/oid4vc-common';
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import nock from 'nock';

diff --git a/packages/client/lib/__tests__/IssuanceInitiation.spec.ts b/packages/client/lib/__tests__/IssuanceInitiation.spec.ts
@@ -1,4 +1,4 @@
-import { OpenId4VCIVersion } from '@sphereon/oid4vci-common';
+import { OpenId4VCIVersion } from '@sphereon/oid4vc-common';
 
 import { CredentialOfferClient } from '../CredentialOfferClient';
 

diff --git a/packages/client/lib/__tests__/JsonURIConversions.spec.ts b/packages/client/lib/__tests__/JsonURIConversions.spec.ts
@@ -1,4 +1,4 @@
-import { convertJsonToURI, convertURIToJsonObject, OpenId4VCIVersion } from '@sphereon/oid4vci-common';
+import { convertJsonToURI, convertURIToJsonObject, OpenId4VCIVersion } from '@sphereon/oid4vc-common';
 
 describe('JSON To URI v8', () => {
   it('should parse an object into open-id-URI with a single credential_type', () => {

diff --git a/packages/client/lib/__tests__/MattrE2E.spec.test.ts b/packages/client/lib/__tests__/MattrE2E.spec.test.ts
@@ -1,4 +1,4 @@
-import { Alg, Jwt } from '@sphereon/oid4vci-common';
+import { Alg, Jwt } from '@sphereon/oid4vc-common';
 import { CredentialMapper } from '@sphereon/ssi-types';
 import { fetch } from 'cross-fetch';
 import { importJWK, JWK, SignJWT } from 'jose';

diff --git a/packages/client/lib/__tests__/MetadataClient.spec.ts b/packages/client/lib/__tests__/MetadataClient.spec.ts
@@ -1,4 +1,4 @@
-import { getIssuerFromCredentialOfferPayload, WellKnownEndpoints } from '@sphereon/oid4vci-common';
+import { getIssuerFromCredentialOfferPayload, WellKnownEndpoints } from '@sphereon/oid4vc-common';
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import nock from 'nock';

diff --git a/packages/client/lib/__tests__/MetadataMocks.ts b/packages/client/lib/__tests__/MetadataMocks.ts
@@ -1,4 +1,4 @@
-import { AuthzFlowType, CredentialOfferRequestWithBaseUrl } from '@sphereon/oid4vci-common';
+import { AuthzFlowType, CredentialOfferRequestWithBaseUrl } from '@sphereon/oid4vc-common';
 
 export const IDENTIPROOF_ISSUER_URL = 'https://issuer.research.identiproof.io';
 export const IDENTIPROOF_AS_URL = 'https://auth.research.identiproof.io';

diff --git a/packages/client/lib/__tests__/OpenID4VCIClient.spec.ts b/packages/client/lib/__tests__/OpenID4VCIClient.spec.ts
@@ -1,4 +1,4 @@
-import { CodeChallengeMethod, WellKnownEndpoints } from '@sphereon/oid4vci-common';
+import { CodeChallengeMethod, WellKnownEndpoints } from '@sphereon/oid4vc-common';
 // eslint-disable-next-line @typescript-eslint/ban-ts-comment
 // @ts-ignore
 import nock from 'nock';

diff --git a/packages/client/lib/__tests__/OpenID4VCIClientPAR.spec.ts b/packages/client/lib/__tests__/OpenID4VCIClientPAR.spec.ts
@@ -1,4 +1,4 @@
-import { CodeChallengeMethod, WellKnownEndpoints } from '@sphereon/oid4vci-common';
+import { CodeChallengeMethod, WellKnownEndpoints } from '@sphereon/oid4vc-common';
 import nock from 'nock';
 
 import { OpenID4VCIClient } from '../OpenID4VCIClient';

diff --git a/packages/client/lib/__tests__/ProofOfPossessionBuilder.spec.ts b/packages/client/lib/__tests__/ProofOfPossessionBuilder.spec.ts
@@ -1,6 +1,6 @@
 import { KeyObject } from 'crypto';
 
-import { Alg, JWS_NOT_VALID, Jwt, NO_JWT_PROVIDED, OpenId4VCIVersion, PROOF_CANT_BE_CONSTRUCTED, ProofOfPossession } from '@sphereon/oid4vci-common';
+import { Alg, JWS_NOT_VALID, Jwt, NO_JWT_PROVIDED, OpenId4VCIVersion, PROOF_CANT_BE_CONSTRUCTED, ProofOfPossession } from '@sphereon/oid4vc-common';
 import * as jose from 'jose';
 
 import { ProofOfPossessionBuilder } from '..';

diff --git a/packages/client/lib/__tests__/SdJwt.spec.ts b/packages/client/lib/__tests__/SdJwt.spec.ts
@@ -1,4 +1,4 @@
-import { AccessTokenRequest, CredentialRequestV1_0_11, CredentialSupportedSdJwtVc } from '@sphereon/oid4vci-common';
+import { AccessTokenRequest, CredentialRequestV1_0_11, CredentialSupportedSdJwtVc } from '@sphereon/oid4vc-common';
 import nock from 'nock';
 
 import { OpenID4VCIClient } from '..';

diff --git a/packages/client/lib/__tests__/SphereonE2E.spec.test.ts b/packages/client/lib/__tests__/SphereonE2E.spec.test.ts
@@ -1,6 +1,6 @@
 import * as crypto from 'crypto';
 
-import { Alg, Jwt, ProofOfPossessionCallbacks } from '@sphereon/oid4vci-common';
+import { Alg, Jwt, ProofOfPossessionCallbacks } from '@sphereon/oid4vc-common';
 import { CredentialMapper } from '@sphereon/ssi-types';
 import * as didts from '@transmute/did-key.js';
 import { fetch } from 'cross-fetch';

diff --git a/packages/client/lib/__tests__/data/VciDataFixtures.ts b/packages/client/lib/__tests__/data/VciDataFixtures.ts
@@ -1,4 +1,4 @@
-import { CredentialSupportedFormatV1_0_08, IssuerCredentialSubjectDisplay, IssuerMetadataV1_0_08 } from '@sphereon/oid4vci-common';
+import { CredentialSupportedFormatV1_0_08, IssuerCredentialSubjectDisplay, IssuerMetadataV1_0_08 } from '@sphereon/oid4vc-common';
 import { ICredentialStatus, W3CVerifiableCredential } from '@sphereon/ssi-types';
 
 export function getMockData(issuerName: string): IssuerMockData | null {

diff --git a/packages/client/lib/functions/ProofUtil.ts b/packages/client/lib/functions/ProofUtil.ts
@@ -9,7 +9,7 @@ import {
   ProofOfPossession,
   ProofOfPossessionCallbacks,
   Typ,
-} from '@sphereon/oid4vci-common';
+} from '@sphereon/oid4vc-common';
 import Debug from 'debug';
 
 const debug = Debug('sphereon:openid4vci:token');

diff --git a/packages/client/lib/functions/index.ts b/packages/client/lib/functions/index.ts
@@ -1,3 +1,3 @@
-export * from '@sphereon/oid4vci-common/dist/functions/Encoding';
-export * from '@sphereon/oid4vci-common/dist/functions/HttpUtils';
+export * from '@sphereon/oid4vc-common/dist/functions/Encoding';
+export * from '@sphereon/oid4vc-common/dist/functions/HttpUtils';
 export * from './ProofUtil';
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -15,8 +15,8 @@
     "build": "tsc"
   },
   "dependencies": {
-    "@sphereon/oid4vci-common": "workspace:*",
-    "@sphereon/ssi-types": "0.17.6-unstable.69",
+    "@sphereon/oid4vc-common": "workspace:*",
+    "@sphereon/ssi-types": "0.18.1",
     "cross-fetch": "^3.1.8",
     "debug": "^4.3.4"
   },

diff --git a/packages/common/CHANGELOG.md b/packages/common/CHANGELOG.md
@@ -5,11 +5,11 @@ See [Conventional Commits](https://conventionalcommits.org) for commit guideline
 
 ## [0.8.1](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.3...v0.8.1) (2023-10-14)
 
-**Note:** Version bump only for package @sphereon/oid4vci-common
+**Note:** Version bump only for package @sphereon/oid4vc-common
 
 ## [0.7.3](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.2...v0.7.3) (2023-09-30)
 
-**Note:** Version bump only for package @sphereon/oid4vci-common
+**Note:** Version bump only for package @sphereon/oid4vc-common
 
 ## [0.7.2](https://github.com/Sphereon-Opensource/OID4VCI/compare/v0.7.1...v0.7.2) (2023-09-28)
 

diff --git a/packages/common/lib/types/Authorization.types.ts b/packages/common/lib/types/Authorization.types.ts
@@ -156,6 +156,8 @@ export enum Encoding {
 
 export enum ResponseType {
   AUTH_CODE = 'code',
+  ID_TOKEN = 'id_token',
+  VP_TOKEN = 'vp_token',
 }
 
 export enum CodeChallengeMethod {

diff --git a/packages/common/package.json b/packages/common/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "@sphereon/oid4vci-common",
+  "name": "@sphereon/oid4vc-common",
   "version": "0.8.1",
-  "description": "OpenID 4 Verifiable Credential Issuance Common Types",
+  "description": "OpenID 4 Verifiable Credentials Common Types",
   "source": "lib/index.ts",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -10,16 +10,16 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/ssi-types": "0.17.6-unstable.69",
+    "@sphereon/ssi-types": "0.18.1",
     "cross-fetch": "^3.1.8",
     "jwt-decode": "^3.1.2"
   },
   "devDependencies": {
     "@types/jest": "^29.5.3",
-    "typescript": "5.0.4"
+    "typescript": "5.3.3"
   },
   "engines": {
-    "node": ">=16"
+    "node": ">=18"
   },
   "files": [
     "lib/**/*",

diff --git a/packages/issuer-rest/lib/IssuerTokenEndpoint.ts b/packages/issuer-rest/lib/IssuerTokenEndpoint.ts
@@ -1,4 +1,4 @@
-import { GrantTypes, PRE_AUTHORIZED_CODE_REQUIRED_ERROR, TokenError, TokenErrorResponse } from '@sphereon/oid4vci-common'
+import { GrantTypes, PRE_AUTHORIZED_CODE_REQUIRED_ERROR, TokenError, TokenErrorResponse } from '@sphereon/oid4vc-common'
 import { assertValidAccessTokenRequest, createAccessTokenResponse, ITokenEndpointOpts, VcIssuer } from '@sphereon/oid4vci-issuer'
 import { sendErrorResponse } from '@sphereon/ssi-express-support'
 import { NextFunction, Request, Response } from 'express'

diff --git a/packages/issuer-rest/lib/OID4VCIServer.ts b/packages/issuer-rest/lib/OID4VCIServer.ts
@@ -7,7 +7,7 @@ import {
   IssuerCredentialSubjectDisplay,
   OID4VCICredentialFormat,
   QRCodeOpts,
-} from '@sphereon/oid4vci-common'
+} from '@sphereon/oid4vc-common'
 import { CredentialSupportedBuilderV1_11, ITokenEndpointOpts, VcIssuer, VcIssuerBuilder } from '@sphereon/oid4vci-issuer'
 import { ExpressSupport, HasEndpointOpts, ISingleEndpointOpts } from '@sphereon/ssi-express-support'
 import express, { Express } from 'express'

diff --git a/packages/issuer-rest/lib/__tests__/ClientIssuerIT.spec.ts b/packages/issuer-rest/lib/__tests__/ClientIssuerIT.spec.ts
@@ -1,7 +1,6 @@
 import { KeyObject } from 'crypto'
 
 import * as didKeyDriver from '@digitalcredentials/did-method-key'
-import { OpenID4VCIClient } from '@sphereon/oid4vci-client'
 import {
   AccessTokenResponse,
   Alg,
@@ -12,7 +11,8 @@ import {
   JWTHeader,
   JWTPayload,
   OpenId4VCIVersion,
-} from '@sphereon/oid4vci-common'
+} from '@sphereon/oid4vc-common'
+import { OpenID4VCIClient } from '@sphereon/oid4vci-client'
 import { VcIssuer } from '@sphereon/oid4vci-issuer/dist/VcIssuer'
 import { CredentialSupportedBuilderV1_11, VcIssuerBuilder } from '@sphereon/oid4vci-issuer/dist/builder'
 import { MemoryStates } from '@sphereon/oid4vci-issuer/dist/state-manager'

diff --git a/packages/issuer-rest/lib/__tests__/IssuerTokenServer.spec.ts b/packages/issuer-rest/lib/__tests__/IssuerTokenServer.spec.ts
@@ -9,7 +9,7 @@ import {
   Jwt,
   STATE_MISSING_ERROR,
   URIState,
-} from '@sphereon/oid4vci-common'
+} from '@sphereon/oid4vc-common'
 import { VcIssuer } from '@sphereon/oid4vci-issuer'
 import { MemoryStates } from '@sphereon/oid4vci-issuer/dist/state-manager'
 import { ExpressBuilder, ExpressSupport } from '@sphereon/ssi-express-support'

diff --git a/packages/issuer-rest/lib/oid4vci-api-functions.ts b/packages/issuer-rest/lib/oid4vci-api-functions.ts
@@ -12,8 +12,8 @@ import {
   IssueStatusResponse,
   JWT_SIGNER_CALLBACK_REQUIRED_ERROR,
   TokenErrorResponse,
-} from '@sphereon/oid4vci-common'
-import { adjustUrl, trimBoth, trimEnd, trimStart } from '@sphereon/oid4vci-common/dist/functions/HttpUtils'
+} from '@sphereon/oid4vc-common'
+import { adjustUrl, trimBoth, trimEnd, trimStart } from '@sphereon/oid4vc-common/dist/functions/HttpUtils'
 import { ITokenEndpointOpts, VcIssuer } from '@sphereon/oid4vci-issuer'
 import { env, ISingleEndpointOpts, sendErrorResponse } from '@sphereon/ssi-express-support'
 import { CredentialFormat } from '@sphereon/ssi-types'