Skip to content

Commit

Permalink
fix: Issuer opts are not AS opts. Make sure we actually return issuer…
Browse files Browse the repository at this point in the history 
… opts when requested
  • Loading branch information
@nklomp
nklomp committed Jan 10, 2025
1 parent 7f46a5a commit 18b4ced
Show file tree
Hide file tree
Showing 14 changed files with 121 additions and 121 deletions.
8 changes: 4 additions & 4 deletions packages/ebsi-support/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
},
"dependencies": {
"@ethersproject/random": "^5.7.0",
"@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.258",
"@sphereon/did-auth-siop-adapter": "0.16.1-feature.MWALL.715.258",
"@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.259",
"@sphereon/did-auth-siop-adapter": "0.16.1-feature.MWALL.715.259",
"@sphereon/pex": "5.0.0-unstable.28",
"@sphereon/pex-models": "^2.3.2",
"@sphereon/ssi-sdk-ext.did-resolver-ebsi": "0.27.1-next.6",
Expand Down Expand Up @@ -44,8 +44,8 @@
"xstate": "^4.38.3"
},
"devDependencies": {
"@sphereon/oid4vci-client": "0.16.1-feature.MWALL.715.258",
"@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.258",
"@sphereon/oid4vci-client": "0.16.1-feature.MWALL.715.259",
"@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.259",
"@sphereon/ssi-express-support": "workspace:*",
"@sphereon/ssi-sdk-ext.key-manager": "0.27.1-next.6",
"@sphereon/ssi-sdk-ext.kms-local": "0.27.1-next.6",
Expand Down
6 changes: 3 additions & 3 deletions packages/mdl-mdoc/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"build:clean": "tsc --build --clean && tsc --build"
},
"dependencies": {
"@sphereon/did-auth-siop-adapter": "0.16.1-feature.MWALL.715.258",
"@sphereon/did-auth-siop-adapter": "0.16.1-feature.MWALL.715.259",
"@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
"@sphereon/pex": "5.0.0-unstable.28",
"@sphereon/pex-models": "^2.3.2",
Expand All @@ -35,8 +35,8 @@
"uuid": "^9.0.1"
},
"devDependencies": {
"@sphereon/oid4vci-client": "0.16.1-feature.MWALL.715.258",
"@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.258",
"@sphereon/oid4vci-client": "0.16.1-feature.MWALL.715.259",
"@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.259",
"@sphereon/ssi-express-support": "workspace:*",
"@sphereon/ssi-sdk-ext.key-manager": "0.27.1-next.6",
"@sphereon/ssi-sdk-ext.kms-local": "0.27.1-next.6",
Expand Down
6 changes: 3 additions & 3 deletions packages/oid4vci-holder/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
},
"dependencies": {
"@sphereon/kmp-mdoc-core": "0.2.0-SNAPSHOT.26",
"@sphereon/oid4vci-client": "0.16.1-feature.MWALL.715.258",
"@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.258",
"@sphereon/oid4vci-client": "0.16.1-feature.MWALL.715.259",
"@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.259",
"@sphereon/ssi-sdk-ext.did-utils": "0.27.1-next.6",
"@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.1-next.6",
"@sphereon/ssi-sdk-ext.jwt-service": "0.27.1-next.6",
Expand All @@ -43,7 +43,7 @@
"xstate": "^4.38.3"
},
"devDependencies": {
"@sphereon/oid4vc-common": "0.16.1-feature.MWALL.715.258",
"@sphereon/oid4vc-common": "0.16.1-feature.MWALL.715.259",
"@sphereon/ssi-sdk-ext.did-resolver-jwk": "0.27.1-next.6",
"@types/i18n-js": "^3.8.9",
"@types/lodash.memoize": "^4.1.9",
Expand Down
6 changes: 3 additions & 3 deletions packages/oid4vci-issuer-rest-api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"start:dev": "ts-node __tests__/RestAPI.ts"
},
"dependencies": {
"@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.258",
"@sphereon/oid4vci-issuer": "0.16.1-feature.MWALL.715.258",
"@sphereon/oid4vci-issuer-server": "0.16.1-feature.MWALL.715.258",
"@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.259",
"@sphereon/oid4vci-issuer": "0.16.1-feature.MWALL.715.259",
"@sphereon/oid4vci-issuer-server": "0.16.1-feature.MWALL.715.259",
"@sphereon/ssi-express-support": "workspace:*",
"@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.1-next.6",
"@sphereon/ssi-sdk.kv-store-temp": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/oid4vci-issuer-rest-client/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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.MWALL.715.258",
"@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.259",
"@sphereon/ssi-types": "workspace:*",
"@veramo/core": "4.2.0",
"cross-fetch": "^3.1.8"
Expand Down
2 changes: 1 addition & 1 deletion packages/oid4vci-issuer-store/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"build:clean": "tsc --build --clean && tsc --build"
},
"dependencies": {
"@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.258",
"@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.259",
"@sphereon/ssi-sdk-ext.did-utils": "0.27.1-next.6",
"@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.1-next.6",
"@sphereon/ssi-sdk.kv-store-temp": "workspace:*",
Expand Down
6 changes: 3 additions & 3 deletions packages/oid4vci-issuer/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"build:clean": "tsc --build --clean && tsc --build"
},
"dependencies": {
"@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.258",
"@sphereon/oid4vci-issuer": "0.16.1-feature.MWALL.715.258",
"@sphereon/oid4vci-client": "0.16.1-feature.MWALL.715.258",
"@sphereon/oid4vci-common": "0.16.1-feature.MWALL.715.259",
"@sphereon/oid4vci-issuer": "0.16.1-feature.MWALL.715.259",
"@sphereon/oid4vci-client": "0.16.1-feature.MWALL.715.259",
"@sphereon/ssi-sdk-ext.did-utils": "0.27.1-next.6",
"@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.1-next.6",
"@sphereon/ssi-sdk.agent-config": "workspace:*",
Expand Down
6 changes: 3 additions & 3 deletions packages/oid4vci-issuer/src/agent/OID4VCIIssuer.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ export class OID4VCIIssuer implements IAgentPlugin {
},
context,
)
const issuerOpts = await this.getIssuerOpts({ ...args, credentialIssuer }, context)
const issuerOpts = await this.getIssuerOptsFromStore({ ...args, credentialIssuer }, context)
if (!issuerOpts.resolveOpts) {
issuerOpts.resolveOpts = { ...issuerOpts.didOpts?.resolveOpts, ...this._opts.resolveOpts }
}
Expand Down Expand Up @@ -153,7 +153,7 @@ export class OID4VCIIssuer implements IAgentPlugin {
return this.instances.get(credentialIssuer)!
}

private async getIssuerOpts(
private async getIssuerOptsFromStore(
opts: {
credentialIssuer: string
storeId?: string
Expand All @@ -165,7 +165,7 @@ export class OID4VCIIssuer implements IAgentPlugin {
const storeId = await this.storeId(opts, context)
const namespace = await this.namespace(opts, context)
const options = await context.agent.oid4vciStoreGetIssuerOpts({
metadataType: 'authorizationServer',
metadataType: 'issuer',
correlationId: credentialIssuer,
storeId,
namespace,
Expand Down
2 changes: 1 addition & 1 deletion packages/siopv2-oid4vp-common/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"access": "public"
},
"dependencies": {
"@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.258",
"@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.259",
"@sphereon/ssi-sdk.core": "workspace:*",
"@sphereon/ssi-types": "workspace:*",
"uint8arrays": "3.1.1"
Expand Down
6 changes: 3 additions & 3 deletions packages/siopv2-oid4vp-op-auth/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"build:clean": "tsc --build --clean && tsc --build"
},
"dependencies": {
"@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.258",
"@sphereon/did-auth-siop-adapter": "0.16.1-feature.MWALL.715.258",
"@sphereon/oid4vc-common": "0.16.1-feature.MWALL.715.258",
"@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.259",
"@sphereon/did-auth-siop-adapter": "0.16.1-feature.MWALL.715.259",
"@sphereon/oid4vc-common": "0.16.1-feature.MWALL.715.259",
"@sphereon/pex": "5.0.0-unstable.28",
"@sphereon/pex-models": "^2.3.2",
"@sphereon/ssi-sdk-ext.did-utils": "0.27.1-next.6",
Expand Down
6 changes: 3 additions & 3 deletions packages/siopv2-oid4vp-rp-auth/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
"build:clean": "tsc --build --clean && tsc --build"
},
"dependencies": {
"@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.258",
"@sphereon/did-auth-siop-adapter": "0.16.1-feature.MWALL.715.258",
"@sphereon/oid4vc-common": "0.16.1-feature.MWALL.715.258",
"@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.259",
"@sphereon/did-auth-siop-adapter": "0.16.1-feature.MWALL.715.259",
"@sphereon/oid4vc-common": "0.16.1-feature.MWALL.715.259",
"@sphereon/pex": "5.0.0-unstable.28",
"@sphereon/ssi-sdk-ext.did-utils": "0.27.1-next.6",
"@sphereon/ssi-sdk-ext.identifier-resolution": "0.27.1-next.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/siopv2-oid4vp-rp-rest-api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"start:dev": "ts-node __tests__/RestAPI.ts"
},
"dependencies": {
"@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.258",
"@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.259",
"@sphereon/ssi-express-support": "workspace:*",
"@sphereon/ssi-sdk.core": "workspace:*",
"@sphereon/ssi-sdk.credential-validation": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion packages/w3c-vc-api/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"start:dev": "ts-node __tests__/agent.ts"
},
"dependencies": {
"@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.258",
"@sphereon/did-auth-siop": "0.16.1-feature.MWALL.715.259",
"@sphereon/ssi-express-support": "workspace:*",
"@sphereon/ssi-sdk.agent-config": "workspace:*",
"@sphereon/ssi-sdk.core": "workspace:*",
Expand Down
Loading

0 comments on commit 18b4ced

Please sign in to comment.