@sphereon/ssi-sdk.data-store 0.23.5-next.12 → 0.23.5-next.24

package/src/contact/ContactStore.ts

@@ -38,8 +38,8 @@ import {
   AddPartyTypeArgs,
   AddPhysicalAddressArgs,
   AddRelationshipArgs,
-  ConnectionTypeEnum,
-  CorrelationIdentifierEnum,
+  ConnectionType,
+  CorrelationIdentifierType,
   ElectronicAddress,
   GetElectronicAddressArgs,
   GetElectronicAddressesArgs,
@@ -59,7 +59,7 @@ import {
   Party,
   PartyRelationship,
   PartyType,
-  PartyTypeEnum,
+  PartyTypeType,
   PhysicalAddress,
   RemoveElectronicAddressArgs,
   RemoveIdentityArgs,
@@ -126,9 +126,9 @@ export class ContactStore extends AbstractContactStore {
     }
 
     for (const identity of identities ?? []) {
-      if (identity.identifier.type === CorrelationIdentifierEnum.URL) {
+      if (identity.identifier.type === CorrelationIdentifierType.URL) {
         if (!identity.connection) {
-          return Promise.reject(Error(`Identity with correlation type ${CorrelationIdentifierEnum.URL} should contain a connection`))
+          return Promise.reject(Error(`Identity with correlation type ${CorrelationIdentifierType.URL} should contain a connection`))
         }
 
         if (!this.hasCorrectConnectionConfig(identity.connection.type, identity.connection.config)) {
@@ -235,9 +235,9 @@ export class ContactStore extends AbstractContactStore {
       return Promise.reject(Error(`No party found for id: ${partyId}`))
     }
 
-    if (identity.identifier.type === CorrelationIdentifierEnum.URL) {
+    if (identity.identifier.type === CorrelationIdentifierType.URL) {
       if (!identity.connection) {
-        return Promise.reject(Error(`Identity with correlation type ${CorrelationIdentifierEnum.URL} should contain a connection`))
+        return Promise.reject(Error(`Identity with correlation type ${CorrelationIdentifierType.URL} should contain a connection`))
       }
 
       if (!this.hasCorrectConnectionConfig(identity.connection.type, identity.connection.config)) {
@@ -266,9 +266,9 @@ export class ContactStore extends AbstractContactStore {
       return Promise.reject(Error(`No identity found for id: ${identity.id}`))
     }
 
-    if (identity.identifier.type === CorrelationIdentifierEnum.URL) {
+    if (identity.identifier.type === CorrelationIdentifierType.URL) {
       if (!identity.connection) {
-        return Promise.reject(Error(`Identity with correlation type ${CorrelationIdentifierEnum.URL} should contain a connection`))
+        return Promise.reject(Error(`Identity with correlation type ${CorrelationIdentifierType.URL} should contain a connection`))
       }
 
       if (!this.hasCorrectConnectionConfig(identity.connection.type, identity.connection.config)) {
@@ -622,22 +622,22 @@ export class ContactStore extends AbstractContactStore {
     await physicalAddressRepository.delete(physicalAddressId)
   }
 
-  private hasCorrectConnectionConfig(type: ConnectionTypeEnum, config: NonPersistedConnectionConfig): boolean {
+  private hasCorrectConnectionConfig(type: ConnectionType, config: NonPersistedConnectionConfig): boolean {
     switch (type) {
-      case ConnectionTypeEnum.OPENID_CONNECT:
+      case ConnectionType.OPENID_CONNECT:
         return isOpenIdConfig(config)
-      case ConnectionTypeEnum.SIOPv2:
+      case ConnectionType.SIOPv2:
         return isDidAuthConfig(config)
       default:
         throw new Error('Connection type not supported')
     }
   }
 
-  private hasCorrectPartyType(type: PartyTypeEnum, contact: NonPersistedContact): boolean {
+  private hasCorrectPartyType(type: PartyTypeType, contact: NonPersistedContact): boolean {
     switch (type) {
-      case PartyTypeEnum.NATURAL_PERSON:
+      case PartyTypeType.NATURAL_PERSON:
         return isNaturalPerson(contact)
-      case PartyTypeEnum.ORGANIZATION:
+      case PartyTypeType.ORGANIZATION:
         return isOrganization(contact)
       default:
         throw new Error('Party type not supported')

package/src/entities/contact/ConnectionEntity.ts

@@ -1,6 +1,6 @@
 import { Entity, Column, PrimaryGeneratedColumn, OneToOne, JoinColumn, BaseEntity } from 'typeorm'
 import { BaseConfigEntity } from './BaseConfigEntity'
-import { ConnectionTypeEnum } from '../../types'
+import { ConnectionType } from '../../types'
 import { IdentityEntity } from './IdentityEntity'
 import { OpenIdConfigEntity } from './OpenIdConfigEntity'
 import { DidAuthConfigEntity } from './DidAuthConfigEntity'
@@ -10,8 +10,8 @@ export class ConnectionEntity extends BaseEntity {
   @PrimaryGeneratedColumn('uuid')
   id!: string
 
-  @Column('simple-enum', { name: 'type', enum: ConnectionTypeEnum, nullable: false })
-  type!: ConnectionTypeEnum
+  @Column('simple-enum', { name: 'type', enum: ConnectionType, nullable: false })
+  type!: ConnectionType
 
   @OneToOne(() => BaseConfigEntity, (config: OpenIdConfigEntity | DidAuthConfigEntity) => config.connection, {
     cascade: true,

package/src/entities/contact/CorrelationIdentifierEntity.ts

@@ -1,5 +1,5 @@
 import { Entity, Column, PrimaryGeneratedColumn, BaseEntity, OneToOne, JoinColumn, BeforeInsert, BeforeUpdate } from 'typeorm'
-import { CorrelationIdentifierEnum, ValidationConstraint } from '../../types'
+import { CorrelationIdentifierType, ValidationConstraint } from '../../types'
 import { IdentityEntity } from './IdentityEntity'
 import { IsNotEmpty, validate, ValidationError } from 'class-validator'
 import { getConstraint } from '../../utils/ValidatorUtils'
@@ -9,8 +9,8 @@ export class CorrelationIdentifierEntity extends BaseEntity {
   @PrimaryGeneratedColumn('uuid')
   id!: string
 
-  @Column('simple-enum', { name: 'type', enum: CorrelationIdentifierEnum, nullable: false })
-  type!: CorrelationIdentifierEnum
+  @Column('simple-enum', { name: 'type', enum: CorrelationIdentifierType, nullable: false })
+  type!: CorrelationIdentifierType
 
   @Column('text', { name: 'correlation_id', nullable: false, unique: true })
   @IsNotEmpty({ message: 'Blank correlation ids are not allowed' })

package/src/entities/contact/IdentityEntity.ts

@@ -16,7 +16,7 @@ import { IsNotEmpty, validate, ValidationError } from 'class-validator'
 import { CorrelationIdentifierEntity } from './CorrelationIdentifierEntity'
 import { ConnectionEntity } from './ConnectionEntity'
 import { IdentityMetadataItemEntity } from './IdentityMetadataItemEntity'
-import { IdentityRoleEnum, ValidationConstraint } from '../../types'
+import { IdentityRole, ValidationConstraint } from '../../types'
 import { PartyEntity } from './PartyEntity'
 import { getConstraint } from '../../utils/ValidatorUtils'
 
@@ -35,7 +35,7 @@ export class IdentityEntity extends BaseEntity {
   alias!: string
 
   @Column('simple-array', { name: 'roles', nullable: false })
-  roles!: Array<IdentityRoleEnum>
+  roles!: Array<IdentityRole>
 
   @OneToOne(() => CorrelationIdentifierEntity, (identifier: CorrelationIdentifierEntity) => identifier.identity, {
     cascade: true,

package/src/entities/contact/PartyTypeEntity.ts

@@ -1,6 +1,6 @@
 import { BeforeInsert, BeforeUpdate, Column, CreateDateColumn, Entity, Index, OneToMany, PrimaryGeneratedColumn, UpdateDateColumn } from 'typeorm'
 import { PartyEntity } from './PartyEntity'
-import { PartyOrigin, PartyTypeEnum, ValidationConstraint } from '../../types'
+import { PartyOrigin, PartyTypeType, ValidationConstraint } from '../../types'
 import { IsNotEmpty, Validate, validate, ValidationError } from 'class-validator'
 import { IsNonEmptyStringConstraint } from '../validators'
 import { getConstraint } from '../../utils/ValidatorUtils'
@@ -11,10 +11,10 @@ export class PartyTypeEntity {
   @PrimaryGeneratedColumn('uuid')
   id!: string
 
-  @Column('simple-enum', { name: 'type', enum: PartyTypeEnum, nullable: false, unique: false })
-  type!: PartyTypeEnum
+  @Column('simple-enum', { name: 'type', enum: PartyTypeType, nullable: false, unique: false })
+  type!: PartyTypeType
 
-  @Column('simple-enum', { name: 'origin', enum: PartyOrigin, default: 'external', nullable: false, unique: false })
+  @Column('simple-enum', { name: 'origin', enum: PartyOrigin, default: 'EXTERNAL', nullable: false, unique: false })
   origin!: PartyOrigin
 
   @Column({ name: 'name', length: 255, nullable: false, unique: true })

package/src/migrations/postgres/1690925872592-CreateContacts.ts

@@ -13,9 +13,9 @@ export class CreateContacts1690925872592 implements MigrationInterface {
     await queryRunner.query(`ALTER TABLE "CorrelationIdentifier" RENAME COLUMN "identityId" TO "identity_id"`)
     await queryRunner.query(`ALTER TABLE "Connection" RENAME COLUMN "identityId" TO "identity_id"`)
     await queryRunner.query(`CREATE TYPE "public"."PartyType_type_enum" AS ENUM('naturalPerson', 'organization')`)
-    await queryRunner.query(`CREATE TYPE "public"."PartyOrigin_type_enum" AS ENUM('internal', 'external')`)
+    await queryRunner.query(`CREATE TYPE "public"."PartyOrigin_type_enum" AS ENUM('INTERNAL', 'EXTERNAL')`)
     await queryRunner.query(
-      `CREATE TABLE "PartyType" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "type" "public"."PartyType_type_enum" NOT NULL, "origin" "public"."PartyOrigin_type_enum" NOT NULL DEFAULT 'external', "name" character varying(255) NOT NULL, "description" character varying(255), "tenant_id" character varying(255) NOT NULL, "created_at" TIMESTAMP NOT NULL DEFAULT now(), "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "UQ_PartyType_name" UNIQUE ("name"), CONSTRAINT "PK_PartyType_id" PRIMARY KEY ("id"))`,
+      `CREATE TABLE "PartyType" ("id" uuid NOT NULL DEFAULT uuid_generate_v4(), "type" "public"."PartyType_type_enum" NOT NULL, "origin" "public"."PartyOrigin_type_enum" NOT NULL DEFAULT 'EXTERNAL', "name" character varying(255) NOT NULL, "description" character varying(255), "tenant_id" character varying(255) NOT NULL, "created_at" TIMESTAMP NOT NULL DEFAULT now(), "last_updated_at" TIMESTAMP NOT NULL DEFAULT now(), CONSTRAINT "UQ_PartyType_name" UNIQUE ("name"), CONSTRAINT "PK_PartyType_id" PRIMARY KEY ("id"))`,
     )
     await queryRunner.query(`CREATE UNIQUE INDEX "IDX_PartyType_type_tenant_id" ON "PartyType" ("type", "tenant_id")`)
     await queryRunner.query(
@@ -83,7 +83,10 @@ export class CreateContacts1690925872592 implements MigrationInterface {
     )
     await queryRunner.query(`DROP TABLE "BaseConfigEntity"`)
     await queryRunner.query(
-      `INSERT INTO "PartyType"(id, type, name, description, tenant_id, created_at, last_updated_at) VALUES ('3875c12e-fdaa-4ef6-a340-c936e054b627', 'organization', 'Sphereon_default_type', 'sphereon_default_organization', '95e09cfc-c974-4174-86aa-7bf1d5251fb4', now(), now())`,
+      `INSERT INTO "PartyType"(id, type, origin, name, description, tenant_id, created_at, last_updated_at) VALUES ('3875c12e-fdaa-4ef6-a340-c936e054b627', 'organization', 'INTERNAL' 'Sphereon_default_organization_type', 'sphereon_default_organization', '95e09cfc-c974-4174-86aa-7bf1d5251fb4', now(), now())`,
+    )
+    await queryRunner.query(
+      `INSERT INTO "PartyType"(id, type, origin, name, description, tenant_id, created_at, last_updated_at) VALUES ('7d248798-41ca-4fc1-a130-9934b43d532e', 'naturalPerson', 'INTERNAL', 'Sphereon_default_natural_person_type', 'sphereon_default_natural_person', '95e09cfc-c974-4174-86aa-7bf1d5251fb4', now(), now())`,
     )
     await queryRunner.query(
       `INSERT INTO "Party"(id, uri, created_at, last_updated_at, party_type_id) SELECT id, uri, created_at, last_updated_at, '3875c12e-fdaa-4ef6-a340-c936e054b627' FROM "Contact"`,

package/src/migrations/sqlite/1690925872693-CreateContacts.ts

@@ -49,7 +49,7 @@ export class CreateContacts1690925872693 implements MigrationInterface {
     await queryRunner.query(`DROP TABLE "Connection"`)
     await queryRunner.query(`ALTER TABLE "temporary_Connection" RENAME TO "Connection"`)
     await queryRunner.query(
-      `CREATE TABLE "PartyType" ("id" varchar PRIMARY KEY NOT NULL, "type" varchar CHECK( "type" IN ('naturalPerson','organization') ) NOT NULL, "origin" varchar CHECK( "origin" IN ('internal', 'external') ) NOT NULL DEFAULT 'external', "name" varchar(255) NOT NULL, "description" varchar(255), "tenant_id" varchar(255) NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), CONSTRAINT "UQ_PartyType_name" UNIQUE ("name"))`,
+      `CREATE TABLE "PartyType" ("id" varchar PRIMARY KEY NOT NULL, "type" varchar CHECK( "type" IN ('naturalPerson','organization') ) NOT NULL, "origin" varchar CHECK( "origin" IN ('INTERNAL', 'EXTERNAL') ) NOT NULL DEFAULT 'EXTERNAL', "name" varchar(255) NOT NULL, "description" varchar(255), "tenant_id" varchar(255) NOT NULL, "created_at" datetime NOT NULL DEFAULT (datetime('now')), "last_updated_at" datetime NOT NULL DEFAULT (datetime('now')), CONSTRAINT "UQ_PartyType_name" UNIQUE ("name"))`,
     )
     await queryRunner.query(`CREATE UNIQUE INDEX "IDX_PartyType_type_tenant_id" ON "PartyType" ("type", "tenant_id")`)
     await queryRunner.query(
@@ -140,7 +140,10 @@ export class CreateContacts1690925872693 implements MigrationInterface {
     )
     await queryRunner.query(`DROP TABLE "BaseConfigEntity"`)
     await queryRunner.query(
-      `INSERT INTO "PartyType"(id, type, name, description, tenant_id, created_at, last_updated_at) VALUES ('3875c12e-fdaa-4ef6-a340-c936e054b627', 'organization', 'Sphereon_default_type', 'sphereon_default_organization', '95e09cfc-c974-4174-86aa-7bf1d5251fb4', datetime('now'), datetime('now'))`,
+      `INSERT INTO "PartyType"(id, type, origin, name, description, tenant_id, created_at, last_updated_at) VALUES ('3875c12e-fdaa-4ef6-a340-c936e054b627', 'organization', 'INTERNAL', 'Sphereon_default_organization_type', 'sphereon_default_organization', '95e09cfc-c974-4174-86aa-7bf1d5251fb4', datetime('now'), datetime('now'))`,
+    )
+    await queryRunner.query(
+      `INSERT INTO "PartyType"(id, type, origin, name, description, tenant_id, created_at, last_updated_at) VALUES ('7d248798-41ca-4fc1-a130-9934b43d532e', 'naturalPerson', 'INTERNAL', 'Sphereon_default_natural_person_type', 'sphereon_default_natural_person', '95e09cfc-c974-4174-86aa-7bf1d5251fb4', datetime('now'), datetime('now'))`,
     )
     await queryRunner.query(
       `INSERT INTO "Party"(id, uri, created_at, last_updated_at, party_type_id) SELECT id, uri, created_at, last_updated_at, '3875c12e-fdaa-4ef6-a340-c936e054b627' FROM "Contact"`,

package/src/types/contact/IAbstractContactStore.ts

@@ -16,7 +16,7 @@ import {
   PartyOrigin,
   PartyRelationship,
   PartyType,
-  PartyTypeEnum,
+  PartyTypeType,
   PhysicalAddress,
 } from './contact'
 
@@ -95,7 +95,7 @@ export type UpdateRelationshipArgs = {
 }
 
 export type AddPartyTypeArgs = {
-  type: PartyTypeEnum
+  type: PartyTypeType
   origin: PartyOrigin
   name: string
   tenantId: string

package/src/types/contact/contact.ts

@@ -3,7 +3,7 @@ import { IIdentifier } from '@veramo/core'
 export type Party = {
   id: string
   uri?: string
-  roles: Array<IdentityRoleEnum>
+  roles: Array<IdentityRole>
   identities: Array<Identity>
   electronicAddresses: Array<ElectronicAddress>
   physicalAddresses: Array<PhysicalAddress>
@@ -47,7 +47,7 @@ export type PartialParty = Partial<
 export type Identity = {
   id: string
   alias: string
-  roles: Array<IdentityRoleEnum>
+  roles: Array<IdentityRole>
   identifier: CorrelationIdentifier
   connection?: Connection
   metadata?: Array<MetadataItem>
@@ -63,7 +63,7 @@ export type PartialIdentity = Partial<Omit<Identity, 'identifier' | 'connection'
   identifier?: PartialCorrelationIdentifier
   connection?: PartialConnection
   metadata?: PartialMetadataItem
-  roles?: IdentityRoleEnum
+  roles?: IdentityRole
   partyId?: string
 }
 
@@ -77,7 +77,7 @@ export type PartialMetadataItem = Partial<MetadataItem>
 
 export type CorrelationIdentifier = {
   id: string
-  type: CorrelationIdentifierEnum
+  type: CorrelationIdentifierType
   correlationId: string
 }
 export type NonPersistedCorrelationIdentifier = Omit<CorrelationIdentifier, 'id'>
@@ -85,7 +85,7 @@ export type PartialCorrelationIdentifier = Partial<CorrelationIdentifier>
 
 export type Connection = {
   id: string
-  type: ConnectionTypeEnum
+  type: ConnectionType
   config: ConnectionConfig
 }
 export type NonPersistedConnection = Omit<Connection, 'id' | 'config'> & {
@@ -150,14 +150,9 @@ export type Contact = NaturalPerson | Organization
 export type NonPersistedContact = NonPersistedNaturalPerson | NonPersistedOrganization
 export type PartialContact = PartialNaturalPerson | PartialOrganization
 
-export enum PartyOrigin {
-  internal = 'internal',
-  external = 'external',
-}
-
 export type PartyType = {
   id: string
-  type: PartyTypeEnum
+  type: PartyTypeType
   origin: PartyOrigin
   name: string
   tenantId: string
@@ -214,24 +209,29 @@ export type ElectronicAddressType = 'email' | 'phone'
 
 export type PhysicalAddressType = 'home' | 'visit' | 'postal'
 
-export enum IdentityRoleEnum {
+export enum IdentityRole {
   ISSUER = 'issuer',
   VERIFIER = 'verifier',
   HOLDER = 'holder',
 }
 
-export enum ConnectionTypeEnum {
+export enum ConnectionType {
   OPENID_CONNECT = 'OIDC',
   SIOPv2 = 'SIOPv2',
   SIOPv2_OpenID4VP = 'SIOPv2+OpenID4VP',
 }
 
-export enum CorrelationIdentifierEnum {
+export enum CorrelationIdentifierType {
   DID = 'did',
   URL = 'url',
 }
 
-export enum PartyTypeEnum {
+export enum PartyTypeType {
   NATURAL_PERSON = 'naturalPerson',
   ORGANIZATION = 'organization',
 }
+
+export enum PartyOrigin {
+  INTERNAL = 'INTERNAL',
+  EXTERNAL = 'EXTERNAL',
+}