chore: fix endpoints and properties used in shared vaults to match the server (#2370)

* chore: upgrade @standardnotes/domain-core

* chore: enable vault tests by default

* chore: fix asymmetric messages paths

* chore: fix message property from user_uuid to recipient_uuid

* chore: fix server response properties for messages and notifications

* chore: fix user_uuid to recipient_uuid in resend all message use case

* chore: use notification payload and type from domain-core

* chore: fix non existent uuid in conflicts tests

* chore: use shared vault user permission from domain-core

* chore: enable all e2e tests

* chore: upgrade domain-core

* chore: mark failing tests as skipped

* chore: skip test

* chore: fix recipient_uuid in specs

* chore: skip test

* chore: skip test

* chore: skip test

* chore: skip test

* chore: fix remove unused var and unskip test

* Revert "chore: skip test"

This reverts commit 26bb876cf55e2c4fa9eeea56f73b3c2917a26f5c.

* chore: unskip passing tests

* chore: skip test

* chore: skip test

* fix: handle invite creation error

* chore: skip tests

* fix: disable vault tests to merge the PR

* chore: unskip asymmetric messages tests
This commit is contained in:
Karol Sójko
2023-07-27 15:43:45 +02:00
committed by GitHub
parent 0eb552ddc7
commit eb062220d6
49 changed files with 152 additions and 161 deletions

View File

@@ -1,4 +1,4 @@
import { SharedVaultInviteServerHash, SharedVaultPermission } from '@standardnotes/responses'
import { SharedVaultInviteServerHash } from '@standardnotes/responses'
import {
TrustedContactInterface,
SharedVaultListingInterface,
@@ -8,7 +8,7 @@ import {
import { SendVaultInvite } from './SendVaultInvite'
import { PkcKeyPair } from '@standardnotes/sncrypto-common'
import { EncryptMessage } from '../../Encryption/UseCase/Asymmetric/EncryptMessage'
import { Result, UseCaseInterface } from '@standardnotes/domain-core'
import { Result, SharedVaultUserPermission, UseCaseInterface } from '@standardnotes/domain-core'
import { ShareContactWithVault } from '../../SharedVaults/UseCase/ShareContactWithVault'
import { KeySystemKeyManagerInterface } from '../../KeySystem/KeySystemKeyManagerInterface'
@@ -29,7 +29,7 @@ export class InviteToVault implements UseCaseInterface<SharedVaultInviteServerHa
sharedVault: SharedVaultListingInterface
sharedVaultContacts: TrustedContactInterface[]
recipient: TrustedContactInterface
permissions: SharedVaultPermission
permission: string
}): Promise<Result<SharedVaultInviteServerHash>> {
const createInviteResult = await this.inviteContact(params)
@@ -74,8 +74,14 @@ export class InviteToVault implements UseCaseInterface<SharedVaultInviteServerHa
sharedVault: SharedVaultListingInterface
sharedVaultContacts: TrustedContactInterface[]
recipient: TrustedContactInterface
permissions: SharedVaultPermission
permission: string
}): Promise<Result<SharedVaultInviteServerHash>> {
const permissionOrError = SharedVaultUserPermission.create(params.permission)
if (permissionOrError.isFailed()) {
return Result.fail(permissionOrError.getError())
}
const permission = permissionOrError.getValue()
const keySystemRootKey = this.keyManager.getPrimaryKeySystemRootKey(params.sharedVault.systemIdentifier)
if (!keySystemRootKey) {
return Result.fail('Cannot invite contact; key system root key not found')
@@ -127,7 +133,7 @@ export class InviteToVault implements UseCaseInterface<SharedVaultInviteServerHa
sharedVaultUuid: params.sharedVault.sharing.sharedVaultUuid,
recipientUuid: params.recipient.contactUuid,
encryptedMessage: encryptedMessage.getValue(),
permissions: params.permissions,
permission: permission.value,
})
return createInviteResult

View File

@@ -49,7 +49,7 @@ export class ReuploadInvite implements UseCaseInterface<void> {
sharedVaultUuid: params.previousInvite.shared_vault_uuid,
recipientUuid: params.recipient.contactUuid,
encryptedMessage: encryptedMessage.getValue(),
permissions: params.previousInvite.permissions,
permission: params.previousInvite.permission,
})
return createInviteResult

View File

@@ -1,11 +1,6 @@
import {
SharedVaultInviteServerHash,
isErrorResponse,
SharedVaultPermission,
getErrorFromErrorResponse,
} from '@standardnotes/responses'
import { SharedVaultInviteServerHash, isErrorResponse, getErrorFromErrorResponse } from '@standardnotes/responses'
import { SharedVaultInvitesServerInterface } from '@standardnotes/api'
import { Result, UseCaseInterface } from '@standardnotes/domain-core'
import { Result, SharedVaultUserPermission, UseCaseInterface } from '@standardnotes/domain-core'
export class SendVaultInvite implements UseCaseInterface<SharedVaultInviteServerHash> {
constructor(private vaultInvitesServer: SharedVaultInvitesServerInterface) {}
@@ -14,13 +9,19 @@ export class SendVaultInvite implements UseCaseInterface<SharedVaultInviteServer
sharedVaultUuid: string
recipientUuid: string
encryptedMessage: string
permissions: SharedVaultPermission
permission: string
}): Promise<Result<SharedVaultInviteServerHash>> {
const permissionOrError = SharedVaultUserPermission.create(params.permission)
if (permissionOrError.isFailed()) {
return Result.fail(permissionOrError.getError())
}
const permission = permissionOrError.getValue()
const response = await this.vaultInvitesServer.createInvite({
sharedVaultUuid: params.sharedVaultUuid,
recipientUuid: params.recipientUuid,
encryptedMessage: params.encryptedMessage,
permissions: params.permissions,
permission: permission,
})
if (isErrorResponse(response)) {

View File

@@ -27,7 +27,6 @@ import { VaultInviteServiceInterface } from './VaultInviteServiceInterface'
import {
ClientDisplayableError,
SharedVaultInviteServerHash,
SharedVaultPermission,
SharedVaultUserServerHash,
isErrorResponse,
} from '@standardnotes/responses'
@@ -173,7 +172,7 @@ export class VaultInviteService
public async inviteContactToSharedVault(
sharedVault: SharedVaultListingInterface,
contact: TrustedContactInterface,
permissions: SharedVaultPermission,
permission: string,
): Promise<Result<SharedVaultInviteServerHash>> {
const contactsResult = await this._getVaultContacts.execute({
sharedVaultUuid: sharedVault.sharing.sharedVaultUuid,
@@ -194,7 +193,7 @@ export class VaultInviteService
sharedVault,
recipient: contact,
sharedVaultContacts: contacts,
permissions,
permission,
})
void this.notifyEvent(VaultInviteServiceEvent.InviteSent)

View File

@@ -1,7 +1,7 @@
import { InviteRecord } from './InviteRecord'
import { ApplicationServiceInterface } from '../Service/ApplicationServiceInterface'
import { SharedVaultListingInterface, TrustedContactInterface } from '@standardnotes/models'
import { ClientDisplayableError, SharedVaultInviteServerHash, SharedVaultPermission } from '@standardnotes/responses'
import { ClientDisplayableError, SharedVaultInviteServerHash } from '@standardnotes/responses'
import { VaultInviteServiceEvent } from './VaultInviteServiceEvent'
import { Result } from '@standardnotes/domain-core'
@@ -10,7 +10,7 @@ export interface VaultInviteServiceInterface extends ApplicationServiceInterface
inviteContactToSharedVault(
sharedVault: SharedVaultListingInterface,
contact: TrustedContactInterface,
permissions: SharedVaultPermission,
permission: string,
): Promise<Result<SharedVaultInviteServerHash>>
getCachedPendingInviteRecords(): InviteRecord[]
deleteInvite(invite: SharedVaultInviteServerHash): Promise<ClientDisplayableError | void>