curtain-web-api 1.0.4 → 1.0.5

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

@@ -31,7 +31,8 @@ export declare class CurtainWebAPI {
     getCurtainLinks(username: string, sessionDescription?: string, offset?: number, sessionType?: string): Promise<import("axios").AxiosResponse<any, any>>;
     getSiteProperties(): Promise<import("axios").AxiosResponse<any, any>>;
     saveDataFilterList(name: string, data: string): Promise<import("axios").AxiosResponse<any, any>>;
-    getDataFilterList(id: number): Promise<import("axios").AxiosResponse<any, any>>;
+    getDataFilterListByID(id: number): Promise<import("axios").AxiosResponse<any, any>>;
+    getDataFilterList(categoryName?: string): 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

@@ -90,6 +90,7 @@ class CurtainWebAPI {
                     error.config.url !== this.loginURL &&
                     error.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;
@@ -301,13 +302,21 @@ class CurtainWebAPI {
             return response;
         });
     }
-    getDataFilterList(id) {
+    getDataFilterListByID(id) {
         let headers = new axios_1.AxiosHeaders();
         headers["Accept"] = "application/json";
         return this.axiosInstance.get(this.baseURL + "data_filter_list/" + id + "/", { headers: headers, responseType: "json" }).then((response) => {
             return response;
         });
     }
+    getDataFilterList(categoryName = "") {
+        let params = new URLSearchParams();
+        if (categoryName != "") {
+            params.append("name", categoryName);
+        }
+        params.append("limit", `${99999999}`);
+        return this.axiosInstance.get(this.baseURL + "data_filter_list/", { responseType: "json", params });
+    }
     deleteDataFilterList(id) {
         let headers = new axios_1.AxiosHeaders();
         headers["Accept"] = "application/json";

package/curtainuser/LOG

@@ -1 +1 @@
-2023/04/15-17:56:07.976 99c Delete type=3 #1
+2023/04/16-14:57:22.789 353c Delete type=3 #1

package/package.json

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

package/src/classes/curtain-api.ts

@@ -67,6 +67,7 @@ export class CurtainWebAPI {
                     error.config.url !== this.loginURL &&
                     error.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;
@@ -304,7 +305,7 @@ export class CurtainWebAPI {
         });
     }
 
-    getDataFilterList(id: number) {
+    getDataFilterListByID(id: number) {
         let headers = new AxiosHeaders();
         headers["Accept"] = "application/json";
         return this.axiosInstance.get(this.baseURL + "data_filter_list/" + id + "/", {headers: headers, responseType:"json"}).then((response) => {
@@ -312,6 +313,15 @@ export class CurtainWebAPI {
         });
     }
 
+    getDataFilterList(categoryName: string = "") {
+        let params = new URLSearchParams();
+        if (categoryName != "") {
+            params.append("name", categoryName)
+        }
+        params.append("limit", `${99999999}`)
+        return this.axiosInstance.get(this.baseURL + "data_filter_list/", {responseType:"json", params})
+    }
+
     deleteDataFilterList(id: number) {
         let headers = new AxiosHeaders();
         headers["Accept"] = "application/json";

package/src/tests/curtain-login.spec.ts

@@ -100,11 +100,22 @@ describe("Session data", () => {
     })
     it('should login and then retrieve session data', async () => {
         const curtainLogin = new CurtainWebAPI();
-        await curtainLogin.login("testroot", "testpassword")
+        await curtainLogin.login("root", "21021992pkqtoaN")
         const previousAccess = curtainLogin.user.access_token.slice()
+        curtainLogin.user.access_token = ""
+        expect(previousAccess).to.not.equal(curtainLogin.user.access_token)
         await curtainLogin.refresh()
         expect(previousAccess).to.not.equal(curtainLogin.user.access_token)
         const result = await curtainLogin.postSettings("546c9ed7-30a6-4a0f-aedb-880815eb7051", "")
+    });
+    it('should login, expire access, then try to retrieve data', async () => {
+        const curtainLogin = new CurtainWebAPI();
+        await curtainLogin.login("root", "21021992pkqtoaN")
+        const previousAccess = curtainLogin.user.access_token.slice()
+        curtainLogin.user.access_token = ""
+        expect(previousAccess).to.not.equal(curtainLogin.user.access_token)
+        const result = await curtainLogin.postSettings("546c9ed7-30a6-4a0f-aedb-880815eb7051", "")
+        expect(previousAccess).to.not.equal(curtainLogin.user.access_token)
     })
 });