Merge pull request #1515 from numbersprotocol/revert-1467-feature-download-asset-using-cdn

Revert "Feature download asset using cdn"

Author: shc261392

src/app/features/home/capture-tab/capture-tab.component.ts

@@ -99,7 +99,7 @@ export class CaptureTabComponent {
 
   refreshCaptures(event: Event) {
     this.diaBackendAssetRefreshingService
-      .refresh$()
+      .refresh()
       .pipe(finalize(() => (<CustomEvent>event).detail.complete()))
       .subscribe();
   }

src/app/features/home/details/information/session/information-session.service.ts

@@ -52,7 +52,7 @@ export class DetailedCapture {
         const [index, meta] = Object.entries(proof.indexedAssets)[0];
         if (!(await this.mediaStore.exists(index)) && proof.diaBackendAssetId) {
           const mediaBlob = await this.diaBackendAssetRepository
-            .downloadAssetFileFromCDN$(proof.diaBackendAssetId)
+            .downloadFile$({ id: proof.diaBackendAssetId, field: 'asset_file' })
             .pipe(
               first(),
               catchError((err: unknown) => this.errorService.toastError$(err))
@@ -63,6 +63,7 @@ export class DetailedCapture {
         return proof.getFirstAssetUrl();
       });
     }
+
     return this.diaBackendAsset$.pipe(
       isNonNullable(),
       switchMap(asset =>

src/app/shared/dia-backend/asset/dia-backend-asset-repository.service.ts

@@ -134,7 +134,7 @@ export class DiaBackendAssetRepository {
         iif(
           () => !!image,
           of(image).pipe(isNonNullable()),
-          this.downloadAssetFileFromCDN$(postCapture.id).pipe(
+          this.downloadFile$({ id: postCapture.id, field: 'asset_file' }).pipe(
             first(),
             tap(blob => {
               // eslint-disable-next-line rxjs/no-subject-value
@@ -200,18 +200,16 @@ export class DiaBackendAssetRepository {
     );
   }
 
-  downloadAssetFileFromCDN$(cid: string) {
+  downloadFile$({ id, field }: { id: string; field: AssetDownloadField }) {
+    const formData = new FormData();
+    formData.append('field', field);
     return defer(() => this.authService.getAuthHeaders()).pipe(
       concatMap(headers =>
-        this.httpClient.get<DiaBackendAsset>(
-          `${BASE_URL}/api/v3/assets/${cid}`,
-          { headers }
+        this.httpClient.post(
+          `${BASE_URL}/api/v3/assets/${id}/download/`,
+          formData,
+          { headers, responseType: 'blob' }
         )
-      ),
-      concatMap(diaBackendAsset =>
-        this.httpClient.get(`${diaBackendAsset.asset_file}`, {
-          responseType: 'blob',
-        })
       )
     );
   }

src/app/shared/dia-backend/asset/downloading/dia-backend-downloading.service.ts

@@ -1,5 +1,6 @@
-import { HttpClient, HttpErrorResponse } from '@angular/common/http';
+import { HttpErrorResponse } from '@angular/common/http';
 import { Injectable } from '@angular/core';
+import { first } from 'rxjs/operators';
 import { blobToBase64 } from '../../../../utils/encoding/encoding';
 import { OnConflictStrategy } from '../../../database/table/table';
 import { HttpErrorCode } from '../../../error/error.service';
@@ -22,8 +23,7 @@ export class DiaBackendAssetDownloadingService {
   constructor(
     private readonly assetRepository: DiaBackendAssetRepository,
     private readonly mediaStore: MediaStore,
-    private readonly proofRepository: ProofRepository,
-    private readonly httpClient: HttpClient
+    private readonly proofRepository: ProofRepository
   ) {}
 
   async storeRemoteCapture(
@@ -48,11 +48,9 @@ export class DiaBackendAssetDownloadingService {
     if (!diaBackendAsset.information.proof) {
       return;
     }
-    // This function is only called by storeRemoteCapture, which should always
-    // get diaBackendAsset from backend. That should mean we're always using
-    // up-to-date asset_file_thumbnail cdn link.
-    const thumbnailBlob = await this.httpClient
-      .get(diaBackendAsset.asset_file_thumbnail, { responseType: 'blob' })
+    const thumbnailBlob = await this.assetRepository
+      .downloadFile$({ id: diaBackendAsset.id, field: 'asset_file_thumbnail' })
+      .pipe(first())
       .toPromise();
     return this.mediaStore.storeThumbnail(
       diaBackendAsset.proof_hash,

src/app/shared/dia-backend/asset/refreshing/dia-backend-asset-refreshing.service.ts

@@ -1,7 +1,7 @@
 import { HttpErrorResponse } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { UntilDestroy, untilDestroyed } from '@ngneat/until-destroy';
-import { EMPTY, forkJoin, of } from 'rxjs';
+import { EMPTY, forkJoin } from 'rxjs';
 import { catchError, concatMap, first } from 'rxjs/operators';
 import { HttpErrorCode } from '../../../error/error.service';
 import { ProofRepository } from '../../../repositories/proof/proof-repository.service';
@@ -27,18 +27,15 @@ export class DiaBackendAsseRefreshingService {
       .subscribe(value => (this.pendingUploadTasks = value));
   }
 
-  refresh$() {
+  refresh() {
     // Don't refresh if there are still captures being uploaded.
     if (this.pendingUploadTasks > 0) {
       return EMPTY;
     }
-
     return this.proofRepository.all$.pipe(
       first(),
-      // Remove deleted Captures or Captures that no longer belong to the user.
-      concatMap(proofs => {
-        if (proofs.length === 0) return of([]);
-        return forkJoin(
+      concatMap(proofs =>
+        forkJoin(
           proofs.map(proof =>
             this.assetRepository.fetchByProof$(proof).pipe(
               catchError((err: unknown) => {
@@ -52,13 +49,9 @@ export class DiaBackendAsseRefreshingService {
               })
             )
           )
-        );
-      }),
-      concatMap(async () => {
-        // TO DO: pass in diaBackendAssets and skip those when prefetching.
-        await this.diaBackendAssetPrefetchingService.prefetch();
-        return EMPTY;
-      })
+        )
+      ),
+      concatMap(() => this.diaBackendAssetPrefetchingService.prefetch())
     );
   }
 }