Skip to content

Commit

Permalink
chore: update mdoc
Browse files Browse the repository at this point in the history
Signed-off-by: Timo Glastra <[email protected]>
  • Loading branch information
TimoGlastra committed Nov 19, 2024
1 parent 9f404f2 commit 788d221
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 45 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion packages/core/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
Original file line number Diff line number Diff line change
@@ -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 {
/**
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/modules/mdoc/Mdoc.ts
Original file line number Diff line number Diff line change
@@ -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,
Expand All @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion packages/core/src/modules/mdoc/MdocContext.ts
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/modules/mdoc/MdocDeviceResponse.ts
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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'
Expand Down
4 changes: 2 additions & 2 deletions packages/core/src/modules/mdoc/MdocOptions.ts
Original file line number Diff line number Diff line change
@@ -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 {
/**
Expand Down
Original file line number Diff line number Diff line change
@@ -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'

Check failure on line 3 in packages/core/src/modules/mdoc/__tests__/mdocOpenId4VcDeviceResponse.test.ts

View workflow job for this annotation

GitHub Actions / Validate

'@hyperledger/aries-askar-nodejs' should be listed in the project's dependencies. Run 'npm i -S @hyperledger/aries-askar-nodejs' to add it
import { cborEncode, parseDeviceResponse } from '@protokoll/mdoc-client'

import { Agent, KeyType } from '../../..'
import { getInMemoryAgentOptions } from '../../../../tests'
Expand Down
45 changes: 11 additions & 34 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 788d221

Please sign in to comment.