[IIIF-188] refactor to use param in method

Author: FrancescoMolinaro

src/app/bitstream-page/bitstream-download-redirect.guard.spec.ts

@@ -162,8 +162,8 @@ describe('BitstreamDownloadRedirectGuard', () => {
       it('should redirect to the content link', waitForAsync(() => {
         TestBed.runInInjectionContext(() => {
           resolver(route, state).subscribe(() => {
-              expect(hardRedirectService.redirect).toHaveBeenCalledWith('bitstream-content-link');
-            }
+            expect(hardRedirectService.redirect).toHaveBeenCalledWith('bitstream-content-link', null, true);
+          },
           );
         });
       }));
@@ -176,7 +176,7 @@ describe('BitstreamDownloadRedirectGuard', () => {
       it('should redirect to an updated content link', waitForAsync(() => {
         TestBed.runInInjectionContext(() => {
           resolver(route, state).subscribe(() => {
-            expect(hardRedirectService.redirect).toHaveBeenCalledWith('content-url-with-headers');
+            expect(hardRedirectService.redirect).toHaveBeenCalledWith('content-url-with-headers', null, true);
           });
         });
       }));

src/app/bitstream-page/bitstream-download-redirect.guard.ts

@@ -66,16 +66,16 @@ export const bitstreamDownloadRedirectGuard: CanActivateFn = (
     }),
     map(([isAuthorized, isLoggedIn, bitstream, fileLink]: [boolean, boolean, Bitstream, string]) => {
       if (isAuthorized && isLoggedIn && isNotEmpty(fileLink)) {
-        hardRedirectService.redirect(fileLink);
+        hardRedirectService.redirect(fileLink, null, true);
         return false;
       } else if (isAuthorized && !isLoggedIn && !hasValue(accessToken)) {
-        hardRedirectService.redirect(bitstream._links.content.href);
+        hardRedirectService.redirect(bitstream._links.content.href, null, true);
         return false;
       } else if (!isAuthorized) {
         // Either we have an access token, or we are logged in, or we are not logged in.
         // For now, the access token does not care if we are logged in or not.
         if (hasValue(accessToken)) {
-          hardRedirectService.redirect(bitstream._links.content.href + '?accessToken=' + accessToken);
+          hardRedirectService.redirect(bitstream._links.content.href + '?accessToken=' + accessToken, null, true);
           return false;
         } else if (isLoggedIn) {
           return router.createUrlTree([getForbiddenRoute()]);

src/app/core/services/hard-redirect.service.ts

@@ -13,8 +13,10 @@ export abstract class HardRedirectService {
    *    the page to redirect to
    * @param statusCode
    *    optional HTTP status code to use for redirect (default = 302, which is a temporary redirect)
+   * @param shouldSetCorsHeader
+   *    optional to prevent CORS error on redirect
    */
-  abstract redirect(url: string, statusCode?: number);
+  abstract redirect(url: string, statusCode?: number, shouldSetCorsHeader?: boolean);
 
   /**
    * Get the current route, with query params included

src/app/core/services/server-hard-redirect.service.spec.ts

@@ -102,7 +102,7 @@ describe('ServerHardRedirectService', () => {
     service = new ServerHardRedirectService(environmentWithSSRUrl, mockRequest, mockResponse, serverResponseService);
 
     beforeEach(() => {
-      service.redirect(redirect);
+      service.redirect(redirect, null, true);
     });
 
     it('should set header', () => {

src/app/core/services/server-hard-redirect.service.ts

@@ -28,8 +28,9 @@ export class ServerHardRedirectService extends HardRedirectService {
    *    the page to redirect to
    * @param statusCode
    *    optional HTTP status code to use for redirect (default = 302, which is a temporary redirect)
+   * @param shouldSetCorsHeader
    */
-  redirect(url: string, statusCode?: number) {
+  redirect(url: string, statusCode?: number, shouldSetCorsHeader?: boolean) {
     if (url === this.req.url) {
       return;
     }
@@ -59,7 +60,7 @@ export class ServerHardRedirectService extends HardRedirectService {
         status = 302;
       }
 
-      if (this.req.path.endsWith('download')) {
+      if (shouldSetCorsHeader) {
         this.setCorsHeader();
       }