Skip to content

Commit ca1dded

Browse files
nklompnklomp
committed
feat: oid4vc 1.0, mdoc support, update dev and runtime dependencies to latest versions, and clean up imports
1 parent 639db9e commit ca1dded

72 files changed

Lines changed: 508 additions & 1061 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎packages/anomaly-detection/plugin.schema.json‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,7 @@
1919
"type": "string"
2020
}
2121
},
22-
"required": [
23-
"ipOrHostname"
24-
]
22+
"required": ["ipOrHostname"]
2523
},
2624
"AnomalyDetectionLookupLocationResult": {
2725
"type": "object",
@@ -49,4 +47,4 @@
4947
}
5048
}
5149
}
52-
}
50+
}

‎packages/credential-design-manager/__tests__/shared/credentialDesignManagerAgentLogic.ts‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
import { TAgent } from '@veramo/core'
22
import { CredentialDesign } from '@sphereon/ssi-sdk.data-store-types'
3-
import {
4-
AddCredentialDesignArgs,
5-
ICredentialDesignManager,
6-
UpdateCredentialDesignArgs,
7-
} from '../../src'
3+
import { AddCredentialDesignArgs, ICredentialDesignManager, UpdateCredentialDesignArgs } from '../../src'
84

95
import { afterAll, beforeAll, describe, expect, it } from 'vitest'
106

‎packages/credential-design-manager/plugin.schema.json‎

Lines changed: 19 additions & 75 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,7 @@
4343
"type": "string"
4444
}
4545
},
46-
"required": [
47-
"identifier",
48-
"schema",
49-
"uiSchema",
50-
"options"
51-
],
46+
"required": ["identifier", "schema", "uiSchema", "options"],
5247
"additionalProperties": false
5348
},
5449
"Record<string,unknown>": {
@@ -83,9 +78,7 @@
8378
"$ref": "#/components/schemas/Record<string,unknown>"
8479
}
8580
},
86-
"required": [
87-
"format"
88-
],
81+
"required": ["format"],
8982
"additionalProperties": false
9083
},
9184
"CredentialDesignBrandingInput": {
@@ -138,10 +131,7 @@
138131
"type": "number"
139132
}
140133
},
141-
"required": [
142-
"height",
143-
"width"
144-
]
134+
"required": ["height", "width"]
145135
},
146136
"CredentialDesign": {
147137
"type": "object",
@@ -171,12 +161,7 @@
171161
"$ref": "#/components/schemas/CredentialDesignBranding"
172162
}
173163
},
174-
"required": [
175-
"id",
176-
"identifier",
177-
"metadataKeys",
178-
"schemaDefinitions"
179-
],
164+
"required": ["id", "identifier", "metadataKeys", "schemaDefinitions"],
180165
"additionalProperties": false
181166
},
182167
"MetadataKey": {
@@ -198,22 +183,12 @@
198183
}
199184
}
200185
},
201-
"required": [
202-
"id",
203-
"key",
204-
"valueType",
205-
"metadataValues"
206-
],
186+
"required": ["id", "key", "valueType", "metadataValues"],
207187
"additionalProperties": false
208188
},
209189
"ValueType": {
210190
"type": "string",
211-
"enum": [
212-
"Text",
213-
"Number",
214-
"Boolean",
215-
"Date"
216-
]
191+
"enum": ["Text", "Number", "Boolean", "Date"]
217192
},
218193
"MetadataValue": {
219194
"type": "object",
@@ -238,9 +213,7 @@
238213
"format": "date-time"
239214
}
240215
},
241-
"required": [
242-
"id"
243-
],
216+
"required": ["id"],
244217
"additionalProperties": false
245218
},
246219
"SchemaDefinition": {
@@ -268,10 +241,7 @@
268241
"type": "string"
269242
}
270243
},
271-
"required": [
272-
"id",
273-
"schema"
274-
],
244+
"required": ["id", "schema"],
275245
"additionalProperties": false
276246
},
277247
"CredentialDesignBranding": {
@@ -293,9 +263,7 @@
293263
"$ref": "#/components/schemas/IImageAttributes"
294264
}
295265
},
296-
"required": [
297-
"id"
298-
],
266+
"required": ["id"],
299267
"additionalProperties": false
300268
},
301269
"IImageAttributes": {
@@ -320,9 +288,7 @@
320288
"$ref": "#/components/schemas/IImageDimensions"
321289
}
322290
},
323-
"required": [
324-
"id"
325-
],
291+
"required": ["id"],
326292
"additionalProperties": false
327293
},
328294
"IImageDimensions": {
@@ -338,11 +304,7 @@
338304
"type": "number"
339305
}
340306
},
341-
"required": [
342-
"id",
343-
"width",
344-
"height"
345-
],
307+
"required": ["id", "width", "height"],
346308
"additionalProperties": false
347309
},
348310
"CredentialDesignCountArgs": {
@@ -367,9 +329,7 @@
367329
"type": "number"
368330
}
369331
},
370-
"required": [
371-
"count"
372-
],
332+
"required": ["count"],
373333
"additionalProperties": false
374334
},
375335
"FormStepGetOrCreateArgs": {
@@ -379,9 +339,7 @@
379339
"type": "string"
380340
}
381341
},
382-
"required": [
383-
"formId"
384-
],
342+
"required": ["formId"],
385343
"additionalProperties": false
386344
},
387345
"FormStepGetOrCreateResult": {
@@ -391,9 +349,7 @@
391349
"type": "string"
392350
}
393351
},
394-
"required": [
395-
"formStepId"
396-
],
352+
"required": ["formStepId"],
397353
"additionalProperties": false
398354
},
399355
"GetCredentialDesignArgs": {
@@ -403,9 +359,7 @@
403359
"type": "string"
404360
}
405361
},
406-
"required": [
407-
"credentialDesignId"
408-
],
362+
"required": ["credentialDesignId"],
409363
"additionalProperties": false
410364
},
411365
"GetCredentialDesignsArgs": {
@@ -436,9 +390,7 @@
436390
"type": "string"
437391
}
438392
},
439-
"required": [
440-
"credentialDesignId"
441-
],
393+
"required": ["credentialDesignId"],
442394
"additionalProperties": false
443395
},
444396
"RemoveCredentialDesignResult": {
@@ -448,9 +400,7 @@
448400
"type": "boolean"
449401
}
450402
},
451-
"required": [
452-
"result"
453-
],
403+
"required": ["result"],
454404
"additionalProperties": false
455405
},
456406
"UpdateCredentialDesignArgs": {
@@ -491,13 +441,7 @@
491441
"$ref": "#/components/schemas/CredentialDesignBrandingInput"
492442
}
493443
},
494-
"required": [
495-
"credentialDesignId",
496-
"identifier",
497-
"schema",
498-
"uiSchema",
499-
"options"
500-
],
444+
"required": ["credentialDesignId", "identifier", "schema", "uiSchema", "options"],
501445
"additionalProperties": false
502446
}
503447
},
@@ -571,4 +515,4 @@
571515
}
572516
}
573517
}
574-
}
518+
}

‎packages/credential-design-manager/src/agent/CredentialDesignManager.ts‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,7 @@ import {
77
NonPersistedSchemaDefinition,
88
ValueType,
99
} from '@sphereon/ssi-sdk.data-store-types'
10-
import {
11-
CredentialDesignCountResult,
12-
FormStepGetOrCreateResult, RemoveCredentialDesignResult, schema
13-
} from '../index'
10+
import { CredentialDesignCountResult, FormStepGetOrCreateResult, RemoveCredentialDesignResult, schema } from '../index'
1411
import {
1512
AddCredentialDesignArgs,
1613
CredentialConfigurationOptions,
@@ -100,9 +97,7 @@ export class CredentialDesignManager implements IAgentPlugin {
10097

10198
/** {@inheritDoc ICredentialDesignManager.cdmRemoveCredentialDesign} */
10299
private async cdmRemoveCredentialDesign(args: RemoveCredentialDesignArgs, context: RequiredContext): Promise<RemoveCredentialDesignResult> {
103-
return this.store
104-
.removeCredentialDesign({ credentialDesignId: args.credentialDesignId })
105-
.then(() => ({ result: true }))
100+
return this.store.removeCredentialDesign({ credentialDesignId: args.credentialDesignId }).then(() => ({ result: true }))
106101
}
107102

108103
/** {@inheritDoc ICredentialDesignManager.cdmCredentialDesignCount} */

‎packages/credential-validation/src/agent/CredentialValidation.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import mdocPkg from '@sphereon/kmp-mdoc-core'
22
import { IVerifySdJwtVcResult } from '@sphereon/ssi-sdk.sd-jwt'
33
import {
44
CredentialMapper,
5-
ICoseKeyJson,
65
ICredentialSchemaType,
76
IVerifyResult,
87
OriginalVerifiableCredential,
@@ -26,6 +25,7 @@ import {
2625
VerifySDJWTCredentialArgs,
2726
} from '../index'
2827
import IVerifySignatureResult = mdocPkg.com.sphereon.crypto.generic.IVerifySignatureResult
28+
import ICoseKeyJson = mdocPkg.com.sphereon.crypto.cose.ICoseKeyJson
2929
import decodeFrom = mdocPkg.com.sphereon.kmp.decodeFrom
3030
import IssuerSignedCbor = mdocPkg.com.sphereon.mdoc.data.device.IssuerSignedCbor
3131
import { defaultHasher } from '@sphereon/ssi-sdk.core'

‎packages/credential-vcdm/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
"uuid": "^9.0.1"
4545
},
4646
"devDependencies": {
47-
"@sphereon/oid4vci-common": "0.20.2-feature.oid4vci.1.0.18",
47+
"@sphereon/oid4vci-common": "0.20.2-next.21",
4848
"@sphereon/ssi-sdk-ext.did-provider-key": "workspace:*",
4949
"@sphereon/ssi-sdk-ext.key-manager": "workspace:*",
5050
"@sphereon/ssi-sdk-ext.kms-local": "workspace:*",

‎packages/data-store-types/src/credentialDesign/AbstractCredentialDesignStore.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import {
66
FormStepGetOrCreateArgs,
77
AddCredentialDesignArgs,
88
UpdateCredentialDesignArgs,
9-
RemoveCredentialDesignArgs
9+
RemoveCredentialDesignArgs,
1010
} from '../types'
1111

1212
export abstract class AbstractCredentialDesignStore {

‎packages/data-store/src/__tests__/contact.entities.test.ts‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,13 @@ import { PartyEntity } from '../entities/contact/PartyEntity'
1818
import { PartyRelationshipEntity } from '../entities/contact/PartyRelationshipEntity'
1919
import { PartyTypeEntity } from '../entities/contact/PartyTypeEntity'
2020
import { PhysicalAddressEntity } from '../entities/contact/PhysicalAddressEntity'
21-
import { contactMetadataItemEntityFrom, DataStoreEntitiesWithVeramo, DataStoreMigrationsWithVeramo, identityMetadataItemEntityFrom, partyTypeFrom } from '../index'
21+
import {
22+
contactMetadataItemEntityFrom,
23+
DataStoreEntitiesWithVeramo,
24+
DataStoreMigrationsWithVeramo,
25+
identityMetadataItemEntityFrom,
26+
partyTypeFrom,
27+
} from '../index'
2228
import {
2329
IdentityOrigin,
2430
MetadataTypes,

‎packages/data-store/src/__tests__/credential-design-store.test.ts‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -74,9 +74,7 @@ describe('Credential Design store tests', (): void => {
7474
it('should throw error when getting credential design with unknown id', async (): Promise<void> => {
7575
const credentialDesignId = 'unknownCredentialDesignId'
7676

77-
await expect(store.getCredentialDesign({ credentialDesignId })).rejects.toThrow(
78-
`No credential design found for id: ${credentialDesignId}`,
79-
)
77+
await expect(store.getCredentialDesign({ credentialDesignId })).rejects.toThrow(`No credential design found for id: ${credentialDesignId}`)
8078
})
8179

8280
it('should get all credential designs', async (): Promise<void> => {
@@ -412,8 +410,6 @@ describe('Credential Design store tests', (): void => {
412410
it('should throw error when removing credential design with unknown id', async (): Promise<void> => {
413411
const credentialDesignId = 'unknownCredentialDesignId'
414412

415-
await expect(store.removeCredentialDesign({ credentialDesignId })).rejects.toThrow(
416-
`No credential design found for id: ${credentialDesignId}`,
417-
)
413+
await expect(store.removeCredentialDesign({ credentialDesignId })).rejects.toThrow(`No credential design found for id: ${credentialDesignId}`)
418414
})
419415
})

‎packages/data-store/src/credentialDesign/CredentialDesignStore.ts‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,14 @@ import {
1515
import { OrPromise } from '@sphereon/ssi-types'
1616
import Debug from 'debug'
1717
import { DataSource, EntityManager, Repository } from 'typeorm'
18-
import { MetadataSetEntity, MetadataKeyEntity, MetadataValueEntity, SchemaDefinitionEntity, CredentialDesignBrandingEntity, FormStepEntity } from '../entities/credentialDesign'
18+
import {
19+
MetadataSetEntity,
20+
MetadataKeyEntity,
21+
MetadataValueEntity,
22+
SchemaDefinitionEntity,
23+
CredentialDesignBrandingEntity,
24+
FormStepEntity,
25+
} from '../entities/credentialDesign'
1926
import { ImageAttributesEntity } from '../entities/issuanceBranding/ImageAttributesEntity'
2027
import { ImageDimensionsEntity } from '../entities/issuanceBranding/ImageDimensionsEntity'
2128
import {

0 commit comments

Comments
 (0)