From 447d600dbe0ee101a7579409adc9da6cd3e309de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Mon, 10 Oct 2022 10:09:49 +0200 Subject: [PATCH] fix(workspace): rename private key to encrypted private key --- .../1665389240189-rename-private-key.ts | 17 +++++++++++++++++ .../CreateWorkspace/CreateWorkspace.spec.ts | 4 ++-- .../UseCase/CreateWorkspace/CreateWorkspace.ts | 2 +- .../src/Domain/Workspace/WorkspaceUser.ts | 4 ++-- 4 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 packages/workspace/migrations/1665389240189-rename-private-key.ts diff --git a/packages/workspace/migrations/1665389240189-rename-private-key.ts b/packages/workspace/migrations/1665389240189-rename-private-key.ts new file mode 100644 index 000000000..843597747 --- /dev/null +++ b/packages/workspace/migrations/1665389240189-rename-private-key.ts @@ -0,0 +1,17 @@ +import { MigrationInterface, QueryRunner } from 'typeorm' + +export class renamePrivateKey1665389240189 implements MigrationInterface { + name = 'renamePrivateKey1665389240189' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query( + 'ALTER TABLE `workspace_users` CHANGE `private_key` `encrypted_private_key` varchar(255) NOT NULL', + ) + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query( + 'ALTER TABLE `workspace_users` CHANGE `encrypted_private_key` `private_key` varchar(255) NOT NULL', + ) + } +} diff --git a/packages/workspace/src/Domain/UseCase/CreateWorkspace/CreateWorkspace.spec.ts b/packages/workspace/src/Domain/UseCase/CreateWorkspace/CreateWorkspace.spec.ts index 2719c314e..53124fa83 100644 --- a/packages/workspace/src/Domain/UseCase/CreateWorkspace/CreateWorkspace.spec.ts +++ b/packages/workspace/src/Domain/UseCase/CreateWorkspace/CreateWorkspace.spec.ts @@ -41,7 +41,7 @@ describe('CreateWorkspace', () => { expect(workspaceUserRepository.save).toHaveBeenCalledWith({ accessLevel: 'owner', encryptedWorkspaceKey: 'bar', - privateKey: 'foo', + encryptedPrivateKey: 'foo', publicKey: 'buzz', status: 'active', userUuid: '1-2-3', @@ -64,7 +64,7 @@ describe('CreateWorkspace', () => { expect(workspaceUserRepository.save).toHaveBeenCalledWith({ accessLevel: 'owner', encryptedWorkspaceKey: 'bar', - privateKey: 'foo', + encryptedPrivateKey: 'foo', publicKey: 'buzz', status: 'active', userUuid: '1-2-3', diff --git a/packages/workspace/src/Domain/UseCase/CreateWorkspace/CreateWorkspace.ts b/packages/workspace/src/Domain/UseCase/CreateWorkspace/CreateWorkspace.ts index a9f5176bf..3758ffee3 100644 --- a/packages/workspace/src/Domain/UseCase/CreateWorkspace/CreateWorkspace.ts +++ b/packages/workspace/src/Domain/UseCase/CreateWorkspace/CreateWorkspace.ts @@ -31,7 +31,7 @@ export class CreateWorkspace implements UseCaseInterface { const ownerAssociation = new WorkspaceUser() ownerAssociation.accessLevel = WorkspaceAccessLevel.Owner ownerAssociation.encryptedWorkspaceKey = dto.encryptedWorkspaceKey - ownerAssociation.privateKey = dto.encryptedPrivateKey + ownerAssociation.encryptedPrivateKey = dto.encryptedPrivateKey ownerAssociation.publicKey = dto.publicKey ownerAssociation.status = WorkspaceUserStatus.Active ownerAssociation.userUuid = dto.ownerUuid diff --git a/packages/workspace/src/Domain/Workspace/WorkspaceUser.ts b/packages/workspace/src/Domain/Workspace/WorkspaceUser.ts index 6da7d6636..db68b5167 100644 --- a/packages/workspace/src/Domain/Workspace/WorkspaceUser.ts +++ b/packages/workspace/src/Domain/Workspace/WorkspaceUser.ts @@ -42,11 +42,11 @@ export class WorkspaceUser { declare publicKey: string @Column({ - name: 'private_key', + name: 'encrypted_private_key', length: 255, type: 'varchar', }) - declare privateKey: string + declare encryptedPrivateKey: string @Column({ name: 'status',