Merge branch 'release-3.2.0'

oat-sa · Mar 1, 2024 · aea29b2 · aea29b2
2 parents bd10e0e + 20603e3
commit aea29b2
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 14 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@oat-sa/tao-core-ui",
-    "version": "3.1.1",
+    "version": "3.2.0",
     "displayName": "TAO Core UI",
     "description": "UI libraries of TAO",
     "scripts": {

diff --git a/src/taskQueue/taskQueueModel.js b/src/taskQueue/taskQueueModel.js
@@ -496,17 +496,40 @@ export default function taskQueueModel(config) {
                 throw new TypeError('config.url.download is not configured while download() is being called');
             }
 
-            return new Promise(function(resolve, reject) {
-                $.fileDownload(config.url.download, {
-                    httpMethod: 'POST',
-                    data: { taskId: taskId },
-                    successCallback: function(result) {
-                        resolve(result);
-                    },
-                    failCallback: function(err) {
-                        reject(err);
-                    }
-                });
+            return this.getCached(taskId).then(function (taskData) {
+                let redirectUrl = (taskData || {}).redirectUrl;
+
+                if (redirectUrl) {
+                    return new Promise(function (resolve) {
+                        $.fileDownload(redirectUrl, {
+                            httpMethod: 'GET',
+                            data: {},
+                            successCallback: function (result) {
+                                resolve(result);
+                            },
+                            failCallback: function (err) {
+                                resolve(err);
+                                // Security issue : Failed to read a named property 'document' from 'Window':
+                                // Blocked a frame with origin "https://[domain]" from accessing a cross-origin frame.
+                            }
+                        });
+                    });
+                } else {
+                    return new Promise(function (resolve, reject) {
+                        $.fileDownload(config.url.download, {
+                            httpMethod: 'POST',
+                            data: {
+                                taskId: taskId
+                            },
+                            successCallback: function (result) {
+                                resolve(result);
+                            },
+                            failCallback: function (err) {
+                                reject(err);
+                            }
+                        });
+                    });
+                }
             });
         },