curtain-web-api 1.0.1 → 1.0.3

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

@@ -14,7 +14,7 @@ export declare class CurtainWebAPI {
     constructor(baseURL?: string);
     login(username: string, password: string): Promise<User>;
     getUserInfo(): Promise<User>;
-    logout(): Promise<import("axios").AxiosResponse<any, any>>;
+    logout(): Promise<void>;
     refresh(): Promise<import("axios").AxiosResponse<any, any>>;
     ORCIDLogin(authorizationCode: string, redirectURI: string): Promise<User>;
     checkIfRefreshTokenExpired(): boolean;

package/build/classes/curtain-api.js

@@ -67,7 +67,12 @@ class CurtainWebAPI {
         this.userInfoURL = baseURL + "user/";
         this.axiosInstance.interceptors.request.use((config) => {
             if (config.url) {
-                if (config.url === this.logoutURL || config.url === this.userInfoURL || config.url.startsWith(this.baseURL + "curtain/") || config.url.startsWith(this.baseURL + "data_filter_list/")) {
+                if (
+                //config.url === this.refereshURL ||
+                config.url === this.logoutURL ||
+                    config.url === this.userInfoURL ||
+                    config.url.startsWith(this.baseURL + "curtain/") ||
+                    config.url.startsWith(this.baseURL + "data_filter_list/")) {
                     if (this.user.loginStatus) {
                         config.headers["Authorization"] = "Bearer " + this.user.access_token;
                     }
@@ -87,6 +92,7 @@ class CurtainWebAPI {
                     if (!this.checkIfRefreshTokenExpired() && this.user.loginStatus) {
                         if (!this.isRefreshing) {
                             return this.refresh().then((response) => {
+                                this.isRefreshing = false;
                                 return this.axiosInstance.request(error.config);
                             }).catch((error) => {
                                 this.isRefreshing = false;
@@ -134,8 +140,7 @@ class CurtainWebAPI {
         headers["Accept"] = "application/json";
         headers["Content-Type"] = "application/json";
         return this.axiosInstance.post(this.logoutURL, { refresh_token: this.user.refresh_token }, { headers: headers, responseType: "json" }).then((response) => {
-            this.user.clearDB();
-            return response;
+            return this.user.clearDB();
         });
     }
     refresh() {
@@ -190,7 +195,7 @@ class CurtainWebAPI {
         let headers = new axios_1.AxiosHeaders();
         headers["Accept"] = "application/json";
         headers["Content-Type"] = "multipart/form-data";
-        return this.axiosInstance.put(this.baseURL + "curtain/" + this.user.id + "/", form, { headers: headers, responseType: "json" }).then((response) => {
+        return this.axiosInstance.put(this.baseURL + "curtain/", form, { headers: headers, responseType: "json" }).then((response) => {
             return response;
         });
     }

package/curtainuser/LOG

@@ -1 +1 @@
-2023/04/15-17:11:29.479 8a10 Delete type=3 #1
+2023/04/15-17:56:07.976 99c Delete type=3 #1

package/package.json

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

package/src/classes/curtain-api.ts

@@ -43,7 +43,12 @@ export class CurtainWebAPI {
         this.userInfoURL = baseURL + "user/";
         this.axiosInstance.interceptors.request.use((config) => {
             if (config.url) {
-                if (config.url === this.logoutURL || config.url === this.userInfoURL || config.url.startsWith(this.baseURL + "curtain/") || config.url.startsWith(this.baseURL + "data_filter_list/")) {
+                if (
+                    //config.url === this.refereshURL ||
+                    config.url === this.logoutURL ||
+                    config.url === this.userInfoURL ||
+                    config.url.startsWith(this.baseURL + "curtain/") ||
+                    config.url.startsWith(this.baseURL + "data_filter_list/")) {
                     if (this.user.loginStatus) {
                         config.headers["Authorization"] = "Bearer " + this.user.access_token;
                     }
@@ -64,6 +69,7 @@ export class CurtainWebAPI {
                     if (!this.checkIfRefreshTokenExpired() && this.user.loginStatus) {
                         if (!this.isRefreshing) {
                             return this.refresh().then((response) => {
+                                this.isRefreshing = false;
                                 return this.axiosInstance.request(error.config);
                             }).catch((error) => {
                                 this.isRefreshing = false;
@@ -116,8 +122,7 @@ export class CurtainWebAPI {
         headers["Accept"] = "application/json";
         headers["Content-Type"] = "application/json";
         return this.axiosInstance.post(this.logoutURL, {refresh_token: this.user.refresh_token}, {headers: headers, responseType:"json"}).then((response) => {
-            this.user.clearDB();
-            return response;
+            return this.user.clearDB();
         });
     }
 
@@ -177,7 +182,7 @@ export class CurtainWebAPI {
         let headers = new AxiosHeaders();
         headers["Accept"] = "application/json";
         headers["Content-Type"] = "multipart/form-data";
-        return this.axiosInstance.put(this.baseURL + "curtain/" + this.user.id + "/", form, {headers: headers, responseType:"json"}).then((response) => {
+        return this.axiosInstance.put(this.baseURL + "curtain/", form, {headers: headers, responseType:"json"}).then((response) => {
             return response;
         });
     }

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

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