chore: send shared vault owner context when creating a shared vault file valet token (#2435)

* chore: send shared vault owner context when creating a shared vault file valet token

* chore: remove unused shared vault upload bytes limit
This commit is contained in:
Karol Sójko
2023-08-21 14:57:54 +02:00
committed by GitHub
parent f2c92d24f3
commit a6029e3ef1
10 changed files with 59 additions and 29 deletions

View File

@@ -107,6 +107,7 @@ export class FileService extends AbstractService implements FilesClientInterface
unencryptedFileSizeForUpload?: number | undefined
moveOperationType?: SharedVaultMoveType
sharedVaultToSharedVaultMoveTargetUuid?: string
sharedVaultOwnerUuid?: string
}): Promise<string | ClientDisplayableError> {
if (params.operation !== ValetTokenOperation.Write && !params.fileUuidRequiredForExistingFiles) {
throw new Error('File UUID is required for for non-write operations')
@@ -114,6 +115,7 @@ export class FileService extends AbstractService implements FilesClientInterface
const valetTokenResponse = await this.sharedVault.createSharedVaultFileValetToken({
sharedVaultUuid: params.sharedVaultUuid,
sharedVaultOwnerUuid: params.sharedVaultUuid,
fileUuid: params.fileUuidRequiredForExistingFiles,
remoteIdentifier: params.remoteIdentifier,
operation: params.operation,
@@ -135,6 +137,7 @@ export class FileService extends AbstractService implements FilesClientInterface
): Promise<void | ClientDisplayableError> {
const valetTokenResult = await this.createSharedVaultValetToken({
sharedVaultUuid: file.shared_vault_uuid ? file.shared_vault_uuid : sharedVault.sharing.sharedVaultUuid,
sharedVaultOwnerUuid: sharedVault.sharing.ownerUserUuid,
remoteIdentifier: file.remoteIdentifier,
operation: ValetTokenOperation.Move,
fileUuidRequiredForExistingFiles: file.uuid,
@@ -186,6 +189,7 @@ export class FileService extends AbstractService implements FilesClientInterface
vault && vault.isSharedVaultListing()
? await this.createSharedVaultValetToken({
sharedVaultUuid: vault.sharing.sharedVaultUuid,
sharedVaultOwnerUuid: vault.sharing.ownerUserUuid,
remoteIdentifier,
operation: ValetTokenOperation.Write,
unencryptedFileSizeForUpload: sizeInBytes,

View File

@@ -13,7 +13,6 @@ describe('SyncLocalVaultsWithRemoteSharedVaults', () => {
uuid: '1-2-3',
user_uuid: '2-3-4',
file_upload_bytes_used: 123,
file_upload_bytes_limit: 10000000,
created_at_timestamp: 123,
updated_at_timestamp: 123,
}] } })