From f485fbb6870203b60ac27bcbc2e12bb45f24b538 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Wed, 14 Nov 2018 15:19:59 -0500 Subject: [PATCH] fix old attachments by reuploading them --- .../components/attachments.component.ts | 53 +++++++++++++++++++ src/models/view/cipherView.ts | 11 ++++ 2 files changed, 64 insertions(+) diff --git a/src/angular/components/attachments.component.ts b/src/angular/components/attachments.component.ts index c05b3026ab..af925f23ff 100644 --- a/src/angular/components/attachments.component.ts +++ b/src/angular/components/attachments.component.ts @@ -20,6 +20,7 @@ export class AttachmentsComponent implements OnInit { @Input() cipherId: string; @Output() onUploadedAttachment = new EventEmitter(); @Output() onDeletedAttachment = new EventEmitter(); + @Output() onReuploadedAttachment = new EventEmitter(); cipher: CipherView; cipherDomain: Cipher; @@ -27,6 +28,7 @@ export class AttachmentsComponent implements OnInit { canAccessAttachments: boolean; formPromise: Promise; deletePromises: { [id: string]: Promise; } = {}; + reuploadPromises: { [id: string]: Promise; } = {}; constructor(protected cipherService: CipherService, protected i18nService: I18nService, protected cryptoService: CryptoService, protected userService: UserService, @@ -154,6 +156,57 @@ export class AttachmentsComponent implements OnInit { a.downloading = false; } + protected async reuploadCipherAttachment(attachment: AttachmentView, admin: boolean) { + const a = (attachment as any); + if (attachment.key != null || a.downloading || this.reuploadPromises[attachment.id] != null) { + return; + } + + try { + this.reuploadPromises[attachment.id] = Promise.resolve().then(async () => { + // 1. Download + a.downloading = true; + const response = await fetch(new Request(attachment.url, { cache: 'no-cache' })); + if (response.status !== 200) { + this.platformUtilsService.showToast('error', null, this.i18nService.t('errorOccurred')); + a.downloading = false; + return; + } + + try { + // 2. Resave + const buf = await response.arrayBuffer(); + const key = attachment.key != null ? attachment.key : + await this.cryptoService.getOrgKey(this.cipher.organizationId); + const decBuf = await this.cryptoService.decryptFromBytes(buf, key); + this.cipherDomain = await this.cipherService.saveAttachmentRawWithServer( + this.cipherDomain, attachment.fileName, decBuf, admin); + this.cipher = await this.cipherDomain.decrypt(); + + // 3. Delete old + this.deletePromises[attachment.id] = this.deleteCipherAttachment(attachment.id); + await this.deletePromises[attachment.id]; + const foundAttachment = this.cipher.attachments.filter((a2) => a2.id === attachment.id); + if (foundAttachment.length > 0) { + const i = this.cipher.attachments.indexOf(foundAttachment[0]); + if (i > -1) { + this.cipher.attachments.splice(i, 1); + } + } + + this.platformUtilsService.eventTrack('Reuploaded Attachment'); + this.platformUtilsService.showToast('success', null, this.i18nService.t('attachmentSaved')); + this.onReuploadedAttachment.emit(); + } catch (e) { + this.platformUtilsService.showToast('error', null, this.i18nService.t('errorOccurred')); + } + + a.downloading = false; + }); + await this.reuploadPromises[attachment.id]; + } catch { } + } + protected loadCipher() { return this.cipherService.get(this.cipherId); } diff --git a/src/models/view/cipherView.ts b/src/models/view/cipherView.ts index 5c69728c1c..b231be4f28 100644 --- a/src/models/view/cipherView.ts +++ b/src/models/view/cipherView.ts @@ -74,6 +74,17 @@ export class CipherView implements View { return this.attachments && this.attachments.length > 0; } + get hasOldAttachments(): boolean { + if (this.hasAttachments) { + for (let i = 0; i < this.attachments.length; i++) { + if (this.attachments[i].key == null) { + return true; + } + } + } + return false; + } + get hasFields(): boolean { return this.fields && this.fields.length > 0; }