From 788d221445f3606a5a23a79e7276926c8617c8bf Mon Sep 17 00:00:00 2001 From: Timo Glastra Date: Tue, 19 Nov 2024 12:23:25 +0100 Subject: [PATCH 1/2] chore: update mdoc Signed-off-by: Timo Glastra --- .github/workflows/release.yml | 3 +- packages/core/package.json | 2 +- .../models/DifPexCredentialsForRequest.ts | 2 +- packages/core/src/modules/mdoc/Mdoc.ts | 4 +- packages/core/src/modules/mdoc/MdocContext.ts | 2 +- .../src/modules/mdoc/MdocDeviceResponse.ts | 4 +- packages/core/src/modules/mdoc/MdocOptions.ts | 4 +- .../mdocOpenId4VcDeviceResponse.test.ts | 2 +- pnpm-lock.yaml | 45 +++++-------------- 9 files changed, 23 insertions(+), 45 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2109161efe..a27b93b9b8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -46,6 +46,7 @@ jobs: # This expects you to have a script called release which does a build for your packages and calls changeset publish publish: pnpm release title: 'chore(release): new version' + commit: 'chore(release): new version' createGithubReleases: false env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} @@ -56,7 +57,7 @@ jobs: run: echo "CURRENT_PACKAGE_VERSION=$(node -p "require('./packages/core/package.json').version")" >> $GITHUB_ENV - name: Create Github Release - if: steps.changesets.outputs.published == 'true' + if: "startsWith(github.event.head_commit.message, 'chore(release): new version')" uses: softprops/action-gh-release@v2 with: tag_name: v${{ env.CURRENT_PACKAGE_VERSION }} diff --git a/packages/core/package.json b/packages/core/package.json index 7ac3da3cf3..234f5ae7e5 100644 --- a/packages/core/package.json +++ b/packages/core/package.json @@ -35,7 +35,7 @@ "@peculiar/asn1-schema": "^2.3.8", "@peculiar/asn1-x509": "^2.3.8", "@peculiar/x509": "^1.11.0", - "@protokoll/mdoc-client": "0.2.36", + "@animo-id/mdoc": "0.2.38", "@sd-jwt/core": "^0.7.0", "@sd-jwt/decode": "^0.7.0", "@sd-jwt/jwt-status-list": "^0.7.0", diff --git a/packages/core/src/modules/dif-presentation-exchange/models/DifPexCredentialsForRequest.ts b/packages/core/src/modules/dif-presentation-exchange/models/DifPexCredentialsForRequest.ts index bcf4aa7498..2d5e32c87d 100644 --- a/packages/core/src/modules/dif-presentation-exchange/models/DifPexCredentialsForRequest.ts +++ b/packages/core/src/modules/dif-presentation-exchange/models/DifPexCredentialsForRequest.ts @@ -1,7 +1,7 @@ import type { MdocRecord } from '../../mdoc' import type { SdJwtVcRecord } from '../../sd-jwt-vc' import type { ClaimFormat, W3cCredentialRecord } from '../../vc' -import type { MdocNameSpaces } from '@protokoll/mdoc-client' +import type { MdocNameSpaces } from '@animo-id/mdoc' export interface DifPexCredentialsForRequest { /** diff --git a/packages/core/src/modules/mdoc/Mdoc.ts b/packages/core/src/modules/mdoc/Mdoc.ts index 1239e4840d..6882a74e0b 100644 --- a/packages/core/src/modules/mdoc/Mdoc.ts +++ b/packages/core/src/modules/mdoc/Mdoc.ts @@ -1,6 +1,6 @@ import type { MdocSignOptions, MdocNameSpaces, MdocVerifyOptions } from './MdocOptions' import type { AgentContext } from '../../agent' -import type { IssuerSignedDocument } from '@protokoll/mdoc-client' +import type { IssuerSignedDocument } from '@animo-id/mdoc' import { DeviceSignedDocument, @@ -9,7 +9,7 @@ import { cborEncode, parseDeviceSigned, parseIssuerSigned, -} from '@protokoll/mdoc-client' +} from '@animo-id/mdoc' import { getJwkFromKey, JwaSignatureAlgorithm } from '../../crypto' import { X509Certificate, X509ModuleConfig } from '../x509' diff --git a/packages/core/src/modules/mdoc/MdocContext.ts b/packages/core/src/modules/mdoc/MdocContext.ts index 795eeade11..ca91839fb9 100644 --- a/packages/core/src/modules/mdoc/MdocContext.ts +++ b/packages/core/src/modules/mdoc/MdocContext.ts @@ -1,6 +1,6 @@ import type { AgentContext } from '../../agent' import type { JwkJson } from '../../crypto' -import type { MdocContext, X509Context } from '@protokoll/mdoc-client' +import type { MdocContext, X509Context } from '@animo-id/mdoc' import { p256 } from '@noble/curves/p256' import { hkdf } from '@noble/hashes/hkdf' diff --git a/packages/core/src/modules/mdoc/MdocDeviceResponse.ts b/packages/core/src/modules/mdoc/MdocDeviceResponse.ts index e894fa3a3d..a91931e095 100644 --- a/packages/core/src/modules/mdoc/MdocDeviceResponse.ts +++ b/packages/core/src/modules/mdoc/MdocDeviceResponse.ts @@ -1,7 +1,7 @@ import type { MdocDeviceResponseOpenId4VpOptions, MdocDeviceResponseVerifyOptions } from './MdocOptions' import type { AgentContext } from '../../agent' import type { DifPresentationExchangeDefinition } from '../dif-presentation-exchange' -import type { PresentationDefinition } from '@protokoll/mdoc-client' +import type { PresentationDefinition } from '@animo-id/mdoc' import type { InputDescriptorV2 } from '@sphereon/pex-models' import { @@ -14,7 +14,7 @@ import { MDocStatus, cborEncode, parseDeviceResponse, -} from '@protokoll/mdoc-client' +} from '@animo-id/mdoc' import { CredoError } from '../../error' import { uuid } from '../../utils/uuid' diff --git a/packages/core/src/modules/mdoc/MdocOptions.ts b/packages/core/src/modules/mdoc/MdocOptions.ts index e6290c6fd4..db43969be1 100644 --- a/packages/core/src/modules/mdoc/MdocOptions.ts +++ b/packages/core/src/modules/mdoc/MdocOptions.ts @@ -1,9 +1,9 @@ import type { Mdoc } from './Mdoc' import type { Key } from '../../crypto/Key' import type { DifPresentationExchangeDefinition } from '../dif-presentation-exchange' -import type { ValidityInfo, MdocNameSpaces } from '@protokoll/mdoc-client' +import type { ValidityInfo, MdocNameSpaces } from '@animo-id/mdoc' -export type { MdocNameSpaces } from '@protokoll/mdoc-client' +export type { MdocNameSpaces } from '@animo-id/mdoc' export interface MdocVerificationContext { /** diff --git a/packages/core/src/modules/mdoc/__tests__/mdocOpenId4VcDeviceResponse.test.ts b/packages/core/src/modules/mdoc/__tests__/mdocOpenId4VcDeviceResponse.test.ts index b10bb19af4..fd87a5b269 100644 --- a/packages/core/src/modules/mdoc/__tests__/mdocOpenId4VcDeviceResponse.test.ts +++ b/packages/core/src/modules/mdoc/__tests__/mdocOpenId4VcDeviceResponse.test.ts @@ -1,6 +1,6 @@ // eslint-disable-next-line import/no-extraneous-dependencies +import { cborEncode, parseDeviceResponse } from '@animo-id/mdoc' import { Key as AskarKey, Jwk } from '@hyperledger/aries-askar-nodejs' -import { cborEncode, parseDeviceResponse } from '@protokoll/mdoc-client' import { Agent, KeyType } from '../../..' import { getInMemoryAgentOptions } from '../../../../tests' diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 13c3e021d5..7e1bba4e21 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -402,6 +402,9 @@ importers: packages/core: dependencies: + '@animo-id/mdoc': + specifier: 0.2.38 + version: 0.2.38 '@digitalcredentials/jsonld': specifier: ^6.0.0 version: 6.0.0(expo@51.0.29(@babel/core@7.25.2)(@babel/preset-env@7.25.3(@babel/core@7.25.2)))(react-native@0.71.19(@babel/core@7.25.2)(@babel/preset-env@7.25.3(@babel/core@7.25.2))(react@18.3.1))(web-streams-polyfill@3.3.3) @@ -432,9 +435,6 @@ importers: '@peculiar/x509': specifier: ^1.11.0 version: 1.12.1 - '@protokoll/mdoc-client': - specifier: 0.2.36 - version: 0.2.36(typescript@5.5.4) '@sd-jwt/core': specifier: ^0.7.0 version: 0.7.2 @@ -900,6 +900,9 @@ packages: react: '*' react-native: '*' + '@animo-id/mdoc@0.2.38': + resolution: {integrity: sha512-98KQ0jvwTYsFOffTGvvHXBDo23b5xmhYjPiMIX6e807I6iS4fZZ9ypfBySdA5IiGUvXELKqEv27AUaayQa/9bg==} + '@animo-id/react-native-bbs-signatures@0.1.0': resolution: {integrity: sha512-7qvsiWhGfUev8ngE8YzF6ON9PtCID5LiYVYM4EC5eyj80gCdhx3R46CI7K1qbqIlGsoTYQ/Xx5Ubo5Ji9eaUEA==} peerDependencies: @@ -2299,12 +2302,6 @@ packages: '@protobufjs/utf8@1.1.0': resolution: {integrity: sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==} - '@protokoll/core@0.2.36': - resolution: {integrity: sha512-4VHOLNX9XiExUXGCGuT1SnbhhJT4RZCRQnQFqFZ1b6bEnxLQvmy8W06ZdZYuXOcW4IdCfWq0qI/wWs+cKOV1Pw==} - - '@protokoll/mdoc-client@0.2.36': - resolution: {integrity: sha512-8RXjZFLGERBS3qBcnB33Ldjv/HryT2F+gCrvVvzpFi6CvMH29NvuuLxd52GN8JBCNT7r03i/0GPfQX03jidDCg==} - '@react-native-community/cli-clean@10.1.1': resolution: {integrity: sha512-iNsrjzjIRv9yb5y309SWJ8NDHdwYtnCpmxZouQDyOljUdC9MwdZ4ChbtA4rwQyAwgOVfS9F/j56ML3Cslmvrxg==} @@ -2464,6 +2461,7 @@ packages: '@sphereon/kmp-mdl-mdoc@0.2.0-SNAPSHOT.22': resolution: {integrity: sha512-uAZZExVy+ug9JLircejWa5eLtAZ7bnBP6xb7DO2+86LRsHNLh2k2jMWJYxp+iWtGHTsh6RYsZl14ScQLvjiQ/A==} + bundledDependencies: [] '@sphereon/oid4vc-common@0.16.1-fix.173': resolution: {integrity: sha512-+AAUvEEFs0vzz1mrgjSgvDkcBtr18d2XEVgJex7QlAqxCKVGfjzZlqL2Q2vOLKYVaXsazhD5LnYiY6B5WMTC3Q==} @@ -7269,14 +7267,6 @@ packages: resolution: {integrity: sha512-kiGUalWN+rgBJ/1OHZsBtU4rXZOfj/7rKQxULKlIzwzQSvMJUUNgPwJEEh7gU6xEVxC0ahoOBvN2YI8GH6FNgA==} engines: {node: '>=10.12.0'} - valibot@0.37.0: - resolution: {integrity: sha512-FQz52I8RXgFgOHym3XHYSREbNtkgSjF9prvMFH1nBsRyfL6SfCzoT1GuSDTlbsuPubM7/6Kbw0ZMQb8A+V+VsQ==} - peerDependencies: - typescript: '>=5' - peerDependenciesMeta: - typescript: - optional: true - valibot@0.42.1: resolution: {integrity: sha512-3keXV29Ar5b//Hqi4MbSdV7lfVp6zuYLZuA9V1PvQUsXqogr+u5lvLPLk3A4f74VUXDnf/JfWMN6sB+koJ/FFw==} peerDependencies: @@ -7574,6 +7564,10 @@ snapshots: react: 18.3.1 react-native: 0.71.19(@babel/core@7.25.2)(@babel/preset-env@7.25.3(@babel/core@7.25.2))(react@18.3.1) + '@animo-id/mdoc@0.2.38': + dependencies: + compare-versions: 6.1.1 + '@animo-id/react-native-bbs-signatures@0.1.0(react-native@0.71.19(@babel/core@7.25.2)(@babel/preset-env@7.25.3(@babel/core@7.25.2))(react@18.3.1))(react@18.3.1)': dependencies: react: 18.3.1 @@ -9931,19 +9925,6 @@ snapshots: '@protobufjs/utf8@1.1.0': {} - '@protokoll/core@0.2.36(typescript@5.5.4)': - dependencies: - valibot: 0.37.0(typescript@5.5.4) - transitivePeerDependencies: - - typescript - - '@protokoll/mdoc-client@0.2.36(typescript@5.5.4)': - dependencies: - '@protokoll/core': 0.2.36(typescript@5.5.4) - compare-versions: 6.1.1 - transitivePeerDependencies: - - typescript - '@react-native-community/cli-clean@10.1.1': dependencies: '@react-native-community/cli-tools': 10.1.1 @@ -16380,10 +16361,6 @@ snapshots: '@types/istanbul-lib-coverage': 2.0.6 convert-source-map: 2.0.0 - valibot@0.37.0(typescript@5.5.4): - optionalDependencies: - typescript: 5.5.4 - valibot@0.42.1(typescript@5.5.4): optionalDependencies: typescript: 5.5.4 From 91e0eb1ce3f6b47798623a02a13d1522ef98747e Mon Sep 17 00:00:00 2001 From: Timo Glastra Date: Tue, 19 Nov 2024 12:30:41 +0100 Subject: [PATCH 2/2] style: fix Signed-off-by: Timo Glastra --- .../modules/mdoc/__tests__/mdocOpenId4VcDeviceResponse.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/src/modules/mdoc/__tests__/mdocOpenId4VcDeviceResponse.test.ts b/packages/core/src/modules/mdoc/__tests__/mdocOpenId4VcDeviceResponse.test.ts index fd87a5b269..53e4759b8d 100644 --- a/packages/core/src/modules/mdoc/__tests__/mdocOpenId4VcDeviceResponse.test.ts +++ b/packages/core/src/modules/mdoc/__tests__/mdocOpenId4VcDeviceResponse.test.ts @@ -1,5 +1,5 @@ -// eslint-disable-next-line import/no-extraneous-dependencies import { cborEncode, parseDeviceResponse } from '@animo-id/mdoc' +// eslint-disable-next-line import/no-extraneous-dependencies import { Key as AskarKey, Jwk } from '@hyperledger/aries-askar-nodejs' import { Agent, KeyType } from '../../..'