Merge pull request #785 from eea-oasis/feature/759-create-public-key-schema

Add public key schema to prisma

Author: ognjenkurtic

examples/bri-3/prisma/migrations/20240208113418_add_public_keys_to_bpi_subject/migration.sql

@@ -0,0 +1,30 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `publicKey` on the `BpiSubject` table. All the data in the column will be lost.
+
+*/
+-- CreateEnum
+CREATE TYPE "PublicKeyType" AS ENUM ('ECDSA', 'EDDSA');
+
+-- AlterTable
+ALTER TABLE "BpiSubject" DROP COLUMN "publicKey";
+
+-- CreateTable
+CREATE TABLE "PublicKey" (
+    "id" TEXT NOT NULL,
+    "type" "PublicKeyType" NOT NULL,
+    "value" TEXT NOT NULL,
+    "bpiSubjectId" TEXT NOT NULL,
+
+    CONSTRAINT "PublicKey_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateIndex
+CREATE UNIQUE INDEX "PublicKey_value_key" ON "PublicKey"("value");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "PublicKey_type_bpiSubjectId_key" ON "PublicKey"("type", "bpiSubjectId");
+
+-- AddForeignKey
+ALTER TABLE "PublicKey" ADD CONSTRAINT "PublicKey_bpiSubjectId_fkey" FOREIGN KEY ("bpiSubjectId") REFERENCES "BpiSubject"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

examples/bri-3/prisma/schema.prisma

@@ -14,7 +14,7 @@ model BpiSubject {
   id                        String              @id @default(uuid())
   name                      String
   description               String
-  publicKey                 String
+  publicKeys                PublicKey[]
   loginNonce                String              @default("")
   ownedBpiSubjectAccounts   BpiSubjectAccount[] @relation(name: "ownerBpiSubject_fk")
   createdBpiSubjectAccounts BpiSubjectAccount[] @relation(name: "creatorBpiSubject_fk")
@@ -151,7 +151,21 @@ model BpiAccountStateTreeLeafValue {
   witness           String
 }
 
+model PublicKey {
+  id            String      @id @default(uuid())
+  type          PublicKeyType
+  value         String      @unique
+  bpiSubjectId  String
+  bpiSubject    BpiSubject  @relation(fields: [bpiSubjectId], references: [id])
+  @@unique([type, bpiSubjectId])
+}
+
 enum WorkgroupStatus {
   ACTIVE
   ARCHIVED
 }
+
+enum PublicKeyType {
+  ECDSA
+  EDDSA
+}

examples/bri-3/src/bri/identity/bpiSubjects/agents/bpiSubjectsStorage.agent.ts

@@ -4,6 +4,7 @@ import { PrismaService } from '../../../../shared/prisma/prisma.service';
 import { NOT_FOUND_ERR_MESSAGE } from '../api/err.messages';
 import { BpiSubject } from '../models/bpiSubject';
 import { BpiSubjectRole, BpiSubjectRoleName } from '../models/bpiSubjectRole';
+import { PublicKey, PublicKeyType } from '../models/publicKey';
 
 // Repositories are the only places that talk the Prisma language of models.
 // They are always mapped to and from domain objects so that the business layer of the application
@@ -64,8 +65,37 @@ export class BpiSubjectStorageAgent extends PrismaService {
     return this.mapper.map(bpiSubjectRole, BpiSubjectRole);
   }
 
+  async storePublicKey(
+    id: string,
+    type: PublicKeyType,
+    value: string,
+    bpiSubjectId: string,
+  ): Promise<void> {
+    await this.prisma.publicKey.create({
+      data: {
+        id: id,
+        type: type,
+        value: value,
+        bpiSubjectId: bpiSubjectId,
+      },
+    });
+  }
+
+  async updatePublicKey(
+    type: PublicKeyType,
+    value: string,
+    bpiSubjectId: string,
+  ): Promise<PublicKey> {
+    const updatedPublicKey = await this.prisma.publicKey.update({
+      where: { type_bpiSubjectId: { type: type, bpiSubjectId: bpiSubjectId } },
+      data: {
+        value: value,
+      },
+    });
+
+    return this.mapper.map(updatedPublicKey, PublicKey);
+  }
   async storeNewBpiSubject(bpiSubject: BpiSubject): Promise<BpiSubject> {
-    bpiSubject.publicKey = bpiSubject.publicKey.toLowerCase();
     const newBpiSubjectModel = await this.prisma.bpiSubject.create({
       data: {
         ...bpiSubject,
@@ -76,6 +106,13 @@ export class BpiSubjectStorageAgent extends PrismaService {
             };
           }),
         },
+        publicKey: {
+          connect: bpiSubject.publicKeys.map((pk) => {
+            return {
+              id: pk.id,
+            };
+          }),
+        },
       },
     });
 
@@ -94,6 +131,13 @@ export class BpiSubjectStorageAgent extends PrismaService {
             };
           }),
         },
+        publicKey: {
+          connect: bpiSubject.publicKeys.map((pk) => {
+            return {
+              id: pk.id,
+            };
+          }),
+        },
       },
     });
     return this.mapper.map(updatedBpiSubjectModel, BpiSubject);
@@ -105,15 +149,20 @@ export class BpiSubjectStorageAgent extends PrismaService {
     });
   }
 
-  async getBpiSubjectByPublicKey(publicKey: string): Promise<BpiSubject> {
+  async getBpiSubjectByPublicKey(publicKeyValue: string): Promise<BpiSubject> {
     const bpiSubjectModel = await this.prisma.bpiSubject.findFirst({
       where: {
-        publicKey: publicKey,
+        publicKey: {
+          some: {
+            value: publicKeyValue,
+          },
+        },
       },
       include: {
-        roles: true,
+        publicKey: true,
       },
     });
+
     if (!bpiSubjectModel) {
       throw new NotFoundException(NOT_FOUND_ERR_MESSAGE);
     }

examples/bri-3/src/bri/identity/bpiSubjects/models/bpiSubject.ts

@@ -1,6 +1,7 @@
 import { AutoMap } from '@automapper/classes';
 import { v4 } from 'uuid';
 import { BpiSubjectRole } from './bpiSubjectRole';
+import { PublicKeyType, PublicKey } from './publicKey';
 
 export class BpiSubject {
   @AutoMap()
@@ -13,7 +14,7 @@ export class BpiSubject {
   description: string;
 
   @AutoMap()
-  publicKey: string;
+  publicKeys: PublicKey[];
 
   @AutoMap()
   loginNonce: string;
@@ -24,13 +25,13 @@ export class BpiSubject {
     id: string,
     name: string,
     description: string,
-    publicKey: string,
+    publicKeys: PublicKey[],
     roles: BpiSubjectRole[],
   ) {
     this.id = id;
     this.name = name;
     this.description = description;
-    this.publicKey = publicKey;
+    this.publicKeys = publicKeys;
     this.roles = roles;
   }
 
@@ -42,15 +43,20 @@ export class BpiSubject {
     this.description = newDescription;
   }
 
-  public updatePublicKey(newPk: string): void {
-    this.publicKey = newPk;
+  public updatePublicKey(newPk: PublicKey): void {
+    this.publicKeys = this.publicKeys.map((key) =>
+      key.type == newPk.type ? (key = newPk) : key,
+    );
   }
 
   public updateLoginNonce(): void {
     this.loginNonce = v4();
   }
 
   public getBpiSubjectDid(): string {
-    return `did:ethr:0x5:${this.publicKey}`;
+    const ecdsaPublicKey = this.publicKeys.filter(
+      (key) => key.type == PublicKeyType.ECDSA,
+    )[0];
+    return `did:ethr:0x5:${ecdsaPublicKey.value}`;
   }
 }

examples/bri-3/src/bri/identity/bpiSubjects/models/publicKey.ts

@@ -0,0 +1,47 @@
+import { AutoMap } from '@automapper/classes';
+import { BpiSubject } from './bpiSubject';
+
+export enum PublicKeyType {
+  ECDSA = 'ECDSA',
+  EDDSA = 'EDDSA',
+}
+export class PublicKey {
+  @AutoMap()
+  id: string;
+
+  @AutoMap()
+  type: PublicKeyType;
+
+  @AutoMap()
+  value: string;
+
+  @AutoMap()
+  bpiSubjectId: string;
+
+  @AutoMap()
+  bpiSubject: BpiSubject;
+
+  constructor(
+    id: string,
+    type: PublicKeyType,
+    value: string,
+    bpiSubjectId: string,
+  ) {
+    this.id = id;
+    this.type = type;
+    this.value = value;
+    this.bpiSubjectId = bpiSubjectId;
+  }
+
+  public updateType(newType: PublicKeyType): void {
+    this.type = newType;
+  }
+
+  public updateValue(newValue: string): void {
+    this.value = newValue;
+  }
+
+  public updateBpiSubjectId(newBpiSubjectId: string): void {
+    this.bpiSubjectId = newBpiSubjectId;
+  }
+}