diff --git a/examples/bri-3/prisma/seed.ts b/examples/bri-3/prisma/seed.ts index 98f6932dd..16af99758 100644 --- a/examples/bri-3/prisma/seed.ts +++ b/examples/bri-3/prisma/seed.ts @@ -1,4 +1,5 @@ -import { PrismaClient } from '@prisma/client'; +import { PrismaClient, PublicKeyType } from '@prisma/client'; +import { type } from 'os'; const prisma = new PrismaClient(); @@ -23,17 +24,34 @@ async function main() { await prisma.bpiSubject.create({ data: { - name: 'BpiAdmin', - description: 'Internal Bpi Subject of this Bpi', - publicKey: '0x044e851fa6118d0d33f11ebf8d4cae2a25dca959f06c1ab87b8fec9ccbf0ca0021b7efc27c786f9480f9f11cfe8df1ae991329654308611148a35a2277ba5909fe', - // private key 0x0fbdb56ab0fecb2f406fa807d9e6558baedacc1c15c0e2703b77d4c08441e4fe, used for testing purposes only - loginNonce: '', - roles: { - connect: { - id: internalBpiSubjectRole.id - }, + name: 'BpiAdmin', + description: 'Internal Bpi Subject of this Bpi', + publicKeys: { + createMany: { + data: [ + { + type: PublicKeyType.ECDSA, + value: + '0x044e851fa6118d0d33f11ebf8d4cae2a25dca959f06c1ab87b8fec9ccbf0ca0021b7efc27c786f9480f9f11cfe8df1ae991329654308611148a35a2277ba5909fe', + }, + // private key 0x0fbdb56ab0fecb2f406fa807d9e6558baedacc1c15c0e2703b77d4c08441e4fe, used for testing purposes only + { + type: PublicKeyType.EDDSA, + value: + '0x038a312f5b75fbd4f677c080c7f35089c898f2cb75002d659e051fdc1c6b3e06', + }, + // TODO private key + ], }, - } + }, + + loginNonce: '', + roles: { + connect: { + id: internalBpiSubjectRole.id, + }, + }, + }, }); } main() diff --git a/examples/bri-3/src/bri/auth/agent/auth.agent.ts b/examples/bri-3/src/bri/auth/agent/auth.agent.ts index fa7dd91b0..de8d95fdb 100644 --- a/examples/bri-3/src/bri/auth/agent/auth.agent.ts +++ b/examples/bri-3/src/bri/auth/agent/auth.agent.ts @@ -7,6 +7,8 @@ import { BpiSubject } from '../../../bri/identity/bpiSubjects/models/bpiSubject' import { LoggingService } from '../../../shared/logging/logging.service'; import { INVALID_SIGNATURE, USER_NOT_AUTHORIZED } from '../api/err.messages'; import { jwtConstants } from '../constants'; +import { buildBabyjub, buildEddsa } from 'circomlibjs'; +import * as crypto from 'crypto'; @Injectable() export class AuthAgent { @@ -23,12 +25,14 @@ export class AuthAgent { signature: string, publicKey: string, ): void { - if (!this.verifySignatureAgainstPublicKey(message, signature, publicKey)) { + if ( + !this.verifyEcdsaSignatureAgainstPublicKey(message, signature, publicKey) + ) { throw new UnauthorizedException(INVALID_SIGNATURE); } } - verifySignatureAgainstPublicKey( + verifyEcdsaSignatureAgainstPublicKey( message: string, signature: string, senderPublicKey: string, @@ -63,6 +67,40 @@ export class AuthAgent { return isValid; } + async verifyEddsaSignatureAgainstPublicKey( + message: string, + signature: string, + senderPublicKey: string, + ): Promise { + const eddsa = await buildEddsa(); + const babyJub = await buildBabyjub(); + + const hashedPayload = crypto + .createHash(`${process.env.MERKLE_TREE_HASH_ALGH}`) + .update(JSON.stringify(message)) + .digest(); + + const publicKey = Uint8Array.from(Buffer.from(signature, 'hex')); + const publicKeyPoints = babyJub.unpackPoint(publicKey); + + const eddsaSignature = Uint8Array.from(Buffer.from(signature, 'hex')); + const unpackedSignature = eddsa.unpackSignature(eddsaSignature); + + const isValid = eddsa.verifyPedersen( + hashedPayload, + unpackedSignature, + publicKeyPoints, + ); + + if (!isValid) { + this.logger.logWarn( + `Signature: ${signature} for public key ${senderPublicKey} is invalid.`, + ); + } + + return isValid; + } + async getBpiSubjectByPublicKey(publicKey: string) { return this.bpiSubjectStorageAgent.getBpiSubjectByPublicKey(publicKey); } diff --git a/examples/bri-3/src/bri/communication/api/messages.controller.spec.ts b/examples/bri-3/src/bri/communication/api/messages.controller.spec.ts index 36ee0fc6b..51ea67862 100644 --- a/examples/bri-3/src/bri/communication/api/messages.controller.spec.ts +++ b/examples/bri-3/src/bri/communication/api/messages.controller.spec.ts @@ -36,6 +36,10 @@ import { MessageController } from './messages.controller'; import { mockDeep, DeepMockProxy } from 'jest-mock-extended'; import { PrismaService } from '../../../shared/prisma/prisma.service'; import { PrismaClient } from '@prisma/client'; +import { + PublicKey, + PublicKeyType, +} from '../../identity/bpiSubjects/models/publicKey'; describe('MessageController', () => { let mController: MessageController; @@ -56,14 +60,29 @@ describe('MessageController', () => { '', 'name', 'desc', - '0x047a197a795a747c154dd92b217a048d315ef9ca1bfa9c15bfefe4e02fb338a70af23e7683b565a8dece5104a85ed24a50d791d8c5cb09ee21aabc927c98516539', + [ + new PublicKey( + '123', + PublicKeyType.ECDSA, + '0x047a197a795a747c154dd92b217a048d315ef9ca1bfa9c15bfefe4e02fb338a70af23e7683b565a8dece5104a85ed24a50d791d8c5cb09ee21aabc927c98516539', + '', + ), + ], + [], ); existingBpiSubject2 = new BpiSubject( '', 'name2', 'desc2', - '0x04203db7d27bab8d711acc52479efcfa9d7846e4e176d82389689f95cf06a51818b0b9ab1c2c8d72f1a32e236e6296c91c922a0dc3d0cb9afc269834fc5646b980', + [ + new PublicKey( + '123', + PublicKeyType.ECDSA, + '0x04203db7d27bab8d711acc52479efcfa9d7846e4e176d82389689f95cf06a51818b0b9ab1c2c8d72f1a32e236e6296c91c922a0dc3d0cb9afc269834fc5646b980', + '', + ), + ], [], ); diff --git a/examples/bri-3/src/bri/communication/capabilities/createBpiMessage/createBpiMessageCommand.handler.ts b/examples/bri-3/src/bri/communication/capabilities/createBpiMessage/createBpiMessageCommand.handler.ts index f6bc0b9a2..9e87d91ad 100644 --- a/examples/bri-3/src/bri/communication/capabilities/createBpiMessage/createBpiMessageCommand.handler.ts +++ b/examples/bri-3/src/bri/communication/capabilities/createBpiMessage/createBpiMessageCommand.handler.ts @@ -30,7 +30,7 @@ export class CreateBpiMessageCommandHandler this.authAgent.throwIfSignatureVerificationFails( command.content, command.signature, - fromBpiSubject.publicKey, + fromBpiSubject.publicKeys[0].value, ); const newBpiMessageCandidate = this.agent.createNewBpiMessage( @@ -47,7 +47,7 @@ export class CreateBpiMessageCommandHandler ); await this.messagingAgent.publishMessage( - toBpiSubject.publicKey, + toBpiSubject.publicKeys[0].value, this.messagingAgent.serializeBpiMessage(newBpiMessage), ); diff --git a/examples/bri-3/src/bri/communication/capabilities/processInboundMessage/processInboundMessageCommand.handler.ts b/examples/bri-3/src/bri/communication/capabilities/processInboundMessage/processInboundMessageCommand.handler.ts index 58b2f9558..a393f429e 100644 --- a/examples/bri-3/src/bri/communication/capabilities/processInboundMessage/processInboundMessageCommand.handler.ts +++ b/examples/bri-3/src/bri/communication/capabilities/processInboundMessage/processInboundMessageCommand.handler.ts @@ -31,11 +31,12 @@ export class ProcessInboundMessageCommandHandler return false; } - const isSignatureValid = this.authAgent.verifySignatureAgainstPublicKey( - command.content, - command.signature, - fromBpiSubject.publicKey, - ); + const isSignatureValid = + this.authAgent.verifyEcdsaSignatureAgainstPublicKey( + command.content, + command.signature, + fromBpiSubject.publicKeys[0].value, + ); if (!isSignatureValid) { return false; @@ -55,7 +56,7 @@ export class ProcessInboundMessageCommandHandler ); await this.messagingAgent.publishMessage( - toBpiSubject.publicKey, + toBpiSubject.publicKeys[0].value, this.messagingAgent.serializeBpiMessage(newBpiMessage), ); diff --git a/examples/bri-3/src/bri/identity/bpiSubjectAccounts/api/subjectAccounts.controller.spec.ts b/examples/bri-3/src/bri/identity/bpiSubjectAccounts/api/subjectAccounts.controller.spec.ts index 7efdb1b02..22d2695df 100644 --- a/examples/bri-3/src/bri/identity/bpiSubjectAccounts/api/subjectAccounts.controller.spec.ts +++ b/examples/bri-3/src/bri/identity/bpiSubjectAccounts/api/subjectAccounts.controller.spec.ts @@ -22,6 +22,7 @@ import { SubjectsProfile } from '../../bpiSubjects/subjects.profile'; import { mockDeep, DeepMockProxy } from 'jest-mock-extended'; import { BpiSubjectAccount } from '../models/bpiSubjectAccount'; import { uuid } from 'uuidv4'; +import { PublicKey, PublicKeyType } from '../../bpiSubjects/models/publicKey'; describe('SubjectAccountController', () => { let subjectAccountController: SubjectAccountController; @@ -70,14 +71,14 @@ describe('SubjectAccountController', () => { '123', 'owner', 'desc', - 'publicKey', + [new PublicKey('223', PublicKeyType.ECDSA, 'publicKey', '123')], [], ); const creatorBpiSubject = new BpiSubject( '321', 'creator', 'desc', - 'publicKey', + [new PublicKey('223', PublicKeyType.ECDSA, 'publicKey', '321')], [], ); @@ -195,7 +196,7 @@ describe('SubjectAccountController', () => { '123', 'owner', 'desc', - 'publicKey', + [new PublicKey('223', PublicKeyType.ECDSA, 'publicKey', '123')], [], ); const creatorBpiSubjectId = 'not-existing-id'; @@ -219,7 +220,7 @@ describe('SubjectAccountController', () => { '123', 'creator', 'desc', - 'publicKey', + [new PublicKey('223', PublicKeyType.ECDSA, 'publicKey', '123')], [], ); const ownerBpiSubjectId = 'not-existing-id'; diff --git a/examples/bri-3/src/bri/identity/bpiSubjects/agents/bpiSubjects.agent.ts b/examples/bri-3/src/bri/identity/bpiSubjects/agents/bpiSubjects.agent.ts index ed6a2cbbd..ac81d1b6d 100644 --- a/examples/bri-3/src/bri/identity/bpiSubjects/agents/bpiSubjects.agent.ts +++ b/examples/bri-3/src/bri/identity/bpiSubjects/agents/bpiSubjects.agent.ts @@ -11,6 +11,8 @@ import { } from '../api/err.messages'; import { BpiSubjectStorageAgent } from './bpiSubjectsStorage.agent'; import { BpiSubjectRoleName } from '../models/bpiSubjectRole'; +import { PublicKeyDto } from '../api/dtos/request/publicKey.dto'; +import { PublicKey, PublicKeyType } from '../models/publicKey'; // Agent methods have extremely declarative names and perform a single task @Injectable() @@ -27,12 +29,36 @@ export class BpiSubjectAgent { public async createNewExternalBpiSubject( name: string, description: string, - publicKey: string, + publicKeys: PublicKeyDto[], ): Promise { const externalRole = await this.storageAgent.getBpiSubjectRoleByName( BpiSubjectRoleName.EXTERNAL_BPI_SUBJECT, ); - return new BpiSubject(v4(), name, description, publicKey, [externalRole]); + + const bpiSubjectId = v4(); + + const publicKeyCandidates = publicKeys.map((key) => { + let publicKeyType; + + switch (key.type.toLowerCase()) { + case 'ecdsa': + publicKeyType = PublicKeyType.ECDSA; + break; + case 'eddsa': + publicKeyType = PublicKeyType.EDDSA; + break; + default: + } + return new PublicKey(v4(), publicKeyType, key.value, bpiSubjectId); + }); + + return new BpiSubject( + bpiSubjectId, + name, + description, + publicKeyCandidates, + [externalRole], + ); } public async fetchUpdateCandidateAndThrowIfUpdateValidationFails( @@ -64,11 +90,11 @@ export class BpiSubjectAgent { bpiSubjectToUpdate: BpiSubject, name: string, description: string, - publicKey: string, + publicKeys: PublicKeyDto[], ) { bpiSubjectToUpdate.updateName(name); bpiSubjectToUpdate.updateDescription(description); - bpiSubjectToUpdate.updatePublicKey(publicKey); + bpiSubjectToUpdate.updatePublicKeys(publicKeys); } public async fetchDeleteCandidateAndThrowIfDeleteValidationFails( diff --git a/examples/bri-3/src/bri/identity/bpiSubjects/agents/bpiSubjectsStorage.agent.ts b/examples/bri-3/src/bri/identity/bpiSubjects/agents/bpiSubjectsStorage.agent.ts index 80dff8a9f..ec859332d 100644 --- a/examples/bri-3/src/bri/identity/bpiSubjects/agents/bpiSubjectsStorage.agent.ts +++ b/examples/bri-3/src/bri/identity/bpiSubjects/agents/bpiSubjectsStorage.agent.ts @@ -106,12 +106,8 @@ export class BpiSubjectStorageAgent extends PrismaService { }; }), }, - publicKey: { - connect: bpiSubject.publicKeys.map((pk) => { - return { - id: pk.id, - }; - }), + publicKeys: { + createMany: { data: bpiSubject.publicKeys }, }, }, }); @@ -131,12 +127,12 @@ export class BpiSubjectStorageAgent extends PrismaService { }; }), }, - publicKey: { - connect: bpiSubject.publicKeys.map((pk) => { - return { - id: pk.id, - }; - }), + publicKeys: { + upsert: bpiSubject.publicKeys.map((pk) => ({ + where: { id: pk.id }, + create: { type: pk.type, value: pk.value }, + update: { value: pk.value }, + })), }, }, }); @@ -152,14 +148,14 @@ export class BpiSubjectStorageAgent extends PrismaService { async getBpiSubjectByPublicKey(publicKeyValue: string): Promise { const bpiSubjectModel = await this.prisma.bpiSubject.findFirst({ where: { - publicKey: { + publicKeys: { some: { value: publicKeyValue, }, }, }, include: { - publicKey: true, + publicKeys: true, }, }); diff --git a/examples/bri-3/src/bri/identity/bpiSubjects/api/dtos/request/createBpiSubject.dto.spec.ts b/examples/bri-3/src/bri/identity/bpiSubjects/api/dtos/request/createBpiSubject.dto.spec.ts index 1d59e1ee3..8f5ec9237 100644 --- a/examples/bri-3/src/bri/identity/bpiSubjects/api/dtos/request/createBpiSubject.dto.spec.ts +++ b/examples/bri-3/src/bri/identity/bpiSubjects/api/dtos/request/createBpiSubject.dto.spec.ts @@ -6,7 +6,10 @@ import { CreateBpiSubjectDto } from './createBpiSubject.dto'; describe('CreateBpiSubjectDto', () => { it('should return error in case name not provided.', async () => { // Arrange - const dto = { desc: 'this is a description', publicKey: '2323' }; + const dto = { + desc: 'this is a description', + publicKeys: [{ type: 'ecdsa', value: '214324' }], + }; const createBpiSubjectDto = plainToInstance(CreateBpiSubjectDto, dto); // Act @@ -22,7 +25,10 @@ describe('CreateBpiSubjectDto', () => { it('should return error in case desc not provided.', async () => { // Arrange - const dto = { name: 'test', publicKey: '2323' }; + const dto = { + name: 'test', + publicKeys: [{ type: 'ecdsa', value: '214324' }], + }; const createBpiSubjectDto = plainToInstance(CreateBpiSubjectDto, dto); // Act @@ -46,9 +52,9 @@ describe('CreateBpiSubjectDto', () => { // Assert expect(errors.length).toBe(1); - expect(errors[0].property).toEqual('publicKey'); + expect(errors[0].property).toEqual('publicKeys'); expect(errors[0].constraints?.isNotEmpty).toContain( - 'publicKey ' + SHOULD_NOT_BE_EMPTY_VALIDATION_MESSAGE, + 'publicKeys ' + SHOULD_NOT_BE_EMPTY_VALIDATION_MESSAGE, ); }); @@ -57,7 +63,7 @@ describe('CreateBpiSubjectDto', () => { const dto = { name: 'test', desc: 'this is a description', - publicKey: '2323', + publicKeys: [{ type: 'ecdsa', value: '214324' }], }; const createBpiSubjectDto = plainToInstance(CreateBpiSubjectDto, dto); diff --git a/examples/bri-3/src/bri/identity/bpiSubjects/api/dtos/request/createBpiSubject.dto.ts b/examples/bri-3/src/bri/identity/bpiSubjects/api/dtos/request/createBpiSubject.dto.ts index 10f77af8b..48f55737a 100644 --- a/examples/bri-3/src/bri/identity/bpiSubjects/api/dtos/request/createBpiSubject.dto.ts +++ b/examples/bri-3/src/bri/identity/bpiSubjects/api/dtos/request/createBpiSubject.dto.ts @@ -1,4 +1,5 @@ import { IsNotEmpty } from 'class-validator'; +import { PublicKeyDto } from './publicKey.dto'; export class CreateBpiSubjectDto { @IsNotEmpty() @@ -8,5 +9,5 @@ export class CreateBpiSubjectDto { desc: string; @IsNotEmpty() - publicKey: string; + publicKeys: PublicKeyDto[]; } diff --git a/examples/bri-3/src/bri/identity/bpiSubjects/api/dtos/request/publicKey.dto.ts b/examples/bri-3/src/bri/identity/bpiSubjects/api/dtos/request/publicKey.dto.ts new file mode 100644 index 000000000..1b2dc85f4 --- /dev/null +++ b/examples/bri-3/src/bri/identity/bpiSubjects/api/dtos/request/publicKey.dto.ts @@ -0,0 +1,11 @@ +import { AutoMap } from '@automapper/classes'; +import { IsNotEmpty } from 'class-validator'; +export class PublicKeyDto { + @AutoMap() + @IsNotEmpty() + type: string; + + @AutoMap() + @IsNotEmpty() + value: string; +} diff --git a/examples/bri-3/src/bri/identity/bpiSubjects/api/dtos/request/updateBpiSubject.dto.spec.ts b/examples/bri-3/src/bri/identity/bpiSubjects/api/dtos/request/updateBpiSubject.dto.spec.ts index 6fa666e34..37d4eb1e7 100644 --- a/examples/bri-3/src/bri/identity/bpiSubjects/api/dtos/request/updateBpiSubject.dto.spec.ts +++ b/examples/bri-3/src/bri/identity/bpiSubjects/api/dtos/request/updateBpiSubject.dto.spec.ts @@ -6,7 +6,10 @@ import { UpdateBpiSubjectDto } from './updateBpiSubject.dto'; describe('UpdateBpiSubjectDto', () => { it('should return error in case name not provided.', async () => { // Arrange - const dto = { desc: 'this is a description', publicKey: '2323' }; + const dto = { + desc: 'this is a description', + publicKeys: [{ type: 'ecdsa', value: '214324' }], + }; const updateBpiSubjectDto = plainToInstance(UpdateBpiSubjectDto, dto); // Act @@ -22,7 +25,10 @@ describe('UpdateBpiSubjectDto', () => { it('should return error in case desc not provided.', async () => { // Arrange - const dto = { name: 'test', publicKey: '2323' }; + const dto = { + name: 'test', + publicKeys: [{ type: 'ecdsa', value: '214324' }], + }; const updateBpiSubjectDto = plainToInstance(UpdateBpiSubjectDto, dto); // Act @@ -46,9 +52,9 @@ describe('UpdateBpiSubjectDto', () => { // Assert expect(errors.length).toBe(1); - expect(errors[0].property).toEqual('publicKey'); + expect(errors[0].property).toEqual('publicKeys'); expect(errors[0].constraints?.isNotEmpty).toContain( - 'publicKey ' + SHOULD_NOT_BE_EMPTY_VALIDATION_MESSAGE, + 'publicKeys ' + SHOULD_NOT_BE_EMPTY_VALIDATION_MESSAGE, ); }); @@ -57,7 +63,7 @@ describe('UpdateBpiSubjectDto', () => { const dto = { name: 'test', desc: 'this is a description', - publicKey: '2323', + publicKeys: [{ type: 'ecdsa', value: '214324' }], }; const updateBpiSubjectDto = plainToInstance(UpdateBpiSubjectDto, dto); diff --git a/examples/bri-3/src/bri/identity/bpiSubjects/api/dtos/request/updateBpiSubject.dto.ts b/examples/bri-3/src/bri/identity/bpiSubjects/api/dtos/request/updateBpiSubject.dto.ts index ab0177381..0df339e63 100644 --- a/examples/bri-3/src/bri/identity/bpiSubjects/api/dtos/request/updateBpiSubject.dto.ts +++ b/examples/bri-3/src/bri/identity/bpiSubjects/api/dtos/request/updateBpiSubject.dto.ts @@ -1,4 +1,5 @@ import { IsNotEmpty } from 'class-validator'; +import { PublicKeyDto } from './publicKey.dto'; export class UpdateBpiSubjectDto { @IsNotEmpty() @@ -8,5 +9,5 @@ export class UpdateBpiSubjectDto { desc: string; @IsNotEmpty() - publicKey: string; + publicKeys: PublicKeyDto[]; } diff --git a/examples/bri-3/src/bri/identity/bpiSubjects/api/dtos/response/bpiSubject.dto.ts b/examples/bri-3/src/bri/identity/bpiSubjects/api/dtos/response/bpiSubject.dto.ts index d3d4d98fc..3e18ad3d6 100644 --- a/examples/bri-3/src/bri/identity/bpiSubjects/api/dtos/response/bpiSubject.dto.ts +++ b/examples/bri-3/src/bri/identity/bpiSubjects/api/dtos/response/bpiSubject.dto.ts @@ -1,5 +1,6 @@ import { AutoMap } from '@automapper/classes'; import { BpiSubjectRoleDto } from './bpiSubjectRole.dto'; +import { PublicKeyDto } from '../request/publicKey.dto'; export class BpiSubjectDto { @AutoMap() @@ -11,8 +12,8 @@ export class BpiSubjectDto { @AutoMap() description: string; - @AutoMap() - publicKey: string; + @AutoMap(() => [PublicKeyDto]) + publicKeys: PublicKeyDto[]; @AutoMap(() => [BpiSubjectRoleDto]) roles: BpiSubjectRoleDto[]; diff --git a/examples/bri-3/src/bri/identity/bpiSubjects/api/subjects.controller.spec.ts b/examples/bri-3/src/bri/identity/bpiSubjects/api/subjects.controller.spec.ts index a454f09f5..43ca3cf33 100644 --- a/examples/bri-3/src/bri/identity/bpiSubjects/api/subjects.controller.spec.ts +++ b/examples/bri-3/src/bri/identity/bpiSubjects/api/subjects.controller.spec.ts @@ -21,22 +21,37 @@ import { AuthzModule } from '../../../authz/authz.module'; import { mockDeep, DeepMockProxy } from 'jest-mock-extended'; import { BpiSubject } from '../models/bpiSubject'; import { uuid } from 'uuidv4'; +import { PublicKey, PublicKeyType } from '../models/publicKey'; +import { PrismaMapper } from '../../../../shared/prisma/prisma.mapper'; +import { MerkleTreeService } from '../../../merkleTree/services/merkleTree.service'; describe('SubjectController', () => { let sController: SubjectController; let subjectStorageAgentMock: DeepMockProxy; + + const existingBpiSubject1Id = uuid(); + const publicKeys1 = [ + new PublicKey('111', PublicKeyType.ECDSA, 'ecdsaPk', existingBpiSubject1Id), + new PublicKey('112', PublicKeyType.EDDSA, 'eddsaPk', existingBpiSubject1Id), + ]; const existingBpiSubject1 = new BpiSubject( - uuid(), + existingBpiSubject1Id, 'name', 'description', - 'pk', + publicKeys1, [], ); + + const existingBpiSubject2Id = uuid(); + const publicKeys2 = [ + new PublicKey('111', PublicKeyType.ECDSA, 'ecdsaPk', existingBpiSubject2Id), + new PublicKey('112', PublicKeyType.EDDSA, 'eddsaPk', existingBpiSubject2Id), + ]; const existingBpiSubject2 = new BpiSubject( uuid(), 'name2', 'description2', - 'pk2', + publicKeys2, [], ); @@ -59,7 +74,9 @@ describe('SubjectController', () => { GetAllBpiSubjectsQueryHandler, BpiSubjectStorageAgent, SubjectsProfile, + PrismaMapper, AuthzFactory, + MerkleTreeService, ], }) .overrideProvider(BpiSubjectStorageAgent) @@ -100,8 +117,8 @@ describe('SubjectController', () => { expect(fetchedBpiSubject.description).toEqual( existingBpiSubject1.description, ); - expect(fetchedBpiSubject.publicKey).toEqual( - existingBpiSubject1.publicKey, + expect(fetchedBpiSubject.publicKeys[0].type).toEqual( + existingBpiSubject1.publicKeys[0].type, ); }); }); @@ -135,13 +152,18 @@ describe('SubjectController', () => { expect(bpiSubjects[0].description).toEqual( existingBpiSubject1.description, ); - expect(bpiSubjects[0].publicKey).toEqual(existingBpiSubject1.publicKey); + expect(bpiSubjects[0].publicKeys[0].type).toEqual( + existingBpiSubject1.publicKeys[0].type, + ); + expect(bpiSubjects[1].id).toEqual(existingBpiSubject2.id); expect(bpiSubjects[1].name).toEqual(existingBpiSubject2.name); expect(bpiSubjects[1].description).toEqual( existingBpiSubject2.description, ); - expect(bpiSubjects[1].publicKey).toEqual(existingBpiSubject2.publicKey); + expect(bpiSubjects[1].publicKeys[0].type).toEqual( + existingBpiSubject2.publicKeys[0].type, + ); }); }); @@ -150,7 +172,10 @@ describe('SubjectController', () => { // Arrange const requestDto = { desc: 'desc', - publicKey: 'publicKey', + publicKeys: [ + { type: 'ecdsa', value: 'ecdsaPk' }, + { type: 'ecdsa', value: 'ecdsaPk' }, + ], } as CreateBpiSubjectDto; // Act and assert @@ -164,7 +189,10 @@ describe('SubjectController', () => { const requestDto = { name: 'name', desc: 'desc', - publicKey: 'publicKey', + publicKeys: [ + { type: 'ecdsa', value: 'ecdsaPk' }, + { type: 'ecdsa', value: 'ecdsaPk' }, + ], } as CreateBpiSubjectDto; subjectStorageAgentMock.storeNewBpiSubject.mockResolvedValueOnce( existingBpiSubject1, @@ -186,7 +214,10 @@ describe('SubjectController', () => { const requestDto = { name: 'name', desc: 'desc', - publicKey: 'publicKey', + publicKeys: [ + { type: 'ecdsa', value: 'ecdsaPk' }, + { type: 'ecdsa', value: 'ecdsaPk' }, + ], } as UpdateBpiSubjectDto; // Act and assert @@ -203,13 +234,21 @@ describe('SubjectController', () => { const updateRequestDto = { name: 'name2', desc: 'desc2', - publicKey: 'publicKey2', + publicKeys: [ + { type: 'ecdsa', value: 'ecdsaPk' }, + { type: 'eddsa', value: 'eddsaPk' }, + ], } as UpdateBpiSubjectDto; subjectStorageAgentMock.updateBpiSubject.mockResolvedValueOnce({ ...existingBpiSubject1, name: updateRequestDto.name, description: updateRequestDto.desc, - publicKey: updateRequestDto.publicKey, + publicKeys: [ + new PublicKey('111', PublicKeyType.ECDSA, 'ecdsaPk', '123'), + , + new PublicKey('112', PublicKeyType.EDDSA, 'eddsaPk', '123'), + , + ], } as BpiSubject); // Act @@ -222,7 +261,9 @@ describe('SubjectController', () => { expect(updatedBpiSubject.id).toEqual(existingBpiSubject1.id); expect(updatedBpiSubject.name).toEqual(updateRequestDto.name); expect(updatedBpiSubject.description).toEqual(updateRequestDto.desc); - expect(updatedBpiSubject.publicKey).toEqual(updateRequestDto.publicKey); + expect(updatedBpiSubject.publicKeys[0].value).toEqual( + updateRequestDto.publicKeys[0].value, + ); }); }); diff --git a/examples/bri-3/src/bri/identity/bpiSubjects/api/subjects.controller.ts b/examples/bri-3/src/bri/identity/bpiSubjects/api/subjects.controller.ts index c4095da9c..bc40275ff 100644 --- a/examples/bri-3/src/bri/identity/bpiSubjects/api/subjects.controller.ts +++ b/examples/bri-3/src/bri/identity/bpiSubjects/api/subjects.controller.ts @@ -43,7 +43,7 @@ export class SubjectController { new CreateBpiSubjectCommand( requestDto.name, requestDto.desc, - requestDto.publicKey, + requestDto.publicKeys, ), ); } @@ -59,7 +59,7 @@ export class SubjectController { id, requestDto.name, requestDto.desc, - requestDto.publicKey, + requestDto.publicKeys, ), ); } diff --git a/examples/bri-3/src/bri/identity/bpiSubjects/capabilities/createBpiSubject/createBpiSubject.command.ts b/examples/bri-3/src/bri/identity/bpiSubjects/capabilities/createBpiSubject/createBpiSubject.command.ts index cccecea16..4371b849d 100644 --- a/examples/bri-3/src/bri/identity/bpiSubjects/capabilities/createBpiSubject/createBpiSubject.command.ts +++ b/examples/bri-3/src/bri/identity/bpiSubjects/capabilities/createBpiSubject/createBpiSubject.command.ts @@ -1,7 +1,8 @@ +import { PublicKeyDto } from '../../api/dtos/request/publicKey.dto'; export class CreateBpiSubjectCommand { constructor( public readonly name: string, public readonly description: string, - public readonly publicKey: string, + public readonly publicKeys: PublicKeyDto[], ) {} } diff --git a/examples/bri-3/src/bri/identity/bpiSubjects/capabilities/createBpiSubject/createBpiSubjectCommand.handler.ts b/examples/bri-3/src/bri/identity/bpiSubjects/capabilities/createBpiSubject/createBpiSubjectCommand.handler.ts index 4dee36c14..fa45b7ceb 100644 --- a/examples/bri-3/src/bri/identity/bpiSubjects/capabilities/createBpiSubject/createBpiSubjectCommand.handler.ts +++ b/examples/bri-3/src/bri/identity/bpiSubjects/capabilities/createBpiSubject/createBpiSubjectCommand.handler.ts @@ -18,7 +18,7 @@ export class CreateBpiSubjectCommandHandler const newBpiSubjectCandidate = await this.agent.createNewExternalBpiSubject( command.name, command.description, - command.publicKey, + command.publicKeys, ); const newBpiSubject = await this.storageAgent.storeNewBpiSubject( diff --git a/examples/bri-3/src/bri/identity/bpiSubjects/capabilities/updateBpiSubject/updateBpiSubject.command.ts b/examples/bri-3/src/bri/identity/bpiSubjects/capabilities/updateBpiSubject/updateBpiSubject.command.ts index a4dc06548..d1061a8b8 100644 --- a/examples/bri-3/src/bri/identity/bpiSubjects/capabilities/updateBpiSubject/updateBpiSubject.command.ts +++ b/examples/bri-3/src/bri/identity/bpiSubjects/capabilities/updateBpiSubject/updateBpiSubject.command.ts @@ -1,8 +1,9 @@ +import { PublicKeyDto } from '../../api/dtos/request/publicKey.dto'; export class UpdateBpiSubjectCommand { constructor( public readonly id: string, public readonly name: string, public readonly description: string, - public readonly publicKey: string, + public readonly publicKeys: PublicKeyDto[], ) {} } diff --git a/examples/bri-3/src/bri/identity/bpiSubjects/capabilities/updateBpiSubject/updateBpiSubjectCommand.handler.ts b/examples/bri-3/src/bri/identity/bpiSubjects/capabilities/updateBpiSubject/updateBpiSubjectCommand.handler.ts index dbab2567b..1828c55d2 100644 --- a/examples/bri-3/src/bri/identity/bpiSubjects/capabilities/updateBpiSubject/updateBpiSubjectCommand.handler.ts +++ b/examples/bri-3/src/bri/identity/bpiSubjects/capabilities/updateBpiSubject/updateBpiSubjectCommand.handler.ts @@ -3,9 +3,9 @@ import { InjectMapper } from '@automapper/nestjs'; import { CommandHandler, ICommandHandler } from '@nestjs/cqrs'; import { BpiSubjectAgent } from '../../agents/bpiSubjects.agent'; import { BpiSubjectStorageAgent } from '../../agents/bpiSubjectsStorage.agent'; -import { BpiSubjectDto } from '../../api/dtos/response/bpiSubject.dto'; import { BpiSubject } from '../../models/bpiSubject'; import { UpdateBpiSubjectCommand } from './updateBpiSubject.command'; +import { BpiSubjectDto } from '../../api/dtos/response/bpiSubject.dto'; @CommandHandler(UpdateBpiSubjectCommand) export class UpdateBpiSubjectCommandHandler @@ -27,7 +27,7 @@ export class UpdateBpiSubjectCommandHandler bpiSubjectToUpdate, command.name, command.description, - command.publicKey, + command.publicKeys, ); const bpiSubject = await this.storageAgent.updateBpiSubject( diff --git a/examples/bri-3/src/bri/identity/bpiSubjects/models/bpiSubject.ts b/examples/bri-3/src/bri/identity/bpiSubjects/models/bpiSubject.ts index d17c5bd24..bb091d55e 100644 --- a/examples/bri-3/src/bri/identity/bpiSubjects/models/bpiSubject.ts +++ b/examples/bri-3/src/bri/identity/bpiSubjects/models/bpiSubject.ts @@ -2,6 +2,7 @@ import { AutoMap } from '@automapper/classes'; import { v4 } from 'uuid'; import { BpiSubjectRole } from './bpiSubjectRole'; import { PublicKeyType, PublicKey } from './publicKey'; +import { PublicKeyDto } from '../api/dtos/request/publicKey.dto'; export class BpiSubject { @AutoMap() @@ -13,7 +14,7 @@ export class BpiSubject { @AutoMap() description: string; - @AutoMap() + @AutoMap(() => [PublicKey]) publicKeys: PublicKey[]; @AutoMap() @@ -43,10 +44,14 @@ export class BpiSubject { this.description = newDescription; } - public updatePublicKey(newPk: PublicKey): void { - this.publicKeys = this.publicKeys.map((key) => - key.type == newPk.type ? (key = newPk) : key, - ); + public updatePublicKeys(newPKs: PublicKeyDto[]): void { + newPKs.map((newKey: PublicKeyDto) => { + const index = this.publicKeys.findIndex( + (oldKey: PublicKey) => + oldKey.type.toLowerCase() == newKey.type.toLowerCase(), + ); + this.publicKeys[index].value = newKey.value; + }); } public updateLoginNonce(): void { diff --git a/examples/bri-3/src/bri/identity/bpiSubjects/models/publicKey.ts b/examples/bri-3/src/bri/identity/bpiSubjects/models/publicKey.ts index efa0acf60..4f8b6fc93 100644 --- a/examples/bri-3/src/bri/identity/bpiSubjects/models/publicKey.ts +++ b/examples/bri-3/src/bri/identity/bpiSubjects/models/publicKey.ts @@ -1,6 +1,8 @@ import { AutoMap } from '@automapper/classes'; import { BpiSubject } from './bpiSubject'; +//ECDSA - Used for login, messaging, etc. +//EDDSA - Used for signing transactions (inside zk circuit) export enum PublicKeyType { ECDSA = 'ECDSA', EDDSA = 'EDDSA', @@ -16,10 +18,10 @@ export class PublicKey { value: string; @AutoMap() - bpiSubjectId: string; + bpiSubjectId?: string; @AutoMap() - bpiSubject: BpiSubject; + bpiSubject?: BpiSubject; constructor( id: string, diff --git a/examples/bri-3/src/bri/identity/bpiSubjects/subjects.profile.ts b/examples/bri-3/src/bri/identity/bpiSubjects/subjects.profile.ts index 3daf2b25f..167332cb4 100644 --- a/examples/bri-3/src/bri/identity/bpiSubjects/subjects.profile.ts +++ b/examples/bri-3/src/bri/identity/bpiSubjects/subjects.profile.ts @@ -5,6 +5,8 @@ import { BpiSubjectDto } from './api/dtos/response/bpiSubject.dto'; import { BpiSubject } from './models/bpiSubject'; import { BpiSubjectRole } from './models/bpiSubjectRole'; import { BpiSubjectRoleDto } from './api/dtos/response/bpiSubjectRole.dto'; +import { PublicKey } from './models/publicKey'; +import { PublicKeyDto } from './api/dtos/request/publicKey.dto'; @Injectable() export class SubjectsProfile extends AutomapperProfile { @@ -16,6 +18,7 @@ export class SubjectsProfile extends AutomapperProfile { return (mapper) => { createMap(mapper, BpiSubject, BpiSubjectDto); createMap(mapper, BpiSubjectRole, BpiSubjectRoleDto); + createMap(mapper, PublicKey, PublicKeyDto); }; } } diff --git a/examples/bri-3/src/bri/state/bpiAccounts/api/accounts.controller.spec.ts b/examples/bri-3/src/bri/state/bpiAccounts/api/accounts.controller.spec.ts index 69c41458d..4c0c676c8 100644 --- a/examples/bri-3/src/bri/state/bpiAccounts/api/accounts.controller.spec.ts +++ b/examples/bri-3/src/bri/state/bpiAccounts/api/accounts.controller.spec.ts @@ -33,7 +33,10 @@ import { CreateBpiAccountDto } from './dtos/request/createBpiAccount.dto'; import { NOT_FOUND_ERR_MESSAGE } from './err.messages'; import { PrismaService } from '../../../../shared/prisma/prisma.service'; import { PrismaClient } from '@prisma/client'; - +import { + PublicKey, + PublicKeyType, +} from '../../../identity/bpiSubjects/models/publicKey'; describe('AccountController', () => { let accountController: AccountController; let accountStorageAgentMock: DeepMockProxy; @@ -95,14 +98,14 @@ describe('AccountController', () => { '123', 'owner', 'desc', - 'publicKey', + [new PublicKey('232', PublicKeyType.ECDSA, 'publicKey', '123')], [], ); const creatorBpiSubject = new BpiSubject( '321', 'creator', 'desc', - 'publicKey', + [new PublicKey('233', PublicKeyType.ECDSA, 'publicKey', '321')], [], ); return new BpiSubjectAccount( diff --git a/examples/bri-3/src/bri/transactions/agents/transactions.agent.spec.ts b/examples/bri-3/src/bri/transactions/agents/transactions.agent.spec.ts index 89ec6e4ca..05f31b32d 100644 --- a/examples/bri-3/src/bri/transactions/agents/transactions.agent.spec.ts +++ b/examples/bri-3/src/bri/transactions/agents/transactions.agent.spec.ts @@ -15,6 +15,7 @@ import { Workstep, BpiAccount, PrismaClient, + PublicKeyType, } from '../../../../__mocks__/@prisma/client'; import { Test, TestingModule } from '@nestjs/testing'; import { SnarkjsCircuitService } from '../../zeroKnowledgeProof/services/circuit/snarkjs/snarkjs.service'; @@ -28,6 +29,7 @@ import { NOT_FOUND_ERR_MESSAGE as WORKFLOW_NOT_FOUND_ERR_MESSAGE } from '../../w import { AuthModule } from '../../../bri/auth/auth.module'; import { AutomapperModule } from '@automapper/nestjs'; import { classes } from '@automapper/classes'; +import { uuid } from 'uuidv4'; let agent: TransactionAgent; let authAgent: AuthAgent; @@ -76,8 +78,25 @@ beforeEach(async () => { data: { name: 'name', description: 'desc', - publicKey: - '0x047a197a795a747c154dd92b217a048d315ef9ca1bfa9c15bfefe4e02fb338a70af23e7683b565a8dece5104a85ed24a50d791d8c5cb09ee21aabc927c98516539', + publicKeys: { + createMany: { + data: [ + { + type: PublicKeyType.ECDSA, + value: + '0x047a197a795a747c154dd92b217a048d315ef9ca1bfa9c15bfefe4e02fb338a70af23e7683b565a8dece5104a85ed24a50d791d8c5cb09ee21aabc927c98516539', + }, + { + type: PublicKeyType.EDDSA, + value: + '0x047a197a795a747c154dd92b217a048d315ef9ca1bfa9c15bfefe4e02fb338a70af23e7683b565a8dece5104a85ed24a50d791d8c5cb09ee21aabc927c98516539', + }, + ], + }, + }, + }, + include: { + publicKeys: true, }, }); @@ -85,8 +104,23 @@ beforeEach(async () => { data: { name: 'name2', description: 'desc2', - publicKey: - '0x04203db7d27bab8d711acc52479efcfa9d7846e4e176d82389689f95cf06a51818b0b9ab1c2c8d72f1a32e236e6296c91c922a0dc3d0cb9afc269834fc5646b980', + publicKeys: { + create: [ + { + type: PublicKeyType.ECDSA, + value: + '0x04203db7d27bab8d711acc52479efcfa9d7846e4e176d82389689f95cf06a51818b0b9ab1c2c8d72f1a32e236e6296c91c922a0dc3d0cb9afc269834fc5646b980', + }, + { + type: PublicKeyType.EDDSA, + value: + '0x04203db7d27bab8d711acc52479efcfa9d7846e4e176d82389689f95cf06a51818b0b9ab1c2c8d72f1a32e236e6296c91c922a0dc3d0cb9afc269834fc5646b980', + }, + ], + }, + }, + include: { + publicKeys: true, }, }); @@ -100,7 +134,11 @@ beforeEach(async () => { recoveryKey: '', }, include: { - ownerBpiSubject: true, + ownerBpiSubject: { + include: { + publicKeys: true, + }, + }, }, }); bpiSubjectAccount2 = await prisma.bpiSubjectAccount.create({ @@ -113,7 +151,11 @@ beforeEach(async () => { recoveryKey: '', }, include: { - ownerBpiSubject: true, + ownerBpiSubject: { + include: { + publicKeys: true, + }, + }, }, }); bpiAccount1 = await prisma.bpiAccount.create({ @@ -246,8 +288,8 @@ describe('Transaction Agent', () => { it('Should return false when validateTransactionForExecution invoked with tx with wrong signature', async () => { // Arrange jest - .spyOn(authAgent, 'verifySignatureAgainstPublicKey') - .mockImplementationOnce(() => false); + .spyOn(authAgent, 'verifyEddsaSignatureAgainstPublicKey') + .mockImplementationOnce(async () => false); const tx = new Transaction( '1', 1, @@ -270,8 +312,8 @@ describe('Transaction Agent', () => { it('Should return false when validateTransactionForExecution invoked with tx with status not processing', async () => { // Arrange jest - .spyOn(authAgent, 'verifySignatureAgainstPublicKey') - .mockImplementationOnce(() => true); + .spyOn(authAgent, 'verifyEddsaSignatureAgainstPublicKey') + .mockImplementationOnce(async () => true); const tx = new Transaction( '1', 1, @@ -294,8 +336,8 @@ describe('Transaction Agent', () => { it('Should return false when validateTransactionForExecution invoked with tx with nonce not bpi account nonce + 1', async () => { // Arrange jest - .spyOn(authAgent, 'verifySignatureAgainstPublicKey') - .mockImplementationOnce(() => true); + .spyOn(authAgent, 'verifyEddsaSignatureAgainstPublicKey') + .mockImplementationOnce(async () => true); const tx = new Transaction( '1', 2, @@ -318,8 +360,8 @@ describe('Transaction Agent', () => { it('Should return true when validateTransactionForExecution invoked with tx with all properties correctly set', async () => { // Arrange jest - .spyOn(authAgent, 'verifySignatureAgainstPublicKey') - .mockImplementationOnce(() => true); + .spyOn(authAgent, 'verifyEddsaSignatureAgainstPublicKey') + .mockImplementationOnce(async () => true); const tx = new Transaction( '1', 1, diff --git a/examples/bri-3/src/bri/transactions/agents/transactions.agent.ts b/examples/bri-3/src/bri/transactions/agents/transactions.agent.ts index 2c9d31f16..2dd23d42d 100644 --- a/examples/bri-3/src/bri/transactions/agents/transactions.agent.ts +++ b/examples/bri-3/src/bri/transactions/agents/transactions.agent.ts @@ -7,8 +7,6 @@ import { import { Transaction } from '../models/transaction'; import { TransactionStatus } from '../models/transactionStatus.enum'; -import MerkleTree from 'merkletreejs'; -import { Witness } from 'src/bri/zeroKnowledgeProof/models/witness'; import { AuthAgent } from '../../auth/agent/auth.agent'; import { BpiSubjectAccount } from '../../identity/bpiSubjectAccounts/models/bpiSubjectAccount'; import { MerkleTreeService } from '../../merkleTree/services/merkleTree.service'; @@ -23,6 +21,7 @@ import { } from '../api/err.messages'; import { TransactionStorageAgent } from './transactionStorage.agent'; import { TransactionResult } from '../models/transactionResult'; +import { PublicKeyType } from '../../identity/bpiSubjects/models/publicKey'; @Injectable() export class TransactionAgent { @@ -154,11 +153,14 @@ export class TransactionAgent { return false; } - const isSignatureValid = this.authAgent.verifySignatureAgainstPublicKey( - tx.payload, - tx.signature, - tx.fromBpiSubjectAccount.ownerBpiSubject.publicKey, - ); + const isSignatureValid = + await this.authAgent.verifyEddsaSignatureAgainstPublicKey( + tx.payload, + tx.signature, + tx.fromBpiSubjectAccount.ownerBpiSubject.publicKeys.filter( + (key) => key.type == PublicKeyType.EDDSA, + )[0].value, + ); if (!isSignatureValid) { return false; diff --git a/examples/bri-3/src/bri/transactions/api/transactions.controller.spec.ts b/examples/bri-3/src/bri/transactions/api/transactions.controller.spec.ts index 701e5d321..9e9d790c8 100644 --- a/examples/bri-3/src/bri/transactions/api/transactions.controller.spec.ts +++ b/examples/bri-3/src/bri/transactions/api/transactions.controller.spec.ts @@ -29,6 +29,10 @@ import { UpdateTransactionDto } from './dtos/request/updateTransaction.dto'; import { NOT_FOUND_ERR_MESSAGE } from './err.messages'; import { TransactionController } from './transactions.controller'; import { MerkleTreeService } from '../../merkleTree/services/merkleTree.service'; +import { + PublicKey, + PublicKeyType, +} from '../../identity/bpiSubjects/models/publicKey'; describe('TransactionController', () => { let controller: TransactionController; @@ -40,14 +44,14 @@ describe('TransactionController', () => { '123', 'owner', 'desc', - 'publicKey', + [new PublicKey('222', PublicKeyType.ECDSA, 'publicKey', '123')], [], ); const creatorBpiSubject = new BpiSubject( '321', 'creator', 'desc', - 'publicKey', + [new PublicKey('223', PublicKeyType.ECDSA, 'publicKey', '321')], [], ); diff --git a/examples/bri-3/src/bri/transactions/capabilities/processInboundTransaction/processInboundTransactionCommand.handler.ts b/examples/bri-3/src/bri/transactions/capabilities/processInboundTransaction/processInboundTransactionCommand.handler.ts index 9db4ef7a1..0c5e64c70 100644 --- a/examples/bri-3/src/bri/transactions/capabilities/processInboundTransaction/processInboundTransactionCommand.handler.ts +++ b/examples/bri-3/src/bri/transactions/capabilities/processInboundTransaction/processInboundTransactionCommand.handler.ts @@ -34,11 +34,12 @@ export class ProcessInboundTransactionCommandHandler return false; } - const isSignatureValid = this.authAgent.verifySignatureAgainstPublicKey( - command.payload, - command.signature, - subjectAccounts[0].ownerBpiSubject.publicKey, - ); + const isSignatureValid = + this.authAgent.verifyEcdsaSignatureAgainstPublicKey( + command.payload, + command.signature, + subjectAccounts[0].ownerBpiSubject.publicKeys[0].value, + ); if (!isSignatureValid) { return false; diff --git a/examples/bri-3/src/bri/vsm/capabilites/handleWorkstepEvents/workstepExecutedEvent.handler.ts b/examples/bri-3/src/bri/vsm/capabilites/handleWorkstepEvents/workstepExecutedEvent.handler.ts index 386150a6e..8bb83ff0e 100644 --- a/examples/bri-3/src/bri/vsm/capabilites/handleWorkstepEvents/workstepExecutedEvent.handler.ts +++ b/examples/bri-3/src/bri/vsm/capabilites/handleWorkstepEvents/workstepExecutedEvent.handler.ts @@ -43,10 +43,14 @@ export class WorkstepExecutedEventHandler ); // Change channels to publish message here - const channels = [event.tx.fromBpiSubjectAccount.ownerBpiSubject.publicKey]; + const channels = [ + event.tx.fromBpiSubjectAccount.ownerBpiSubject.publicKeys[0].value, + ]; if (event.status == 'Success') { - channels.push(event.tx.toBpiSubjectAccount.ownerBpiSubject.publicKey); + channels.push( + event.tx.toBpiSubjectAccount.ownerBpiSubject.publicKeys[0].value, + ); } await this.publishMessage(channels, bpiMessage); diff --git a/examples/bri-3/src/bri/workgroup/workflows/api/workflows.controller.spec.ts b/examples/bri-3/src/bri/workgroup/workflows/api/workflows.controller.spec.ts index 6c978373c..1b63b6fe0 100644 --- a/examples/bri-3/src/bri/workgroup/workflows/api/workflows.controller.spec.ts +++ b/examples/bri-3/src/bri/workgroup/workflows/api/workflows.controller.spec.ts @@ -29,6 +29,9 @@ import { UpdateWorkflowDto } from './dtos/request/updateWorkflow.dto'; import { WorkflowController } from './workflows.controller'; import { PrismaService } from '../../../../shared/prisma/prisma.service'; import { PrismaClient } from '@prisma/client'; +import { MerkleTreeAgent } from '../../../merkleTree/agents/merkleTree.agent'; +import { MerkleTreeStorageAgent } from '../../../merkleTree/agents/merkleTreeStorage.agent'; +import { MerkleTreeService } from '../../../merkleTree/services/merkleTree.service'; describe('WorkflowsController', () => { let workflowController: WorkflowController; @@ -100,6 +103,7 @@ describe('WorkflowsController', () => { WorkgroupAgent, BpiAccountAgent, BpiSubjectAccountAgent, + MerkleTreeAgent, CreateWorkflowCommandHandler, UpdateWorkflowCommandHandler, DeleteWorkflowCommandHandler, @@ -107,22 +111,24 @@ describe('WorkflowsController', () => { GetAllWorkflowsQueryHandler, WorkflowStorageAgent, BpiAccountStorageAgent, + MerkleTreeStorageAgent, WorkstepProfile, WorkflowProfile, + MerkleTreeService, ], }) .overrideProvider(WorkflowStorageAgent) .useValue(mockDeep()) .overrideProvider(WorkstepStorageAgent) .useValue(mockDeep()) - .overrideProvider(BpiAccountAgent) - .useValue(mockDeep()) .overrideProvider(BpiSubjectAccountAgent) .useValue(mockDeep()) .overrideProvider(WorkgroupAgent) .useValue(mockDeep()) .overrideProvider(BpiAccountStorageAgent) .useValue(mockDeep()) + .overrideProvider(MerkleTreeStorageAgent) + .useValue(mockDeep()) .overrideProvider(PrismaService) .useValue(mockDeep()) .compile(); diff --git a/examples/bri-3/src/bri/workgroup/workgroups/api/workgroups.controller.spec.ts b/examples/bri-3/src/bri/workgroup/workgroups/api/workgroups.controller.spec.ts index 7089bd0b4..c02f80302 100644 --- a/examples/bri-3/src/bri/workgroup/workgroups/api/workgroups.controller.spec.ts +++ b/examples/bri-3/src/bri/workgroup/workgroups/api/workgroups.controller.spec.ts @@ -28,6 +28,10 @@ import { uuid } from 'uuidv4'; import { WorkgroupProfile } from '../workgroups.profile'; import { PrismaService } from '../../../../shared/prisma/prisma.service'; import { PrismaClient } from '@prisma/client'; +import { + PublicKey, + PublicKeyType, +} from '../../../identity/bpiSubjects/models/publicKey'; describe('WorkgroupsController', () => { let workgroupController: WorkgroupController; @@ -35,7 +39,13 @@ describe('WorkgroupsController', () => { let subjectStorageAgentMock: DeepMockProxy; const createTestBpiSubject = () => { - return new BpiSubject('123', 'name', 'desc', 'pubkey', []); + return new BpiSubject( + '123', + 'name', + 'desc', + [new PublicKey('223', PublicKeyType.ECDSA, 'publicKey', '123')], + [], + ); }; const createTestWorkgroup = (): Workgroup => { diff --git a/examples/bri-3/src/bri/zeroKnowledgeProof/services/circuit/circuitInputsParser/circuitInputParser.service.ts b/examples/bri-3/src/bri/zeroKnowledgeProof/services/circuit/circuitInputsParser/circuitInputParser.service.ts index 05fe7be54..dc30953e0 100644 --- a/examples/bri-3/src/bri/zeroKnowledgeProof/services/circuit/circuitInputsParser/circuitInputParser.service.ts +++ b/examples/bri-3/src/bri/zeroKnowledgeProof/services/circuit/circuitInputsParser/circuitInputParser.service.ts @@ -11,7 +11,7 @@ export class CircuitInputsParserService { try { const jsonPayload = JSON.parse(payload); - for (let mapping of cim.mapping) { + for (const mapping of cim.mapping) { const value = this.getJsonValueByPath( jsonPayload, mapping.payloadJsonPath, @@ -26,7 +26,9 @@ export class CircuitInputsParserService { switch (mapping.dataType) { case 'string': - result[mapping.circuitInput] = this.calculateStringCharCodeSum(value || mapping.defaultValue); + result[mapping.circuitInput] = this.calculateStringCharCodeSum( + value || mapping.defaultValue, + ); break; case 'integer': diff --git a/examples/bri-3/src/bri/zeroKnowledgeProof/services/circuit/snarkjs/utils/computePublicInputs.ts b/examples/bri-3/src/bri/zeroKnowledgeProof/services/circuit/snarkjs/utils/computePublicInputs.ts index 2567104a4..d3793effb 100644 --- a/examples/bri-3/src/bri/zeroKnowledgeProof/services/circuit/snarkjs/utils/computePublicInputs.ts +++ b/examples/bri-3/src/bri/zeroKnowledgeProof/services/circuit/snarkjs/utils/computePublicInputs.ts @@ -47,7 +47,8 @@ export const computeEcdsaSigPublicInputs = (tx: Transaction) => { ethers.utils.arrayify(ethers.utils.hashMessage(tx.payload)), ); - const publicKey = tx.fromBpiSubjectAccount.ownerBpiSubject.publicKey; + const publicKey = + tx.fromBpiSubjectAccount.ownerBpiSubject.publicKeys[0].value; return computeEffectiveEcdsaSigPublicInputs( ecdsaSignature, @@ -113,7 +114,7 @@ export const computeEddsaSigPublicInputs = async (tx: Transaction) => { .digest(); const publicKey = - tx.fromBpiSubjectAccount.ownerBpiSubject.publicKey.split(','); + tx.fromBpiSubjectAccount.ownerBpiSubject.publicKeys[0].value.split(','); const publicKeyPoints = [ Uint8Array.from(Buffer.from(publicKey[0], 'hex')), diff --git a/examples/bri-3/src/shared/testing/builders.ts b/examples/bri-3/src/shared/testing/builders.ts index 8f9068cf0..730f2554c 100644 --- a/examples/bri-3/src/shared/testing/builders.ts +++ b/examples/bri-3/src/shared/testing/builders.ts @@ -8,6 +8,7 @@ import { BpiMerkleTree } from '../../bri/merkleTree/models/bpiMerkleTree'; import { Workflow } from '../../bri/workgroup/workflows/models/workflow'; import { Workgroup } from '../../bri/workgroup/workgroups/models/workgroup'; import { Workstep } from '../../bri/workgroup/worksteps/models/workstep'; +import { PublicKey } from '../../bri/identity/bpiSubjects/models/publicKey'; export class WorkstepBuilder { private id: string; @@ -121,7 +122,7 @@ export class BpiSubjectBuilder { private id: string; private name: string; private description: string; - private publicKey: string; + private publicKey: PublicKey[]; private loginNonce: string; private roles: BpiSubjectRole[]; @@ -142,7 +143,7 @@ export class BpiSubjectBuilder { return this; } - setPublicKey(publicKey: string): BpiSubjectBuilder { + setPublicKey(publicKey: PublicKey[]): BpiSubjectBuilder { this.publicKey = publicKey; return this; } diff --git a/examples/bri-3/src/shared/testing/testData.helper.ts b/examples/bri-3/src/shared/testing/testData.helper.ts index da7a555b6..b0e92dec3 100644 --- a/examples/bri-3/src/shared/testing/testData.helper.ts +++ b/examples/bri-3/src/shared/testing/testData.helper.ts @@ -16,6 +16,10 @@ import { WorkgroupBuilder, WorkstepBuilder, } from './builders'; +import { + PublicKey, + PublicKeyType, +} from '../../bri/identity/bpiSubjects/models/publicKey'; // A place to encapsulate creation of test data objects used for controller testing. // These objects will later be used to mock prisma.client calls only once during test bootstrap @@ -51,11 +55,14 @@ export class TestDataHelper { }; public static createBpiSubject = () => { + const bpiSubjectId = uuid(); const bpiSubject = new BpiSubjectBuilder() - .setId(uuid()) + .setId(bpiSubjectId) .setName('name') .setDescription('desc') - .setPublicKey('pk') + .setPublicKey([ + new PublicKey(uuid(), PublicKeyType.ECDSA, '12345', bpiSubjectId), + ]) .setRoles([ new BpiSubjectRole( uuid(),