Merge remote-tracking branch 'upstream/main' into oid4vci-draft-13

openwallet-foundation · Jul 17, 2024 · bdc50c3 · bdc50c3
2 parents 09a5907 + 7d5ebba
commit bdc50c3
Show file tree

Hide file tree

Showing 88 changed files with 2,783 additions and 2,080 deletions.
diff --git a/.changeset/big-baboons-poke.md b/.changeset/big-baboons-poke.md
diff --git a/.changeset/eighty-radios-grin.md b/.changeset/eighty-radios-grin.md
diff --git a/.changeset/lemon-kangaroos-walk.md b/.changeset/lemon-kangaroos-walk.md
diff --git a/.changeset/nice-meals-rest.md b/.changeset/nice-meals-rest.md
@@ -0,0 +1,6 @@
+---
+"@credo-ts/core": patch
+"@credo-ts/openid4vc": patch
+---
+
+Adds support for issuance and verification of SD-JWT VCs using x509 certificates over OpenID4VC, as well as adds support for the `x509_san_uri` and `x509_san_dns` values for `client_id_scheme`.  It also adds support for OpenID4VP Draft 20
diff --git a/.changeset/pink-icons-hope.md b/.changeset/pink-icons-hope.md
@@ -0,0 +1,5 @@
+---
+'@credo-ts/core': patch
+---
+
+Treat an empty received handshake_protocols array as undefined
diff --git a/.changeset/pretty-spies-argue.md b/.changeset/pretty-spies-argue.md
@@ -0,0 +1,5 @@
+---
+'@credo-ts/core': patch
+---
+
+Allow to pass in a key instance when registering a DID jwk, key or peer with num algo 0
diff --git a/demo-openid/package.json b/demo-openid/package.json
@@ -15,7 +15,7 @@
   },
   "dependencies": {
     "@hyperledger/anoncreds-nodejs": "^0.2.2",
-    "@hyperledger/aries-askar-nodejs": "^0.2.1",
+    "@hyperledger/aries-askar-nodejs": "^0.2.3",
     "@hyperledger/indy-vdr-nodejs": "^0.2.2",
     "express": "^4.18.1",
     "inquirer": "^8.2.5"

diff --git a/demo/package.json b/demo/package.json
@@ -15,7 +15,7 @@
   "dependencies": {
     "@hyperledger/indy-vdr-nodejs": "^0.2.2",
     "@hyperledger/anoncreds-nodejs": "^0.2.2",
-    "@hyperledger/aries-askar-nodejs": "^0.2.1",
+    "@hyperledger/aries-askar-nodejs": "^0.2.3",
     "inquirer": "^8.2.5"
   },
   "devDependencies": {

diff --git a/package.json b/package.json
@@ -8,6 +8,7 @@
     "demo-openid",
     "samples/*"
   ],
+  "packageManager": "pnpm@9.1.0",
   "repository": {
     "url": "https://github.com/openwallet-foundation/credo-ts",
     "type": "git"
@@ -31,7 +32,7 @@
   },
   "devDependencies": {
     "@changesets/cli": "^2.27.5",
-    "@hyperledger/aries-askar-nodejs": "^0.2.1",
+    "@hyperledger/aries-askar-nodejs": "^0.2.3",
     "@jest/types": "^29.6.3",
     "@types/bn.js": "^5.1.5",
     "@types/cors": "^2.8.10",

diff --git a/packages/action-menu/CHANGELOG.md b/packages/action-menu/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.5.7
+
+### Patch Changes
+
+- Updated dependencies [352383f]
+- Updated dependencies [1044c9d]
+  - @credo-ts/core@0.5.7
+
 ## 0.5.6
 
 ### Patch Changes

diff --git a/packages/action-menu/package.json b/packages/action-menu/package.json
@@ -2,7 +2,7 @@
   "name": "@credo-ts/action-menu",
   "main": "src/index",
   "types": "src/index",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "files": [
     "build"
   ],

diff --git a/packages/anoncreds/CHANGELOG.md b/packages/anoncreds/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## 0.5.7
+
+### Patch Changes
+
+- 1044c9d: make credential_preview optional on V2CredentialOfferMessage
+- Updated dependencies [352383f]
+- Updated dependencies [1044c9d]
+  - @credo-ts/core@0.5.7
+
 ## 0.5.6
 
 ### Patch Changes

diff --git a/packages/anoncreds/package.json b/packages/anoncreds/package.json
@@ -2,7 +2,7 @@
   "name": "@credo-ts/anoncreds",
   "main": "src/index",
   "types": "src/index",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "files": [
     "build"
   ],

diff --git a/packages/askar/CHANGELOG.md b/packages/askar/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.5.7
+
+### Patch Changes
+
+- Updated dependencies [352383f]
+- Updated dependencies [1044c9d]
+  - @credo-ts/core@0.5.7
+
 ## 0.5.6
 
 ### Patch Changes

diff --git a/packages/askar/package.json b/packages/askar/package.json
@@ -2,7 +2,7 @@
   "name": "@credo-ts/askar",
   "main": "src/index",
   "types": "src/index",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "files": [
     "build"
   ],
@@ -34,8 +34,8 @@
     "tsyringe": "^4.8.0"
   },
   "devDependencies": {
-    "@hyperledger/aries-askar-nodejs": "^0.2.1",
-    "@hyperledger/aries-askar-shared": "^0.2.1",
+    "@hyperledger/aries-askar-nodejs": "^0.2.3",
+    "@hyperledger/aries-askar-shared": "^0.2.3",
     "@types/bn.js": "^5.1.0",
     "@types/ref-array-di": "^1.2.6",
     "@types/ref-struct-di": "^1.1.10",
@@ -44,6 +44,6 @@
     "typescript": "~5.5.2"
   },
   "peerDependencies": {
-    "@hyperledger/aries-askar-shared": "^0.2.1"
+    "@hyperledger/aries-askar-shared": "^0.2.3"
   }
 }
diff --git a/packages/askar/src/utils/askarKeyBackend.ts b/packages/askar/src/utils/askarKeyBackend.ts
@@ -0,0 +1,11 @@
+import { KeyBackend as CredoKeyBackend } from '@credo-ts/core'
+import { KeyBackend as AskarKeyBackend } from '@hyperledger/aries-askar-shared'
+
+export const convertToAskarKeyBackend = (credoKeyBackend: CredoKeyBackend) => {
+  switch (credoKeyBackend) {
+    case CredoKeyBackend.Software:
+      return AskarKeyBackend.Software
+    case CredoKeyBackend.SecureElement:
+      return AskarKeyBackend.SecureElement
+  }
+}
diff --git a/packages/askar/src/wallet/AskarBaseWallet.ts b/packages/askar/src/wallet/AskarBaseWallet.ts
@@ -24,6 +24,7 @@ import {
   WalletError,
   Key,
   TypedArrayEncoder,
+  KeyBackend,
 } from '@credo-ts/core'
 import { CryptoBox, Store, Key as AskarKey, keyAlgFromString } from '@hyperledger/aries-askar-shared'
 import BigNumber from 'bn.js'
@@ -35,6 +36,7 @@ import {
   isKeyTypeSupportedByAskarForPurpose,
   keyTypesSupportedByAskar,
 } from '../utils'
+import { convertToAskarKeyBackend } from '../utils/askarKeyBackend'
 
 import { didcommV1Pack, didcommV1Unpack } from './didcommV1'
 
@@ -125,7 +127,12 @@ export abstract class AskarBaseWallet implements Wallet {
    * Create a key with an optional seed and keyType.
    * The keypair is also automatically stored in the wallet afterwards
    */
-  public async createKey({ seed, privateKey, keyType }: WalletCreateKeyOptions): Promise<Key> {
+  public async createKey({
+    seed,
+    privateKey,
+    keyType,
+    keyBackend = KeyBackend.Software,
+  }: WalletCreateKeyOptions): Promise<Key> {
     try {
       if (seed && privateKey) {
         throw new WalletError('Only one of seed and privateKey can be set')
@@ -149,7 +156,7 @@ export abstract class AskarBaseWallet implements Wallet {
             ? AskarKey.fromSecretBytes({ secretKey: privateKey, algorithm })
             : seed
             ? AskarKey.fromSeed({ seed, algorithm })
-            : AskarKey.generate(algorithm)
+            : AskarKey.generate(algorithm, convertToAskarKeyBackend(keyBackend))
 
           // FIXME: we need to create a separate const '_key' so TS definitely knows _key is defined in the session callback.
           // This will be fixed once we use the new 'using' syntax

diff --git a/packages/askar/src/wallet/__tests__/AskarWallet.test.ts b/packages/askar/src/wallet/__tests__/AskarWallet.test.ts
@@ -22,6 +22,7 @@ import {
 } from '@credo-ts/core'
 import { Store } from '@hyperledger/aries-askar-shared'
 
+import { KeyBackend } from '../../../../core/src/crypto/KeyBackend'
 import { encodeToBase58 } from '../../../../core/src/utils/base58'
 import { agentDependencies } from '../../../../core/tests/helpers'
 import testLogger from '../../../../core/tests/logger'
@@ -102,7 +103,7 @@ describe('AskarWallet basic operations', () => {
         seed,
         keyType: KeyType.Ed25519,
       })
-    ).rejects.toThrowError()
+    ).rejects.toThrow()
   })
 
   test('Create x25519 keypair', async () => {
@@ -122,13 +123,17 @@ describe('AskarWallet basic operations', () => {
   test('throws WalletKeyExistsError when a key already exists', async () => {
     const privateKey = TypedArrayEncoder.fromString('2103de41b4ae37e8e28586d84a342b68')
     await expect(askarWallet.createKey({ privateKey, keyType: KeyType.Ed25519 })).resolves.toEqual(expect.any(Key))
-    await expect(askarWallet.createKey({ privateKey, keyType: KeyType.Ed25519 })).rejects.toThrowError(
-      WalletKeyExistsError
-    )
+    await expect(askarWallet.createKey({ privateKey, keyType: KeyType.Ed25519 })).rejects.toThrow(WalletKeyExistsError)
   })
 
   test('Fail to create a P384 keypair', async () => {
-    await expect(askarWallet.createKey({ seed, keyType: KeyType.P384 })).rejects.toThrowError(WalletError)
+    await expect(askarWallet.createKey({ seed, keyType: KeyType.P384 })).rejects.toThrow(WalletError)
+  })
+
+  test('Fail to create a P256 keypair in hardware', async () => {
+    await expect(
+      askarWallet.createKey({ keyType: KeyType.P256, keyBackend: KeyBackend.SecureElement })
+    ).rejects.toThrow(WalletError)
   })
 
   test('Create a signature with a ed25519 keypair', async () => {
@@ -186,12 +191,12 @@ describe.skip('Currently, all KeyTypes are supported by Askar natively', () => {
       }
 
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      public async sign(options: SignOptions): Promise<Buffer> {
+      public async sign(_options: SignOptions): Promise<Buffer> {
         return new Buffer('signed')
       }
 
       // eslint-disable-next-line @typescript-eslint/no-unused-vars
-      public async verify(options: VerifyOptions): Promise<boolean> {
+      public async verify(_options: VerifyOptions): Promise<boolean> {
         return true
       }
     }
@@ -268,7 +273,7 @@ describe('AskarWallet management', () => {
     await askarWallet.close()
     await expect(
       askarWallet.createAndOpen({ ...walletConfig, id: 'AskarWallet Create', key: anotherKey })
-    ).rejects.toThrowError(WalletDuplicateError)
+    ).rejects.toThrow(WalletDuplicateError)
   })
 
   test('Open', async () => {
@@ -282,14 +287,14 @@ describe('AskarWallet management', () => {
 
     // Close and try to re-opening it with a wrong key
     await askarWallet.close()
-    await expect(askarWallet.open({ ...walletConfig, id: 'AskarWallet Open', key: wrongKey })).rejects.toThrowError(
+    await expect(askarWallet.open({ ...walletConfig, id: 'AskarWallet Open', key: wrongKey })).rejects.toThrow(
       WalletInvalidKeyError
     )
 
     // Try to open a non existent wallet
     await expect(
       askarWallet.open({ ...walletConfig, id: 'AskarWallet Open - Non existent', key: initialKey })
-    ).rejects.toThrowError(WalletNotFoundError)
+    ).rejects.toThrow(WalletNotFoundError)
   })
 
   test('Rotate key', async () => {
@@ -313,7 +318,7 @@ describe('AskarWallet management', () => {
 
     await expect(
       askarWallet.open({ ...walletConfig, id: 'AskarWallet Key Rotation', key: initialKey })
-    ).rejects.toThrowError(WalletInvalidKeyError)
+    ).rejects.toThrow(WalletInvalidKeyError)
 
     await askarWallet.open({ ...walletConfig, id: 'AskarWallet Key Rotation', key: newKey })
 

diff --git a/packages/bbs-signatures/CHANGELOG.md b/packages/bbs-signatures/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 0.5.7
+
+### Patch Changes
+
+- Updated dependencies [352383f]
+- Updated dependencies [1044c9d]
+  - @credo-ts/core@0.5.7
+
 ## 0.5.6
 
 ### Patch Changes

diff --git a/packages/bbs-signatures/package.json b/packages/bbs-signatures/package.json
@@ -2,7 +2,7 @@
   "name": "@credo-ts/bbs-signatures",
   "main": "src/index",
   "types": "src/index",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "files": [
     "build"
   ],

diff --git a/packages/cheqd/CHANGELOG.md b/packages/cheqd/CHANGELOG.md
@@ -1,5 +1,15 @@
 # Changelog
 
+## 0.5.7
+
+### Patch Changes
+
+- 8474776: Fix a build issue where importing cheqd pacakge would not work and give type errors
+- Updated dependencies [352383f]
+- Updated dependencies [1044c9d]
+  - @credo-ts/core@0.5.7
+  - @credo-ts/anoncreds@0.5.7
+
 ## 0.5.6
 
 ### Patch Changes

diff --git a/packages/cheqd/package.json b/packages/cheqd/package.json
@@ -2,7 +2,7 @@
   "name": "@credo-ts/cheqd",
   "main": "src/index",
   "types": "src/index",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "files": [
     "build"
   ],

diff --git a/packages/core/CHANGELOG.md b/packages/core/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 0.5.7
+
+### Patch Changes
+
+- 352383f: Fix a build issue where the types would reference source code not available in the published NPM package
+- 1044c9d: make credential_preview optional on V2CredentialOfferMessage
+
 ## 0.5.6
 
 ### Patch Changes

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -2,7 +2,7 @@
   "name": "@credo-ts/core",
   "main": "src/index",
   "types": "src/index",
-  "version": "0.5.6",
+  "version": "0.5.7",
   "files": [
     "build"
   ],

diff --git a/packages/core/src/agent/Agent.ts b/packages/core/src/agent/Agent.ts
@@ -11,7 +11,7 @@ import { Subject } from 'rxjs'
 import { concatMap, takeUntil } from 'rxjs/operators'
 
 import { InjectionSymbols } from '../constants'
-import { SigningProviderToken, X509Service } from '../crypto'
+import { SigningProviderToken } from '../crypto'
 import { JwsService } from '../crypto/JwsService'
 import { CredoError } from '../error'
 import { DependencyManager } from '../plugins'
@@ -59,7 +59,6 @@ export class Agent<AgentModules extends AgentModulesInput = any> extends BaseAge
     dependencyManager.registerSingleton(DidCommMessageRepository)
     dependencyManager.registerSingleton(StorageVersionRepository)
     dependencyManager.registerSingleton(StorageUpdateService)
-    dependencyManager.registerSingleton(X509Service)
 
     // This is a really ugly hack to make tsyringe work without any SigningProviders registered
     // It is currently impossible to use @injectAll if there are no instances registered for the