Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/SDK-41_oidf-support #280

Merged
merged 30 commits into from
Nov 22, 2024
Merged

Conversation

sanderPostma
Copy link
Contributor

No description provided.

…oidf-support

# Conflicts:
#	packages/ebsi-support/package.json
#	packages/mdl-mdoc/package.json
#	packages/oid4vci-holder/package.json
#	packages/oid4vci-issuer-rest-api/package.json
#	packages/oid4vci-issuer-rest-client/package.json
#	packages/oid4vci-issuer-store/package.json
#	packages/oid4vci-issuer/package.json
#	packages/siopv2-oid4vp-common/package.json
#	packages/siopv2-oid4vp-op-auth/package.json
#	packages/siopv2-oid4vp-rp-auth/package.json
#	packages/siopv2-oid4vp-rp-rest-api/package.json
#	packages/w3c-vc-api/package.json
#	pnpm-lock.yaml
…oidf-support

# Conflicts:
#	packages/ebsi-support/package.json
#	packages/mdl-mdoc/package.json
#	packages/oid4vci-holder/package.json
#	packages/oid4vci-issuer-rest-api/package.json
#	packages/oid4vci-issuer-rest-client/package.json
#	packages/oid4vci-issuer-store/package.json
#	packages/oid4vci-issuer/package.json
#	packages/siopv2-oid4vp-common/package.json
#	packages/siopv2-oid4vp-op-auth/package.json
#	packages/siopv2-oid4vp-rp-auth/package.json
#	packages/siopv2-oid4vp-rp-rest-api/package.json
#	packages/w3c-vc-api/package.json
#	pnpm-lock.yaml
…f-support

# Conflicts:
#	packages/oid4vci-issuer-store/src/agent/OID4VCIStore.ts
#	packages/oid4vci-issuer-store/src/types/IOID4VCIStore.ts
#	packages/oidf-metadata-server/LICENSE
#	packages/oidf-metadata-server/package.json
#	packages/oidf-metadata-server/tsconfig.json
…-41_oidf-support

# Conflicts:
#	pnpm-lock.yaml
@@ -193,6 +195,7 @@ export interface IPresentationWithDefinition {
export interface ISIOPIdentifierOptions extends Omit<IDIDOptions, 'idOpts'> {
// we replace the legacy idOpts with the Managed Identifier opts from the identifier resolution module
idOpts: ManagedIdentifierOptsOrResult
oidfOpts?: ExternalIdentifierOIDFEntityIdOpts
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Took a shortcut here by keeping it side-by-side

packages/oidf-client/package.json Outdated Show resolved Hide resolved
packages/tsconfig.json Outdated Show resolved Hide resolved
packages/kv-store/src/keyv/keyv.ts Outdated Show resolved Hide resolved
packages/kv-store/src/keyv/keyv.ts Outdated Show resolved Hide resolved
…f-support

# Conflicts:
#	packages/oid4vci-holder/package.json
#	packages/oid4vci-holder/src/types/IOID4VCIHolder.ts
@sanderPostma sanderPostma merged commit d8b119e into develop Nov 22, 2024
2 checks passed
@sanderPostma sanderPostma deleted the feature/SDK-41_oidf-support branch November 22, 2024 11:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants