curtain-web-api 1.0.6 → 1.0.8

package/.idea/curtain-web-api.iml

@@ -6,6 +6,8 @@
       <excludeFolder url="file://$MODULE_DIR$/temp" />
       <excludeFolder url="file://$MODULE_DIR$/tmp" />
       <excludeFolder url="file://$MODULE_DIR$/node_modules" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+      <excludeFolder url="file://$MODULE_DIR$/curtainuser" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />

package/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

package/README.md

@@ -1,4 +1,4 @@
-# Curtain Web API
+ # Curtain Web API
 ---
 
 This is a node.js package used to interact with the Curtain Web REST API.

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

@@ -32,7 +32,7 @@ export declare class CurtainWebAPI {
     getSiteProperties(): Promise<import("axios").AxiosResponse<any, any>>;
     saveDataFilterList(name: string, data: string): Promise<import("axios").AxiosResponse<any, any>>;
     getDataFilterListByID(id: number): Promise<import("axios").AxiosResponse<any, any>>;
-    getDataFilterList(categoryName?: string): Promise<import("axios").AxiosResponse<any, any>>;
+    getDataFilterList(categoryName?: string, searchTerm?: string, limit?: number): Promise<import("axios").AxiosResponse<any, any>>;
     deleteDataFilterList(id: number): Promise<import("axios").AxiosResponse<any, any>>;
     downloadStats(): Promise<import("axios").AxiosResponse<any, any>>;
 }

package/build/classes/curtain-api.js

@@ -67,6 +67,27 @@ class CurtainWebAPI {
         this.userInfoURL = baseURL + "user/";
         this.axiosInstance.interceptors.request.use((config) => {
             if (config.url) {
+                /*if (!this.checkIfRefreshTokenExpired() && this.user.loginStatus) {
+                    if (config.url !== this.refereshURL &&
+                        config.url !== this.loginURL &&
+                        config.url !== this.orcidLoginURL) {
+                        if (!this.checkIfRefreshTokenExpired() && this.user.loginStatus) {
+                            console.log("refreshing token")
+                            if (!this.isRefreshing) {
+                                return this.refresh().then((response) => {
+                                    this.isRefreshing = false;
+                                    return this.axiosInstance.request(config);
+                                }).catch((error) => {
+                                    this.isRefreshing = false;
+                                    this.user = new User();
+                                    return error;
+                                });
+                            }
+                        }
+                    }
+                } else {
+                    this.user = new User();
+                }*/
                 if (
                 //config.url === this.refereshURL ||
                 config.url === this.logoutURL ||
@@ -116,6 +137,7 @@ class CurtainWebAPI {
             this.user.access_token = response.data.access;
             this.user.refresh_token = response.data.refresh;
             this.user.loginStatus = true;
+            this.user.saveIntoDB().then();
             return this.getUserInfo();
         });
     }
@@ -163,6 +185,7 @@ class CurtainWebAPI {
             this.user.access_token = response.data.access;
             this.user.refresh_token = response.data.refresh;
             this.user.loginStatus = true;
+            this.user.saveIntoDB().then();
             return response;
         }).then((response) => {
             return this.getUserInfo();
@@ -309,12 +332,15 @@ class CurtainWebAPI {
             return response;
         });
     }
-    getDataFilterList(categoryName = "") {
+    getDataFilterList(categoryName = "", searchTerm = "", limit = 99999999) {
         let params = new URLSearchParams();
         if (categoryName != "") {
             params.append("name", categoryName);
         }
-        params.append("limit", `${99999999}`);
+        if (searchTerm != "" && searchTerm != undefined) {
+            params.append("data", searchTerm);
+        }
+        params.append("limit", limit.toString());
         return this.axiosInstance.get(this.baseURL + "data_filter_list/", { responseType: "json", params });
     }
     deleteDataFilterList(id) {

package/package.json

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

package/src/classes/curtain-api.ts

@@ -43,6 +43,27 @@ export class CurtainWebAPI {
         this.userInfoURL = baseURL + "user/";
         this.axiosInstance.interceptors.request.use((config) => {
             if (config.url) {
+                /*if (!this.checkIfRefreshTokenExpired() && this.user.loginStatus) {
+                    if (config.url !== this.refereshURL &&
+                        config.url !== this.loginURL &&
+                        config.url !== this.orcidLoginURL) {
+                        if (!this.checkIfRefreshTokenExpired() && this.user.loginStatus) {
+                            console.log("refreshing token")
+                            if (!this.isRefreshing) {
+                                return this.refresh().then((response) => {
+                                    this.isRefreshing = false;
+                                    return this.axiosInstance.request(config);
+                                }).catch((error) => {
+                                    this.isRefreshing = false;
+                                    this.user = new User();
+                                    return error;
+                                });
+                            }
+                        }
+                    }
+                } else {
+                    this.user = new User();
+                }*/
                 if (
                     //config.url === this.refereshURL ||
                     config.url === this.logoutURL ||
@@ -94,6 +115,7 @@ export class CurtainWebAPI {
             this.user.access_token = response.data.access;
             this.user.refresh_token = response.data.refresh;
             this.user.loginStatus = true;
+            this.user.saveIntoDB().then();
             return this.getUserInfo();
         });
     }
@@ -147,6 +169,7 @@ export class CurtainWebAPI {
             this.user.access_token = response.data.access;
             this.user.refresh_token = response.data.refresh;
             this.user.loginStatus = true;
+            this.user.saveIntoDB().then();
             return response;
         }).then((response) => {
             return this.getUserInfo();
@@ -313,12 +336,16 @@ export class CurtainWebAPI {
         });
     }
 
-    getDataFilterList(categoryName: string = "") {
+    getDataFilterList(categoryName: string = "", searchTerm: string = "", limit: number = 99999999) {
         let params = new URLSearchParams();
         if (categoryName != "") {
             params.append("name", categoryName)
         }
-        params.append("limit", `${99999999}`)
+        if (searchTerm != "" && searchTerm != undefined) {
+            params.append("data", searchTerm)
+        }
+
+        params.append("limit", limit.toString())
         return this.axiosInstance.get(this.baseURL + "data_filter_list/", {responseType:"json", params})
     }