@oat-sa/tao-core-ui 3.1.1 → 3.2.0

package/dist/taskQueue/taskQueueModel.js

@@ -449,19 +449,39 @@ define(['jquery', 'lodash', 'i18n', 'core/eventifier', 'core/polling', 'core/dat
           if (!config.url || !config.url.download) {
             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);
+                  }
+                });
+              });
+            }
           });
         },
         /**

package/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": {

package/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);
+                            }
+                        });
+                    });
+                }
             });
         },