ufal/fe-download-bitstream-back-to-item

src/aai/aai.js

@@ -72,6 +72,11 @@
               case 'local':
                 // DiscoJuice.UI.setScreen(opts.localauth);
                 // jQuery('input#login').focus();
+                var expires = new Date();
+                expires.setTime(expires.getTime() + 1 * 24 * 60 * 60 * 1000);
+                var cookieString = "dsRedirectUrl=" + getCookie('dsRedirectUrl') + ";expires=" + expires.toUTCString() + ";path=/";
+                document.cookie = cookieString;
+
                 window.location = window.location.origin + (namespace === '' ? namespace : '/' + namespace) + "/login?redirectUrl=" + window.location.href;
                 break;
               //case 'saml':
@@ -97,6 +102,22 @@
     };
   }
 
+  function getCookie(name) {
+    var cookies = document.cookie.split(';');
+
+    for (var i = 0; i < cookies.length; i++) {
+      var cookie = cookies[i].trim();
+      // Check if this cookie has the specified name
+      if (cookie.startsWith(name + '=')) {
+        // Extract and return the cookie value
+        return cookie.substring(name.length + 1);
+      }
+    }
+
+    // Return null if the cookie with the specified name is not found
+    return null;
+  }
+
   if (!window.aai) {
     window.aai = new AAI();
   }

src/app/bitstream-page/clarin-bitstream-download-page/clarin-bitstream-download-page.component.ts

@@ -126,10 +126,10 @@ export class ClarinBitstreamDownloadPageComponent implements OnInit {
       // bitstreamURL = 'http://localhost:8080/server/api/core/bitstreams/d9a41f84-a470-495a-8821-20e0a18e9276/content';
       if ((isAuthorized || isAuthorizedByClarin) && isLoggedIn && isNotEmpty(fileLink)) {
         this.downloadStatus.next(RequestEntryState.Success);
-        this.hardRedirectService.redirect(fileLink);
+        window.location.replace(fileLink);
       } else if ((isAuthorized || isAuthorizedByClarin) && !isLoggedIn) {
         this.downloadStatus.next(RequestEntryState.Success);
-        this.hardRedirectService.redirect(bitstreamURL);
+        window.location.replace(bitstreamURL);
       } else if (!(isAuthorized || isAuthorizedByClarin) && isLoggedIn &&
         this.downloadStatus.value === RequestEntryState.Error) {
         // this.downloadStatus is `ERROR` - no CLARIN exception is thrown up

src/app/shared/log-in/methods/password/log-in-password.component.ts

@@ -1,4 +1,4 @@
-import { map } from 'rxjs/operators';
+import {map} from 'rxjs/operators';
 import { Component, Inject, OnInit } from '@angular/core';
 import { FormBuilder, FormGroup, Validators } from '@angular/forms';
 
@@ -138,6 +138,7 @@ export class LogInPasswordComponent implements OnInit {
 
     // Load `dspace.ui.url` into `baseUrl` property.
     await this.assignBaseUrl();
+    this.toggleDiscojuiceLogin();
     void this.setUpRedirectUrl();
   }
 
@@ -155,13 +156,14 @@ export class LogInPasswordComponent implements OnInit {
     }
 
     // Store the `redirectUrl` value from the url and then remove that value from url.
-    if (isNotEmpty(this.route.snapshot.queryParams?.redirectUrl)) {
-      // Overwrite `this.redirectUrl` only if it's not stored in the authService `redirectUrl` property.
-      if (isEmpty(this.redirectUrl)) {
-        this.redirectUrl = this.route.snapshot.queryParams?.redirectUrl;
-      }
-    } else {
-      // Pop up discojuice login e.g. when the token is expired or the user is trying to download restricted bitstream.
+    // Overwrite `this.redirectUrl` only if it's not stored in the authService `redirectUrl` property.
+    if (isEmpty(this.redirectUrl)) {
+      this.redirectUrl = this.route.snapshot.queryParams?.redirectUrl;
+    }
+  }
+
+  private toggleDiscojuiceLogin() {
+    if (isEmpty(this.route.snapshot.queryParams?.redirectUrl)) {
       this.popUpDiscoJuiceLogin();
     }
   }
@@ -191,10 +193,16 @@ export class LogInPasswordComponent implements OnInit {
     email.trim();
     password.trim();
 
-    // Local authentication redirects to /login page and the user should be redirected to the page from where
-    // was the login initiated.
     if (!this.isStandalonePage || isNotEmpty(this.redirectUrl)) {
-      this.authService.setRedirectUrl(this.redirectUrl.replace(this.baseUrl, ''));
+      // Create a URLSearchParams object
+      const urlParams = new URLSearchParams(this.redirectUrl.split('?')[1]);
+      // Get the value of the 'redirectUrl' parameter
+      let redirectUrl = urlParams.get('redirectUrl');
+      if (isEmpty(redirectUrl)) {
+        redirectUrl = this.redirectUrl;
+      }
+
+      this.authService.setRedirectUrl(redirectUrl.replace(this.baseUrl, ''));
     } else {
       this.authService.setRedirectUrlIfNotSet('/');
     }