feat: (WIP) added ownerId, tenantId, and origin.

Sphereon-Opensource · Mar 14, 2024 · d9b8623 · d9b8623
1 parent 03d3feb
commit d9b8623
Show file tree

Hide file tree

Showing 22 changed files with 428 additions and 103 deletions.
diff --git a/packages/contact-manager/__tests__/shared/contactManagerAgentLogic.ts b/packages/contact-manager/__tests__/shared/contactManagerAgentLogic.ts
@@ -1,10 +1,11 @@
-import { TAgent } from '@veramo/core'
+import {TAgent} from '@veramo/core'
 import {
   CorrelationIdentifierEnum,
+  CredentialRole,
   ElectronicAddress,
   GetPartiesArgs,
   Identity,
-  IdentityRoleEnum,
+  IdentityOrigin,
   NaturalPerson,
   NonPersistedElectronicAddress,
   NonPersistedIdentity,
@@ -14,7 +15,7 @@ import {
   PartyTypeEnum,
   PhysicalAddress,
 } from '../../../data-store/src'
-import { AddContactArgs, IContactManager } from '../../src'
+import {AddContactArgs, IContactManager} from '../../src'
 
 type ConfiguredAgent = TAgent<IContactManager>
 
@@ -43,7 +44,8 @@ export default (testContext: { getAgent: () => ConfiguredAgent; setup: () => Pro
       const correlationId = 'default_example_did'
       const identity: NonPersistedIdentity = {
         alias: correlationId,
-        roles: [IdentityRoleEnum.ISSUER, IdentityRoleEnum.VERIFIER],
+        origin: IdentityOrigin.EXTRERNAL,
+        roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
         identifier: {
           type: CorrelationIdentifierEnum.DID,
           correlationId,
@@ -237,7 +239,8 @@ export default (testContext: { getAgent: () => ConfiguredAgent; setup: () => Pro
       const correlationId = 'new_example_did'
       const identity: NonPersistedIdentity = {
         alias: correlationId,
-        roles: [IdentityRoleEnum.ISSUER, IdentityRoleEnum.VERIFIER],
+        origin: IdentityOrigin.EXTRERNAL,
+        roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
         identifier: {
           type: CorrelationIdentifierEnum.DID,
           correlationId,
@@ -261,7 +264,8 @@ export default (testContext: { getAgent: () => ConfiguredAgent; setup: () => Pro
       const correlationId = 'missing_connection_add_example'
       const identity: NonPersistedIdentity = {
         alias: correlationId,
-        roles: [IdentityRoleEnum.ISSUER, IdentityRoleEnum.VERIFIER],
+        origin: IdentityOrigin.EXTRERNAL,
+        roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
         identifier: {
           type: CorrelationIdentifierEnum.URL,
           correlationId,
@@ -277,7 +281,8 @@ export default (testContext: { getAgent: () => ConfiguredAgent; setup: () => Pro
       const correlationId = 'missing_connection_update_example'
       const identity: NonPersistedIdentity = {
         alias: correlationId,
-        roles: [IdentityRoleEnum.ISSUER, IdentityRoleEnum.VERIFIER],
+
+        roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
         identifier: {
           type: CorrelationIdentifierEnum.DID,
           correlationId,
@@ -293,7 +298,8 @@ export default (testContext: { getAgent: () => ConfiguredAgent; setup: () => Pro
       const correlationId = 'new_update_example_did'
       const identity: NonPersistedIdentity = {
         alias: 'update_example_did',
-        roles: [IdentityRoleEnum.ISSUER, IdentityRoleEnum.VERIFIER],
+        origin: IdentityOrigin.EXTRERNAL,
+        roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
         identifier: {
           type: CorrelationIdentifierEnum.DID,
           correlationId: 'update_example_did',

diff --git a/packages/contact-manager/src/agent/ContactManager.ts b/packages/contact-manager/src/agent/ContactManager.ts
@@ -46,6 +46,7 @@ import {
   UpdatePhysicalAddressArgs,
   UpdateRelationshipArgs,
 } from '../types/IContactManager'
+import {IdentityOrigin} from "@sphereon/ssi-sdk.data-store/dist";
 
 /**
  * {@inheritDoc IContactManager}
@@ -141,6 +142,9 @@ export class ContactManager implements IAgentPlugin {
   /** {@inheritDoc IContactManager.cmAddIdentity} */
   private async cmAddIdentity(args: AddIdentityArgs, context: RequiredContext): Promise<Identity> {
     const { contactId, identity } = args
+    if(!identity.origin) {
+      identity.origin = IdentityOrigin.EXTRERNAL
+    }
     return this.store.addIdentity({ partyId: contactId, identity })
   }
 

diff --git a/packages/data-store/src/__tests__/contact.entities.test.ts b/packages/data-store/src/__tests__/contact.entities.test.ts
@@ -1,23 +1,23 @@
-import { DataSource, FindOptionsWhere } from 'typeorm'
-import { DataStoreContactEntities, DataStoreMigrations } from '../index'
-import { BaseContactEntity } from '../entities/contact/BaseContactEntity'
-import { ConnectionEntity } from '../entities/contact/ConnectionEntity'
-import { CorrelationIdentifierEntity } from '../entities/contact/CorrelationIdentifierEntity'
-import { DidAuthConfigEntity } from '../entities/contact/DidAuthConfigEntity'
-import { ElectronicAddressEntity } from '../entities/contact/ElectronicAddressEntity'
-import { IdentityEntity } from '../entities/contact/IdentityEntity'
-import { IdentityMetadataItemEntity } from '../entities/contact/IdentityMetadataItemEntity'
-import { NaturalPersonEntity } from '../entities/contact/NaturalPersonEntity'
-import { OpenIdConfigEntity } from '../entities/contact/OpenIdConfigEntity'
-import { OrganizationEntity } from '../entities/contact/OrganizationEntity'
-import { PartyEntity } from '../entities/contact/PartyEntity'
-import { PartyRelationshipEntity } from '../entities/contact/PartyRelationshipEntity'
-import { PartyTypeEntity } from '../entities/contact/PartyTypeEntity'
-import { PhysicalAddressEntity } from '../entities/contact/PhysicalAddressEntity'
+import {DataSource, FindOptionsWhere} from 'typeorm'
+import {DataStoreContactEntities, DataStoreMigrations, IdentityOrigin} from '../index'
+import {BaseContactEntity} from '../entities/contact/BaseContactEntity'
+import {ConnectionEntity} from '../entities/contact/ConnectionEntity'
+import {CorrelationIdentifierEntity} from '../entities/contact/CorrelationIdentifierEntity'
+import {DidAuthConfigEntity} from '../entities/contact/DidAuthConfigEntity'
+import {ElectronicAddressEntity} from '../entities/contact/ElectronicAddressEntity'
+import {IdentityEntity} from '../entities/contact/IdentityEntity'
+import {IdentityMetadataItemEntity} from '../entities/contact/IdentityMetadataItemEntity'
+import {NaturalPersonEntity} from '../entities/contact/NaturalPersonEntity'
+import {OpenIdConfigEntity} from '../entities/contact/OpenIdConfigEntity'
+import {OrganizationEntity} from '../entities/contact/OrganizationEntity'
+import {PartyEntity} from '../entities/contact/PartyEntity'
+import {PartyRelationshipEntity} from '../entities/contact/PartyRelationshipEntity'
+import {PartyTypeEntity} from '../entities/contact/PartyTypeEntity'
+import {PhysicalAddressEntity} from '../entities/contact/PhysicalAddressEntity'
 import {
   ConnectionTypeEnum,
   CorrelationIdentifierEnum,
-  IdentityRoleEnum,
+  CredentialRole,
   NaturalPerson,
   NonPersistedConnection,
   NonPersistedDidAuthConfig,
@@ -397,7 +397,8 @@ describe('Database entities tests', (): void => {
     const alias = 'non_unique_alias'
     const identity1: NonPersistedIdentity = {
       alias,
-      roles: [IdentityRoleEnum.ISSUER, IdentityRoleEnum.VERIFIER],
+      origin: IdentityOrigin.EXTRERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierEnum.DID,
         correlationId: 'unique_correlationId1',
@@ -408,7 +409,8 @@ describe('Database entities tests', (): void => {
 
     const identity2: NonPersistedIdentity = {
       alias: alias,
-      roles: [IdentityRoleEnum.ISSUER, IdentityRoleEnum.VERIFIER],
+      origin: IdentityOrigin.EXTRERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierEnum.DID,
         correlationId: 'unique_correlationId2',
@@ -424,7 +426,8 @@ describe('Database entities tests', (): void => {
     const correlationId = 'non_unique_correlationId'
     const identity1: NonPersistedIdentity = {
       alias: 'unique_alias1',
-      roles: [IdentityRoleEnum.ISSUER, IdentityRoleEnum.VERIFIER],
+      origin: IdentityOrigin.EXTRERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierEnum.DID,
         correlationId,
@@ -435,7 +438,8 @@ describe('Database entities tests', (): void => {
 
     const identity2: NonPersistedIdentity = {
       alias: 'unique_alias2',
-      roles: [IdentityRoleEnum.ISSUER, IdentityRoleEnum.VERIFIER],
+      origin: IdentityOrigin.EXTRERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierEnum.DID,
         correlationId,
@@ -451,7 +455,8 @@ describe('Database entities tests', (): void => {
     const correlationId = 'example_did'
     const identity: NonPersistedIdentity = {
       alias: correlationId,
-      roles: [IdentityRoleEnum.ISSUER, IdentityRoleEnum.VERIFIER],
+      origin: IdentityOrigin.EXTRERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierEnum.DID,
         correlationId,
@@ -480,7 +485,8 @@ describe('Database entities tests', (): void => {
   it('should throw error when saving identity with blank alias', async (): Promise<void> => {
     const identity: NonPersistedIdentity = {
       alias: '',
-      roles: [IdentityRoleEnum.ISSUER, IdentityRoleEnum.VERIFIER],
+      origin: IdentityOrigin.EXTRERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierEnum.DID,
         correlationId: 'example_did',
@@ -495,7 +501,8 @@ describe('Database entities tests', (): void => {
   it('should throw error when saving identity with blank correlation id', async (): Promise<void> => {
     const identity: NonPersistedIdentity = {
       alias: 'example_did',
-      roles: [IdentityRoleEnum.ISSUER, IdentityRoleEnum.VERIFIER],
+      origin: IdentityOrigin.EXTRERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierEnum.DID,
         correlationId: '',
@@ -511,7 +518,8 @@ describe('Database entities tests', (): void => {
     const correlationId = 'example_did'
     const identity: NonPersistedIdentity = {
       alias: correlationId,
-      roles: [IdentityRoleEnum.ISSUER, IdentityRoleEnum.VERIFIER],
+      origin: IdentityOrigin.EXTRERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierEnum.DID,
         correlationId,
@@ -533,7 +541,8 @@ describe('Database entities tests', (): void => {
     const correlationId = 'example_did'
     const identity: NonPersistedIdentity = {
       alias: correlationId,
-      roles: [IdentityRoleEnum.ISSUER, IdentityRoleEnum.VERIFIER],
+      origin: IdentityOrigin.EXTRERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierEnum.DID,
         correlationId,
@@ -555,7 +564,8 @@ describe('Database entities tests', (): void => {
     const correlationId = 'example.com'
     const identity: NonPersistedIdentity = {
       alias: correlationId,
-      roles: [IdentityRoleEnum.ISSUER, IdentityRoleEnum.VERIFIER],
+      origin: IdentityOrigin.EXTRERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierEnum.URL,
         correlationId,
@@ -600,7 +610,8 @@ describe('Database entities tests', (): void => {
     const correlationId = 'example.com'
     const identity: NonPersistedIdentity = {
       alias: correlationId,
-      roles: [IdentityRoleEnum.ISSUER, IdentityRoleEnum.VERIFIER],
+      origin: IdentityOrigin.EXTRERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierEnum.URL,
         correlationId,
@@ -811,7 +822,8 @@ describe('Database entities tests', (): void => {
     const correlationId = 'relation_example.com'
     const identity: NonPersistedIdentity = {
       alias: correlationId,
-      roles: [IdentityRoleEnum.ISSUER, IdentityRoleEnum.VERIFIER],
+      origin: IdentityOrigin.EXTRERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierEnum.URL,
         correlationId,
@@ -970,7 +982,8 @@ describe('Database entities tests', (): void => {
     const correlationId = 'relation_example.com'
     const identity: NonPersistedIdentity = {
       alias: correlationId,
-      roles: [IdentityRoleEnum.ISSUER, IdentityRoleEnum.VERIFIER],
+      origin: IdentityOrigin.EXTRERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierEnum.URL,
         correlationId,
@@ -1070,7 +1083,8 @@ describe('Database entities tests', (): void => {
     const correlationId = 'relation_example.com'
     const identity: NonPersistedIdentity = {
       alias: correlationId,
-      roles: [IdentityRoleEnum.ISSUER, IdentityRoleEnum.VERIFIER],
+      origin: IdentityOrigin.EXTRERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierEnum.URL,
         correlationId,
@@ -1191,7 +1205,8 @@ describe('Database entities tests', (): void => {
     const correlationId = 'example_did'
     const identity: NonPersistedIdentity = {
       alias: correlationId,
-      roles: [IdentityRoleEnum.ISSUER, IdentityRoleEnum.VERIFIER],
+      origin: IdentityOrigin.EXTRERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierEnum.DID,
         correlationId,
@@ -1217,7 +1232,8 @@ describe('Database entities tests', (): void => {
     const correlationId = 'example_did'
     const identity: NonPersistedIdentity = {
       alias: correlationId,
-      roles: [IdentityRoleEnum.ISSUER, IdentityRoleEnum.VERIFIER],
+      origin: IdentityOrigin.EXTRERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierEnum.DID,
         correlationId,
@@ -1354,7 +1370,8 @@ describe('Database entities tests', (): void => {
     const correlationId = 'example_did'
     const identity: NonPersistedIdentity = {
       alias: correlationId,
-      roles: [IdentityRoleEnum.ISSUER, IdentityRoleEnum.VERIFIER],
+      origin: IdentityOrigin.EXTRERNAL,
+      roles: [CredentialRole.ISSUER, CredentialRole.VERIFIER],
       identifier: {
         type: CorrelationIdentifierEnum.DID,
         correlationId,