fix(api): workspace creation arguments

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',

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<WorkspaceApiOperations, boolean>
 
@@ -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<WorkspaceCreationResponse> {
     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,

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<WorkspaceCreationResponse>
 }

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
 }