curtain-web-api 1.0.26 → 1.0.28

package/build/classes/curtain-api.js

@@ -188,6 +188,7 @@ class CurtainWebAPI {
             this.user.access_token = response.data.access;
             this.user.refresh_token = response.data.refresh;
             this.user.loginStatus = true;
+            console.log(this.user.loginStatus);
             this.user.saveIntoDB().then();
             return this.getUserInfo();
         });

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

@@ -24,7 +24,7 @@ export declare class User {
     init(): Promise<void | undefined>;
     initiateDB(): Promise<void>;
     updateDB(): Promise<void>;
-    saveIntoDB(): Promise<void>;
+    saveIntoDB(): Promise<void | undefined>;
     loadFromDB(): Promise<void>;
     clearDB(): Promise<void>;
     reset(): void;

package/build/classes/curtain-user.js

@@ -87,6 +87,47 @@ class User {
         });
     }
     saveIntoDB() {
+        this.db.get("user").catch((error) => {
+            if (error.name === "not_found") {
+                console.log(this.loginStatus);
+                return {
+                    _id: "user",
+                    access_token: this.access_token,
+                    refresh_token: this.refresh_token,
+                    username: this.username,
+                    loginStatus: this.loginStatus,
+                    isStaff: this.isStaff,
+                    id: this.id,
+                    totalCurtain: this.totalCurtain,
+                    canDelete: this.canDelete,
+                    curtainLinkLimit: this.curtainLinkLimit,
+                    curtainLinkLimitExceeded: this.curtainLinkLimitExceeded,
+                    lastAccessTokenUpdate: this.lastAccessTokenUpdate,
+                    lastRefreshTokenUpdate: this.lastRefreshTokenUpdate
+                };
+            }
+            else {
+                throw error;
+            }
+        }).then((doc) => {
+            console.log(this.loginStatus);
+            return this.db.put({
+                _id: "user",
+                _rev: doc._rev,
+                access_token: this.access_token,
+                refresh_token: this.refresh_token,
+                username: this.username,
+                loginStatus: this.loginStatus,
+                isStaff: this.isStaff,
+                id: this.id,
+                totalCurtain: this.totalCurtain,
+                canDelete: this.canDelete,
+                curtainLinkLimit: this.curtainLinkLimit,
+                curtainLinkLimitExceeded: this.curtainLinkLimitExceeded,
+                lastAccessTokenUpdate: this.lastAccessTokenUpdate,
+                lastRefreshTokenUpdate: this.lastRefreshTokenUpdate
+            });
+        });
         return this.db.put({
             _id: "user",
             access_token: this.access_token,
@@ -105,6 +146,10 @@ class User {
             console.log(response);
         }).catch((error) => {
             console.log(error);
+            console.log(this.loginStatus);
+            if (error.name === "conflict") {
+                return this.updateDB();
+            }
         });
     }
     loadFromDB() {

package/package.json

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

package/src/classes/curtain-api.ts

@@ -172,6 +172,7 @@ export class CurtainWebAPI {
             this.user.access_token = response.data.access;
             this.user.refresh_token = response.data.refresh;
             this.user.loginStatus = true;
+            console.log(this.user.loginStatus)
             this.user.saveIntoDB().then();
             return this.getUserInfo();
         })

package/src/classes/curtain-user.ts

@@ -95,6 +95,46 @@ export class User {
     }
 
     saveIntoDB() {
+        this.db.get("user").catch((error) => {
+          if (error.name === "not_found") {
+            console.log(this.loginStatus)
+            return {
+                _id: "user",
+                access_token: this.access_token,
+                refresh_token: this.refresh_token,
+                username: this.username,
+                loginStatus: this.loginStatus,
+                isStaff: this.isStaff,
+                id: this.id,
+                totalCurtain: this.totalCurtain,
+                canDelete: this.canDelete,
+                curtainLinkLimit: this.curtainLinkLimit,
+                curtainLinkLimitExceeded: this.curtainLinkLimitExceeded,
+                lastAccessTokenUpdate: this.lastAccessTokenUpdate,
+                lastRefreshTokenUpdate: this.lastRefreshTokenUpdate
+            }
+          } else {
+            throw error
+          }
+        }).then((doc: any) => {
+            console.log(this.loginStatus)
+            return this.db.put({
+                _id: "user",
+                _rev: doc._rev,
+                access_token: this.access_token,
+                refresh_token: this.refresh_token,
+                username: this.username,
+                loginStatus: this.loginStatus,
+                isStaff: this.isStaff,
+                id: this.id,
+                totalCurtain: this.totalCurtain,
+                canDelete: this.canDelete,
+                curtainLinkLimit: this.curtainLinkLimit,
+                curtainLinkLimitExceeded: this.curtainLinkLimitExceeded,
+                lastAccessTokenUpdate: this.lastAccessTokenUpdate,
+                lastRefreshTokenUpdate: this.lastRefreshTokenUpdate
+            })
+        })
         return this.db.put({
             _id: "user",
             access_token: this.access_token,
@@ -113,6 +153,10 @@ export class User {
             console.log(response);
         }).catch((error) => {
             console.log(error);
+            console.log(this.loginStatus);
+            if (error.name === "conflict") {
+                return this.updateDB();
+            }
         });
     }