curtain-web-api 1.0.0 → 1.0.2

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,9 +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();
-            this.user = new curtain_user_1.User();
-            return response;
+            return this.user.clearDB();
         });
     }
     refresh() {
@@ -167,7 +171,7 @@ class CurtainWebAPI {
         let now = new Date();
         let diff = (now.getTime() - this.user.lastRefreshTokenUpdate.getTime()) / 1000;
         diff = diff / 60 / 60;
-        return 24 > Math.abs(Math.round(diff));
+        return 24 <= Math.abs(Math.round(diff));
     }
     deleteCurtainLink(curtainLinkID) {
         let headers = new axios_1.AxiosHeaders();

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

@@ -27,4 +27,5 @@ export declare class User {
     saveIntoDB(): Promise<void>;
     loadFromDB(): Promise<void>;
     clearDB(): Promise<void>;
+    reset(): void;
 }

package/build/classes/curtain-user.js

@@ -127,11 +127,26 @@ class User {
     }
     clearDB() {
         return this.db.destroy().then((response) => {
+            this.reset();
             this.db = new pouchdb_1.default("curtainuser");
             return this.initiateDB();
         }).catch((error) => {
             console.log(error);
         });
     }
+    reset() {
+        this.access_token = "";
+        this.refresh_token = "";
+        this.username = "";
+        this.loginStatus = false;
+        this.isStaff = false;
+        this.id = 0;
+        this.totalCurtain = 0;
+        this.canDelete = false;
+        this.curtainLinkLimit = 0;
+        this.curtainLinkLimitExceeded = false;
+        this.lastAccessTokenUpdate = new Date();
+        this.lastRefreshTokenUpdate = new Date();
+    }
 }
 exports.User = User;

package/curtainuser/LOG

@@ -1 +1 @@
-2023/04/15-16:03:03.770 2568 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.0",
+  "version": "1.0.2",
   "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,9 +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();
-            this.user = new User();
-            return response;
+            return this.user.clearDB();
         });
     }
 
@@ -152,7 +156,7 @@ export class CurtainWebAPI {
         let now = new Date();
         let diff = (now.getTime() - this.user.lastRefreshTokenUpdate.getTime()) / 1000;
         diff = diff/60/60;
-        return 24 > Math.abs(Math.round(diff));
+        return 24 <= Math.abs(Math.round(diff));
     }
 
     deleteCurtainLink(curtainLinkID: string) {

package/src/classes/curtain-user.ts

@@ -137,10 +137,26 @@ export class User {
 
     clearDB() {
         return this.db.destroy().then((response) => {
+            this.reset()
             this.db = new PouchDB("curtainuser");
             return this.initiateDB();
         }).catch((error) => {
             console.log(error);
         });
     }
+
+    reset() {
+        this.access_token = "";
+        this.refresh_token = "";
+        this.username = "";
+        this.loginStatus = false;
+        this.isStaff = false;
+        this.id = 0;
+        this.totalCurtain = 0;
+        this.canDelete = false;
+        this.curtainLinkLimit = 0;
+        this.curtainLinkLimitExceeded = false;
+        this.lastAccessTokenUpdate = new Date();
+        this.lastRefreshTokenUpdate = new Date();
+    }
 }

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

@@ -34,6 +34,19 @@ describe('User', function () {
             await user.clearDB();
             await Promise.resolve()
 
+            assert.ok(true)
+        });
+        it("destroying user data from local storage", async () => {
+            const user = new User();
+            await user.init();
+            for (const i in userEx) {
+                user[i] = userEx[i]
+            }
+            await user.updateDB();
+            await user.clearDB();
+            await user.loadFromDB();
+            expect(user.username).to.equal("");
+            await Promise.resolve()
             assert.ok(true)
         })
     })
@@ -66,6 +79,7 @@ describe("Login", () => {
       it("check token expiry", async () => {
           const curtainLogin = new CurtainWebAPI();
           await curtainLogin.user.loadFromDB()
+          console.log(curtainLogin.user.lastRefreshTokenUpdate)
           const expired = curtainLogin.checkIfRefreshTokenExpired()
           expect(expired).to.equal(false)
           await Promise.resolve()
@@ -75,10 +89,22 @@ describe("Login", () => {
 })
 
 describe("Session data", () => {
+    it('should retrieve session meta data', async () => {
+        const curtainLogin = new CurtainWebAPI();
+        const result = await curtainLogin.getSessionSettings("546c9ed7-30a6-4a0f-aedb-880815eb7051")
+    });
+
     it('should retrieve session data', async () => {
         const curtainLogin = new CurtainWebAPI();
         const result = await curtainLogin.postSettings("546c9ed7-30a6-4a0f-aedb-880815eb7051", "")
-        console.log(result)
+    })
+    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", "")
     })
 });