Skip to content

chore: sync with upstream openwallet-foundation/acapy-plugins main#33

Merged
burdettadam merged 64 commits intomainfrom
chore/sync-upstream-main
Mar 26, 2026
Merged

chore: sync with upstream openwallet-foundation/acapy-plugins main#33
burdettadam merged 64 commits intomainfrom
chore/sync-upstream-main

Conversation

@burdettadam
Copy link
Collaborator

Summary

Merges 40 commits from upstream openwallet-foundation/acapy-plugins main into Indicio's fork.

Upstream changes included

Conflict resolutions

  • Lock files (poetry.lock, package-lock.json): Kept Indicio versions; should be regenerated after merge
  • Dockerfiles: Kept Indicio multi-stage Rust build for isomdl-uniffi
  • Demo: Kept Indicio modern TypeScript/Playwright demo
  • mso_mdoc/mso/issuer.py: Kept Indicio deletion (replaced by mdoc/issuer.py)
  • oid4vc/routes.py, public_routes.py: Kept Indicio directory-based structure
  • Code files: Kept Indicio implementations (more complete, OID4VCI 1.0 compliant)

Notes

  • Lock files should be regenerated (poetry lock) after merging to pick up upstream dependency updates

jamshale and others added 30 commits December 3, 2025 13:01
* feat: issue-credential v1 plugin - Initial Commit

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* chore: Linting fixes

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* fix: Relative paths

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* fix: Relative paths

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* fix: Relative paths

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* chore: Add initial integration tests

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* feat: Add v1 cred revocation event handler

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* chore: Update temporary acapy-agent ref

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* fix: integration test build

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* chore: Initial readme

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Update lock file

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* chore: Update acapy-agent ref

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* fix: Repair the non monkey patched fall back

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Some fixes

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* fix: message thread_id

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* chore: formatting fixes / update acapy-agent again

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* chore: Couple library upgrades

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Update acapy-agent ref to openwallet

Signed-off-by: jamshale <jamiehalebc@gmail.com>

---------

Signed-off-by: jamshale <jamiehalebc@gmail.com>
Bumps the npm_and_yarn group with 1 update in the /oid4vc/integration/credo directory: [validator](https://github.com/validatorjs/validator.js).


Updates `validator` from 13.15.20 to 13.15.23
- [Release notes](https://github.com/validatorjs/validator.js/releases)
- [Changelog](https://github.com/validatorjs/validator.js/blob/master/CHANGELOG.md)
- [Commits](validatorjs/validator.js@13.15.20...13.15.23)

---
updated-dependencies:
- dependency-name: validator
  dependency-version: 13.15.23
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…#2459)

* chore: clean up some default and common values

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* chore: Switch base default image to slim python

Signed-off-by: jamshale <jamiehalebc@gmail.com>

---------

Signed-off-by: jamshale <jamiehalebc@gmail.com>
Signed-off-by: jamshale <jamiehalebc@gmail.com>
* Week 51, 2025 - Library Upgrades

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Add some logging to unit test / linking workflow

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Update oid4cv askar dep / fix a toml error in redis_events

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Fix connections pyproject askar version

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* re-sync redis_event lock file

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* re-sync webvh lock file

Signed-off-by: jamshale <jamiehalebc@gmail.com>

---------

Signed-off-by: jamshale <jamiehalebc@gmail.com>
…undation#2505)

Bumps the all-actions group with 3 updates: [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request), [tj-actions/changed-files](https://github.com/tj-actions/changed-files) and [actions/cache](https://github.com/actions/cache).


Updates `peter-evans/create-pull-request` from 7 to 8
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](peter-evans/create-pull-request@v7...v8)

Updates `tj-actions/changed-files` from 47.0.0 to 47.0.1
- [Release notes](https://github.com/tj-actions/changed-files/releases)
- [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md)
- [Commits](tj-actions/changed-files@v47.0.0...v47.0.1)

Updates `actions/cache` from 4 to 5
- [Release notes](https://github.com/actions/cache/releases)
- [Changelog](https://github.com/actions/cache/blob/main/RELEASES.md)
- [Commits](actions/cache@v4...v5)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-version: '8'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
- dependency-name: tj-actions/changed-files
  dependency-version: 47.0.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-actions
- dependency-name: actions/cache
  dependency-version: '5'
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps the pip group with 1 update in the /redis_events/docker/services directory: [filelock](https://github.com/tox-dev/py-filelock).


Updates `filelock` from 3.18.0 to 3.20.1
- [Release notes](https://github.com/tox-dev/py-filelock/releases)
- [Changelog](https://github.com/tox-dev/filelock/blob/main/docs/changelog.rst)
- [Commits](tox-dev/filelock@3.18.0...3.20.1)

---
updated-dependencies:
- dependency-name: filelock
  dependency-version: 3.20.1
  dependency-type: indirect
  dependency-group: pip
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps the pip group with 1 update in the /status_list directory: [filelock](https://github.com/tox-dev/py-filelock).


Updates `filelock` from 3.18.0 to 3.20.1
- [Release notes](https://github.com/tox-dev/py-filelock/releases)
- [Changelog](https://github.com/tox-dev/filelock/blob/main/docs/changelog.rst)
- [Commits](tox-dev/filelock@3.18.0...3.20.1)

---
updated-dependencies:
- dependency-name: filelock
  dependency-version: 3.20.1
  dependency-type: direct:production
  dependency-group: pip
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps the pip group with 1 update in the /redis_events directory: [filelock](https://github.com/tox-dev/py-filelock).


Updates `filelock` from 3.18.0 to 3.20.1
- [Release notes](https://github.com/tox-dev/py-filelock/releases)
- [Changelog](https://github.com/tox-dev/filelock/blob/main/docs/changelog.rst)
- [Commits](tox-dev/filelock@3.18.0...3.20.1)

---
updated-dependencies:
- dependency-name: filelock
  dependency-version: 3.20.1
  dependency-type: indirect
  dependency-group: pip
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Initial commit

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Change acapy-agent ref

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* More stuff

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* fix formatting

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Add intergration test

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Remove depreciated tags

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* fix: Integration test config

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Update issue-credential dep ref

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Update issue-credential dep ref

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Update issue-credential dep ref

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* sync refs

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* fix

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Problamatic unit test removal and reformatting

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Update readmes

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* One more reformat

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Remove a few more problem unit tests

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Update acapy-agent ref

Signed-off-by: jamshale <jamiehalebc@gmail.com>

---------

Signed-off-by: jamshale <jamiehalebc@gmail.com>
* feat: Upgrade python version to 3.13

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Try dfferent technique for getting correct python

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Update lock file / Add some logging

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* fix: askar list error with upgraded python

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Update lock files

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Update oid4vc pydantic to python 3.13 compatible version

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* fix: Add small wait for rev reg creation

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Rebase and update acapy-agent ref

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Update lock file

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Update acapy-agent refs

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Update refs

Signed-off-by: jamshale <jamiehalebc@gmail.com>

---------

Signed-off-by: jamshale <jamiehalebc@gmail.com>
Signed-off-by: jamshale <jamiehalebc@gmail.com>
Signed-off-by: jamshale <jamiehalebc@gmail.com>
…ory (openwallet-foundation#2586)

Bumps the pip group with 1 update in the /present_proof/integration directory: [urllib3](https://github.com/urllib3/urllib3).


Updates `urllib3` from 2.5.0 to 2.6.0
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](urllib3/urllib3@2.5.0...2.6.0)

---
updated-dependencies:
- dependency-name: urllib3
  dependency-version: 2.6.0
  dependency-type: indirect
  dependency-group: pip
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…update (openwallet-foundation#2587)

Bumps the npm_and_yarn group with 1 update in the /oid4vc/demo/frontend directory: [qs](https://github.com/ljharb/qs).
Bumps the npm_and_yarn group with 1 update in the /oid4vc/integration/credo directory: [qs](https://github.com/ljharb/qs).


Updates `qs` from 6.13.0 to 6.14.1
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](ljharb/qs@v6.13.0...v6.14.1)

Updates `qs` from 6.13.0 to 6.14.1
- [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md)
- [Commits](ljharb/qs@v6.13.0...v6.14.1)

---
updated-dependencies:
- dependency-name: qs
  dependency-version: 6.14.1
  dependency-type: indirect
  dependency-group: npm_and_yarn
- dependency-name: qs
  dependency-version: 6.14.1
  dependency-type: indirect
  dependency-group: npm_and_yarn
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…nwallet-foundation#2589)

---
updated-dependencies:
- dependency-name: aiohttp
  dependency-version: 3.13.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…t-foundation#2592)

---
updated-dependencies:
- dependency-name: aiohttp
  dependency-version: 3.13.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…t-foundation#2591)

---
updated-dependencies:
- dependency-name: aiohttp
  dependency-version: 3.13.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…undation#2590)

---
updated-dependencies:
- dependency-name: aiohttp
  dependency-version: 3.13.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
openwallet-foundation#2588)

Bumps the pip group with 1 update in the /oid4vc directory: [cbor2](https://github.com/agronholm/cbor2).


Updates `cbor2` from 5.7.0 to 5.8.0
- [Release notes](https://github.com/agronholm/cbor2/releases)
- [Commits](agronholm/cbor2@5.7.0...5.8.0)

---
updated-dependencies:
- dependency-name: cbor2
  dependency-version: 5.8.0
  dependency-type: direct:production
  dependency-group: pip
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…penwallet-foundation#2604)

---
updated-dependencies:
- dependency-name: aiohttp
  dependency-version: 3.13.3
  dependency-type: indirect
  dependency-group: pip
- dependency-name: aiohttp
  dependency-version: 3.13.3
  dependency-type: indirect
  dependency-group: pip
- dependency-name: aiohttp
  dependency-version: 3.13.3
  dependency-type: indirect
  dependency-group: pip
- dependency-name: aiohttp
  dependency-version: 3.13.3
  dependency-type: direct:production
  dependency-group: pip
- dependency-name: aiohttp
  dependency-version: 3.13.3
  dependency-type: direct:production
  dependency-group: pip
- dependency-name: aiohttp
  dependency-version: 3.13.3
  dependency-type: indirect
  dependency-group: pip
- dependency-name: aiohttp
  dependency-version: 3.13.3
  dependency-type: indirect
  dependency-group: pip
- dependency-name: aiohttp
  dependency-version: 3.13.3
  dependency-type: indirect
  dependency-group: pip
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Week 3, 2026 - Library Upgrades

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* Lower test loggin and prune docker after each test

Signed-off-by: jamshale <jamiehalebc@gmail.com>

---------

Signed-off-by: jamshale <jamiehalebc@gmail.com>
Signed-off-by: jamshale <jamiehalebc@gmail.com>
…oundation#2689)

Bumps [jsonpath](https://github.com/dchester/jsonpath) from 1.1.1 to 1.2.1.
- [Commits](https://github.com/dchester/jsonpath/commits/1.2.1)

---
updated-dependencies:
- dependency-name: jsonpath
  dependency-version: 1.2.1
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
…enwallet-foundation#2690)

Bumps the pip group with 3 updates in the /oid4vc/auth_server directory: [orjson](https://github.com/ijl/orjson), [authlib](https://github.com/authlib/authlib) and [python-multipart](https://github.com/Kludex/python-multipart).


Updates `orjson` from 3.11.3 to 3.11.5
- [Release notes](https://github.com/ijl/orjson/releases)
- [Changelog](https://github.com/ijl/orjson/blob/master/CHANGELOG.md)
- [Commits](ijl/orjson@3.11.3...3.11.5)

Updates `authlib` from 1.6.5 to 1.6.6
- [Release notes](https://github.com/authlib/authlib/releases)
- [Changelog](https://github.com/authlib/authlib/blob/main/docs/changelog.rst)
- [Commits](authlib/authlib@v1.6.5...v1.6.6)

Updates `python-multipart` from 0.0.20 to 0.0.22
- [Release notes](https://github.com/Kludex/python-multipart/releases)
- [Changelog](https://github.com/Kludex/python-multipart/blob/master/CHANGELOG.md)
- [Commits](Kludex/python-multipart@0.0.20...0.0.22)

---
updated-dependencies:
- dependency-name: orjson
  dependency-version: 3.11.5
  dependency-type: direct:production
  dependency-group: pip
- dependency-name: authlib
  dependency-version: 1.6.6
  dependency-type: direct:production
  dependency-group: pip
- dependency-name: python-multipart
  dependency-version: 0.0.22
  dependency-type: direct:production
  dependency-group: pip
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* fix: upgrade bcrypt to v5 with explicit 72-byte password truncation in multitenant_provider

Signed-off-by: Patrick St-Louis <patrick.st-louis@opsecid.ca>

* regenerate lock file with updated poetry version

Signed-off-by: Patrick St-Louis <patrick.st-louis@opsecid.ca>

---------

Signed-off-by: Patrick St-Louis <patrick.st-louis@opsecid.ca>
Signed-off-by: Patrick St-Louis <43082425+PatStLouis@users.noreply.github.com>
…let-foundation#2738)

Signed-off-by: nodirbek.parpibaev <nodirbek.parpibaev@dsr-corporation.com>
* Week 9, 2026 - Library Upgrades

Signed-off-by: jamshale <jamiehalebc@gmail.com>

* fix: formatting in oid4vc

Signed-off-by: jamshale <jamiehalebc@gmail.com>

---------

Signed-off-by: jamshale <jamiehalebc@gmail.com>
…penwallet-foundation#2719)

Bumps the all-actions group with 1 update: [tj-actions/changed-files](https://github.com/tj-actions/changed-files).


Updates `tj-actions/changed-files` from 47.0.1 to 47.0.2
- [Release notes](https://github.com/tj-actions/changed-files/releases)
- [Changelog](https://github.com/tj-actions/changed-files/blob/main/HISTORY.md)
- [Commits](tj-actions/changed-files@v47.0.1...v47.0.2)

---
updated-dependencies:
- dependency-name: tj-actions/changed-files
  dependency-version: 47.0.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
jamshale and others added 28 commits March 3, 2026 10:45
Signed-off-by: jamshale <jamiehalebc@gmail.com>
Bumps the pip group with 1 update in the /hedera directory: [protobuf](https://github.com/protocolbuffers/protobuf).


Updates `protobuf` from 5.29.5 to 5.29.6
- [Release notes](https://github.com/protocolbuffers/protobuf/releases)
- [Commits](https://github.com/protocolbuffers/protobuf/commits)

---
updated-dependencies:
- dependency-name: protobuf
  dependency-version: 5.29.6
  dependency-type: indirect
  dependency-group: pip
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Bumps the pip group with 1 update in the /oid4vc/auth_server directory: [authlib](https://github.com/authlib/authlib).


Updates `authlib` from 1.6.6 to 1.6.7
- [Release notes](https://github.com/authlib/authlib/releases)
- [Changelog](https://github.com/authlib/authlib/blob/main/docs/changelog.rst)
- [Commits](authlib/authlib@v1.6.6...v1.6.7)

---
updated-dependencies:
- dependency-name: authlib
  dependency-version: 1.6.7
  dependency-type: direct:production
  dependency-group: pip
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
* Demo support for status list and mdoc

Signed-off-by: timbl-ont <tim.bloomfield@ontario.ca>

* OID4VC Update to README.md

Add notes on how to use the status list plugin with the oid4vc plugin

Signed-off-by: timbl-ont <163455524+timbl-ont@users.noreply.github.com>

* Initial update of the demo to add status list and mdoc

Signed-off-by: timbl-ont <tim.bloomfield@ontario.ca>

* update index

Signed-off-by: timbl-ont <tim.bloomfield@ontario.ca>

* Cleanup and fixed status list ID display

Signed-off-by: timbl-ont <tim.bloomfield@ontario.ca>

* Temp fixes for mdoc in support of Paradym

Signed-off-by: timbl-ont <tim.bloomfield@ontario.ca>

* More mdoc fixes

Signed-off-by: Tim Bloomfield <tim.bloomfield@iccs-isac.org>

* oid4vci v1.0 alignment

Signed-off-by: Ivan Wei <ivan.wei@ontario.ca>

* test cases adjustments for v1.0

Signed-off-by: Ivan Wei <ivan.wei@ontario.ca>

* fix: linting

Signed-off-by: Ivan Wei <ivan.wei@ontario.ca>

* minor fixes

Signed-off-by: Ivan Wei <ivan.wei@ontario.ca>

* fix: integration

Signed-off-by: Ivan Wei <ivan.wei@ontario.ca>

* fix: integration client touch-up

Signed-off-by: Ivan Wei <ivan.wei@ontario.ca>

* fix: PR review items

Signed-off-by: Ivan Wei <ivan.wei@ontario.ca>

---------

Signed-off-by: timbl-ont <tim.bloomfield@ontario.ca>
Signed-off-by: timbl-ont <163455524+timbl-ont@users.noreply.github.com>
Signed-off-by: Tim Bloomfield <tim.bloomfield@iccs-isac.org>
Signed-off-by: Ivan Wei <ivan.wei@ontario.ca>
Co-authored-by: timbl-ont <tim.bloomfield@ontario.ca>
Co-authored-by: timbl-ont <163455524+timbl-ont@users.noreply.github.com>
Co-authored-by: Tim Bloomfield <tim.bloomfield@iccs-isac.org>
Co-authored-by: Wei <weiiv@ON44C03942807.local>
Signed-off-by: Adam Burdett <burdettadam@gmail.com>

# Conflicts:
#	oid4vc/README.md
#	oid4vc/demo/docker-compose.yaml
#	oid4vc/demo/frontend/index.js
#	oid4vc/demo/frontend/package-lock.json
#	oid4vc/demo/frontend/package.json
#	oid4vc/demo/frontend/templates/issue-form.ejs
#	oid4vc/docker/Dockerfile
#	oid4vc/integration/Dockerfile
#	oid4vc/integration/credo/package-lock.json
#	oid4vc/integration/docker-compose.yml
#	oid4vc/integration/oid4vci_client/client.py
#	oid4vc/integration/poetry.lock
#	oid4vc/integration/pyproject.toml
#	oid4vc/integration/tests/conftest.py
#	oid4vc/jwt_vc_json/tests/conftest.py
#	oid4vc/jwt_vc_json/tests/test_cred_processor.py
#	oid4vc/mso_mdoc/README.md
#	oid4vc/mso_mdoc/cred_processor.py
#	oid4vc/mso_mdoc/mdoc/issuer.py
#	oid4vc/mso_mdoc/mso/issuer.py
#	oid4vc/mso_mdoc/routes.py
#	oid4vc/mso_mdoc/tests/mso/test_issuer.py
#	oid4vc/oid4vc/__init__.py
#	oid4vc/oid4vc/models/nonce.py
#	oid4vc/oid4vc/models/supported_cred.py
#	oid4vc/oid4vc/public_routes.py
#	oid4vc/oid4vc/routes.py
#	oid4vc/oid4vc/tests/routes/test_public_routes.py
#	oid4vc/poetry.lock
#	oid4vc/pyproject.toml
#	oid4vc/sd_jwt_vc/cred_processor.py
#	status_list/integration/poetry.lock
#	status_list/poetry.lock
Upstream added jwt_vc_json/routes.py with JWT-specific supported credential
CRUD routes, but our fork already has these handlers in
oid4vc/routes/supported_credential.py as part of the directory-based routes
restructure. The upstream file would also break due to importing from
oid4vc.routes (single file) which no longer exists.

Signed-off-by: Adam Burdett <burdettadam@gmail.com>
- Rename cryptographic_suites_supported → credential_signing_alg_values_supported
- Replace flat type/@context/credentialSubject/order fields with
  credential_definition dict in JwtSupportedCredCreateRequestSchema
- Add credential_metadata field (OID4VCI 1.0 claims/display structure)
- Add marshmallow validation (unknown=RAISE) to JWT create/update handlers
- Catch BaseModelError in update handler for better error reporting
- Use DEBUG logging instead of INFO for request payloads
- Use post-deserialized 'identifier' key (via data_key='id') consistently

Signed-off-by: Adam Burdett <burdettadam@gmail.com>
The upstream merge dropped 'used' from TAG_NAMES, but redeem_by_value()
filters on {"used": "False"} — without the tag indexed, Askar won't
match any records and nonce redemption silently breaks.

Signed-off-by: Adam Burdett <burdettadam@gmail.com>
- Uncomment and rewrite test_admin.py with 9 tests covering:
  generic create, duplicate detection, JWT create with
  credential_definition/credential_metadata, unknown field rejection,
  list, get-by-id, not-found, JWT update, and delete
- Re-export SupportedCredentialMatchSchema and supported_cred_is_unique
  from oid4vc.routes.__init__ (fixes mso_mdoc import)
- Add missing AskarProfileSession import in mso_mdoc/routes.py

Signed-off-by: Adam Burdett <burdettadam@gmail.com>
Upstream's credential_metadata rename left 'vct' unassigned in issue().
Derive it from body_vct or supported_vct with a guard for missing values.

Signed-off-by: Adam Burdett <burdettadam@gmail.com>
The upstream merge replaced our rich mDoc schema with a generic
stripped-down version, losing:
- claims (namespace-keyed ISO 18013-5 claims)
- trust_anchors, signing_key_id (signing infrastructure)
- status_list_def_id, status_list_base_uri (revocation support)
- Separate update schema with partial-update semantics
- Merge-based update helper preserving unset fields
- Missing StorageError/StorageNotFoundError/BaseModelError imports

Restore all mDoc-specific fields while keeping OID4VCI 1.0 naming
(credential_signing_alg_values_supported, credential_metadata) and
RAISE validation on the create endpoint.

Signed-off-by: Adam Burdett <burdettadam@gmail.com>
- Merged origin/main which includes PR #30 refactor/mso-mdoc-align-patterns
- Resolved conflict in oid4vc/mso_mdoc/routes.py:
  - Removed sign/verify endpoints (deleted upstream with key_generation,
    key_routes, and storage modules)
  - Fixed imports to use new trust_anchor_routes.register(app) pattern
  - Kept OID4VCI 1.0 improvements (credential_definition, credential_metadata,
    credential_signing_alg_values_supported, RAISE validation)
- Fixed variable name mismatch in supported_cred.py to_issuer_metadata()
- Fixed test mock return values (hex string for bytes.fromhex compatibility)
- All 292 tests passing

Signed-off-by: Adam Burdett <burdettadam@gmail.com>
…etry.lock

- Dockerfile: bump Python from 3.12 to 3.13 (required by status_list ^3.13)
- Dockerfile: bump ACA-Py from 1.4.0 to 1.5.1 (matches pyproject.toml)
- poetry.lock: regenerated to match pyproject.toml

Signed-off-by: Adam Burdett <burdettadam@gmail.com>
Signed-off-by: Adam Burdett <burdettadam@gmail.com>
Signed-off-by: Adam Burdett <burdettadam@gmail.com>
Signed-off-by: Adam Burdett <burdettadam@gmail.com>
Plugins using 'tests' service name instead of 'test-river' would fail
when included in the changed files set. Skip gracefully when test-river
service is not defined in the plugin's docker-compose.

Signed-off-by: Adam Burdett <burdettadam@gmail.com>
- Integration tests: rename cryptographic_suites_supported → credential_signing_alg_values_supported
- JWT VC routes: use schema default (exclude) instead of RAISE for unknown fields
- JWT VC routes: add backward compat for top-level @context/type → credential_definition
- Update test_admin.py: unknown fields are now excluded, not rejected
- Format test files

Signed-off-by: Adam Burdett <burdettadam@gmail.com>
- Rename CredentialOffer.credentials → credential_configuration_ids in
  oid4vci_client/client.py to match OID4VCI 1.0 field name; fixes
  AttributeError in test_pre_auth_code_flow tests
- Bump ACAPY_VERSION 1.4.0 → 1.5.1 in docker-compose.yml and
  Dockerfile.test.runner to match plugin pyproject.toml requirement
  (~1.5.1); resolves mDoc 500 Internal Server Error during issuance
- Add ACA-Py issuer/verifier log dumping to CI workflow on test failure
  for better diagnostics

Signed-off-by: Adam Burdett <burdettadam@gmail.com>
ACA-Py 1.5.1 requires Python>=3.13 but the test-runner container uses
Python 3.12 (pyproject.toml requires-python = '>=3.12,<3.13'). Only
update ACAPY_VERSION to 1.5.1 for acapy-issuer, acapy-verifier, and
oid4vc-base services; keep test-river at 1.4.0.

Signed-off-by: Adam Burdett <burdettadam@gmail.com>
Our issuer.py uses isomdl-uniffi's Mdoc.issuer_signed_b64() which returns
standard base64, not hex. Replace bytes.fromhex() with base64.b64decode()
and convert to base64url per OID4VCI 1.0 §7.3.1.

Update test mocks to use standard base64 return values.

Signed-off-by: Adam Burdett <burdettadam@gmail.com>
Signed-off-by: Adam Burdett <burdettadam@gmail.com>
…ers.noreply.github.com>

On behalf of jamshale <31809382+jamshale@users.noreply.github.com>, I, Adam Burdett <burdettadam@gmail.com>, hereby add my Signed-off-by to this commit: ea91ec6
On behalf of jamshale <31809382+jamshale@users.noreply.github.com>, I, Adam Burdett <burdettadam@gmail.com>, hereby add my Signed-off-by to this commit: 17c116c
On behalf of jamshale <31809382+jamshale@users.noreply.github.com>, I, Adam Burdett <burdettadam@gmail.com>, hereby add my Signed-off-by to this commit: de4fbcc
On behalf of jamshale <31809382+jamshale@users.noreply.github.com>, I, Adam Burdett <burdettadam@gmail.com>, hereby add my Signed-off-by to this commit: 7a1a7c6
On behalf of jamshale <31809382+jamshale@users.noreply.github.com>, I, Adam Burdett <burdettadam@gmail.com>, hereby add my Signed-off-by to this commit: 3fb3d94
On behalf of jamshale <31809382+jamshale@users.noreply.github.com>, I, Adam Burdett <burdettadam@gmail.com>, hereby add my Signed-off-by to this commit: 4bf06bf
On behalf of jamshale <31809382+jamshale@users.noreply.github.com>, I, Adam Burdett <burdettadam@gmail.com>, hereby add my Signed-off-by to this commit: 237f6e1
On behalf of jamshale <31809382+jamshale@users.noreply.github.com>, I, Adam Burdett <burdettadam@gmail.com>, hereby add my Signed-off-by to this commit: ee22df2
On behalf of jamshale <31809382+jamshale@users.noreply.github.com>, I, Adam Burdett <burdettadam@gmail.com>, hereby add my Signed-off-by to this commit: 2f3ee3f
On behalf of jamshale <31809382+jamshale@users.noreply.github.com>, I, Adam Burdett <burdettadam@gmail.com>, hereby add my Signed-off-by to this commit: 0e1355a
On behalf of jamshale <31809382+jamshale@users.noreply.github.com>, I, Adam Burdett <burdettadam@gmail.com>, hereby add my Signed-off-by to this commit: edce9a3
On behalf of jamshale <31809382+jamshale@users.noreply.github.com>, I, Adam Burdett <burdettadam@gmail.com>, hereby add my Signed-off-by to this commit: aeb84e7
On behalf of jamshale <31809382+jamshale@users.noreply.github.com>, I, Adam Burdett <burdettadam@gmail.com>, hereby add my Signed-off-by to this commit: 38dc56f
On behalf of jamshale <31809382+jamshale@users.noreply.github.com>, I, Adam Burdett <burdettadam@gmail.com>, hereby add my Signed-off-by to this commit: 043218e

Signed-off-by: Adam Burdett <burdettadam@gmail.com>
…eply.github.com>

On behalf of Lucas O'Neil <loneil@users.noreply.github.com>, I, Adam Burdett <burdettadam@gmail.com>, hereby add my Signed-off-by to this commit: 065fd9b
On behalf of Lucas O'Neil <loneil@users.noreply.github.com>, I, Adam Burdett <burdettadam@gmail.com>, hereby add my Signed-off-by to this commit: 62dda9b

Signed-off-by: Adam Burdett <burdettadam@gmail.com>
…parpibaev@dsr-corporation.com>

On behalf of Nodirbek Parpibayev <nodirbek.parpibaev@dsr-corporation.com>, I, Adam Burdett <burdettadam@gmail.com>, hereby add my Signed-off-by to this commit: ae851a9

Signed-off-by: Adam Burdett <burdettadam@gmail.com>
…StLouis@users.noreply.github.com>

On behalf of Patrick St-Louis <43082425+PatStLouis@users.noreply.github.com>, I, Adam Burdett <burdettadam@gmail.com>, hereby add my Signed-off-by to this commit: 4ca36b5
On behalf of Patrick St-Louis <43082425+PatStLouis@users.noreply.github.com>, I, Adam Burdett <burdettadam@gmail.com>, hereby add my Signed-off-by to this commit: 3a4be5f

Signed-off-by: Adam Burdett <burdettadam@gmail.com>
… UUID4)

Signed-off-by: Adam Burdett <burdettadam@gmail.com>
…eeded

Signed-off-by: Adam Burdett <burdettadam@gmail.com>
@burdettadam burdettadam merged commit 13bd78c into main Mar 26, 2026
6 checks passed
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.

7 participants