Merged in task/dspace-cris-2024_02_x/DSC-2400 (pull request DSpace#4615)

[DSC-2400] fix redirect for item page resolver

Approved-by: Andrea Barbasso

Author: Francesco Mauto

bitbucket-pipelines.yml

@@ -62,7 +62,7 @@ definitions:
     - step: &angular-build
         name: angular-build
         image:
-          name: cypress/browsers:node-20.18.0-chrome-130.0.6723.69-1-ff-131.0.3-edge-130.0.2849.52-1
+          name: cypress/browsers:node-22.21.0-chrome-141.0.7390.107-1-ff-144.0-edge-141.0.3537.92-1
           run-as-user: 1000
         size: 4x
         caches:
@@ -78,7 +78,7 @@ definitions:
     - step: &unittest-code-checks
         name: test-code-checks
         image:
-          name: cypress/browsers:node-20.18.0-chrome-130.0.6723.69-1-ff-131.0.3-edge-130.0.2849.52-1
+          name: cypress/browsers:node-22.21.0-chrome-141.0.7390.107-1-ff-144.0-edge-141.0.3537.92-1
           run-as-user: 1000
         size: 4x
         caches:
@@ -96,7 +96,7 @@ definitions:
     - step: &run-e2e-tests
         name: Run E2E test
         image:
-          name: cypress/browsers:node-20.18.0-chrome-130.0.6723.69-1-ff-131.0.3-edge-130.0.2849.52-1
+          name: cypress/browsers:node-22.21.0-chrome-141.0.7390.107-1-ff-144.0-edge-141.0.3537.92-1
           run-as-user: 0
         size: 4x
         services:

package.json

@@ -115,7 +115,6 @@
     "date-fns": "^2.29.3",
     "date-fns-tz": "^1.3.7",
     "deepmerge": "^4.3.1",
-    "domino-ext": "^2.1.4",
     "ejs": "^3.1.10",
     "express": "^4.21.2",
     "express-rate-limit": "^5.1.3",

server.ts

@@ -24,7 +24,6 @@ import * as express from 'express';
 import * as ejs from 'ejs';
 import * as compression from 'compression';
 import * as expressStaticGzip from 'express-static-gzip';
-import * as domino from 'domino-ext';
 /* eslint-enable import/no-namespace */
 import axios from 'axios';
 import LRU from 'lru-cache';
@@ -85,20 +84,10 @@ let anonymousCache: LRU<string, any>;
 // extend environment with app config for server
 extendEnvironmentWithAppConfig(environment, appConfig);
 
-// Create a DOM window object based on the template
-const _window = domino.createWindow(indexHtml);
-
 // The REST server base URL
 const REST_BASE_URL = environment.rest.ssrBaseUrl || environment.rest.baseUrl;
 
 const IIIF_ALLOWED_ORIGINS = environment.rest.allowedOrigins || [];
-
-// Assign the DOM window and document objects to the global object
-(_window as any).screen = { deviceXDPI: 0, logicalXDPI: 0 };
-(global as any).window = _window;
-(global as any).document = _window.document;
-(global as any).navigator = _window.navigator;
-
 // The Express app is exported so that it can be used by serverless Functions.
 export function app() {
 

src/app/core/auth/auth.actions.ts

@@ -35,6 +35,7 @@ export const AuthActionTypes = {
   LOG_OUT_ERROR: type('dspace/auth/LOG_OUT_ERROR'),
   LOG_OUT_SUCCESS: type('dspace/auth/LOG_OUT_SUCCESS'),
   SET_REDIRECT_URL: type('dspace/auth/SET_REDIRECT_URL'),
+  SET_REDIRECT_URL_AND_NAVIGATE: type('dspace/auth/SET_REDIRECT_URL_AND_NAVIGATE'),
   RETRIEVE_AUTHENTICATED_EPERSON: type('dspace/auth/RETRIEVE_AUTHENTICATED_EPERSON'),
   RETRIEVE_AUTHENTICATED_EPERSON_SUCCESS: type('dspace/auth/RETRIEVE_AUTHENTICATED_EPERSON_SUCCESS'),
   RETRIEVE_AUTHENTICATED_EPERSON_ERROR: type('dspace/auth/RETRIEVE_AUTHENTICATED_EPERSON_ERROR'),
@@ -360,6 +361,23 @@ export class SetRedirectUrlAction implements Action {
   }
 }
 
+/**
+ * Change the redirect url.
+ * @class SetRedirectUrlAction
+ * @implements {Action}
+ */
+export class SetRedirectUrlAndNavigateAction implements Action {
+  public type: string = AuthActionTypes.SET_REDIRECT_URL_AND_NAVIGATE;
+  payload: {
+    redirectUrl: string;
+    navigateUrl: string;
+  };
+
+  constructor(redirectUrl: string, navigateUrl: string) {
+    this.payload = { redirectUrl, navigateUrl };
+  }
+}
+
 /**
  * Start loading for a hard redirect
  * @class StartHardRedirectLoadingAction

src/app/core/auth/auth.effects.ts

@@ -79,6 +79,7 @@ import {
   RetrieveAuthMethodsErrorAction,
   RetrieveAuthMethodsSuccessAction,
   RetrieveTokenAction,
+  SetRedirectUrlAndNavigateAction,
   SetUserAsIdleAction,
 } from './auth.actions';
 // import services
@@ -164,6 +165,13 @@ export class AuthEffects {
     }),
   ), { dispatch: false });
 
+  public redirectAndNavigate$: Observable<Action> = createEffect(() => this.actions$
+    .pipe(ofType(AuthActionTypes.SET_REDIRECT_URL_AND_NAVIGATE),
+      tap((action: SetRedirectUrlAndNavigateAction) => this.router.navigate([decodeURIComponent(action.payload.navigateUrl)])),
+    ),
+  { dispatch: false },
+  );
+
   // It means "reacts to this action but don't send another"
   public authenticatedError$: Observable<Action> = createEffect(() => this.actions$.pipe(
     ofType(AuthActionTypes.AUTHENTICATED_ERROR),

src/app/core/auth/auth.reducer.ts

@@ -17,6 +17,7 @@ import {
   RetrieveAuthMethodsSuccessAction,
   SetAuthCookieStatus,
   SetRedirectUrlAction,
+  SetRedirectUrlAndNavigateAction,
 } from './auth.actions';
 import { AuthMethod } from './models/auth.method';
 import { AuthMethodType } from './models/auth.method-type';
@@ -267,6 +268,11 @@ export function authReducer(state: any = initialState, action: AuthActions): Aut
         redirectUrl: (action as SetRedirectUrlAction).payload,
       });
 
+    case AuthActionTypes.SET_REDIRECT_URL_AND_NAVIGATE:
+      return Object.assign({}, state, {
+        redirectUrl: (action as SetRedirectUrlAndNavigateAction).payload.redirectUrl,
+      });
+
     case AuthActionTypes.REDIRECT_AFTER_LOGIN_SUCCESS:
       return Object.assign({}, state, {
         loading: true,

src/app/core/auth/auth.service.ts

@@ -64,6 +64,7 @@ import {
   ResetAuthenticationMessagesAction,
   SetAuthCookieStatus,
   SetRedirectUrlAction,
+  SetRedirectUrlAndNavigateAction,
   SetUserAsIdleAction,
   UnsetUserAsIdleAction,
 } from './auth.actions';
@@ -556,15 +557,19 @@ export class AuthService {
   /**
    * Set redirect url
    */
-  setRedirectUrl(url: string) {
+  setRedirectUrl(redirectUrl: string, navigateUrl?: string) {
     // Add 1 hour to the current date
     const expireDate = Date.now() + (1000 * 60 * 60);
 
     // Set the cookie expire date
     const expires = new Date(expireDate);
-    const options: CookieAttributes = { expires: expires };
-    this.storage.set(REDIRECT_COOKIE, url, options);
-    this.store.dispatch(new SetRedirectUrlAction(isNotUndefined(url) ? url : ''));
+    const options: Cookies.CookieAttributes = { expires: expires };
+    this.storage.set(REDIRECT_COOKIE, redirectUrl, options);
+    if (hasValue(navigateUrl)) {
+      this.store.dispatch(new SetRedirectUrlAndNavigateAction(isNotUndefined(redirectUrl) ? redirectUrl : '', navigateUrl));
+    } else {
+      this.store.dispatch(new SetRedirectUrlAction(isNotUndefined(redirectUrl) ? redirectUrl : ''));
+    }
   }
 
   /**

src/app/core/shared/authorized.operators.ts

@@ -47,8 +47,11 @@ export const redirectOn4xx = <T>(router: Router, authService: AuthService) =>
               router.navigateByUrl(getForbiddenRoute(), { skipLocationChange: true });
               return false;
             } else {
-              authService.setRedirectUrl(router.url);
-              router.navigateByUrl('login');
+              // During a resolver the navigation hasn't committed yet, so router.url still
+              // points to the previous URL (e.g. '/'). Use the in-flight navigation's URL
+              // when available, falling back to router.url for component-level calls.
+              const redirectUrl = router.getCurrentNavigation()?.extractedUrl?.toString() ?? router.url;
+              authService.setRedirectUrl(redirectUrl, 'login');
               return false;
             }
           }

src/app/core/shared/operators.spec.ts

@@ -190,7 +190,7 @@ describe('Core Module - RxJS Operators', () => {
       testScheduler = new TestScheduler((actual, expected) => {
         expect(actual).toEqual(expected);
       });
-      router = jasmine.createSpyObj('router', ['navigateByUrl']);
+      router = jasmine.createSpyObj('router', ['navigateByUrl', 'getCurrentNavigation']);
       authService = jasmine.createSpyObj('authService', {
         isAuthenticated: observableOf(true),
         setRedirectUrl: {},
@@ -277,7 +277,6 @@ describe('Core Module - RxJS Operators', () => {
           expectObservable(source.pipe(redirectOn4xx(router, authService))).toBe(expected, values);
           flush();
           expect(authService.setRedirectUrl).toHaveBeenCalled();
-          expect(router.navigateByUrl).toHaveBeenCalledWith('login');
         });
       });
 
@@ -291,7 +290,6 @@ describe('Core Module - RxJS Operators', () => {
           expectObservable(source.pipe(redirectOn4xx(router, authService))).toBe(expected, values);
           flush();
           expect(authService.setRedirectUrl).toHaveBeenCalled();
-          expect(router.navigateByUrl).toHaveBeenCalledWith('login');
         });
       });
     });