bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-16 08:13:42 +00:00
Code Issues Releases Wiki Activity

Use new attachment download data (#355)

Browse Source 
* Use new attachment download data

* lint fix
This commit is contained in:
Matt Gibson
2021-04-22 09:30:53 -05:00
committed by GitHub
parent 36641f07b9
commit 11fff06b8c
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/angular/components/view.component.ts
View File

@@ -13,6 +13,7 @@ import { CipherType } from '../../enums/cipherType';
import { EventType } from '../../enums/eventType'; import { EventType } from '../../enums/eventType';
import { FieldType } from '../../enums/fieldType'; import { FieldType } from '../../enums/fieldType';
import { ApiService } from '../../abstractions/api.service';
import { AuditService } from '../../abstractions/audit.service'; import { AuditService } from '../../abstractions/audit.service';
import { CipherService } from '../../abstractions/cipher.service'; import { CipherService } from '../../abstractions/cipher.service';
import { CryptoService } from '../../abstractions/crypto.service'; import { CryptoService } from '../../abstractions/crypto.service';
@@ -23,6 +24,8 @@ import { TokenService } from '../../abstractions/token.service';
import { TotpService } from '../../abstractions/totp.service'; import { TotpService } from '../../abstractions/totp.service';
import { UserService } from '../../abstractions/user.service'; import { UserService } from '../../abstractions/user.service';
import { ErrorResponse } from '../../models/response/errorResponse';
import { AttachmentView } from '../../models/view/attachmentView'; import { AttachmentView } from '../../models/view/attachmentView';
import { CipherView } from '../../models/view/cipherView'; import { CipherView } from '../../models/view/cipherView';
import { FieldView } from '../../models/view/fieldView'; import { FieldView } from '../../models/view/fieldView';
@@ -61,7 +64,7 @@ export class ViewComponent implements OnDestroy, OnInit {
protected auditService: AuditService, protected win: Window, protected auditService: AuditService, protected win: Window,
protected broadcasterService: BroadcasterService, protected ngZone: NgZone, protected broadcasterService: BroadcasterService, protected ngZone: NgZone,
protected changeDetectorRef: ChangeDetectorRef, protected userService: UserService, protected changeDetectorRef: ChangeDetectorRef, protected userService: UserService,
protected eventService: EventService) { } protected eventService: EventService, protected apiService: ApiService) { }
ngOnInit() { ngOnInit() {
this.broadcasterService.subscribe(BroadcasterSubscriptionId, (message: any) => { this.broadcasterService.subscribe(BroadcasterSubscriptionId, (message: any) => {
@@ -243,8 +246,22 @@ export class ViewComponent implements OnDestroy, OnInit {
return; return;
} }
let url: string;
try {
const attachmentDownloadResponse = await this.apiService.getAttachmentData(this.cipher.id, attachment.id);
url = attachmentDownloadResponse.url;
} catch (e) {
if (e instanceof ErrorResponse && (e as ErrorResponse).statusCode === 404) {
url = attachment.url;
} else if (e instanceof ErrorResponse) {
throw new Error((e as ErrorResponse).getSingleMessage());
} else {
throw e;
}
}
a.downloading = true; a.downloading = true;
const response = await fetch(new Request(attachment.url, { cache: 'no-store' })); const response = await fetch(new Request(url, { cache: 'no-store' }));
if (response.status !== 200) { if (response.status !== 200) {
this.platformUtilsService.showToast('error', null, this.i18nService.t('errorOccurred')); this.platformUtilsService.showToast('error', null, this.i18nService.t('errorOccurred'));
a.downloading = false; a.downloading = false;