Merge pull request #210 from Sphereon-Opensource/develop

New release
Sphereon-Opensource · Jun 13, 2024 · a999fc2 · a999fc2
2 parents fd8e108 + dc56df2
commit a999fc2
Show file tree

Hide file tree

Showing 167 changed files with 11,363 additions and 6,023 deletions.
diff --git a/LICENSE b/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [2021] [Sphereon BV]
+   Copyright [2024] [Sphereon International B.V.]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/package.json b/package.json
@@ -111,6 +111,9 @@
       "@veramo/url-handler": "4.2.0",
       "@sphereon/ssi-types": "workspace:*",
       "@sphereon/ssi-sdk.core": "workspace:*",
+      "@sphereon/oid4vci-common": "0.10.4-next.25",
+      "@sphereon/oid4vci-client": "0.10.4-next.25",
+      "@sphereon/oid4vci-issuer": "0.10.4-next.25",
       "@noble/hashes": "1.2.0",
       "did-jwt": "6.11.6",
       "did-jwt-vc": "3.1.3",
@@ -128,4 +131,3 @@
     }
   }
 }
-
diff --git a/packages/agent-config/LICENSE b/packages/agent-config/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [2022] [Sphereon BV]
+   Copyright [2024] [Sphereon International B.V.]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/packages/contact-manager-rest-api/LICENSE b/packages/contact-manager-rest-api/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [2021] [Sphereon BV]
+   Copyright [2024] [Sphereon International B.V.]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/packages/contact-manager-rest-api/__tests__/agent.ts b/packages/contact-manager-rest-api/__tests__/agent.ts
@@ -3,7 +3,14 @@ import { DataStore, DataStoreORM, DIDStore } from '@veramo/data-store'
 import { IRequiredPlugins } from '../src'
 import { DB_CONNECTION_NAME, sqliteConfig } from './database'
 import { AddContactArgs, ContactManager } from '@sphereon/ssi-sdk.contact-manager'
-import { ContactStore, CorrelationIdentifierEnum, IdentityRoleEnum, NonPersistedIdentity, PartyTypeEnum } from '@sphereon/ssi-sdk.data-store'
+import {
+  ContactStore,
+  CorrelationIdentifierType,
+  CredentialRole,
+  NonPersistedIdentity,
+  PartyOrigin,
+  PartyTypeType,
+} from '@sphereon/ssi-sdk.data-store'
 import { DataSources } from '@sphereon/ssi-sdk.agent-config'
 import { v4 } from 'uuid'
 import { DIDManager } from '@veramo/did-manager'
@@ -60,9 +67,9 @@ const toContactIdentityDTO = (contact: Record<string, any>, identifier: IIdentif
   console.log(`Contact received did ${identifier.did}, contact: ${JSON.stringify(contact)}`)
   return {
     alias: identifier.alias,
-    roles: [IdentityRoleEnum.ISSUER],
+    roles: [CredentialRole.ISSUER],
     identifier: {
-      type: CorrelationIdentifierEnum.DID,
+      type: CorrelationIdentifierType.DID,
       correlationId: identifier.did,
     },
   } as NonPersistedIdentity
@@ -72,13 +79,15 @@ async function addContacts() {
   try {
     const personContactType = await agent.cmAddContactType({
       name: 'people',
-      type: PartyTypeEnum.NATURAL_PERSON,
+      origin: PartyOrigin.EXTERNAL,
+      type: PartyTypeType.NATURAL_PERSON,
       tenantId: v4(),
     })
 
     const organizationalContactType = await agent.cmAddContactType({
       name: 'organizations',
-      type: PartyTypeEnum.ORGANIZATION,
+      origin: PartyOrigin.EXTERNAL,
+      type: PartyTypeType.ORGANIZATION,
       tenantId: v4(),
     })
 

diff --git a/packages/contact-manager-rest-api/package.json b/packages/contact-manager-rest-api/package.json
@@ -12,8 +12,8 @@
   },
   "dependencies": {
     "@sphereon/ssi-express-support": "workspace:*",
-    "@sphereon/ssi-sdk-ext.key-manager": "0.19.0",
-    "@sphereon/ssi-sdk-ext.key-utils": "0.19.0",
+    "@sphereon/ssi-sdk-ext.key-manager": "0.20.0",
+    "@sphereon/ssi-sdk-ext.key-utils": "0.20.0",
     "@sphereon/ssi-sdk.agent-config": "workspace:*",
     "@sphereon/ssi-sdk.contact-manager": "workspace:*",
     "@sphereon/ssi-sdk.core": "workspace:*",

diff --git a/packages/contact-manager-rest-api/src/api-functions.ts b/packages/contact-manager-rest-api/src/api-functions.ts
@@ -67,6 +67,7 @@ export function partyDeleteEndpoint(router: Router, context: IRequiredContext, o
     try {
       const partyId = request.params.partyId
       const result = await context.agent.cmRemoveContact({ contactId: partyId })
+      response.statusCode = 200
       return response.send(result)
     } catch (error) {
       return sendErrorResponse(response, 500, error.message, error)

diff --git a/packages/contact-manager/LICENSE b/packages/contact-manager/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [2022] [Sphereon BV]
+   Copyright [2024] [Sphereon International B.V.]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/packages/contact-manager/__tests__/shared/contactManagerAgentLogic.ts b/packages/contact-manager/__tests__/shared/contactManagerAgentLogic.ts
@@ -4,7 +4,8 @@ import {
   ElectronicAddress,
   GetPartiesArgs,
   Identity,
-  IdentityRole,
+  CredentialRole,
+  IdentityOrigin,
   NaturalPerson,
   NonPersistedElectronicAddress,
   NonPersistedIdentity,
@@ -45,7 +46,8 @@ export default (testContext: { getAgent: () => ConfiguredAgent; setup: () => Pro
       const correlationId = 'default_example_did'
       const identity: NonPersistedIdentity = {
         alias: correlationId,
-        roles: [IdentityRole.ISSUER, IdentityRole.VERIFIER],
+        origin: IdentityOrigin.EXTERNAL,
+        roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
         identifier: {
           type: CorrelationIdentifierType.DID,
           correlationId,
@@ -241,7 +243,8 @@ export default (testContext: { getAgent: () => ConfiguredAgent; setup: () => Pro
       const correlationId = 'new_example_did'
       const identity: NonPersistedIdentity = {
         alias: correlationId,
-        roles: [IdentityRole.ISSUER, IdentityRole.VERIFIER],
+        origin: IdentityOrigin.EXTERNAL,
+        roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
         identifier: {
           type: CorrelationIdentifierType.DID,
           correlationId,
@@ -265,7 +268,8 @@ export default (testContext: { getAgent: () => ConfiguredAgent; setup: () => Pro
       const correlationId = 'missing_connection_add_example'
       const identity: NonPersistedIdentity = {
         alias: correlationId,
-        roles: [IdentityRole.ISSUER, IdentityRole.VERIFIER],
+        origin: IdentityOrigin.EXTERNAL,
+        roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
         identifier: {
           type: CorrelationIdentifierType.URL,
           correlationId,
@@ -281,7 +285,8 @@ export default (testContext: { getAgent: () => ConfiguredAgent; setup: () => Pro
       const correlationId = 'missing_connection_update_example'
       const identity: NonPersistedIdentity = {
         alias: correlationId,
-        roles: [IdentityRole.ISSUER, IdentityRole.VERIFIER],
+        origin: IdentityOrigin.EXTERNAL,
+        roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
         identifier: {
           type: CorrelationIdentifierType.DID,
           correlationId,
@@ -297,7 +302,8 @@ export default (testContext: { getAgent: () => ConfiguredAgent; setup: () => Pro
       const correlationId = 'new_update_example_did'
       const identity: NonPersistedIdentity = {
         alias: 'update_example_did',
-        roles: [IdentityRole.ISSUER, IdentityRole.VERIFIER],
+        origin: IdentityOrigin.EXTERNAL,
+        roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
         identifier: {
           type: CorrelationIdentifierType.DID,
           correlationId: 'update_example_did',

diff --git a/packages/data-store/LICENSE b/packages/data-store/LICENSE
@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright 2022 Sphereon BV
+   Copyright [2024] [Sphereon International B.V.]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

diff --git a/packages/data-store/package.json b/packages/data-store/package.json
@@ -6,19 +6,22 @@
   "types": "dist/index.d.ts",
   "scripts": {
     "build": "tsc --build",
+    "build:clean": "tsc --build --clean && tsc --build",
     "typeorm": "ts-node --project ./tsconfig.json -r tsconfig-paths/register ../../node_modules/.pnpm/[email protected][email protected][email protected]/node_modules/typeorm/cli.js --config src/migrations/internal-migrations-ormconfig.ts",
     "typeorm-sqlite:migration:generate": "pnpm run typeorm -- migration:generate -c migration-sqlite -d src/migrations/sqlite -n",
     "typeorm-sqlite:migration:run": "pnpm run typeorm -- migration:run -c migration-sqlite",
     "typeorm-postgres:migration:generate": "pnpm run typeorm -- migration:generate -c migration-postgres -d src/migrations/postgres -n",
     "typeorm-postgres:migration:run": "pnpm run typeorm -- migration:run -c migration-postgres"
   },
   "dependencies": {
+    "@sphereon/pex": "^3.3.3",
     "@sphereon/ssi-sdk.core": "workspace:*",
     "@sphereon/ssi-types": "workspace:*",
     "@veramo/core": "4.2.0",
     "@veramo/utils": "4.2.0",
     "class-validator": "^0.14.0",
     "debug": "^4.3.4",
+    "blakejs": "^1.1.1",
     "typeorm": "^0.3.20"
   },
   "devDependencies": {