From a275a45753abc4a29a89de5fe784260165297bbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Mon, 10 Oct 2022 10:40:46 +0200 Subject: [PATCH] fix(api): workspace creation arguments --- ...mmon-npm-1.36.1-8fadd25f7f-4f2367d461.zip} | Bin 35278 -> 39729 bytes packages/api/package.json | 2 +- .../Workspace/WorkspaceApiService.spec.ts | 4 +++ .../Client/Workspace/WorkspaceApiService.ts | 10 ++++-- .../Workspace/WorkspaceApiServiceInterface.ts | 9 ++++-- .../WorkspaceCreationRequestParams.ts | 9 ++++-- packages/encryption/package.json | 2 +- packages/features/package.json | 2 +- packages/filepicker/package.json | 2 +- packages/files/package.json | 2 +- packages/models/package.json | 2 +- packages/responses/package.json | 2 +- packages/services/package.json | 2 +- .../Workspace/WorkspaceClientInterface.ts | 9 ++++-- .../src/Domain/Workspace/WorkspaceManager.ts | 9 ++++-- packages/snjs/package.json | 2 +- packages/ui-services/package.json | 2 +- packages/utils/package.json | 2 +- yarn.lock | 30 +++++++++--------- 19 files changed, 61 insertions(+), 41 deletions(-) rename .yarn/cache/{@standardnotes-common-npm-1.32.0-9a02bcfd46-52d33f385e.zip => @standardnotes-common-npm-1.36.1-8fadd25f7f-4f2367d461.zip} (66%) diff --git a/.yarn/cache/@standardnotes-common-npm-1.32.0-9a02bcfd46-52d33f385e.zip b/.yarn/cache/@standardnotes-common-npm-1.36.1-8fadd25f7f-4f2367d461.zip similarity index 66% rename from .yarn/cache/@standardnotes-common-npm-1.32.0-9a02bcfd46-52d33f385e.zip rename to .yarn/cache/@standardnotes-common-npm-1.36.1-8fadd25f7f-4f2367d461.zip index b53a634329d1d2aaaf67c24d7a971e02413994bb..b806c765e5a1d82dbe1cb911fd246301b0d5fb32 100644 GIT binary patch delta 5989 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 diff --git a/packages/api/package.json b/packages/api/package.json index c606befa4..ad9213772 100644 --- a/packages/api/package.json +++ b/packages/api/package.json @@ -36,7 +36,7 @@ "typescript": "*" }, "dependencies": { - "@standardnotes/common": "^1.32.0", + "@standardnotes/common": "^1.36.1", "@standardnotes/encryption": "workspace:*", "@standardnotes/models": "workspace:*", "@standardnotes/responses": "workspace:*", diff --git a/packages/api/src/Domain/Client/Workspace/WorkspaceApiService.spec.ts b/packages/api/src/Domain/Client/Workspace/WorkspaceApiService.spec.ts index 0cfeab6f3..d8dd50940 100644 --- a/packages/api/src/Domain/Client/Workspace/WorkspaceApiService.spec.ts +++ b/packages/api/src/Domain/Client/Workspace/WorkspaceApiService.spec.ts @@ -1,3 +1,4 @@ +import { WorkspaceType } from '@standardnotes/common' import { WorkspaceCreationResponse } from '../../Response/Workspace/WorkspaceCreationResponse' import { WorkspaceServerInterface } from '../../Server/Workspace/WorkspaceServerInterface' @@ -18,6 +19,7 @@ describe('WorkspaceApiService', () => { it('should create a workspace', async () => { const response = await createService().createWorkspace({ + workspaceType: WorkspaceType.Private, encryptedPrivateKey: 'foo', encryptedWorkspaceKey: 'bar', publicKey: 'buzz', @@ -44,6 +46,7 @@ describe('WorkspaceApiService', () => { let error = null try { await service.createWorkspace({ + workspaceType: WorkspaceType.Private, encryptedPrivateKey: 'foo', encryptedWorkspaceKey: 'bar', publicKey: 'buzz', @@ -63,6 +66,7 @@ describe('WorkspaceApiService', () => { let error = null try { await createService().createWorkspace({ + workspaceType: WorkspaceType.Private, encryptedPrivateKey: 'foo', encryptedWorkspaceKey: 'bar', publicKey: 'buzz', diff --git a/packages/api/src/Domain/Client/Workspace/WorkspaceApiService.ts b/packages/api/src/Domain/Client/Workspace/WorkspaceApiService.ts index 24be4e16d..c96b21e8a 100644 --- a/packages/api/src/Domain/Client/Workspace/WorkspaceApiService.ts +++ b/packages/api/src/Domain/Client/Workspace/WorkspaceApiService.ts @@ -6,6 +6,8 @@ import { WorkspaceServerInterface } from '../../Server/Workspace/WorkspaceServer import { WorkspaceApiServiceInterface } from './WorkspaceApiServiceInterface' import { WorkspaceApiOperations } from './WorkspaceApiOperations' +import { WorkspaceType } from '@standardnotes/common' + export class WorkspaceApiService implements WorkspaceApiServiceInterface { private operationsInProgress: Map @@ -14,9 +16,10 @@ export class WorkspaceApiService implements WorkspaceApiServiceInterface { } async createWorkspace(dto: { - encryptedWorkspaceKey: string - encryptedPrivateKey: string - publicKey: string + workspaceType: WorkspaceType, + encryptedWorkspaceKey?: string + encryptedPrivateKey?: string + publicKey?: string workspaceName?: string }): Promise { if (this.operationsInProgress.get(WorkspaceApiOperations.Creating)) { @@ -27,6 +30,7 @@ export class WorkspaceApiService implements WorkspaceApiServiceInterface { try { const response = await this.workspaceServer.createWorkspace({ + workspaceType: dto.workspaceType, encryptedPrivateKey: dto.encryptedPrivateKey, encryptedWorkspaceKey: dto.encryptedWorkspaceKey, publicKey: dto.publicKey, diff --git a/packages/api/src/Domain/Client/Workspace/WorkspaceApiServiceInterface.ts b/packages/api/src/Domain/Client/Workspace/WorkspaceApiServiceInterface.ts index 3c3ce5cfc..ef598dc5f 100644 --- a/packages/api/src/Domain/Client/Workspace/WorkspaceApiServiceInterface.ts +++ b/packages/api/src/Domain/Client/Workspace/WorkspaceApiServiceInterface.ts @@ -1,10 +1,13 @@ +import { WorkspaceType } from '@standardnotes/common' + import { WorkspaceCreationResponse } from '../../Response' export interface WorkspaceApiServiceInterface { createWorkspace(dto: { - encryptedWorkspaceKey: string - encryptedPrivateKey: string - publicKey: string + workspaceType: WorkspaceType + encryptedWorkspaceKey?: string + encryptedPrivateKey?: string + publicKey?: string workspaceName?: string }): Promise } diff --git a/packages/api/src/Domain/Request/Workspace/WorkspaceCreationRequestParams.ts b/packages/api/src/Domain/Request/Workspace/WorkspaceCreationRequestParams.ts index 94ed0b93a..b44a10b46 100644 --- a/packages/api/src/Domain/Request/Workspace/WorkspaceCreationRequestParams.ts +++ b/packages/api/src/Domain/Request/Workspace/WorkspaceCreationRequestParams.ts @@ -1,7 +1,10 @@ +import { WorkspaceType } from '@standardnotes/common' + export type WorkspaceCreationRequestParams = { - encryptedWorkspaceKey: string - encryptedPrivateKey: string - publicKey: string + workspaceType: WorkspaceType + encryptedWorkspaceKey?: string + encryptedPrivateKey?: string + publicKey?: string workspaceName?: string [additionalParam: string]: unknown } diff --git a/packages/encryption/package.json b/packages/encryption/package.json index a5b496972..a45242e31 100644 --- a/packages/encryption/package.json +++ b/packages/encryption/package.json @@ -35,7 +35,7 @@ "typescript": "*" }, "dependencies": { - "@standardnotes/common": "^1.32.0", + "@standardnotes/common": "^1.36.1", "@standardnotes/models": "workspace:*", "@standardnotes/responses": "workspace:*", "@standardnotes/sncrypto-common": "workspace:*", diff --git a/packages/features/package.json b/packages/features/package.json index 857611ef8..327964642 100644 --- a/packages/features/package.json +++ b/packages/features/package.json @@ -26,7 +26,7 @@ }, "dependencies": { "@standardnotes/auth": "^3.19.4", - "@standardnotes/common": "^1.32.0", + "@standardnotes/common": "^1.36.1", "@standardnotes/security": "^1.2.0", "reflect-metadata": "^0.1.13" }, diff --git a/packages/filepicker/package.json b/packages/filepicker/package.json index 2b4cd3d77..7a6345ae8 100644 --- a/packages/filepicker/package.json +++ b/packages/filepicker/package.json @@ -31,7 +31,7 @@ "ts-node": "^10.5.0" }, "dependencies": { - "@standardnotes/common": "^1.32.0", + "@standardnotes/common": "^1.36.1", "@standardnotes/files": "workspace:*", "@standardnotes/utils": "workspace:*", "@types/wicg-file-system-access": "^2020.9.5", diff --git a/packages/files/package.json b/packages/files/package.json index 8a6b5195c..4c685c657 100644 --- a/packages/files/package.json +++ b/packages/files/package.json @@ -30,7 +30,7 @@ "ts-jest": "^28.0.5" }, "dependencies": { - "@standardnotes/common": "^1.32.0", + "@standardnotes/common": "^1.36.1", "@standardnotes/encryption": "workspace:*", "@standardnotes/models": "workspace:*", "@standardnotes/responses": "workspace:*", diff --git a/packages/models/package.json b/packages/models/package.json index 8a61ceca5..80cd5e586 100644 --- a/packages/models/package.json +++ b/packages/models/package.json @@ -31,7 +31,7 @@ "typescript": "*" }, "dependencies": { - "@standardnotes/common": "^1.32.0", + "@standardnotes/common": "^1.36.1", "@standardnotes/features": "workspace:*", "@standardnotes/responses": "workspace:*", "@standardnotes/utils": "workspace:*", diff --git a/packages/responses/package.json b/packages/responses/package.json index 47c5c5852..7e85c9208 100644 --- a/packages/responses/package.json +++ b/packages/responses/package.json @@ -31,7 +31,7 @@ "ts-jest": "^28.0.5" }, "dependencies": { - "@standardnotes/common": "^1.32.0", + "@standardnotes/common": "^1.36.1", "@standardnotes/features": "workspace:*", "@standardnotes/security": "^1.1.0", "reflect-metadata": "^0.1.13" diff --git a/packages/services/package.json b/packages/services/package.json index e6f0e7363..b665dd49c 100644 --- a/packages/services/package.json +++ b/packages/services/package.json @@ -26,7 +26,7 @@ "dependencies": { "@standardnotes/api": "workspace:^", "@standardnotes/auth": "^3.19.4", - "@standardnotes/common": "^1.32.0", + "@standardnotes/common": "^1.36.1", "@standardnotes/encryption": "workspace:^", "@standardnotes/files": "workspace:^", "@standardnotes/models": "workspace:^", diff --git a/packages/services/src/Domain/Workspace/WorkspaceClientInterface.ts b/packages/services/src/Domain/Workspace/WorkspaceClientInterface.ts index b1036912b..3ff2b8c76 100644 --- a/packages/services/src/Domain/Workspace/WorkspaceClientInterface.ts +++ b/packages/services/src/Domain/Workspace/WorkspaceClientInterface.ts @@ -1,8 +1,11 @@ +import { WorkspaceType } from '@standardnotes/common' + export interface WorkspaceClientInterface { createWorkspace(dto: { - encryptedWorkspaceKey: string - encryptedPrivateKey: string - publicKey: string + workspaceType: WorkspaceType + encryptedWorkspaceKey?: string + encryptedPrivateKey?: string + publicKey?: string workspaceName?: string }): Promise<{ uuid: string } | null> } diff --git a/packages/services/src/Domain/Workspace/WorkspaceManager.ts b/packages/services/src/Domain/Workspace/WorkspaceManager.ts index 460c5a7ec..6889476b7 100644 --- a/packages/services/src/Domain/Workspace/WorkspaceManager.ts +++ b/packages/services/src/Domain/Workspace/WorkspaceManager.ts @@ -1,4 +1,6 @@ import { WorkspaceApiServiceInterface } from '@standardnotes/api' +import { WorkspaceType } from '@standardnotes/common' + import { InternalEventBusInterface } from '../Internal/InternalEventBusInterface' import { AbstractService } from '../Service/AbstractService' import { WorkspaceClientInterface } from './WorkspaceClientInterface' @@ -12,9 +14,10 @@ export class WorkspaceManager extends AbstractService implements WorkspaceClient } async createWorkspace(dto: { - encryptedWorkspaceKey: string - encryptedPrivateKey: string - publicKey: string + workspaceType: WorkspaceType, + encryptedWorkspaceKey?: string + encryptedPrivateKey?: string + publicKey?: string workspaceName?: string }): Promise<{ uuid: string } | null> { try { diff --git a/packages/snjs/package.json b/packages/snjs/package.json index 0f778e885..2f63a77a3 100644 --- a/packages/snjs/package.json +++ b/packages/snjs/package.json @@ -68,7 +68,7 @@ }, "dependencies": { "@standardnotes/api": "workspace:*", - "@standardnotes/common": "^1.32.0", + "@standardnotes/common": "^1.36.1", "@standardnotes/domain-events": "^2.39.0", "@standardnotes/encryption": "workspace:*", "@standardnotes/features": "workspace:*", diff --git a/packages/ui-services/package.json b/packages/ui-services/package.json index e828056c8..b64ae894d 100644 --- a/packages/ui-services/package.json +++ b/packages/ui-services/package.json @@ -23,7 +23,7 @@ "test": "jest spec --coverage --passWithNoTests" }, "dependencies": { - "@standardnotes/common": "^1.32.0", + "@standardnotes/common": "^1.36.1", "@standardnotes/filepicker": "workspace:^", "@standardnotes/services": "workspace:^", "@standardnotes/styles": "workspace:^", diff --git a/packages/utils/package.json b/packages/utils/package.json index 5bc27c571..284c7e9d8 100644 --- a/packages/utils/package.json +++ b/packages/utils/package.json @@ -25,7 +25,7 @@ "test": "jest spec" }, "dependencies": { - "@standardnotes/common": "^1.32.0", + "@standardnotes/common": "^1.36.1", "dompurify": "^2.3.8", "lodash": "^4.17.21", "reflect-metadata": "^0.1.13" diff --git a/yarn.lock b/yarn.lock index 0bac0babb..30c134afe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6068,7 +6068,7 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/api@workspace:packages/api" dependencies: - "@standardnotes/common": ^1.32.0 + "@standardnotes/common": ^1.36.1 "@standardnotes/encryption": "workspace:*" "@standardnotes/models": "workspace:*" "@standardnotes/responses": "workspace:*" @@ -6251,12 +6251,12 @@ __metadata: languageName: node linkType: hard -"@standardnotes/common@npm:^1.32.0": - version: 1.32.0 - resolution: "@standardnotes/common@npm:1.32.0" +"@standardnotes/common@npm:^1.36.1": + version: 1.36.1 + resolution: "@standardnotes/common@npm:1.36.1" dependencies: reflect-metadata: ^0.1.13 - checksum: 52d33f385e4cc26ac8d2f723c3a5e12bb8a2c4a17f08700ca5843810583ca722475a83b71f86bb1402fda7c7c66e8149beb3f70848efc90da4aafef663d7ffbe + checksum: 4f2367d461aa1cd4e3ec132520310773183c3c9f8e423565aec315f5e5dffdce79f9704307a32fbfec17157f99d37d49982ad4272eee5aac0dbe37da34be054c languageName: node linkType: hard @@ -6443,7 +6443,7 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/encryption@workspace:packages/encryption" dependencies: - "@standardnotes/common": ^1.32.0 + "@standardnotes/common": ^1.36.1 "@standardnotes/config": 2.4.3 "@standardnotes/models": "workspace:*" "@standardnotes/responses": "workspace:*" @@ -6485,7 +6485,7 @@ __metadata: resolution: "@standardnotes/features@workspace:packages/features" dependencies: "@standardnotes/auth": ^3.19.4 - "@standardnotes/common": ^1.32.0 + "@standardnotes/common": ^1.36.1 "@standardnotes/security": ^1.2.0 "@types/jest": ^28.1.5 "@typescript-eslint/eslint-plugin": ^5.30.0 @@ -6501,7 +6501,7 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/filepicker@workspace:packages/filepicker" dependencies: - "@standardnotes/common": ^1.32.0 + "@standardnotes/common": ^1.36.1 "@standardnotes/files": "workspace:*" "@standardnotes/utils": "workspace:*" "@types/jest": ^28.1.5 @@ -6519,7 +6519,7 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/files@workspace:packages/files" dependencies: - "@standardnotes/common": ^1.32.0 + "@standardnotes/common": ^1.36.1 "@standardnotes/encryption": "workspace:*" "@standardnotes/models": "workspace:*" "@standardnotes/responses": "workspace:*" @@ -6905,7 +6905,7 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/models@workspace:packages/models" dependencies: - "@standardnotes/common": ^1.32.0 + "@standardnotes/common": ^1.36.1 "@standardnotes/features": "workspace:*" "@standardnotes/responses": "workspace:*" "@standardnotes/utils": "workspace:*" @@ -6972,7 +6972,7 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/responses@workspace:packages/responses" dependencies: - "@standardnotes/common": ^1.32.0 + "@standardnotes/common": ^1.36.1 "@standardnotes/features": "workspace:*" "@standardnotes/security": ^1.1.0 "@types/jest": ^28.1.5 @@ -7041,7 +7041,7 @@ __metadata: dependencies: "@standardnotes/api": "workspace:^" "@standardnotes/auth": ^3.19.4 - "@standardnotes/common": ^1.32.0 + "@standardnotes/common": ^1.36.1 "@standardnotes/encryption": "workspace:^" "@standardnotes/files": "workspace:^" "@standardnotes/models": "workspace:^" @@ -7156,7 +7156,7 @@ __metadata: "@babel/core": "*" "@babel/preset-env": "*" "@standardnotes/api": "workspace:*" - "@standardnotes/common": ^1.32.0 + "@standardnotes/common": ^1.36.1 "@standardnotes/domain-events": ^2.39.0 "@standardnotes/encryption": "workspace:*" "@standardnotes/features": "workspace:*" @@ -7309,7 +7309,7 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/ui-services@workspace:packages/ui-services" dependencies: - "@standardnotes/common": ^1.32.0 + "@standardnotes/common": ^1.36.1 "@standardnotes/filepicker": "workspace:^" "@standardnotes/services": "workspace:^" "@standardnotes/styles": "workspace:^" @@ -7329,7 +7329,7 @@ __metadata: version: 0.0.0-use.local resolution: "@standardnotes/utils@workspace:packages/utils" dependencies: - "@standardnotes/common": ^1.32.0 + "@standardnotes/common": ^1.36.1 "@types/dompurify": ^2.3.3 "@types/jest": ^28.1.5 "@types/jsdom": ^16.2.14