added repository prefix for bitstream redirecting

Author: Paurikova2

config/config.yml

@@ -1,5 +1,8 @@
 debug: false
 
+ui:
+  nameSpace: /repository
+
 rest:
   ssl: false
   host: localhost

src/app/bitstream-page/legacy-bitstream-url-redirect.guard.spec.ts

@@ -10,6 +10,7 @@ import { HardRedirectService } from '../core/services/hard-redirect.service';
 import { Bitstream } from '../core/shared/bitstream.model';
 import { RouterStub } from '../shared/testing/router.stub';
 import { legacyBitstreamURLRedirectGuard } from './legacy-bitstream-url-redirect.guard';
+import { AppConfig } from '../../config/app-config.interface';
 
 describe('legacyBitstreamURLRedirectGuard', () => {
   let resolver: any;
@@ -19,6 +20,7 @@ describe('legacyBitstreamURLRedirectGuard', () => {
   let state;
   let hardRedirectService: HardRedirectService;
   let router: RouterStub;
+  let appConfig: AppConfig;
 
   let bitstream: Bitstream;
 
@@ -29,6 +31,11 @@ describe('legacyBitstreamURLRedirectGuard', () => {
     };
     router = new RouterStub();
     hardRedirectService = new BrowserHardRedirectService(window.location);
+    appConfig = {
+      ui: {
+        nameSpace: '/repository'
+      }
+    } as AppConfig;
     state = {};
     bitstream = Object.assign(new Bitstream(), {
       uuid: 'bitstream-id',
@@ -60,7 +67,7 @@ describe('legacyBitstreamURLRedirectGuard', () => {
         });
       });
       it(`should call findByItemHandle with the handle, sequence id, and filename from the route`, () => {
-        resolver(route, state, bitstreamDataService, hardRedirectService, router);
+        resolver(route, state, bitstreamDataService, hardRedirectService, router, appConfig);
         expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
           `${route.params.prefix}/${route.params.suffix}`,
           route.params.sequence_id,
@@ -85,7 +92,7 @@ describe('legacyBitstreamURLRedirectGuard', () => {
           });
         });
         it(`should call findByItemHandle with the handle and filename from the route, and the sequence ID from the queryParams`, () => {
-          resolver(route, state, bitstreamDataService, hardRedirectService, router);
+          resolver(route, state, bitstreamDataService, hardRedirectService, router, appConfig);
           expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
             `${route.params.prefix}/${route.params.suffix}`,
             route.queryParams.sequenceId,
@@ -105,7 +112,7 @@ describe('legacyBitstreamURLRedirectGuard', () => {
           });
         });
         it(`should call findByItemHandle with the handle, and filename from the route`, () => {
-          resolver(route, state, bitstreamDataService, hardRedirectService, router);
+          resolver(route, state, bitstreamDataService, hardRedirectService, router, appConfig);
           expect(bitstreamDataService.findByItemHandle).toHaveBeenCalledWith(
             `${route.params.prefix}/${route.params.suffix}`,
             undefined,
@@ -122,7 +129,7 @@ describe('legacyBitstreamURLRedirectGuard', () => {
           b: remoteDataMocks.ResponsePending,
           c: remoteDataMocks.Error,
         }));
-        resolver(route, state, bitstreamDataService, hardRedirectService, router).subscribe(() => {
+        resolver(route, state, bitstreamDataService, hardRedirectService, router, appConfig).subscribe(() => {
           expect(bitstreamDataService.findByItemHandle).toHaveBeenCalled();
           expect(router.createUrlTree).toHaveBeenCalledWith([PAGE_NOT_FOUND_PATH]);
         });
@@ -135,7 +142,7 @@ describe('legacyBitstreamURLRedirectGuard', () => {
           b: remoteDataMocks.ResponsePending,
           c: remoteDataMocks.NoContent,
         }));
-        resolver(route, state, bitstreamDataService, hardRedirectService, router).subscribe(() => {
+        resolver(route, state, bitstreamDataService, hardRedirectService, router, appConfig).subscribe(() => {
           expect(bitstreamDataService.findByItemHandle).toHaveBeenCalled();
           expect(router.createUrlTree).toHaveBeenCalledWith([PAGE_NOT_FOUND_PATH]);
         });
@@ -148,9 +155,9 @@ describe('legacyBitstreamURLRedirectGuard', () => {
           b: remoteDataMocks.ResponsePending,
           c: remoteDataMocks.Success,
         }));
-        resolver(route, state, bitstreamDataService, hardRedirectService, router).subscribe(() => {
+        resolver(route, state, bitstreamDataService, hardRedirectService, router, appConfig).subscribe(() => {
           expect(bitstreamDataService.findByItemHandle).toHaveBeenCalled();
-          expect(hardRedirectService.redirect).toHaveBeenCalledWith(new URL(`/bitstreams/${bitstream.uuid}/download`, window.location.origin).href, 301);
+          expect(hardRedirectService.redirect).toHaveBeenCalledWith(new URL(`/repository/bitstreams/${bitstream.uuid}/download`, window.location.origin).href, 301);
         });
       });
     });

src/app/bitstream-page/legacy-bitstream-url-redirect.guard.ts

@@ -16,6 +16,7 @@ import { HardRedirectService } from '../core/services/hard-redirect.service';
 import { Bitstream } from '../core/shared/bitstream.model';
 import { getFirstCompletedRemoteData } from '../core/shared/operators';
 import { hasNoValue } from '../shared/empty.util';
+import { APP_CONFIG, AppConfig } from '../../config/app-config.interface';
 
 /**
  * Redirects to a bitstream based on the handle of the item, and the sequence id or the filename of the
@@ -30,6 +31,7 @@ export const legacyBitstreamURLRedirectGuard: CanActivateFn = (
   bitstreamDataService: BitstreamDataService = inject(BitstreamDataService),
   serverHardRedirectService: HardRedirectService = inject(HardRedirectService),
   router: Router = inject(Router),
+  appConfig: AppConfig = inject(APP_CONFIG),
 ): Observable<UrlTree | boolean> => {
   const prefix = route.params.prefix;
   const suffix = route.params.suffix;
@@ -46,7 +48,11 @@ export const legacyBitstreamURLRedirectGuard: CanActivateFn = (
     getFirstCompletedRemoteData(),
     map((rd: RemoteData<Bitstream>) => {
       if (rd.hasSucceeded && !rd.hasNoContent) {
-        serverHardRedirectService.redirect(new URL(`/bitstreams/${rd.payload.uuid}/download`, serverHardRedirectService.getCurrentOrigin()).href, 301);
+        // Get the UI namespace to construct the correct redirect URL
+        const { nameSpace } = appConfig.ui;
+        const namespacePrefix = nameSpace === '/' ? '' : nameSpace;
+        const redirectPath = `${namespacePrefix}/bitstreams/${rd.payload.uuid}/download`;
+        serverHardRedirectService.redirect(new URL(redirectPath, serverHardRedirectService.getCurrentOrigin()).href, 301);
         return false;
       } else {
         return router.createUrlTree([PAGE_NOT_FOUND_PATH]);