ufal/fe-email-restricted-download (#430)

* ClarinAuthorization passed, but vanilla not because of vanilla check - I added dtoken into vanilla authorization url and because of that the vanilla authorization will be passed.

* Added message for the expiration token message - it was hardcoded.

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

@@ -85,7 +85,9 @@ export class ClarinBitstreamDownloadPageComponent implements OnInit {
         this.requestService.send(headRequest);
 
         const clarinIsAuthorized$ = this.rdbService.buildFromRequestUUID(requestId);
-        const isAuthorized$ = this.authorizationService.isAuthorized(FeatureID.CanDownload, isNotEmpty(bitstream) ? bitstream.self : undefined);
+        // Clarin authorization will check dtoken parameter from the request
+        const dtoken = isNotEmpty(this.dtoken) ? '?dtoken=' + this.dtoken : '';
+        const isAuthorized$ = this.authorizationService.isAuthorized(FeatureID.CanDownload, isNotEmpty(bitstream) ? bitstream.self + dtoken : undefined);
         const isLoggedIn$ = this.auth.isAuthenticated();
         return observableCombineLatest([clarinIsAuthorized$, isAuthorized$, isLoggedIn$, observableOf(bitstream)]);
       }),

src/app/bitstream-page/clarin-bitstream-token-expired/clarin-bitstream-token-expired.component.html

@@ -1,5 +1,5 @@
 <div class="jumbotron jumbotron-fluid bg-clarin-red rounded">
   <div class="container">
-    <h1 class="display-4 px-3 py-3">The download token is expired, you will be redirected to the download page.</h1>
+    <h1 class="display-4 px-3 py-3">{{'clarin.bitstream.expired.dtoken.message' | translate}}</h1>
   </div>
 </div>

src/assets/i18n/cs.json5

@@ -1039,6 +1039,10 @@
 
   // "clarin.license.agreement.notification.cannot.send.email": "Error: cannot send the email.",
   "clarin.license.agreement.notification.cannot.send.email": "Error: cannot send the email.",
+
+  // "clarin.bitstream.expired.dtoken.message": "The download token is expired, you will be redirected to the download page.",
+  "clarin.bitstream.expired.dtoken.message": "Platnost tokenu pro stahování vypršel, budete přesměrováni na stránku stahování.",
+
   // "bitstream.download.page.back": "Back" ,
   "bitstream.download.page.back" : "Zpět",
 

src/assets/i18n/en.json5

@@ -699,6 +699,9 @@
   "clarin.license.agreement.notification.check.email": "You will receive email with download link.",
 
   "clarin.license.agreement.notification.cannot.send.email": "Error: cannot send the email.",
+
+  "clarin.bitstream.expired.dtoken.message": "The download token is expired, you will be redirected to the download page.",
+
   "bitstream.download.page.back": "Back" ,