Merge pull request #5221 from DSpace/backport-5028-to-dspace-9_x

[Port dspace-9_x] Reduce bitstream authorization requests for item page

Author: tdonohue

src/app/shared/file-download-link/file-download-link.component.spec.ts

@@ -113,9 +113,11 @@ describe('FileDownloadLinkComponent', () => {
           component.item = item;
           fixture.detectChanges();
         });
+        it('should return canDownload truthy', () => {
+          expect(component.canDownload$).toBeObservable(cold('-a', { a: true }));
+        });
         it('should return the bitstreamPath based on the input bitstream', () => {
           expect(component.bitstreamPath$).toBeObservable(cold('-a', { a: { routerLink: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString(), queryParams: {} } }));
-          expect(component.canDownload$).toBeObservable(cold('--a', { a: true }));
 
         });
         it('should init the component', () => {
@@ -147,9 +149,11 @@ describe('FileDownloadLinkComponent', () => {
           component.bitstream = bitstream;
           fixture.detectChanges();
         });
+        it('should return canDownload falsy', () => {
+          expect(component.canDownload$).toBeObservable(cold('-a', { a: false }));
+        });
         it('should return the bitstreamPath based on the input bitstream', () => {
-          expect(component.bitstreamPath$).toBeObservable(cold('-a', { a: { routerLink: new URLCombiner(getItemModuleRoute(), item.uuid, 'request-a-copy').toString(), queryParams: { bitstream: bitstream.uuid } } }));
-          expect(component.canDownload$).toBeObservable(cold('--a', { a: false }));
+          expect(component.bitstreamPath$).toBeObservable(cold('--a', { a: { routerLink: new URLCombiner(getItemModuleRoute(), item.uuid, 'request-a-copy').toString(), queryParams: { bitstream: bitstream.uuid } } }));
 
         });
         it('should init the component', () => {
@@ -176,9 +180,11 @@ describe('FileDownloadLinkComponent', () => {
           component.item = item;
           fixture.detectChanges();
         });
+        it('should return canDownload falsy', () => {
+          expect(component.canDownload$).toBeObservable(cold('-a', { a: false }));
+        });
         it('should return the bitstreamPath based on the input bitstream', () => {
-          expect(component.bitstreamPath$).toBeObservable(cold('-a', { a: { routerLink: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString(), queryParams: {} } }));
-          expect(component.canDownload$).toBeObservable(cold('--a', { a: false }));
+          expect(component.bitstreamPath$).toBeObservable(cold('--a', { a: { routerLink: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString(), queryParams: {} } }));
 
         });
         it('should init the component and show the locked icon', () => {
@@ -205,9 +211,11 @@ describe('FileDownloadLinkComponent', () => {
           component.item = item;
           fixture.detectChanges();
         });
+        it('should return canDownload falsy', () => {
+          expect(component.canDownload$).toBeObservable(cold('-a', { a: false }));
+        });
         it('should return the bitstreamPath based on the access token and request-a-copy path', () => {
-          expect(component.bitstreamPath$).toBeObservable(cold('-a', { a: { routerLink: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString(), queryParams: { accessToken: 'abc123' } } }));
-          expect(component.canDownload$).toBeObservable(cold('--a', { a: false }));
+          expect(component.bitstreamPath$).toBeObservable(cold('--a', { a: { routerLink: new URLCombiner(getBitstreamModuleRoute(), bitstream.uuid, 'download').toString(), queryParams: { accessToken: 'abc123' } } }));
 
         });
         it('should init the component and show an open lock', () => {

src/app/shared/file-download-link/file-download-link.component.ts

@@ -21,7 +21,10 @@ import {
   Observable,
   of,
 } from 'rxjs';
-import { map } from 'rxjs/operators';
+import {
+  map,
+  switchMap,
+} from 'rxjs/operators';
 
 import {
   getBitstreamDownloadRoute,
@@ -112,13 +115,23 @@ export class FileDownloadLinkComponent implements OnInit {
     if (this.enableRequestACopy) {
       // Obtain item request data from the route snapshot
       this.itemRequest = this.route.snapshot.data.itemRequest;
-      // Set up observables to test access rights to a normal bitstream download, a valid token download, and the request-a-copy feature
+      // Set up observable to evaluate access rights for a normal download
       this.canDownload$ = this.authorizationService.isAuthorized(FeatureID.CanDownload, isNotEmpty(this.bitstream) ? this.bitstream.self : undefined);
-      this.canDownloadWithToken$ = of((this.itemRequest && this.itemRequest.acceptRequest && !this.itemRequest.accessExpired) ? (this.itemRequest.allfiles !== false || this.itemRequest.bitstreamId === this.bitstream.uuid) : false);
-      this.canRequestACopy$ = this.authorizationService.isAuthorized(FeatureID.CanRequestACopy, isNotEmpty(this.bitstream) ? this.bitstream.self : undefined);
-      // Set up observable to determine the path to the bitstream based on the user's access rights and features as above
-      this.bitstreamPath$ = observableCombineLatest([this.canDownload$, this.canDownloadWithToken$, this.canRequestACopy$]).pipe(
-        map(([canDownload, canDownloadWithToken, canRequestACopy]) => this.getBitstreamPath(canDownload, canDownloadWithToken, canRequestACopy)),
+      // Only set up and execute other observables if canDownload emits false
+      this.bitstreamPath$ = this.canDownload$.pipe(
+        switchMap(canDownload => {
+          if (canDownload) {
+            return of(this.getBitstreamDownloadPath());
+          }
+          // Set up and combine observables to evaluate access rights to a valid token download and the request-a-copy feature
+          this.canDownloadWithToken$ = of((this.itemRequest && this.itemRequest.acceptRequest && !this.itemRequest.accessExpired) ? (this.itemRequest.allfiles !== false || this.itemRequest.bitstreamId === this.bitstream.uuid) : false);
+          this.canRequestACopy$ = this.authorizationService.isAuthorized(FeatureID.CanRequestACopy, isNotEmpty(this.bitstream) ? this.bitstream.self : undefined);
+          // Set up canDownload observable so the template can read the state
+          this.canDownload$ = of(false);
+          return observableCombineLatest([this.canDownloadWithToken$, this.canRequestACopy$]).pipe(
+            map(([canDownloadWithToken, canRequestACopy]) => this.getBitstreamPathForRequestACopy(canDownloadWithToken, canRequestACopy)),
+          );
+        }),
       );
     } else {
       this.bitstreamPath$ = of(this.getBitstreamDownloadPath());
@@ -130,21 +143,16 @@ export class FileDownloadLinkComponent implements OnInit {
    * Return a path to the bitstream based on what kind of access and authorization the user has, and whether
    * they may request a copy
    *
-   * @param canDownload user can download normally
    * @param canDownloadWithToken user can download using a token granted by a request approver
    * @param canRequestACopy user can request approval to access a copy
    */
-  getBitstreamPath(canDownload: boolean, canDownloadWithToken, canRequestACopy: boolean) {
-    // No matter what, if the user can download with their own authZ, allow it
-    if (canDownload) {
-      return this.getBitstreamDownloadPath();
-    }
-    // Otherwise, if they access token is valid, use this
+  getBitstreamPathForRequestACopy(canDownloadWithToken: boolean, canRequestACopy: boolean) {
+    //  if the access token is valid, use this
     if (canDownloadWithToken) {
       return this.getAccessByTokenBitstreamPath(this.itemRequest);
     }
     // If the user can't download, but can request a copy, show the request a copy link
-    if (!canDownload && canRequestACopy && hasValue(this.item)) {
+    if (canRequestACopy && hasValue(this.item)) {
       return getBitstreamRequestACopyRoute(this.item, this.bitstream);
     }
     // By default, return the plain path