chore: remove code from wrong branch

Sphereon-Opensource · Feb 8, 2025 · fc43a0c · fc43a0c
1 parent a776819
commit fc43a0c
Show file tree

Hide file tree

Showing 17 changed files with 137 additions and 160 deletions.
diff --git a/packages/ebsi-support/package.json b/packages/ebsi-support/package.json
@@ -15,8 +15,8 @@
   },
   "dependencies": {
     "@ethersproject/random": "^5.7.0",
-    "@sphereon/did-auth-siop": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
-    "@sphereon/did-auth-siop-adapter": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
+    "@sphereon/did-auth-siop": "0.16.1-feature.IATAB2B.52.355",
+    "@sphereon/did-auth-siop-adapter": "0.16.1-feature.IATAB2B.52.355",
     "@sphereon/pex": "5.0.0-unstable.28",
     "@sphereon/pex-models": "^2.3.2",
     "@sphereon/ssi-sdk-ext.did-resolver-ebsi": "0.27.0",
@@ -44,8 +44,8 @@
     "xstate": "^4.38.3"
   },
   "devDependencies": {
-    "@sphereon/oid4vci-client": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
-    "@sphereon/oid4vci-common": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
+    "@sphereon/oid4vci-client": "0.16.1-feature.IATAB2B.52.355",
+    "@sphereon/oid4vci-common": "0.16.1-feature.IATAB2B.52.355",
     "@sphereon/ssi-express-support": "workspace:*",
     "@sphereon/ssi-sdk-ext.key-manager": "0.27.0",
     "@sphereon/ssi-sdk-ext.kms-local": "0.27.0",

diff --git a/packages/mdl-mdoc/package.json b/packages/mdl-mdoc/package.json
@@ -14,7 +14,7 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
+    "@sphereon/did-auth-siop": "0.16.1-feature.IATAB2B.52.355",
     "@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
     "@sphereon/pex": "5.0.0-unstable.28",
     "@sphereon/pex-models": "^2.3.2",
@@ -35,8 +35,8 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@sphereon/oid4vci-client": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
-    "@sphereon/oid4vci-common": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
+    "@sphereon/oid4vci-client": "0.16.1-feature.IATAB2B.52.355",
+    "@sphereon/oid4vci-common": "0.16.1-feature.IATAB2B.52.355",
     "@sphereon/ssi-express-support": "workspace:*",
     "@sphereon/ssi-sdk-ext.key-manager": "0.27.0",
     "@sphereon/ssi-sdk-ext.kms-local": "0.27.0",

diff --git a/packages/oid4vci-holder/package.json b/packages/oid4vci-holder/package.json
@@ -15,9 +15,9 @@
   },
   "dependencies": {
     "@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
-    "@sphereon/did-auth-siop": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
-    "@sphereon/oid4vci-client": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
-    "@sphereon/oid4vci-common": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
+    "@sphereon/did-auth-siop": "0.16.1-feature.IATAB2B.52.355",
+    "@sphereon/oid4vci-client": "0.16.1-feature.IATAB2B.52.355",
+    "@sphereon/oid4vci-common": "0.16.1-feature.IATAB2B.52.355",
     "@sphereon/ssi-sdk-ext.did-utils": "0.27.0",
     "@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.0",
     "@sphereon/ssi-sdk-ext.jwt-service": "0.27.0",
@@ -45,7 +45,7 @@
     "xstate": "^4.38.3"
   },
   "devDependencies": {
-    "@sphereon/oid4vc-common": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
+    "@sphereon/oid4vc-common": "0.16.1-feature.IATAB2B.52.355",
     "@sphereon/ssi-sdk.siopv2-oid4vp-common": "workspace:*",
     "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.27.0",
     "@types/i18n-js": "^3.8.9",

diff --git a/packages/oid4vci-holder/src/link-handler/index.ts b/packages/oid4vci-holder/src/link-handler/index.ts
@@ -1,17 +1,15 @@
 import { CredentialOfferClient } from '@sphereon/oid4vci-client'
-import {
-  AuthorizationRequestOpts,
-  AuthorizationServerClientOpts,
-  AuthzFlowType,
-  convertURIToJsonObject,
-  decodeJsonProperties,
-} from '@sphereon/oid4vci-common'
+import { AuthorizationRequestOpts, AuthorizationServerClientOpts, AuthzFlowType, convertURIToJsonObject } from '@sphereon/oid4vci-common'
 import { DefaultLinkPriorities, LinkHandlerAdapter } from '@sphereon/ssi-sdk.core'
 import { IMachineStatePersistence, interpreterStartOrResume, SerializableState } from '@sphereon/ssi-sdk.xstate-machine-persistence'
 import { IAgentContext } from '@veramo/core'
-import { GetMachineArgs, IOID4VCIHolder, OID4VCIMachineEvents, OID4VCIMachineStateNavigationListener } from '../types/IOID4VCIHolder'
+import {
+  GetMachineArgs,
+  IOID4VCIHolder,
+  OID4VCIMachineEvents,
+  OID4VCIMachineStateNavigationListener
+} from '../types/IOID4VCIHolder'
 import { FirstPartyMachineStateNavigationListener } from '../types/FirstPartyMachine'
-import { fetch } from 'cross-fetch'
 
 /**
  * This handler only handles credential offer links (either by value or by reference)
@@ -26,10 +24,7 @@ export class OID4VCIHolderLinkHandler extends LinkHandlerAdapter {
   private readonly trustAnchors?: Array<string>
 
   constructor(
-    args: Pick<
-      GetMachineArgs,
-      'stateNavigationListener' | 'authorizationRequestOpts' | 'clientOpts' | 'trustAnchors' | 'firstPartyStateNavigationListener'
-    > & {
+    args: Pick<GetMachineArgs, 'stateNavigationListener' | 'authorizationRequestOpts' | 'clientOpts' | 'trustAnchors' | 'firstPartyStateNavigationListener'> & {
       priority?: number | DefaultLinkPriorities
       protocols?: Array<string | RegExp>
       noStateMachinePersistence?: boolean
@@ -57,22 +52,7 @@ export class OID4VCIHolderLinkHandler extends LinkHandlerAdapter {
     },
   ): Promise<void> {
     const uri = new URL(url).toString()
-    let offerData = convertURIToJsonObject(uri) as Record<string, unknown>
-    if ('credential_offer_uri' in offerData) {
-      const credentialOfferUri = offerData['credential_offer_uri'] as string
-      const uri = decodeURIComponent(credentialOfferUri)
-      const response = await fetch(uri)
-      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')
-      }
-      offerData = decodeJsonProperties(await response.json()) as Record<string, unknown>
-    }
+    const offerData = convertURIToJsonObject(uri) as Record<string, unknown>
     const hasCode = 'code' in offerData && !!offerData.code && !('issuer' in offerData)
     const code = hasCode ? (offerData.code as string) : undefined
     const clientOpts = { ...this.clientOpts, ...opts?.clientOpts }
@@ -89,7 +69,7 @@ export class OID4VCIHolderLinkHandler extends LinkHandlerAdapter {
       authorizationRequestOpts: { ...this.authorizationRequestOpts, ...opts?.authorizationRequestOpts },
       ...((clientOpts.clientId || clientOpts.clientAssertionType) && { clientOpts: clientOpts as AuthorizationServerClientOpts }),
       stateNavigationListener: this.stateNavigationListener,
-      firstPartyStateNavigationListener: this.firstPartyStateNavigationListener,
+      firstPartyStateNavigationListener: this.firstPartyStateNavigationListener
     })
 
     const interpreter = oid4vciMachine.interpreter

diff --git a/packages/oid4vci-issuer-rest-api/package.json b/packages/oid4vci-issuer-rest-api/package.json
@@ -11,9 +11,9 @@
     "start:dev": "ts-node __tests__/RestAPI.ts"
   },
   "dependencies": {
-    "@sphereon/oid4vci-common": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
-    "@sphereon/oid4vci-issuer": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
-    "@sphereon/oid4vci-issuer-server": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
+    "@sphereon/oid4vci-common": "0.16.1-feature.IATAB2B.52.355",
+    "@sphereon/oid4vci-issuer": "0.16.1-feature.IATAB2B.52.355",
+    "@sphereon/oid4vci-issuer-server": "0.16.1-feature.IATAB2B.52.355",
     "@sphereon/ssi-express-support": "workspace:*",
     "@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.0",
     "@sphereon/ssi-sdk-ext.jwt-service": "0.27.0",

diff --git a/packages/oid4vci-issuer-rest-client/package.json b/packages/oid4vci-issuer-rest-client/package.json
@@ -16,7 +16,7 @@
     "generate-plugin-schema": "ts-node ../../packages/dev/bin/sphereon.js dev generate-plugin-schema"
   },
   "dependencies": {
-    "@sphereon/oid4vci-common": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
+    "@sphereon/oid4vci-common": "0.16.1-feature.IATAB2B.52.355",
     "@sphereon/ssi-types": "workspace:*",
     "@veramo/core": "4.2.0",
     "cross-fetch": "^3.1.8"

diff --git a/packages/oid4vci-issuer-store/package.json b/packages/oid4vci-issuer-store/package.json
@@ -14,7 +14,7 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/oid4vci-common": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
+    "@sphereon/oid4vci-common": "0.16.1-feature.IATAB2B.52.355",
     "@sphereon/ssi-sdk-ext.did-utils": "0.27.0",
     "@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.0",
     "@sphereon/ssi-sdk.kv-store-temp": "workspace:*",

diff --git a/packages/oid4vci-issuer/package.json b/packages/oid4vci-issuer/package.json
@@ -14,8 +14,8 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/oid4vci-common": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
-    "@sphereon/oid4vci-issuer": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
+    "@sphereon/oid4vci-common": "0.16.1-feature.IATAB2B.52.355",
+    "@sphereon/oid4vci-issuer": "0.16.1-feature.IATAB2B.52.355",
     "@sphereon/ssi-sdk-ext.did-utils": "0.27.0",
     "@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.0",
     "@sphereon/ssi-sdk-ext.jwt-service": "0.27.0",
@@ -36,7 +36,7 @@
     "uuid": "^9.0.1"
   },
   "devDependencies": {
-    "@sphereon/did-auth-siop": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
+    "@sphereon/did-auth-siop": "0.16.1-feature.IATAB2B.52.355",
     "@sphereon/did-uni-client": "^0.6.3",
     "@veramo/did-provider-key": "4.2.0",
     "@veramo/did-resolver": "4.2.0",

diff --git a/packages/oid4vci-issuer/src/types/IOID4VCIIssuer.ts b/packages/oid4vci-issuer/src/types/IOID4VCIIssuer.ts
@@ -4,7 +4,6 @@ import {
   CredentialConfigurationSupported,
   CredentialDataSupplierInput,
   CredentialIssuerMetadataOpts,
-  CredentialOfferPayloadMode,
   CredentialOfferSession,
   CredentialRequest,
   CredentialResponse,
@@ -37,7 +36,6 @@ export interface IOID4VCIIssuerOpts {
 }
 
 export interface ICreateOfferArgs extends IIssuerInstanceArgs {
-  credentialOfferPayloadMode: CredentialOfferPayloadMode
   grants?: Grant
   credentials?: Record<string, CredentialConfigurationSupported>
   credentialDefinition?: IssuerCredentialDefinition

diff --git a/packages/siopv2-oid4vp-common/package.json b/packages/siopv2-oid4vp-common/package.json
@@ -12,7 +12,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
+    "@sphereon/did-auth-siop": "0.16.1-feature.IATAB2B.52.355",
     "@sphereon/ssi-sdk.core": "workspace:*",
     "@sphereon/ssi-types": "workspace:*",
     "uint8arrays": "3.1.1"

diff --git a/packages/siopv2-oid4vp-op-auth/package.json b/packages/siopv2-oid4vp-op-auth/package.json
@@ -14,9 +14,9 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
-    "@sphereon/did-auth-siop-adapter": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
-    "@sphereon/oid4vc-common": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
+    "@sphereon/did-auth-siop": "0.16.1-feature.IATAB2B.52.355",
+    "@sphereon/did-auth-siop-adapter": "0.16.1-feature.IATAB2B.52.355",
+    "@sphereon/oid4vc-common": "0.16.1-feature.IATAB2B.52.355",
     "@sphereon/pex": "5.0.0-unstable.28",
     "@sphereon/pex-models": "^2.3.2",
     "@sphereon/ssi-sdk-ext.did-utils": "0.27.0",

diff --git a/packages/siopv2-oid4vp-rp-auth/package.json b/packages/siopv2-oid4vp-rp-auth/package.json
@@ -14,9 +14,9 @@
     "build:clean": "tsc --build --clean && tsc --build"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
-    "@sphereon/did-auth-siop-adapter": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
-    "@sphereon/oid4vc-common": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
+    "@sphereon/did-auth-siop": "0.16.1-feature.IATAB2B.52.355",
+    "@sphereon/did-auth-siop-adapter": "0.16.1-feature.IATAB2B.52.355",
+    "@sphereon/oid4vc-common": "0.16.1-feature.IATAB2B.52.355",
     "@sphereon/pex": "5.0.0-unstable.28",
     "@sphereon/ssi-sdk-ext.did-utils": "0.27.0",
     "@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.0",

diff --git a/packages/siopv2-oid4vp-rp-rest-api/package.json b/packages/siopv2-oid4vp-rp-rest-api/package.json
@@ -11,7 +11,7 @@
     "start:dev": "ts-node __tests__/RestAPI.ts"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
+    "@sphereon/did-auth-siop": "0.16.1-feature.IATAB2B.52.355",
     "@sphereon/ssi-express-support": "workspace:*",
     "@sphereon/ssi-sdk.core": "workspace:*",
     "@sphereon/ssi-sdk.credential-validation": "workspace:*",

diff --git a/packages/vc-status-list-issuer/package.json b/packages/vc-status-list-issuer/package.json
@@ -35,7 +35,7 @@
   "devDependencies": {
     "@babel/preset-typescript": "^7.24.7",
     "@sphereon/did-uni-client": "^0.6.3",
-    "@sphereon/oid4vci-common": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
+    "@sphereon/oid4vci-common": "0.16.1-feature.IATAB2B.52.355",
     "@sphereon/ssi-sdk-ext.did-provider-jwk": "0.27.0",
     "@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.27.0",
     "@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.0",

diff --git a/packages/vc-status-list/package.json b/packages/vc-status-list/package.json
@@ -16,7 +16,7 @@
     "@sphereon/ssi-sdk-ext.jwt-service": "0.27.0",
     "@sphereon/ssi-types": "workspace:*",
     "@sphereon/vc-status-list": "7.0.0-next.0",
-    "@sphereon/oid4vci-common": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
+    "@sphereon/oid4vci-common": "0.16.1-feature.IATAB2B.52.355",
     "@sphereon/kmp-cbor": "0.2.0-SNAPSHOT.25",
     "@sd-jwt/core": "^0.7.2",
     "@sd-jwt/sd-jwt-vc": "^0.7.2",

diff --git a/packages/w3c-vc-api/package.json b/packages/w3c-vc-api/package.json
@@ -11,7 +11,7 @@
     "start:dev": "ts-node __tests__/agent.ts"
   },
   "dependencies": {
-    "@sphereon/did-auth-siop": "0.16.1-feature.SSISDK.5.credential.offer.uri.366",
+    "@sphereon/did-auth-siop": "0.16.1-feature.IATAB2B.52.355",
     "@sphereon/ssi-express-support": "workspace:*",
     "@sphereon/ssi-sdk.agent-config": "workspace:*",
     "@sphereon/ssi-sdk.core": "workspace:*",