chore: Update branch with main (#2106)

* chore: return access token response (#2097) Signed-off-by: Timo Glastra <[email protected]> * fix: exp encoding (#2101) Signed-off-by: Timo Glastra <[email protected]> * fix: mdoc patches (#2102) Signed-off-by: Timo Glastra <[email protected]> * fix: address pex fixes (#2104) Signed-off-by: Timo Glastra <[email protected]> --------- Signed-off-by: Timo Glastra <[email protected]> Co-authored-by: Timo Glastra <[email protected]>
openwallet-foundation · Nov 24, 2024 · 367dfa2 · 367dfa2
1 parent 11455b5
commit 367dfa2
Show file tree

Hide file tree

Showing 20 changed files with 610 additions and 247 deletions.
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -35,14 +35,14 @@
     "@peculiar/asn1-schema": "^2.3.8",
     "@peculiar/asn1-x509": "^2.3.8",
     "@peculiar/x509": "^1.11.0",
-    "@animo-id/mdoc": "0.2.38",
+    "@animo-id/mdoc": "0.2.39",
     "@sd-jwt/core": "^0.7.0",
     "@sd-jwt/decode": "^0.7.0",
     "@sd-jwt/jwt-status-list": "^0.7.0",
     "@sd-jwt/sd-jwt-vc": "^0.7.0",
     "@sd-jwt/types": "^0.7.0",
     "@sd-jwt/utils": "^0.7.0",
-    "@sphereon/pex": "5.0.0-unstable.25",
+    "@animo-id/pex": "4.1.1-alpha.0",
     "@sphereon/pex-models": "^2.3.1",
     "@sphereon/ssi-types": "0.30.2-next.135",
     "@stablelib/ed25519": "^1.0.2",
@@ -54,7 +54,7 @@
     "class-transformer": "0.5.1",
     "class-validator": "0.14.1",
     "did-resolver": "^4.1.0",
-    "jsonpath": "^1.1.1",
+    "@astronautlabs/jsonpath": "^1.1.2",
     "lru_map": "^0.4.1",
     "luxon": "^3.5.0",
     "make-error": "^1.3.6",
@@ -70,7 +70,6 @@
   },
   "devDependencies": {
     "@types/events": "^3.0.0",
-    "@types/jsonpath": "^0.2.4",
     "@types/luxon": "^3.2.0",
     "@types/object-inspect": "^1.8.0",
     "@types/uuid": "^9.0.1",

diff --git a/packages/core/src/modules/dif-presentation-exchange/DifPresentationExchangeService.ts b/packages/core/src/modules/dif-presentation-exchange/DifPresentationExchangeService.ts
@@ -14,16 +14,16 @@ import type { VerificationMethod } from '../dids'
 import type { SdJwtVcRecord } from '../sd-jwt-vc'
 import type { W3cCredentialRecord } from '../vc'
 import type { IAnonCredsDataIntegrityService } from '../vc/data-integrity/models/IAnonCredsDataIntegrityService'
-import type { PresentationSignCallBackParams, Validated, VerifiablePresentationResult } from '@sphereon/pex'
+import type { PresentationSignCallBackParams, Validated, VerifiablePresentationResult } from '@animo-id/pex'
 import type { InputDescriptorV2 } from '@sphereon/pex-models'
 import type {
   SdJwtDecodedVerifiableCredential,
   W3CVerifiablePresentation as SphereonW3cVerifiablePresentation,
   W3CVerifiablePresentation,
 } from '@sphereon/ssi-types'
 
-import { PEVersion, PEX, PresentationSubmissionLocation, Status } from '@sphereon/pex'
-import { PartialSdJwtDecodedVerifiableCredential } from '@sphereon/pex/dist/main/lib'
+import { PEVersion, PEX, PresentationSubmissionLocation, Status } from '@animo-id/pex'
+import { PartialSdJwtDecodedVerifiableCredential } from '@animo-id/pex/dist/main/lib'
 import { injectable } from 'tsyringe'
 
 import { Hasher, getJwkFromKey } from '../../crypto'

diff --git a/...re/src/modules/dif-presentation-exchange/__tests__/DifPresentationExchangeService.test.ts b/...re/src/modules/dif-presentation-exchange/__tests__/DifPresentationExchangeService.test.ts
diff --git 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,6 @@
-import type { MdocRecord } from '../../mdoc'
+import type { MdocNameSpaces, MdocRecord } from '../../mdoc'
 import type { SdJwtVcRecord } from '../../sd-jwt-vc'
 import type { ClaimFormat, W3cCredentialRecord } from '../../vc'
-import type { MdocNameSpaces } from '@animo-id/mdoc'
 
 export interface DifPexCredentialsForRequest {
   /**

diff --git a/packages/core/src/modules/dif-presentation-exchange/models/index.ts b/packages/core/src/modules/dif-presentation-exchange/models/index.ts
@@ -4,7 +4,7 @@ import type { SdJwtVc } from '../../sd-jwt-vc'
 import type { W3cVerifiableCredential, W3cVerifiablePresentation } from '../../vc'
 import type { PresentationDefinitionV1, PresentationDefinitionV2, PresentationSubmission } from '@sphereon/pex-models'
 
-import { PresentationSubmissionLocation } from '@sphereon/pex'
+import { PresentationSubmissionLocation } from '@animo-id/pex'
 
 // Re-export some types from sphereon library, but under more explicit names
 export type DifPresentationExchangeDefinition = PresentationDefinitionV1 | PresentationDefinitionV2