Merged in dspace-cris-2023_02_x-DSC-1511 (pull request DSpace#1494)

[DSC-1511] Fix issue for which navigating to item page could have lead to and hard redirect of the page when it shouldn't

Approved-by: Vincenzo Mecca

Author: atarix83

src/app/item-page/item-page.resolver.spec.ts

@@ -7,6 +7,7 @@ import { TestBed } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 import { Router } from '@angular/router';
 import { HardRedirectService } from '../core/services/hard-redirect.service';
+import { PLATFORM_ID } from '@angular/core';
 
 describe('ItemPageResolver', () => {
   beforeEach(() => {
@@ -25,6 +26,7 @@ describe('ItemPageResolver', () => {
     let store;
     let router;
     let hardRedirectService: HardRedirectService ;
+    let platformId;
     const uuid = '1234-65487-12354-1235';
     const item = Object.assign(new Item(), {
       id: uuid,
@@ -58,6 +60,7 @@ describe('ItemPageResolver', () => {
 
       beforeEach(() => {
         router = TestBed.inject(Router);
+        platformId = TestBed.inject(PLATFORM_ID);
         itemService = {
           findById: (id: string) => createSuccessfulRemoteDataObject$(item)
         } as any;
@@ -71,7 +74,7 @@ describe('ItemPageResolver', () => {
         });
 
         spyOn(router, 'navigateByUrl');
-        resolver = new ItemPageResolver(hardRedirectService, itemService, store, router);
+        resolver = new ItemPageResolver(platformId, hardRedirectService, itemService, store, router);
       });
 
       it('should resolve a an item from from the item with the url redirect', (done) => {
@@ -137,31 +140,74 @@ describe('ItemPageResolver', () => {
         });
 
         spyOn(router, 'navigateByUrl');
-        resolver = new ItemPageResolver(hardRedirectService, itemService, store, router);
       });
 
-      it('should redirect if it has not the new item url', (done) => {
-        resolver.resolve({ params: { id: uuid } } as any, { url: '/items/1234-65487-12354-1235/edit' } as any)
-          .pipe(first())
-          .subscribe(
-            (resolved) => {
-              expect(hardRedirectService.redirect).toHaveBeenCalledWith('/entities/person/1234-65487-12354-1235/edit', 301);
-              done();
-            }
-          );
+      describe(' and platform is server', () => {
+
+        beforeEach(() => {
+          platformId = 'server';
+          resolver = new ItemPageResolver(platformId, hardRedirectService, itemService, store, router);
+        });
+
+        it('should redirect if it has not the new item url', (done) => {
+          resolver.resolve({ params: { id: uuid } } as any, { url: '/items/1234-65487-12354-1235/edit' } as any)
+            .pipe(first())
+            .subscribe(
+              (resolved) => {
+                expect(hardRedirectService.redirect).toHaveBeenCalledWith('/entities/person/1234-65487-12354-1235/edit', 301);
+                expect(router.navigateByUrl).not.toHaveBeenCalled();
+                done();
+              }
+            );
+        });
+
+        it('should not redirect if it has the new item url', (done) => {
+          resolver.resolve({ params: { id: uuid } } as any, { url: '/entities/person/1234-65487-12354-1235/edit' } as any)
+            .pipe(first())
+            .subscribe(
+              (resolved) => {
+                expect(hardRedirectService.redirect).not.toHaveBeenCalled();
+                expect(router.navigateByUrl).not.toHaveBeenCalled();
+                done();
+              }
+            );
+        });
       });
 
-      it('should not redirect if it has the new item url', (done) => {
-        resolver.resolve({ params: { id: uuid } } as any, { url: '/entities/person/1234-65487-12354-1235/edit' } as any)
-          .pipe(first())
-          .subscribe(
-            (resolved) => {
-              expect(hardRedirectService.redirect).not.toHaveBeenCalled();
-              done();
-            }
-          );
+      describe(' and platform is browser', () => {
+
+        beforeEach(() => {
+          platformId = 'browser';
+          resolver = new ItemPageResolver(platformId, hardRedirectService, itemService, store, router);
+        });
+
+        it('should redirect if it has not the new item url', (done) => {
+          resolver.resolve({ params: { id: uuid } } as any, { url: '/items/1234-65487-12354-1235/edit' } as any)
+            .pipe(first())
+            .subscribe(
+              (resolved) => {
+                expect(router.navigateByUrl).toHaveBeenCalledWith('/entities/person/1234-65487-12354-1235/edit');
+                expect(hardRedirectService.redirect).not.toHaveBeenCalled();
+                done();
+              }
+            );
+        });
+
+        it('should not redirect if it has the new item url', (done) => {
+          resolver.resolve({ params: { id: uuid } } as any, { url: '/entities/person/1234-65487-12354-1235/edit' } as any)
+            .pipe(first())
+            .subscribe(
+              (resolved) => {
+                expect(hardRedirectService.redirect).not.toHaveBeenCalled();
+                expect(router.navigateByUrl).not.toHaveBeenCalled();
+                done();
+              }
+            );
+        });
       });
 
+
+
     });
 
   });

src/app/item-page/item-page.resolver.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Inject, Injectable, PLATFORM_ID } from '@angular/core';
 import { ActivatedRouteSnapshot, Router, RouterStateSnapshot } from '@angular/router';
 import { Observable } from 'rxjs';
 import { RemoteData } from '../core/data/remote-data';
@@ -10,6 +10,7 @@ import { hasValue, isNotEmpty } from '../shared/empty.util';
 import { getItemPageRoute } from './item-page-routing-paths';
 import { ItemResolver } from './item.resolver';
 import { HardRedirectService } from '../core/services/hard-redirect.service';
+import { isPlatformServer } from '@angular/common';
 
 /**
  * This class represents a resolver that requests a specific item before the route is activated and will redirect to the
@@ -18,6 +19,7 @@ import { HardRedirectService } from '../core/services/hard-redirect.service';
 @Injectable()
 export class ItemPageResolver extends ItemResolver {
   constructor(
+    @Inject(PLATFORM_ID) protected platformId: any,
     protected hardRedirectService: HardRedirectService,
     protected itemService: ItemDataService,
     protected store: Store<any>,
@@ -55,7 +57,11 @@ export class ItemPageResolver extends ItemResolver {
             if (!thisRoute.startsWith(itemRoute)) {
               const itemId = rd.payload.uuid;
               const subRoute = thisRoute.substring(thisRoute.indexOf(itemId) + itemId.length, thisRoute.length);
-              this.hardRedirectService.redirect(itemRoute + subRoute, 301);
+              if (isPlatformServer(this.platformId)) {
+                this.hardRedirectService.redirect(itemRoute + subRoute, 301);
+              } else {
+                this.router.navigateByUrl(itemRoute + subRoute);
+              }
             }
           }
         }