Convert navigateToUrl to hard redirect on user agreement page

Author: Maciej Kleban

src/app/info/end-user-agreement/end-user-agreement.component.spec.ts

@@ -1,7 +1,9 @@
 import { NO_ERRORS_SCHEMA } from '@angular/core';
 import {
   ComponentFixture,
+  fakeAsync,
   TestBed,
+  tick,
   waitForAsync,
 } from '@angular/core/testing';
 import { By } from '@angular/platform-browser';
@@ -13,7 +15,9 @@ import { LogOutAction } from '@dspace/core/auth/auth.actions';
 import { AuthService } from '@dspace/core/auth/auth.service';
 import { EndUserAgreementService } from '@dspace/core/end-user-agreement/end-user-agreement.service';
 import { NotificationsService } from '@dspace/core/notification-system/notifications.service';
+import { HardRedirectService } from '@dspace/core/services/hard-redirect.service';
 import { ActivatedRouteStub } from '@dspace/core/testing/active-router.stub';
+import { URLCombiner } from '@dspace/core/url-combiner/url-combiner';
 import { Store } from '@ngrx/store';
 import { TranslateModule } from '@ngx-translate/core';
 import { of } from 'rxjs';
@@ -32,11 +36,14 @@ describe('EndUserAgreementComponent', () => {
   let store;
   let router: Router;
   let route: ActivatedRoute;
+  let hardRedirectService: HardRedirectService;
 
   let redirectUrl;
+  let baseUrl;
 
   function init() {
     redirectUrl = 'redirect/url';
+    baseUrl = 'https://dspace.test';
 
     endUserAgreementService = jasmine.createSpyObj('endUserAgreementService', {
       hasCurrentUserOrCookieAcceptedAgreement: of(false),
@@ -53,6 +60,15 @@ describe('EndUserAgreementComponent', () => {
         redirect: redirectUrl,
       }),
     }) as any;
+    hardRedirectService = jasmine.createSpyObj('hardRedirectService', {
+      redirect: null,
+      getBaseUrl: baseUrl,
+    });
+
+    endUserAgreementService = jasmine.createSpyObj('endUserAgreementService', {
+      hasCurrentUserOrCookieAcceptedAgreement: of(false),
+      setUserAcceptedAgreement: of(true),
+    });
   }
 
   beforeEach(waitForAsync(() => {
@@ -66,6 +82,7 @@ describe('EndUserAgreementComponent', () => {
         { provide: Store, useValue: store },
         { provide: Router, useValue: router },
         { provide: ActivatedRoute, useValue: route },
+        { provide: HardRedirectService, useValue: hardRedirectService },
       ],
       schemas: [NO_ERRORS_SCHEMA],
     })
@@ -128,9 +145,10 @@ describe('EndUserAgreementComponent', () => {
           expect(notificationsService.success).toHaveBeenCalled();
         });
 
-        it('should navigate the user to the redirect url', () => {
-          expect(router.navigateByUrl).toHaveBeenCalledWith(redirectUrl);
-        });
+        it('should navigate the user to the redirect url', fakeAsync(() => {
+          tick();
+          expect(hardRedirectService.redirect).toHaveBeenCalledWith(new URLCombiner(baseUrl, redirectUrl).toString());
+        }));
       });
 
       describe('when accepting the agreement was unsuccessful', () => {

src/app/info/end-user-agreement/end-user-agreement.component.ts

@@ -11,6 +11,8 @@ import { LogOutAction } from '@dspace/core/auth/auth.actions';
 import { AuthService } from '@dspace/core/auth/auth.service';
 import { EndUserAgreementService } from '@dspace/core/end-user-agreement/end-user-agreement.service';
 import { NotificationsService } from '@dspace/core/notification-system/notifications.service';
+import { HardRedirectService } from '@dspace/core/services/hard-redirect.service';
+import { URLCombiner } from '@dspace/core/url-combiner/url-combiner';
 import { isNotEmpty } from '@dspace/shared/utils/empty.util';
 import { Store } from '@ngrx/store';
 import {
@@ -55,7 +57,8 @@ export class EndUserAgreementComponent implements OnInit {
               protected authService: AuthService,
               protected store: Store<AppState>,
               protected router: Router,
-              protected route: ActivatedRoute) {
+              protected route: ActivatedRoute,
+              protected hardRedirectService: HardRedirectService) {
   }
 
   /**
@@ -92,7 +95,8 @@ export class EndUserAgreementComponent implements OnInit {
       take(1),
     ).subscribe((redirectUrl) => {
       if (isNotEmpty(redirectUrl)) {
-        this.router.navigateByUrl(decodeURIComponent(redirectUrl));
+        const fullRedirectUrl = new URLCombiner(this.hardRedirectService.getBaseUrl(), decodeURIComponent(redirectUrl));
+        this.hardRedirectService.redirect(fullRedirectUrl.toString());
       }
     });
   }

src/assets/i18n/en.json5

@@ -7469,7 +7469,7 @@
   "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfDataset.added.local-entity": "Successfully added local organization to the selection",
 
   "submission.sections.describe.relationship-lookup.external-source.import-modal.isOrgUnitOfDataset.added.new-entity": "Successfully imported and added external organization to the selection",
-  
+
   "admin.edit-cms-metadata.success": "Metadata successfully updated",
 
   "admin.edit-cms-metadata.back-button": "Back",