Merge 28a0d20 into b977f3c

Sphereon-Opensource · May 29, 2024 · c4d749c · c4d749c
2 parents b977f3c + 28a0d20
commit c4d749c
Show file tree

Hide file tree

Showing 39 changed files with 12,693 additions and 8,278 deletions.
diff --git a/.github/workflows/build-test-on-pr.yml b/.github/workflows/build-test-on-pr.yml
@@ -21,7 +21,7 @@ jobs:
           fetch-depth: 0
       - uses: pnpm/action-setup@v3
         with:
-          version: 8
+          version: 9
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:

diff --git a/.github/workflows/build-test-publish-on-push.yml b/.github/workflows/build-test-publish-on-push.yml
@@ -35,7 +35,7 @@ jobs:
           fetch-depth: 0
       - uses: pnpm/action-setup@v3
         with:
-          version: 8
+          version: 9
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:

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/__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',