Merge branch 'master' into VM/RED-2614

angular.json

@@ -1,4 +1,7 @@
 {
+  "cli": {
+    "analytics": false
+  },
   "version": 1,
   "projects": {
     "common-ui": {

apps/red-ui/src/app/modules/upload-download/services/file-download.service.ts

@@ -7,9 +7,9 @@ import {
     IPrepareDownloadRequest,
     IRemoveDownloadRequest,
 } from '@red/domain';
-import { interval, Observable } from 'rxjs';
+import { Observable } from 'rxjs';
 import { ConfigService } from '@services/config.service';
-import { filter, map, switchMap, tap, withLatestFrom } from 'rxjs/operators';
+import { map, switchMap, tap } from 'rxjs/operators';
 import { KeycloakService } from 'keycloak-angular';
 import { UserService } from '@services/user.service';
 import { EntitiesService, List, mapEach, RequiredParam, Validate } from '@iqser/common-ui';
@@ -44,11 +44,12 @@ export class FileDownloadService extends EntitiesService<DownloadStatus, IDownlo
     }
 
     async performDownload(status: DownloadStatus) {
-        const token = await this._keycloakService.getToken();
         const anchor = document.createElement('a');
-        anchor.href = `${this._configService.values.API_URL}/async/download?access_token=${encodeURIComponent(
+        anchor.href = `${this._configService.values.API_URL}/async/download?storageId=${encodeURIComponent(status.storageId)}`;
-            token,
+        if (!this._configService.values.USE_SESSION_FOR_DOWNLOAD) {
-        )}&storageId=${encodeURIComponent(status.storageId)}`;
+            const token = await this._keycloakService.getToken();
+            anchor.href = anchor.href + `&access_token=${encodeURIComponent(token)}`;
+        }
         anchor.download = status.filename;
         anchor.target = '_blank';
 

apps/red-ui/src/app/utils/constants.ts

@@ -1 +1 @@
-export const CHANGED_CHECK_INTERVAL = 3000;
+export const CHANGED_CHECK_INTERVAL = 5000;

apps/red-ui/src/assets/config/config.json

@@ -19,5 +19,6 @@
   "OAUTH_IDP_HINT": null,
   "OAUTH_URL": "https://aks-staging.iqser.cloud/auth/realms/redaction",
   "RECENT_PERIOD_IN_HOURS": 24,
-  "SELECTION_MODE": "structural"
+  "SELECTION_MODE": "structural",
+  "USE_SESSION_FOR_DOWNLOAD": false
 }

docker/red-ui/docker-entrypoint.sh

@@ -24,6 +24,8 @@ OAUTH_URL="${OAUTH_URL:-/auth}"
 RECENT_PERIOD_IN_HOURS="${RECENT_PERIOD_IN_HOURS:-24}"
 SELECTION_MODE="${SELECTION_MODE:-structural}"
 
+USE_SESSION_FOR_DOWNLOAD="${USE_SESSION_FOR_DOWNLOAD:-false}"
+
 
 echo '{
           "ADMIN_CONTACT_NAME":"'"$ADMIN_CONTACT_NAME"'",
@@ -45,7 +47,8 @@ echo '{
           "OAUTH_IDP_HINT":"'"$OAUTH_IDP_HINT"'",
           "OAUTH_URL":"'"$OAUTH_URL"'",
           "RECENT_PERIOD_IN_HOURS":'"$RECENT_PERIOD_IN_HOURS"',
-          "SELECTION_MODE":"'"$SELECTION_MODE"'"
+          "SELECTION_MODE":"'"$SELECTION_MODE"'",
+          "USE_SESSION_FOR_DOWNLOAD":'"$USE_SESSION_FOR_DOWNLOAD"'
        }' > /usr/share/nginx/html/ui/assets/config/config.json
 
 echo 'Env variables: '

package.json

@@ -1,6 +1,6 @@
 {
   "name": "redaction",
-  "version": "3.173.0",
+  "version": "3.176.0",
   "private": true,
   "license": "MIT",
   "scripts": {