refactor: add pkc fields for registration endpoint (#1680)

packages/api/src/Domain/Client/User/UserApiService.spec.ts

@@ -24,7 +24,12 @@ describe('UserApiService', () => {
   })
 
   it('should register a user', async () => {
-    const response = await createService().register('test@test.te', 'testpasswd', keyParams, false)
+    const response = await createService().register({
+      email: 'test@test.te',
+      serverPassword: 'testpasswd',
+      keyParams,
+      ephemeral: false,
+    })
 
     expect(response).toEqual({
       data: {
@@ -52,7 +57,7 @@ describe('UserApiService', () => {
 
     let error = null
     try {
-      await service.register('test@test.te', 'testpasswd', keyParams, false)
+      await service.register({ email: 'test@test.te', serverPassword: 'testpasswd', keyParams, ephemeral: false })
     } catch (caughtError) {
       error = caughtError
     }
@@ -67,7 +72,12 @@ describe('UserApiService', () => {
 
     let error = null
     try {
-      await createService().register('test@test.te', 'testpasswd', keyParams, false)
+      await createService().register({
+        email: 'test@test.te',
+        serverPassword: 'testpasswd',
+        keyParams,
+        ephemeral: false,
+      })
     } catch (caughtError) {
       error = caughtError
     }

packages/api/src/Domain/Client/User/UserApiService.ts

@@ -15,12 +15,12 @@ export class UserApiService implements UserApiServiceInterface {
     this.registering = false
   }
 
-  async register(
-    email: string,
-    serverPassword: string,
-    keyParams: RootKeyParamsInterface,
-    ephemeral: boolean,
-  ): Promise<UserRegistrationResponse> {
+  async register(registerDTO: {
+    email: string
+    serverPassword: string
+    keyParams: RootKeyParamsInterface
+    ephemeral: boolean
+  }): Promise<UserRegistrationResponse> {
     if (this.registering) {
       throw new ApiCallError(ErrorMessage.RegistrationInProgress)
     }
@@ -29,10 +29,10 @@ export class UserApiService implements UserApiServiceInterface {
     try {
       const response = await this.userServer.register({
         [ApiEndpointParam.ApiVersion]: ApiVersion.v0,
-        password: serverPassword,
-        email,
-        ephemeral,
-        ...keyParams.getPortableValue(),
+        password: registerDTO.serverPassword,
+        email: registerDTO.email,
+        ephemeral: registerDTO.ephemeral,
+        ...registerDTO.keyParams.getPortableValue(),
       })
 
       this.registering = false

packages/api/src/Domain/Client/User/UserApiServiceInterface.ts

@@ -2,10 +2,10 @@ import { RootKeyParamsInterface } from '@standardnotes/models'
 import { UserRegistrationResponse } from '../../Response/User/UserRegistrationResponse'
 
 export interface UserApiServiceInterface {
-  register(
-    email: string,
-    serverPassword: string,
-    keyParams: RootKeyParamsInterface,
-    ephemeral: boolean,
-  ): Promise<UserRegistrationResponse>
+  register(registerDTO: {
+    email: string
+    serverPassword: string
+    keyParams: RootKeyParamsInterface
+    ephemeral: boolean
+  }): Promise<UserRegistrationResponse>
 }

packages/api/src/Domain/Request/User/UserRegistrationRequestParams.ts

@@ -8,4 +8,6 @@ export type UserRegistrationRequestParams = AnyKeyParamsContent & {
   email: string
   ephemeral: boolean
   [additionalParam: string]: unknown
+  pkcPublicKey?: string
+  pkcEncryptedPrivateKey?: string
 }

packages/snjs/lib/Services/Session/SessionManager.ts

@@ -286,7 +286,7 @@ export class SNSessionManager extends AbstractService<SessionEvent> implements S
     const serverPassword = rootKey.serverPassword as string
     const keyParams = rootKey.keyParams
 
-    const registerResponse = await this.userApiService.register(email, serverPassword, keyParams, ephemeral)
+    const registerResponse = await this.userApiService.register({ email, serverPassword, keyParams, ephemeral })
 
     if ('error' in registerResponse.data) {
       throw new ApiCallError((registerResponse.data as HttpErrorResponseBody).error.message)

packages/snjs/mocha/lib/factory.js

@@ -144,7 +144,11 @@ export async function registerOldUser({ application, email, password, version })
   const operator = application.protocolService.operatorManager.operatorForVersion(version)
   const accountKey = await operator.createRootKey(email, password, KeyParamsOrigination.Registration)
 
-  const response = await application.userApiService.register(email, accountKey.serverPassword, accountKey.keyParams)
+  const response = await application.userApiService.register({
+    email: email,
+    serverPassword: accountKey.serverPassword,
+    keyParams: accountKey.keyParams,
+  })
   /** Mark all existing items as dirty. */
   await application.itemManager.changeItems(application.itemManager.items, (m) => {
     m.dirty = true