curtain-web-api 1.0.19 → 1.0.21

package/build/classes/curtain-api.d.ts

@@ -7,6 +7,7 @@ export declare class CurtainWebAPI {
     refereshURL: string;
     orcidLoginURL: string;
     userInfoURL: string;
+    curtainURL: string;
     user: User;
     isRefreshing: boolean;
     axiosInstance: import("axios").AxiosInstance;

package/build/classes/curtain-api.js

@@ -55,6 +55,7 @@ class CurtainWebAPI {
         this.refereshURL = "";
         this.orcidLoginURL = "";
         this.userInfoURL = "";
+        this.curtainURL = "";
         this.user = new curtain_user_1.User();
         this.isRefreshing = false;
         this.axiosInstance = axios_1.default.create();
@@ -65,6 +66,7 @@ class CurtainWebAPI {
         this.refereshURL = baseURL + "token/refresh/";
         this.orcidLoginURL = baseURL + "rest-auth/orcid/";
         this.userInfoURL = baseURL + "user/";
+        this.curtainURL = baseURL + "curtain/";
         this.axiosInstance.interceptors.request.use((config) => {
             if (config.url) {
                 /*if (!this.checkIfRefreshTokenExpired() && this.user.loginStatus) {
@@ -92,7 +94,7 @@ class CurtainWebAPI {
                 //config.url === this.refereshURL ||
                 config.url === this.logoutURL ||
                     config.url === this.userInfoURL ||
-                    config.url.startsWith(this.baseURL + "curtain/") ||
+                    config.url.startsWith(this.curtainURL) ||
                     config.url.startsWith(this.baseURL + "data_filter_list/")) {
                     if (this.user.loginStatus) {
                         config.headers["Authorization"] = "Bearer " + this.user.access_token;
@@ -231,8 +233,15 @@ class CurtainWebAPI {
         let headers = new axios_1.AxiosHeaders();
         headers["Accept"] = "application/json";
         if (onDownloadProgress !== undefined) {
-            return this.axiosInstance.get(this.baseURL + "curtain/" + id + "/download/token=" + token + "/", { responseType: "json", onDownloadProgress: onDownloadProgress }).then((response) => {
-                return response;
+            return this.axiosInstance.get(this.baseURL + "curtain/" + id + "/download/token=" + token + "/", { responseType: "json" }).then((response) => {
+                if ("url" in response.data) {
+                    return this.axiosInstance.get(response.data.url, { responseType: "json", onDownloadProgress: onDownloadProgress }).then((response) => {
+                        return response;
+                    });
+                }
+                else {
+                    return response;
+                }
             });
         }
         return this.axiosInstance.get(this.baseURL + "curtain/" + id + "/download/token=" + token + "/", { responseType: "json" }).then((response) => {
@@ -396,7 +405,7 @@ class CurtainWebAPI {
         let headers = new axios_1.AxiosHeaders();
         headers["Accept"] = "application/json";
         headers["Content-Type"] = "application/json";
-        return axios_1.default.post(this.baseURL + "primitive-stats-test/", { data, type }, { headers: headers, responseType: "json" }).then((response) => {
+        return axios_1.default.post(this.baseURL + "primitive-stats-test/", { data, type }).then((response) => {
             return response;
         });
     }

package/curtainuser/LOG

@@ -1 +1 @@
-2023/04/16-14:57:22.789 353c Delete type=3 #1
+2023/07/26-14:29:40.802 c4f4 Delete type=3 #1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "curtain-web-api",
-  "version": "1.0.19",
+  "version": "1.0.21",
   "description": "",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",

package/src/classes/curtain-api.ts

@@ -29,6 +29,7 @@ export class CurtainWebAPI {
     refereshURL: string = "";
     orcidLoginURL: string = "";
     userInfoURL: string = "";
+    curtainURL: string = "";
     user: User = new User();
     isRefreshing: boolean = false;
     axiosInstance = axios.create()
@@ -41,6 +42,7 @@ export class CurtainWebAPI {
         this.refereshURL = baseURL + "token/refresh/";
         this.orcidLoginURL = baseURL + "rest-auth/orcid/";
         this.userInfoURL = baseURL + "user/";
+        this.curtainURL = baseURL + "curtain/"
         this.axiosInstance.interceptors.request.use((config) => {
             if (config.url) {
                 /*if (!this.checkIfRefreshTokenExpired() && this.user.loginStatus) {
@@ -68,7 +70,7 @@ export class CurtainWebAPI {
                     //config.url === this.refereshURL ||
                     config.url === this.logoutURL ||
                     config.url === this.userInfoURL ||
-                    config.url.startsWith(this.baseURL + "curtain/") ||
+                    config.url.startsWith(this.curtainURL) ||
                     config.url.startsWith(this.baseURL + "data_filter_list/")) {
                     if (this.user.loginStatus) {
                         config.headers["Authorization"] = "Bearer " + this.user.access_token;
@@ -219,8 +221,14 @@ export class CurtainWebAPI {
         let headers = new AxiosHeaders();
         headers["Accept"] = "application/json";
         if (onDownloadProgress !== undefined) {
-            return this.axiosInstance.get(this.baseURL + "curtain/" + id + "/download/token=" + token + "/", {responseType:"json", onDownloadProgress: onDownloadProgress}).then((response) => {
-                return response;
+            return this.axiosInstance.get(this.baseURL + "curtain/" + id + "/download/token=" + token + "/", {responseType:"json"}).then((response) => {
+                if ("url" in response.data) {
+                    return this.axiosInstance.get(response.data.url, {responseType: "json", onDownloadProgress: onDownloadProgress}).then((response) => {
+                        return response;
+                    })
+                } else {
+                    return response;
+                }
             })
         }
         return this.axiosInstance.get(this.baseURL + "curtain/" + id + "/download/token=" + token + "/", {responseType:"json"}).then((response) => {
@@ -411,7 +419,7 @@ export class CurtainWebAPI {
         let headers = new AxiosHeaders();
         headers["Accept"] = "application/json";
         headers["Content-Type"] = "application/json";
-        return axios.post(this.baseURL + "primitive-stats-test/", {data,type}, {headers: headers, responseType: "json"}).then((response) => {
+        return axios.post(this.baseURL + "primitive-stats-test/", {data,type},  ).then((response) => {
             return response;
         });
     }