chore: add handling shared vault invites via websockets (#2475)

This commit is contained in:
Karol Sójko
2023-09-01 17:04:32 +02:00
committed by GitHub
parent 318a2caf08
commit 4ca291291c
12 changed files with 47 additions and 35 deletions

View File

@@ -2,4 +2,5 @@ export enum WebSocketsServiceEvent {
UserRoleMessageReceived = 'WebSocketMessageReceived',
NotificationAddedForUser = 'NotificationAddedForUser',
MessageSentToUser = 'MessageSentToUser',
UserInvitedToSharedVault = 'UserInvitedToSharedVault',
}

View File

@@ -71,6 +71,9 @@ export class WebSocketsService extends AbstractService<WebSocketsServiceEvent, D
case 'MESSAGE_SENT_TO_USER':
void this.notifyEvent(WebSocketsServiceEvent.MessageSentToUser, eventData)
break
case 'USER_INVITED_TO_SHARED_VAULT':
void this.notifyEvent(WebSocketsServiceEvent.UserInvitedToSharedVault, eventData)
break
default:
break
}

View File

@@ -211,7 +211,7 @@ export class AsymmetricMessageService
const result = this._getUntrustedPayload.execute({
privateKey: keys.getValue().encryption.privateKey,
message,
payload: message,
})
if (result.isFailed()) {
@@ -236,7 +236,7 @@ export class AsymmetricMessageService
privateKey: keys.getValue().encryption.privateKey,
sender: contact.getValue(),
ownUserUuid: this.sessions.userUuid,
message,
payload: message,
})
if (result.isFailed()) {

View File

@@ -18,7 +18,7 @@ describe('GetTrustedPayload', () => {
describe('execute', () => {
const mockDto = {
privateKey: 'test-private-key',
message: {} as AsymmetricMessageServerHash,
payload: {} as AsymmetricMessageServerHash,
sender: {} as TrustedContactInterface,
ownUserUuid: 'test-user-uuid',
}

View File

@@ -1,4 +1,4 @@
import { AsymmetricMessageServerHash } from '@standardnotes/responses'
import { AsymmetricMessageServerHash, SharedVaultInviteServerHash } from '@standardnotes/responses'
import { AsymmetricMessagePayload, TrustedContactInterface } from '@standardnotes/models'
import { DecryptMessage } from '../../Encryption/UseCase/Asymmetric/DecryptMessage'
import { Result, SyncUseCaseInterface } from '@standardnotes/domain-core'
@@ -8,12 +8,12 @@ export class GetTrustedPayload implements SyncUseCaseInterface<AsymmetricMessage
execute<M extends AsymmetricMessagePayload>(dto: {
privateKey: string
message: AsymmetricMessageServerHash
payload: AsymmetricMessageServerHash | SharedVaultInviteServerHash
sender: TrustedContactInterface
ownUserUuid: string
}): Result<M> {
const result = this.decryptMessage.execute<M>({
message: dto.message.encrypted_message,
message: dto.payload.encrypted_message,
sender: dto.sender,
privateKey: dto.privateKey,
})

View File

@@ -1,4 +1,4 @@
import { AsymmetricMessageServerHash } from '@standardnotes/responses'
import { AsymmetricMessageServerHash, SharedVaultInviteServerHash } from '@standardnotes/responses'
import { AsymmetricMessagePayload } from '@standardnotes/models'
import { DecryptMessage } from '../../Encryption/UseCase/Asymmetric/DecryptMessage'
import { Result, SyncUseCaseInterface } from '@standardnotes/domain-core'
@@ -8,10 +8,10 @@ export class GetUntrustedPayload implements SyncUseCaseInterface<AsymmetricMessa
execute<M extends AsymmetricMessagePayload>(dto: {
privateKey: string
message: AsymmetricMessageServerHash
payload: AsymmetricMessageServerHash | SharedVaultInviteServerHash
}): Result<M> {
const result = this.decryptMessage.execute<M>({
message: dto.message.encrypted_message,
message: dto.payload.encrypted_message,
sender: undefined,
privateKey: dto.privateKey,
})

View File

@@ -1,3 +1,20 @@
import { UserInvitedToSharedVaultEvent } from '@standardnotes/domain-events'
import {
ClientDisplayableError,
SharedVaultInviteServerHash,
SharedVaultUserServerHash,
isClientDisplayableError,
isErrorResponse,
} from '@standardnotes/responses'
import { ContentType, Result } from '@standardnotes/domain-core'
import { SharedVaultInvitesServer } from '@standardnotes/api'
import {
AsymmetricMessageSharedVaultInvite,
PayloadEmitSource,
SharedVaultListingInterface,
TrustedContactInterface,
} from '@standardnotes/models'
import { AcceptVaultInvite } from './UseCase/AcceptVaultInvite'
import { SyncEvent, SyncEventReceivedSharedVaultInvitesData } from './../Event/SyncEvent'
import { InternalEventInterface } from './../Internal/InternalEventInterface'
@@ -15,26 +32,12 @@ import { SyncServiceInterface } from './../Sync/SyncServiceInterface'
import { InternalEventBusInterface } from './../Internal/InternalEventBusInterface'
import { SessionsClientInterface } from './../Session/SessionsClientInterface'
import { GetAllContacts } from './../Contacts/UseCase/GetAllContacts'
import {
AsymmetricMessageSharedVaultInvite,
PayloadEmitSource,
SharedVaultListingInterface,
TrustedContactInterface,
} from '@standardnotes/models'
import { VaultInviteServiceInterface } from './VaultInviteServiceInterface'
import {
ClientDisplayableError,
SharedVaultInviteServerHash,
SharedVaultUserServerHash,
isClientDisplayableError,
isErrorResponse,
} from '@standardnotes/responses'
import { AbstractService } from './../Service/AbstractService'
import { VaultInviteServiceEvent } from './VaultInviteServiceEvent'
import { ContentType, Result } from '@standardnotes/domain-core'
import { SharedVaultInvitesServer } from '@standardnotes/api'
import { GetKeyPairs } from '../Encryption/UseCase/GetKeyPairs'
import { DecryptErroredPayloads } from '../Encryption/UseCase/DecryptErroredPayloads'
import { WebSocketsServiceEvent } from '../Api/WebSocketsServiceEvent'
export class VaultInviteService
extends AbstractService<VaultInviteServiceEvent>
@@ -98,6 +101,9 @@ export class VaultInviteService
case SyncEvent.ReceivedSharedVaultInvites:
await this.processInboundInvites(event.payload as SyncEventReceivedSharedVaultInvitesData)
break
case WebSocketsServiceEvent.UserInvitedToSharedVault:
await this.processInboundInvites([(event as UserInvitedToSharedVaultEvent).payload.invite])
break
}
}
@@ -261,7 +267,7 @@ export class VaultInviteService
const sender = this._findContact.execute({ userUuid: invite.sender_uuid })
if (!sender.isFailed()) {
const trustedMessage = this._getTrustedPayload.execute<AsymmetricMessageSharedVaultInvite>({
message: invite,
payload: invite,
privateKey: keys.getValue().encryption.privateKey,
ownUserUuid: this.session.userUuid,
sender: sender.getValue(),
@@ -279,7 +285,7 @@ export class VaultInviteService
}
const untrustedMessage = this._getUntrustedPayload.execute<AsymmetricMessageSharedVaultInvite>({
message: invite,
payload: invite,
privateKey: keys.getValue().encryption.privateKey,
})