refactor: http service (#2233)

packages/api/src/Domain/Server/Auth/AuthServer.ts

@@ -1,9 +1,10 @@
 import { HttpServiceInterface } from '../../Http/HttpServiceInterface'
 import { RecoveryKeyParamsRequestParams, SignInWithRecoveryCodesRequestParams } from '../../Request'
+import { HttpResponse } from '@standardnotes/responses'
 import {
-  GenerateRecoveryCodesResponse,
-  RecoveryKeyParamsResponse,
-  SignInWithRecoveryCodesResponse,
+  GenerateRecoveryCodesResponseBody,
+  RecoveryKeyParamsResponseBody,
+  SignInWithRecoveryCodesResponseBody,
 } from '../../Response'
 import { AuthServerInterface } from './AuthServerInterface'
 import { Paths } from './Paths'
@@ -11,23 +12,19 @@ import { Paths } from './Paths'
 export class AuthServer implements AuthServerInterface {
   constructor(private httpService: HttpServiceInterface) {}
 
-  async generateRecoveryCodes(): Promise<GenerateRecoveryCodesResponse> {
-    const response = await this.httpService.post(Paths.v1.generateRecoveryCodes)
-
-    return response as GenerateRecoveryCodesResponse
+  async generateRecoveryCodes(): Promise<HttpResponse<GenerateRecoveryCodesResponseBody>> {
+    return this.httpService.post(Paths.v1.generateRecoveryCodes)
   }
 
-  async recoveryKeyParams(params: RecoveryKeyParamsRequestParams): Promise<RecoveryKeyParamsResponse> {
-    const response = await this.httpService.post(Paths.v1.recoveryKeyParams, params)
-
-    return response as RecoveryKeyParamsResponse
+  async recoveryKeyParams(
+    params: RecoveryKeyParamsRequestParams,
+  ): Promise<HttpResponse<RecoveryKeyParamsResponseBody>> {
+    return this.httpService.post(Paths.v1.recoveryKeyParams, params)
   }
 
   async signInWithRecoveryCodes(
     params: SignInWithRecoveryCodesRequestParams,
-  ): Promise<SignInWithRecoveryCodesResponse> {
-    const response = await this.httpService.post(Paths.v1.signInWithRecoveryCodes, params)
-
-    return response as SignInWithRecoveryCodesResponse
+  ): Promise<HttpResponse<SignInWithRecoveryCodesResponseBody>> {
+    return this.httpService.post(Paths.v1.signInWithRecoveryCodes, params)
   }
 }

packages/api/src/Domain/Server/Auth/AuthServerInterface.ts

@@ -1,12 +1,15 @@
+import { HttpResponse } from '@standardnotes/responses'
 import { RecoveryKeyParamsRequestParams, SignInWithRecoveryCodesRequestParams } from '../../Request'
 import {
-  GenerateRecoveryCodesResponse,
-  RecoveryKeyParamsResponse,
-  SignInWithRecoveryCodesResponse,
+  GenerateRecoveryCodesResponseBody,
+  RecoveryKeyParamsResponseBody,
+  SignInWithRecoveryCodesResponseBody,
 } from '../../Response'
 
 export interface AuthServerInterface {
-  generateRecoveryCodes(): Promise<GenerateRecoveryCodesResponse>
-  recoveryKeyParams(params: RecoveryKeyParamsRequestParams): Promise<RecoveryKeyParamsResponse>
-  signInWithRecoveryCodes(params: SignInWithRecoveryCodesRequestParams): Promise<SignInWithRecoveryCodesResponse>
+  generateRecoveryCodes(): Promise<HttpResponse<GenerateRecoveryCodesResponseBody>>
+  recoveryKeyParams(params: RecoveryKeyParamsRequestParams): Promise<HttpResponse<RecoveryKeyParamsResponseBody>>
+  signInWithRecoveryCodes(
+    params: SignInWithRecoveryCodesRequestParams,
+  ): Promise<HttpResponse<SignInWithRecoveryCodesResponseBody>>
 }

packages/api/src/Domain/Server/Authenticator/AuthenticatorServer.ts

@@ -5,12 +5,13 @@ import {
   DeleteAuthenticatorRequestParams,
   VerifyAuthenticatorRegistrationResponseRequestParams,
 } from '../../Request'
+import { HttpResponse } from '@standardnotes/responses'
 import {
-  ListAuthenticatorsResponse,
-  DeleteAuthenticatorResponse,
-  GenerateAuthenticatorRegistrationOptionsResponse,
-  VerifyAuthenticatorRegistrationResponseResponse,
-  GenerateAuthenticatorAuthenticationOptionsResponse,
+  ListAuthenticatorsResponseBody,
+  DeleteAuthenticatorResponseBody,
+  GenerateAuthenticatorRegistrationOptionsResponseBody,
+  VerifyAuthenticatorRegistrationResponseBody,
+  GenerateAuthenticatorAuthenticationOptionsResponseBody,
 } from '../../Response'
 import { AuthenticatorServerInterface } from './AuthenticatorServerInterface'
 import { Paths } from './Paths'
@@ -18,37 +19,27 @@ import { Paths } from './Paths'
 export class AuthenticatorServer implements AuthenticatorServerInterface {
   constructor(private httpService: HttpServiceInterface) {}
 
-  async list(params: ListAuthenticatorsRequestParams): Promise<ListAuthenticatorsResponse> {
-    const response = await this.httpService.get(Paths.v1.listAuthenticators, params)
-
-    return response as ListAuthenticatorsResponse
+  async list(params: ListAuthenticatorsRequestParams): Promise<HttpResponse<ListAuthenticatorsResponseBody>> {
+    return this.httpService.get(Paths.v1.listAuthenticators, params)
   }
 
-  async delete(params: DeleteAuthenticatorRequestParams): Promise<DeleteAuthenticatorResponse> {
-    const response = await this.httpService.delete(Paths.v1.deleteAuthenticator(params.authenticatorId), params)
-
-    return response as DeleteAuthenticatorResponse
+  async delete(params: DeleteAuthenticatorRequestParams): Promise<HttpResponse<DeleteAuthenticatorResponseBody>> {
+    return this.httpService.delete(Paths.v1.deleteAuthenticator(params.authenticatorId), params)
   }
 
-  async generateRegistrationOptions(): Promise<GenerateAuthenticatorRegistrationOptionsResponse> {
-    const response = await this.httpService.get(Paths.v1.generateRegistrationOptions)
-
-    return response as GenerateAuthenticatorRegistrationOptionsResponse
+  async generateRegistrationOptions(): Promise<HttpResponse<GenerateAuthenticatorRegistrationOptionsResponseBody>> {
+    return this.httpService.get(Paths.v1.generateRegistrationOptions)
   }
 
   async verifyRegistrationResponse(
     params: VerifyAuthenticatorRegistrationResponseRequestParams,
-  ): Promise<VerifyAuthenticatorRegistrationResponseResponse> {
-    const response = await this.httpService.post(Paths.v1.verifyRegistrationResponse, params)
-
-    return response as VerifyAuthenticatorRegistrationResponseResponse
+  ): Promise<HttpResponse<VerifyAuthenticatorRegistrationResponseBody>> {
+    return this.httpService.post(Paths.v1.verifyRegistrationResponse, params)
   }
 
   async generateAuthenticationOptions(
     params: GenerateAuthenticatorAuthenticationOptionsRequestParams,
-  ): Promise<GenerateAuthenticatorAuthenticationOptionsResponse> {
-    const response = await this.httpService.post(Paths.v1.generateAuthenticationOptions, params)
-
-    return response as GenerateAuthenticatorAuthenticationOptionsResponse
+  ): Promise<HttpResponse<GenerateAuthenticatorAuthenticationOptionsResponseBody>> {
+    return this.httpService.post(Paths.v1.generateAuthenticationOptions, params)
   }
 }

packages/api/src/Domain/Server/Authenticator/AuthenticatorServerInterface.ts

@@ -1,3 +1,4 @@
+import { HttpResponse } from '@standardnotes/responses'
 import {
   ListAuthenticatorsRequestParams,
   DeleteAuthenticatorRequestParams,
@@ -5,21 +6,21 @@ import {
   GenerateAuthenticatorAuthenticationOptionsRequestParams,
 } from '../../Request'
 import {
-  ListAuthenticatorsResponse,
-  DeleteAuthenticatorResponse,
-  GenerateAuthenticatorRegistrationOptionsResponse,
-  VerifyAuthenticatorRegistrationResponseResponse,
-  GenerateAuthenticatorAuthenticationOptionsResponse,
+  ListAuthenticatorsResponseBody,
+  DeleteAuthenticatorResponseBody,
+  GenerateAuthenticatorRegistrationOptionsResponseBody,
+  VerifyAuthenticatorRegistrationResponseBody,
+  GenerateAuthenticatorAuthenticationOptionsResponseBody,
 } from '../../Response'
 
 export interface AuthenticatorServerInterface {
-  list(params: ListAuthenticatorsRequestParams): Promise<ListAuthenticatorsResponse>
-  delete(params: DeleteAuthenticatorRequestParams): Promise<DeleteAuthenticatorResponse>
-  generateRegistrationOptions(): Promise<GenerateAuthenticatorRegistrationOptionsResponse>
+  list(params: ListAuthenticatorsRequestParams): Promise<HttpResponse<ListAuthenticatorsResponseBody>>
+  delete(params: DeleteAuthenticatorRequestParams): Promise<HttpResponse<DeleteAuthenticatorResponseBody>>
+  generateRegistrationOptions(): Promise<HttpResponse<GenerateAuthenticatorRegistrationOptionsResponseBody>>
   verifyRegistrationResponse(
     params: VerifyAuthenticatorRegistrationResponseRequestParams,
-  ): Promise<VerifyAuthenticatorRegistrationResponseResponse>
+  ): Promise<HttpResponse<VerifyAuthenticatorRegistrationResponseBody>>
   generateAuthenticationOptions(
     params: GenerateAuthenticatorAuthenticationOptionsRequestParams,
-  ): Promise<GenerateAuthenticatorAuthenticationOptionsResponse>
+  ): Promise<HttpResponse<GenerateAuthenticatorAuthenticationOptionsResponseBody>>
 }

packages/api/src/Domain/Server/Revision/RevisionServer.ts

@@ -1,8 +1,9 @@
 import { HttpServiceInterface } from '../../Http/HttpServiceInterface'
 import { DeleteRevisionRequestParams, GetRevisionRequestParams, ListRevisionsRequestParams } from '../../Request'
-import { DeleteRevisionResponse } from '../../Response/Revision/DeleteRevisionResponse'
-import { GetRevisionResponse } from '../../Response/Revision/GetRevisionResponse'
-import { ListRevisionsResponse } from '../../Response/Revision/ListRevisionsResponse'
+import { HttpResponse } from '@standardnotes/responses'
+import { DeleteRevisionResponseBody } from '../../Response/Revision/DeleteRevisionResponseBody'
+import { GetRevisionResponseBody } from '../../Response/Revision/GetRevisionResponseBody'
+import { ListRevisionsResponseBody } from '../../Response/Revision/ListRevisionsResponseBody'
 
 import { Paths } from './Paths'
 import { RevisionServerInterface } from './RevisionServerInterface'
@@ -10,21 +11,15 @@ import { RevisionServerInterface } from './RevisionServerInterface'
 export class RevisionServer implements RevisionServerInterface {
   constructor(private httpService: HttpServiceInterface) {}
 
-  async listRevisions(params: ListRevisionsRequestParams): Promise<ListRevisionsResponse> {
-    const response = await this.httpService.get(Paths.v2.listRevisions(params.itemUuid))
-
-    return response as ListRevisionsResponse
+  async listRevisions(params: ListRevisionsRequestParams): Promise<HttpResponse<ListRevisionsResponseBody>> {
+    return this.httpService.get(Paths.v2.listRevisions(params.itemUuid))
   }
 
-  async getRevision(params: GetRevisionRequestParams): Promise<GetRevisionResponse> {
-    const response = await this.httpService.get(Paths.v2.getRevision(params.itemUuid, params.revisionUuid))
-
-    return response as GetRevisionResponse
+  async getRevision(params: GetRevisionRequestParams): Promise<HttpResponse<GetRevisionResponseBody>> {
+    return this.httpService.get(Paths.v2.getRevision(params.itemUuid, params.revisionUuid))
   }
 
-  async deleteRevision(params: DeleteRevisionRequestParams): Promise<DeleteRevisionResponse> {
-    const response = await this.httpService.delete(Paths.v2.deleteRevision(params.itemUuid, params.revisionUuid))
-
-    return response as DeleteRevisionResponse
+  async deleteRevision(params: DeleteRevisionRequestParams): Promise<HttpResponse<DeleteRevisionResponseBody>> {
+    return this.httpService.delete(Paths.v2.deleteRevision(params.itemUuid, params.revisionUuid))
   }
 }

packages/api/src/Domain/Server/Revision/RevisionServerInterface.ts

@@ -1,12 +1,13 @@
+import { HttpResponse } from '@standardnotes/responses'
 import { DeleteRevisionRequestParams } from '../../Request/Revision/DeleteRevisionRequestParams'
 import { GetRevisionRequestParams } from '../../Request/Revision/GetRevisionRequestParams'
 import { ListRevisionsRequestParams } from '../../Request/Revision/ListRevisionsRequestParams'
-import { DeleteRevisionResponse } from '../../Response/Revision/DeleteRevisionResponse'
-import { GetRevisionResponse } from '../../Response/Revision/GetRevisionResponse'
-import { ListRevisionsResponse } from '../../Response/Revision/ListRevisionsResponse'
+import { DeleteRevisionResponseBody } from '../../Response/Revision/DeleteRevisionResponseBody'
+import { GetRevisionResponseBody } from '../../Response/Revision/GetRevisionResponseBody'
+import { ListRevisionsResponseBody } from '../../Response/Revision/ListRevisionsResponseBody'
 
 export interface RevisionServerInterface {
-  listRevisions(params: ListRevisionsRequestParams): Promise<ListRevisionsResponse>
-  getRevision(params: GetRevisionRequestParams): Promise<GetRevisionResponse>
-  deleteRevision(params: DeleteRevisionRequestParams): Promise<DeleteRevisionResponse>
+  listRevisions(params: ListRevisionsRequestParams): Promise<HttpResponse<ListRevisionsResponseBody>>
+  getRevision(params: GetRevisionRequestParams): Promise<HttpResponse<GetRevisionResponseBody>>
+  deleteRevision(params: DeleteRevisionRequestParams): Promise<HttpResponse<DeleteRevisionResponseBody>>
 }

packages/api/src/Domain/Server/Subscription/SubscriptionServer.ts

@@ -1,4 +1,3 @@
-import { AppleIAPConfirmResponse } from './../../Response/Subscription/AppleIAPConfirmResponse'
 import { HttpServiceInterface } from '../../Http/HttpServiceInterface'
 import { AppleIAPConfirmRequestParams } from '../../Request'
 import { SubscriptionInviteAcceptRequestParams } from '../../Request/Subscription/SubscriptionInviteAcceptRequestParams'
@@ -6,11 +5,13 @@ import { SubscriptionInviteCancelRequestParams } from '../../Request/Subscriptio
 import { SubscriptionInviteDeclineRequestParams } from '../../Request/Subscription/SubscriptionInviteDeclineRequestParams'
 import { SubscriptionInviteListRequestParams } from '../../Request/Subscription/SubscriptionInviteListRequestParams'
 import { SubscriptionInviteRequestParams } from '../../Request/Subscription/SubscriptionInviteRequestParams'
-import { SubscriptionInviteAcceptResponse } from '../../Response/Subscription/SubscriptionInviteAcceptResponse'
-import { SubscriptionInviteCancelResponse } from '../../Response/Subscription/SubscriptionInviteCancelResponse'
-import { SubscriptionInviteDeclineResponse } from '../../Response/Subscription/SubscriptionInviteDeclineResponse'
-import { SubscriptionInviteListResponse } from '../../Response/Subscription/SubscriptionInviteListResponse'
-import { SubscriptionInviteResponse } from '../../Response/Subscription/SubscriptionInviteResponse'
+import { AppleIAPConfirmResponseBody } from './../../Response/Subscription/AppleIAPConfirmResponseBody'
+import { SubscriptionInviteAcceptResponseBody } from '../../Response/Subscription/SubscriptionInviteAcceptResponseBody'
+import { SubscriptionInviteCancelResponseBody } from '../../Response/Subscription/SubscriptionInviteCancelResponseBody'
+import { SubscriptionInviteDeclineResponseBody } from '../../Response/Subscription/SubscriptionInviteDeclineResponseBody'
+import { SubscriptionInviteListResponseBody } from '../../Response/Subscription/SubscriptionInviteListResponseBody'
+import { SubscriptionInviteResponseBody } from '../../Response/Subscription/SubscriptionInviteResponseBody'
+import { HttpResponse } from '@standardnotes/responses'
 
 import { Paths } from './Paths'
 import { SubscriptionServerInterface } from './SubscriptionServerInterface'
@@ -18,39 +19,35 @@ import { SubscriptionServerInterface } from './SubscriptionServerInterface'
 export class SubscriptionServer implements SubscriptionServerInterface {
   constructor(private httpService: HttpServiceInterface) {}
 
-  async acceptInvite(params: SubscriptionInviteAcceptRequestParams): Promise<SubscriptionInviteAcceptResponse> {
-    const response = await this.httpService.post(Paths.v1.acceptInvite(params.inviteUuid), params)
-
-    return response as SubscriptionInviteAcceptResponse
+  async acceptInvite(
+    params: SubscriptionInviteAcceptRequestParams,
+  ): Promise<HttpResponse<SubscriptionInviteAcceptResponseBody>> {
+    return this.httpService.post(Paths.v1.acceptInvite(params.inviteUuid), params)
   }
 
-  async declineInvite(params: SubscriptionInviteDeclineRequestParams): Promise<SubscriptionInviteDeclineResponse> {
-    const response = await this.httpService.get(Paths.v1.declineInvite(params.inviteUuid), params)
-
-    return response as SubscriptionInviteDeclineResponse
+  async declineInvite(
+    params: SubscriptionInviteDeclineRequestParams,
+  ): Promise<HttpResponse<SubscriptionInviteDeclineResponseBody>> {
+    return this.httpService.get(Paths.v1.declineInvite(params.inviteUuid), params)
   }
 
-  async cancelInvite(params: SubscriptionInviteCancelRequestParams): Promise<SubscriptionInviteCancelResponse> {
-    const response = await this.httpService.delete(Paths.v1.cancelInvite(params.inviteUuid), params)
-
-    return response as SubscriptionInviteCancelResponse
+  async cancelInvite(
+    params: SubscriptionInviteCancelRequestParams,
+  ): Promise<HttpResponse<SubscriptionInviteCancelResponseBody>> {
+    return this.httpService.delete(Paths.v1.cancelInvite(params.inviteUuid), params)
   }
 
-  async listInvites(params: SubscriptionInviteListRequestParams): Promise<SubscriptionInviteListResponse> {
-    const response = await this.httpService.get(Paths.v1.listInvites, params)
-
-    return response as SubscriptionInviteListResponse
+  async listInvites(
+    params: SubscriptionInviteListRequestParams,
+  ): Promise<HttpResponse<SubscriptionInviteListResponseBody>> {
+    return this.httpService.get(Paths.v1.listInvites, params)
   }
 
-  async invite(params: SubscriptionInviteRequestParams): Promise<SubscriptionInviteResponse> {
-    const response = await this.httpService.post(Paths.v1.invite, params)
-
-    return response as SubscriptionInviteResponse
+  async invite(params: SubscriptionInviteRequestParams): Promise<HttpResponse<SubscriptionInviteResponseBody>> {
+    return this.httpService.post(Paths.v1.invite, params)
   }
 
-  async confirmAppleIAP(params: AppleIAPConfirmRequestParams): Promise<AppleIAPConfirmResponse> {
-    const response = await this.httpService.post(Paths.v1.confirmAppleIAP, params)
-
-    return response as AppleIAPConfirmResponse
+  async confirmAppleIAP(params: AppleIAPConfirmRequestParams): Promise<HttpResponse<AppleIAPConfirmResponseBody>> {
+    return this.httpService.post(Paths.v1.confirmAppleIAP, params)
   }
 }

packages/api/src/Domain/Server/Subscription/SubscriptionServerInterface.ts

@@ -1,21 +1,29 @@
-import { AppleIAPConfirmResponse } from './../../Response/Subscription/AppleIAPConfirmResponse'
 import { AppleIAPConfirmRequestParams } from './../../Request/Subscription/AppleIAPConfirmRequestParams'
 import { SubscriptionInviteAcceptRequestParams } from '../../Request/Subscription/SubscriptionInviteAcceptRequestParams'
 import { SubscriptionInviteCancelRequestParams } from '../../Request/Subscription/SubscriptionInviteCancelRequestParams'
 import { SubscriptionInviteDeclineRequestParams } from '../../Request/Subscription/SubscriptionInviteDeclineRequestParams'
 import { SubscriptionInviteListRequestParams } from '../../Request/Subscription/SubscriptionInviteListRequestParams'
 import { SubscriptionInviteRequestParams } from '../../Request/Subscription/SubscriptionInviteRequestParams'
-import { SubscriptionInviteAcceptResponse } from '../../Response/Subscription/SubscriptionInviteAcceptResponse'
-import { SubscriptionInviteCancelResponse } from '../../Response/Subscription/SubscriptionInviteCancelResponse'
-import { SubscriptionInviteDeclineResponse } from '../../Response/Subscription/SubscriptionInviteDeclineResponse'
-import { SubscriptionInviteListResponse } from '../../Response/Subscription/SubscriptionInviteListResponse'
-import { SubscriptionInviteResponse } from '../../Response/Subscription/SubscriptionInviteResponse'
+
+import { AppleIAPConfirmResponseBody } from './../../Response/Subscription/AppleIAPConfirmResponseBody'
+import { SubscriptionInviteAcceptResponseBody } from '../../Response/Subscription/SubscriptionInviteAcceptResponseBody'
+import { SubscriptionInviteCancelResponseBody } from '../../Response/Subscription/SubscriptionInviteCancelResponseBody'
+import { SubscriptionInviteDeclineResponseBody } from '../../Response/Subscription/SubscriptionInviteDeclineResponseBody'
+import { SubscriptionInviteListResponseBody } from '../../Response/Subscription/SubscriptionInviteListResponseBody'
+import { SubscriptionInviteResponseBody } from '../../Response/Subscription/SubscriptionInviteResponseBody'
+import { HttpResponse } from '@standardnotes/responses'
 
 export interface SubscriptionServerInterface {
-  invite(params: SubscriptionInviteRequestParams): Promise<SubscriptionInviteResponse>
-  acceptInvite(params: SubscriptionInviteAcceptRequestParams): Promise<SubscriptionInviteAcceptResponse>
-  declineInvite(params: SubscriptionInviteDeclineRequestParams): Promise<SubscriptionInviteDeclineResponse>
-  cancelInvite(params: SubscriptionInviteCancelRequestParams): Promise<SubscriptionInviteCancelResponse>
-  listInvites(params: SubscriptionInviteListRequestParams): Promise<SubscriptionInviteListResponse>
-  confirmAppleIAP(params: AppleIAPConfirmRequestParams): Promise<AppleIAPConfirmResponse>
+  invite(params: SubscriptionInviteRequestParams): Promise<HttpResponse<SubscriptionInviteResponseBody>>
+  acceptInvite(
+    params: SubscriptionInviteAcceptRequestParams,
+  ): Promise<HttpResponse<SubscriptionInviteAcceptResponseBody>>
+  declineInvite(
+    params: SubscriptionInviteDeclineRequestParams,
+  ): Promise<HttpResponse<SubscriptionInviteDeclineResponseBody>>
+  cancelInvite(
+    params: SubscriptionInviteCancelRequestParams,
+  ): Promise<HttpResponse<SubscriptionInviteCancelResponseBody>>
+  listInvites(params: SubscriptionInviteListRequestParams): Promise<HttpResponse<SubscriptionInviteListResponseBody>>
+  confirmAppleIAP(params: AppleIAPConfirmRequestParams): Promise<HttpResponse<AppleIAPConfirmResponseBody>>
 }

packages/api/src/Domain/Server/User/UserServer.ts

@@ -1,23 +1,20 @@
 import { HttpServiceInterface } from '../../Http/HttpServiceInterface'
 import { UserDeletionRequestParams } from '../../Request/User/UserDeletionRequestParams'
 import { UserRegistrationRequestParams } from '../../Request/User/UserRegistrationRequestParams'
-import { UserDeletionResponse } from '../../Response/User/UserDeletionResponse'
-import { UserRegistrationResponse } from '../../Response/User/UserRegistrationResponse'
+import { HttpResponse } from '@standardnotes/responses'
+import { UserDeletionResponseBody } from '../../Response/User/UserDeletionResponseBody'
+import { UserRegistrationResponseBody } from '../../Response/User/UserRegistrationResponseBody'
 import { Paths } from './Paths'
 import { UserServerInterface } from './UserServerInterface'
 
 export class UserServer implements UserServerInterface {
   constructor(private httpService: HttpServiceInterface) {}
 
-  async deleteAccount(params: UserDeletionRequestParams): Promise<UserDeletionResponse> {
-    const response = await this.httpService.delete(Paths.v1.deleteAccount(params.userUuid), params)
-
-    return response as UserDeletionResponse
+  async deleteAccount(params: UserDeletionRequestParams): Promise<HttpResponse<UserDeletionResponseBody>> {
+    return this.httpService.delete(Paths.v1.deleteAccount(params.userUuid), params)
   }
 
-  async register(params: UserRegistrationRequestParams): Promise<UserRegistrationResponse> {
-    const response = await this.httpService.post(Paths.v1.register, params)
-
-    return response as UserRegistrationResponse
+  async register(params: UserRegistrationRequestParams): Promise<HttpResponse<UserRegistrationResponseBody>> {
+    return this.httpService.post(Paths.v1.register, params)
   }
 }

packages/api/src/Domain/Server/User/UserServerInterface.ts

@@ -1,9 +1,10 @@
+import { HttpResponse } from '@standardnotes/responses'
 import { UserDeletionRequestParams } from '../../Request/User/UserDeletionRequestParams'
 import { UserRegistrationRequestParams } from '../../Request/User/UserRegistrationRequestParams'
-import { UserDeletionResponse } from '../../Response/User/UserDeletionResponse'
-import { UserRegistrationResponse } from '../../Response/User/UserRegistrationResponse'
+import { UserDeletionResponseBody } from '../../Response/User/UserDeletionResponseBody'
+import { UserRegistrationResponseBody } from '../../Response/User/UserRegistrationResponseBody'
 
 export interface UserServerInterface {
-  register(params: UserRegistrationRequestParams): Promise<UserRegistrationResponse>
-  deleteAccount(params: UserDeletionRequestParams): Promise<UserDeletionResponse>
+  register(params: UserRegistrationRequestParams): Promise<HttpResponse<UserRegistrationResponseBody>>
+  deleteAccount(params: UserDeletionRequestParams): Promise<HttpResponse<UserDeletionResponseBody>>
 }

packages/api/src/Domain/Server/UserRequest/UserRequestServer.ts

@@ -1,6 +1,7 @@
 import { HttpServiceInterface } from '../../Http/HttpServiceInterface'
 import { UserRequestRequestParams } from '../../Request/UserRequest/UserRequestRequestParams'
-import { UserRequestResponse } from '../../Response/UserRequest/UserRequestResponse'
+import { HttpResponse } from '@standardnotes/responses'
+import { UserRequestResponseBody } from '../../Response/UserRequest/UserRequestResponseBody'
 
 import { Paths } from './Paths'
 import { UserRequestServerInterface } from './UserRequestServerInterface'
@@ -8,9 +9,7 @@ import { UserRequestServerInterface } from './UserRequestServerInterface'
 export class UserRequestServer implements UserRequestServerInterface {
   constructor(private httpService: HttpServiceInterface) {}
 
-  async submitUserRequest(params: UserRequestRequestParams): Promise<UserRequestResponse> {
-    const response = await this.httpService.post(Paths.v1.submitUserRequest(params.userUuid), params)
-
-    return response as UserRequestResponse
+  async submitUserRequest(params: UserRequestRequestParams): Promise<HttpResponse<UserRequestResponseBody>> {
+    return this.httpService.post(Paths.v1.submitUserRequest(params.userUuid), params)
   }
 }

packages/api/src/Domain/Server/UserRequest/UserRequestServerInterface.ts

@@ -1,6 +1,7 @@
+import { HttpResponse } from '@standardnotes/responses'
 import { UserRequestRequestParams } from '../../Request/UserRequest/UserRequestRequestParams'
-import { UserRequestResponse } from '../../Response/UserRequest/UserRequestResponse'
+import { UserRequestResponseBody } from '../../Response/UserRequest/UserRequestResponseBody'
 
 export interface UserRequestServerInterface {
-  submitUserRequest(params: UserRequestRequestParams): Promise<UserRequestResponse>
+  submitUserRequest(params: UserRequestRequestParams): Promise<HttpResponse<UserRequestResponseBody>>
 }

packages/api/src/Domain/Server/WebSocket/WebSocketServer.ts

@@ -1,6 +1,7 @@
 import { HttpServiceInterface } from '../../Http/HttpServiceInterface'
 import { WebSocketConnectionTokenRequestParams } from '../../Request/WebSocket/WebSocketConnectionTokenRequestParams'
-import { WebSocketConnectionTokenResponse } from '../../Response/WebSocket/WebSocketConnectionTokenResponse'
+import { HttpResponse } from '@standardnotes/responses'
+import { WebSocketConnectionTokenResponseBody } from '../../Response/WebSocket/WebSocketConnectionTokenResponseBody'
 import { Paths } from './Paths'
 import { WebSocketServerInterface } from './WebSocketServerInterface'
 
@@ -9,9 +10,7 @@ export class WebSocketServer implements WebSocketServerInterface {
 
   async createConnectionToken(
     params: WebSocketConnectionTokenRequestParams,
-  ): Promise<WebSocketConnectionTokenResponse> {
-    const response = await this.httpService.post(Paths.v1.createConnectionToken, params)
-
-    return response as WebSocketConnectionTokenResponse
+  ): Promise<HttpResponse<WebSocketConnectionTokenResponseBody>> {
+    return this.httpService.post(Paths.v1.createConnectionToken, params)
   }
 }

packages/api/src/Domain/Server/WebSocket/WebSocketServerInterface.ts

@@ -1,6 +1,9 @@
+import { HttpResponse } from '@standardnotes/responses'
 import { WebSocketConnectionTokenRequestParams } from '../../Request/WebSocket/WebSocketConnectionTokenRequestParams'
-import { WebSocketConnectionTokenResponse } from '../../Response/WebSocket/WebSocketConnectionTokenResponse'
+import { WebSocketConnectionTokenResponseBody } from '../../Response/WebSocket/WebSocketConnectionTokenResponseBody'
 
 export interface WebSocketServerInterface {
-  createConnectionToken(params: WebSocketConnectionTokenRequestParams): Promise<WebSocketConnectionTokenResponse>
+  createConnectionToken(
+    params: WebSocketConnectionTokenRequestParams,
+  ): Promise<HttpResponse<WebSocketConnectionTokenResponseBody>>
 }