rmorawski/standardnotes-app-web
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix(api): workspace creation arguments

Browse Source
This commit is contained in:
Karol Sójko
2022-10-10 10:40:46 +02:00
parent 8863ee82bb
commit a275a45753
19 changed files with 61 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.yarn/cache/@standardnotes-common-npm-1.32.0-9a02bcfd46-52d33f385e.zip → .yarn/cache/@standardnotes-common-npm-1.36.1-8fadd25f7f-4f2367d461.zip vendored
View File

Binary file not shown.

2
packages/api/package.json
View File

@@ -36,7 +36,7 @@
"typescript": "*" "typescript": "*"
}, },
"dependencies": { "dependencies": {
"@standardnotes/common": "^1.32.0", "@standardnotes/common": "^1.36.1",
"@standardnotes/encryption": "workspace:*", "@standardnotes/encryption": "workspace:*",
"@standardnotes/models": "workspace:*", "@standardnotes/models": "workspace:*",
"@standardnotes/responses": "workspace:*", "@standardnotes/responses": "workspace:*",

4
packages/api/src/Domain/Client/Workspace/WorkspaceApiService.spec.ts
View File

@@ -1,3 +1,4 @@
import { WorkspaceType } from '@standardnotes/common'
import { WorkspaceCreationResponse } from '../../Response/Workspace/WorkspaceCreationResponse' import { WorkspaceCreationResponse } from '../../Response/Workspace/WorkspaceCreationResponse'
import { WorkspaceServerInterface } from '../../Server/Workspace/WorkspaceServerInterface' import { WorkspaceServerInterface } from '../../Server/Workspace/WorkspaceServerInterface'
@@ -18,6 +19,7 @@ describe('WorkspaceApiService', () => {
it('should create a workspace', async () => { it('should create a workspace', async () => {
const response = await createService().createWorkspace({ const response = await createService().createWorkspace({
workspaceType: WorkspaceType.Private,
encryptedPrivateKey: 'foo', encryptedPrivateKey: 'foo',
encryptedWorkspaceKey: 'bar', encryptedWorkspaceKey: 'bar',
publicKey: 'buzz', publicKey: 'buzz',
@@ -44,6 +46,7 @@ describe('WorkspaceApiService', () => {
let error = null let error = null
try { try {
await service.createWorkspace({ await service.createWorkspace({
workspaceType: WorkspaceType.Private,
encryptedPrivateKey: 'foo', encryptedPrivateKey: 'foo',
encryptedWorkspaceKey: 'bar', encryptedWorkspaceKey: 'bar',
publicKey: 'buzz', publicKey: 'buzz',
@@ -63,6 +66,7 @@ describe('WorkspaceApiService', () => {
let error = null let error = null
try { try {
await createService().createWorkspace({ await createService().createWorkspace({
workspaceType: WorkspaceType.Private,
encryptedPrivateKey: 'foo', encryptedPrivateKey: 'foo',
encryptedWorkspaceKey: 'bar', encryptedWorkspaceKey: 'bar',
publicKey: 'buzz', publicKey: 'buzz',

10
packages/api/src/Domain/Client/Workspace/WorkspaceApiService.ts
View File

@@ -6,6 +6,8 @@ import { WorkspaceServerInterface } from '../../Server/Workspace/WorkspaceServer
import { WorkspaceApiServiceInterface } from './WorkspaceApiServiceInterface' import { WorkspaceApiServiceInterface } from './WorkspaceApiServiceInterface'
import { WorkspaceApiOperations } from './WorkspaceApiOperations' import { WorkspaceApiOperations } from './WorkspaceApiOperations'
import { WorkspaceType } from '@standardnotes/common'
export class WorkspaceApiService implements WorkspaceApiServiceInterface { export class WorkspaceApiService implements WorkspaceApiServiceInterface {
private operationsInProgress: Map<WorkspaceApiOperations, boolean> private operationsInProgress: Map<WorkspaceApiOperations, boolean>
@@ -14,9 +16,10 @@ export class WorkspaceApiService implements WorkspaceApiServiceInterface {
} }
async createWorkspace(dto: { async createWorkspace(dto: {
encryptedWorkspaceKey: string workspaceType: WorkspaceType,
encryptedPrivateKey: string encryptedWorkspaceKey?: string
publicKey: string encryptedPrivateKey?: string
publicKey?: string
workspaceName?: string workspaceName?: string
}): Promise<WorkspaceCreationResponse> { }): Promise<WorkspaceCreationResponse> {
if (this.operationsInProgress.get(WorkspaceApiOperations.Creating)) { if (this.operationsInProgress.get(WorkspaceApiOperations.Creating)) {
@@ -27,6 +30,7 @@ export class WorkspaceApiService implements WorkspaceApiServiceInterface {
try { try {
const response = await this.workspaceServer.createWorkspace({ const response = await this.workspaceServer.createWorkspace({
workspaceType: dto.workspaceType,
encryptedPrivateKey: dto.encryptedPrivateKey, encryptedPrivateKey: dto.encryptedPrivateKey,
encryptedWorkspaceKey: dto.encryptedWorkspaceKey, encryptedWorkspaceKey: dto.encryptedWorkspaceKey,
publicKey: dto.publicKey, publicKey: dto.publicKey,

9
packages/api/src/Domain/Client/Workspace/WorkspaceApiServiceInterface.ts
View File

@@ -1,10 +1,13 @@
import { WorkspaceType } from '@standardnotes/common'
import { WorkspaceCreationResponse } from '../../Response' import { WorkspaceCreationResponse } from '../../Response'
export interface WorkspaceApiServiceInterface { export interface WorkspaceApiServiceInterface {
createWorkspace(dto: { createWorkspace(dto: {
encryptedWorkspaceKey: string workspaceType: WorkspaceType
encryptedPrivateKey: string encryptedWorkspaceKey?: string
publicKey: string encryptedPrivateKey?: string
publicKey?: string
workspaceName?: string workspaceName?: string
}): Promise<WorkspaceCreationResponse> }): Promise<WorkspaceCreationResponse>
} }

9
packages/api/src/Domain/Request/Workspace/WorkspaceCreationRequestParams.ts
View File

@@ -1,7 +1,10 @@
import { WorkspaceType } from '@standardnotes/common'
export type WorkspaceCreationRequestParams = { export type WorkspaceCreationRequestParams = {
encryptedWorkspaceKey: string workspaceType: WorkspaceType
encryptedPrivateKey: string encryptedWorkspaceKey?: string
publicKey: string encryptedPrivateKey?: string
publicKey?: string
workspaceName?: string workspaceName?: string
[additionalParam: string]: unknown [additionalParam: string]: unknown
} }

2
packages/encryption/package.json
View File

@@ -35,7 +35,7 @@
"typescript": "*" "typescript": "*"
}, },
"dependencies": { "dependencies": {
"@standardnotes/common": "^1.32.0", "@standardnotes/common": "^1.36.1",
"@standardnotes/models": "workspace:*", "@standardnotes/models": "workspace:*",
"@standardnotes/responses": "workspace:*", "@standardnotes/responses": "workspace:*",
"@standardnotes/sncrypto-common": "workspace:*", "@standardnotes/sncrypto-common": "workspace:*",

2
packages/features/package.json
View File

@@ -26,7 +26,7 @@
}, },
"dependencies": { "dependencies": {
"@standardnotes/auth": "^3.19.4", "@standardnotes/auth": "^3.19.4",
"@standardnotes/common": "^1.32.0", "@standardnotes/common": "^1.36.1",
"@standardnotes/security": "^1.2.0", "@standardnotes/security": "^1.2.0",
"reflect-metadata": "^0.1.13" "reflect-metadata": "^0.1.13"
}, },

2
packages/filepicker/package.json
View File

@@ -31,7 +31,7 @@
"ts-node": "^10.5.0" "ts-node": "^10.5.0"
}, },
"dependencies": { "dependencies": {
"@standardnotes/common": "^1.32.0", "@standardnotes/common": "^1.36.1",
"@standardnotes/files": "workspace:*", "@standardnotes/files": "workspace:*",
"@standardnotes/utils": "workspace:*", "@standardnotes/utils": "workspace:*",
"@types/wicg-file-system-access": "^2020.9.5", "@types/wicg-file-system-access": "^2020.9.5",

2
packages/files/package.json
View File

@@ -30,7 +30,7 @@
"ts-jest": "^28.0.5" "ts-jest": "^28.0.5"
}, },
"dependencies": { "dependencies": {
"@standardnotes/common": "^1.32.0", "@standardnotes/common": "^1.36.1",
"@standardnotes/encryption": "workspace:*", "@standardnotes/encryption": "workspace:*",
"@standardnotes/models": "workspace:*", "@standardnotes/models": "workspace:*",
"@standardnotes/responses": "workspace:*", "@standardnotes/responses": "workspace:*",

2
packages/models/package.json
View File

@@ -31,7 +31,7 @@
"typescript": "*" "typescript": "*"
}, },
"dependencies": { "dependencies": {
"@standardnotes/common": "^1.32.0", "@standardnotes/common": "^1.36.1",
"@standardnotes/features": "workspace:*", "@standardnotes/features": "workspace:*",
"@standardnotes/responses": "workspace:*", "@standardnotes/responses": "workspace:*",
"@standardnotes/utils": "workspace:*", "@standardnotes/utils": "workspace:*",

2
packages/responses/package.json
View File

@@ -31,7 +31,7 @@
"ts-jest": "^28.0.5" "ts-jest": "^28.0.5"
}, },
"dependencies": { "dependencies": {
"@standardnotes/common": "^1.32.0", "@standardnotes/common": "^1.36.1",
"@standardnotes/features": "workspace:*", "@standardnotes/features": "workspace:*",
"@standardnotes/security": "^1.1.0", "@standardnotes/security": "^1.1.0",
"reflect-metadata": "^0.1.13" "reflect-metadata": "^0.1.13"

2
packages/services/package.json
View File

@@ -26,7 +26,7 @@
"dependencies": { "dependencies": {
"@standardnotes/api": "workspace:^", "@standardnotes/api": "workspace:^",
"@standardnotes/auth": "^3.19.4", "@standardnotes/auth": "^3.19.4",
"@standardnotes/common": "^1.32.0", "@standardnotes/common": "^1.36.1",
"@standardnotes/encryption": "workspace:^", "@standardnotes/encryption": "workspace:^",
"@standardnotes/files": "workspace:^", "@standardnotes/files": "workspace:^",
"@standardnotes/models": "workspace:^", "@standardnotes/models": "workspace:^",

9
packages/services/src/Domain/Workspace/WorkspaceClientInterface.ts
View File

@@ -1,8 +1,11 @@
import { WorkspaceType } from '@standardnotes/common'
export interface WorkspaceClientInterface { export interface WorkspaceClientInterface {
createWorkspace(dto: { createWorkspace(dto: {
encryptedWorkspaceKey: string workspaceType: WorkspaceType
encryptedPrivateKey: string encryptedWorkspaceKey?: string
publicKey: string encryptedPrivateKey?: string
publicKey?: string
workspaceName?: string workspaceName?: string
}): Promise<{ uuid: string } | null> }): Promise<{ uuid: string } | null>
} }

9
packages/services/src/Domain/Workspace/WorkspaceManager.ts
View File

@@ -1,4 +1,6 @@
import { WorkspaceApiServiceInterface } from '@standardnotes/api' import { WorkspaceApiServiceInterface } from '@standardnotes/api'
import { WorkspaceType } from '@standardnotes/common'
import { InternalEventBusInterface } from '../Internal/InternalEventBusInterface' import { InternalEventBusInterface } from '../Internal/InternalEventBusInterface'
import { AbstractService } from '../Service/AbstractService' import { AbstractService } from '../Service/AbstractService'
import { WorkspaceClientInterface } from './WorkspaceClientInterface' import { WorkspaceClientInterface } from './WorkspaceClientInterface'
@@ -12,9 +14,10 @@ export class WorkspaceManager extends AbstractService implements WorkspaceClient
} }
async createWorkspace(dto: { async createWorkspace(dto: {
encryptedWorkspaceKey: string workspaceType: WorkspaceType,
encryptedPrivateKey: string encryptedWorkspaceKey?: string
publicKey: string encryptedPrivateKey?: string
publicKey?: string
workspaceName?: string workspaceName?: string
}): Promise<{ uuid: string } | null> { }): Promise<{ uuid: string } | null> {
try { try {

2
packages/snjs/package.json
View File

@@ -68,7 +68,7 @@
}, },
"dependencies": { "dependencies": {
"@standardnotes/api": "workspace:*", "@standardnotes/api": "workspace:*",
"@standardnotes/common": "^1.32.0", "@standardnotes/common": "^1.36.1",
"@standardnotes/domain-events": "^2.39.0", "@standardnotes/domain-events": "^2.39.0",
"@standardnotes/encryption": "workspace:*", "@standardnotes/encryption": "workspace:*",
"@standardnotes/features": "workspace:*", "@standardnotes/features": "workspace:*",

2
packages/ui-services/package.json
View File

@@ -23,7 +23,7 @@
"test": "jest spec --coverage --passWithNoTests" "test": "jest spec --coverage --passWithNoTests"
}, },
"dependencies": { "dependencies": {
"@standardnotes/common": "^1.32.0", "@standardnotes/common": "^1.36.1",
"@standardnotes/filepicker": "workspace:^", "@standardnotes/filepicker": "workspace:^",
"@standardnotes/services": "workspace:^", "@standardnotes/services": "workspace:^",
"@standardnotes/styles": "workspace:^", "@standardnotes/styles": "workspace:^",

2
packages/utils/package.json
View File

@@ -25,7 +25,7 @@
"test": "jest spec" "test": "jest spec"
}, },
"dependencies": { "dependencies": {
"@standardnotes/common": "^1.32.0", "@standardnotes/common": "^1.36.1",
"dompurify": "^2.3.8", "dompurify": "^2.3.8",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"reflect-metadata": "^0.1.13" "reflect-metadata": "^0.1.13"

30
yarn.lock
View File

@@ -6068,7 +6068,7 @@ __metadata:
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@standardnotes/api@workspace:packages/api" resolution: "@standardnotes/api@workspace:packages/api"
dependencies: dependencies:
"@standardnotes/common": ^1.32.0 "@standardnotes/common": ^1.36.1
"@standardnotes/encryption": "workspace:*" "@standardnotes/encryption": "workspace:*"
"@standardnotes/models": "workspace:*" "@standardnotes/models": "workspace:*"
"@standardnotes/responses": "workspace:*" "@standardnotes/responses": "workspace:*"
@@ -6251,12 +6251,12 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@standardnotes/common@npm:^1.32.0": "@standardnotes/common@npm:^1.36.1":
version: 1.32.0 version: 1.36.1
resolution: "@standardnotes/common@npm:1.32.0" resolution: "@standardnotes/common@npm:1.36.1"
dependencies: dependencies:
reflect-metadata: ^0.1.13 reflect-metadata: ^0.1.13
checksum: 52d33f385e4cc26ac8d2f723c3a5e12bb8a2c4a17f08700ca5843810583ca722475a83b71f86bb1402fda7c7c66e8149beb3f70848efc90da4aafef663d7ffbe checksum: 4f2367d461aa1cd4e3ec132520310773183c3c9f8e423565aec315f5e5dffdce79f9704307a32fbfec17157f99d37d49982ad4272eee5aac0dbe37da34be054c
languageName: node languageName: node
linkType: hard linkType: hard
@@ -6443,7 +6443,7 @@ __metadata:
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@standardnotes/encryption@workspace:packages/encryption" resolution: "@standardnotes/encryption@workspace:packages/encryption"
dependencies: dependencies:
"@standardnotes/common": ^1.32.0 "@standardnotes/common": ^1.36.1
"@standardnotes/config": 2.4.3 "@standardnotes/config": 2.4.3
"@standardnotes/models": "workspace:*" "@standardnotes/models": "workspace:*"
"@standardnotes/responses": "workspace:*" "@standardnotes/responses": "workspace:*"
@@ -6485,7 +6485,7 @@ __metadata:
resolution: "@standardnotes/features@workspace:packages/features" resolution: "@standardnotes/features@workspace:packages/features"
dependencies: dependencies:
"@standardnotes/auth": ^3.19.4 "@standardnotes/auth": ^3.19.4
"@standardnotes/common": ^1.32.0 "@standardnotes/common": ^1.36.1
"@standardnotes/security": ^1.2.0 "@standardnotes/security": ^1.2.0
"@types/jest": ^28.1.5 "@types/jest": ^28.1.5
"@typescript-eslint/eslint-plugin": ^5.30.0 "@typescript-eslint/eslint-plugin": ^5.30.0
@@ -6501,7 +6501,7 @@ __metadata:
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@standardnotes/filepicker@workspace:packages/filepicker" resolution: "@standardnotes/filepicker@workspace:packages/filepicker"
dependencies: dependencies:
"@standardnotes/common": ^1.32.0 "@standardnotes/common": ^1.36.1
"@standardnotes/files": "workspace:*" "@standardnotes/files": "workspace:*"
"@standardnotes/utils": "workspace:*" "@standardnotes/utils": "workspace:*"
"@types/jest": ^28.1.5 "@types/jest": ^28.1.5
@@ -6519,7 +6519,7 @@ __metadata:
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@standardnotes/files@workspace:packages/files" resolution: "@standardnotes/files@workspace:packages/files"
dependencies: dependencies:
"@standardnotes/common": ^1.32.0 "@standardnotes/common": ^1.36.1
"@standardnotes/encryption": "workspace:*" "@standardnotes/encryption": "workspace:*"
"@standardnotes/models": "workspace:*" "@standardnotes/models": "workspace:*"
"@standardnotes/responses": "workspace:*" "@standardnotes/responses": "workspace:*"
@@ -6905,7 +6905,7 @@ __metadata:
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@standardnotes/models@workspace:packages/models" resolution: "@standardnotes/models@workspace:packages/models"
dependencies: dependencies:
"@standardnotes/common": ^1.32.0 "@standardnotes/common": ^1.36.1
"@standardnotes/features": "workspace:*" "@standardnotes/features": "workspace:*"
"@standardnotes/responses": "workspace:*" "@standardnotes/responses": "workspace:*"
"@standardnotes/utils": "workspace:*" "@standardnotes/utils": "workspace:*"
@@ -6972,7 +6972,7 @@ __metadata:
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@standardnotes/responses@workspace:packages/responses" resolution: "@standardnotes/responses@workspace:packages/responses"
dependencies: dependencies:
"@standardnotes/common": ^1.32.0 "@standardnotes/common": ^1.36.1
"@standardnotes/features": "workspace:*" "@standardnotes/features": "workspace:*"
"@standardnotes/security": ^1.1.0 "@standardnotes/security": ^1.1.0
"@types/jest": ^28.1.5 "@types/jest": ^28.1.5
@@ -7041,7 +7041,7 @@ __metadata:
dependencies: dependencies:
"@standardnotes/api": "workspace:^" "@standardnotes/api": "workspace:^"
"@standardnotes/auth": ^3.19.4 "@standardnotes/auth": ^3.19.4
"@standardnotes/common": ^1.32.0 "@standardnotes/common": ^1.36.1
"@standardnotes/encryption": "workspace:^" "@standardnotes/encryption": "workspace:^"
"@standardnotes/files": "workspace:^" "@standardnotes/files": "workspace:^"
"@standardnotes/models": "workspace:^" "@standardnotes/models": "workspace:^"
@@ -7156,7 +7156,7 @@ __metadata:
"@babel/core": "*" "@babel/core": "*"
"@babel/preset-env": "*" "@babel/preset-env": "*"
"@standardnotes/api": "workspace:*" "@standardnotes/api": "workspace:*"
"@standardnotes/common": ^1.32.0 "@standardnotes/common": ^1.36.1
"@standardnotes/domain-events": ^2.39.0 "@standardnotes/domain-events": ^2.39.0
"@standardnotes/encryption": "workspace:*" "@standardnotes/encryption": "workspace:*"
"@standardnotes/features": "workspace:*" "@standardnotes/features": "workspace:*"
@@ -7309,7 +7309,7 @@ __metadata:
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@standardnotes/ui-services@workspace:packages/ui-services" resolution: "@standardnotes/ui-services@workspace:packages/ui-services"
dependencies: dependencies:
"@standardnotes/common": ^1.32.0 "@standardnotes/common": ^1.36.1
"@standardnotes/filepicker": "workspace:^" "@standardnotes/filepicker": "workspace:^"
"@standardnotes/services": "workspace:^" "@standardnotes/services": "workspace:^"
"@standardnotes/styles": "workspace:^" "@standardnotes/styles": "workspace:^"
@@ -7329,7 +7329,7 @@ __metadata:
version: 0.0.0-use.local version: 0.0.0-use.local
resolution: "@standardnotes/utils@workspace:packages/utils" resolution: "@standardnotes/utils@workspace:packages/utils"
dependencies: dependencies:
"@standardnotes/common": ^1.32.0 "@standardnotes/common": ^1.36.1
"@types/dompurify": ^2.3.3 "@types/dompurify": ^2.3.3
"@types/jest": ^28.1.5 "@types/jest": ^28.1.5
"@types/jsdom": ^16.2.14 "@types/jsdom": ^16.2.14