curtain-web-api 1.0.28 → 1.0.29

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

@@ -1,3 +1,4 @@
+/// <reference types="pouchdb-core" />
 import { User } from "./curtain-user";
 export declare const replacer: (key: any, value: any) => any;
 export declare const reviver: (key: any, value: any) => any;
@@ -13,11 +14,11 @@ export declare class CurtainWebAPI {
     axiosInstance: import("axios").AxiosInstance;
     baseURL: string;
     constructor(baseURL?: string);
-    login(username: string, password: string): Promise<User>;
+    login(username: string, password: string): Promise<PouchDB.Core.Response>;
     getUserInfo(): Promise<User>;
     logout(): Promise<void>;
     refresh(): Promise<import("axios").AxiosResponse<any, any>>;
-    ORCIDLogin(authorizationCode: string, redirectURI: string): Promise<User>;
+    ORCIDLogin(authorizationCode: string, redirectURI: string): Promise<PouchDB.Core.Response>;
     checkIfRefreshTokenExpired(): boolean;
     deleteCurtainLink(curtainLinkID: string): Promise<import("axios").AxiosResponse<any, any>>;
     putSettings(settings: any, enable?: boolean, description?: string, sessionType?: string, onUploadProgress?: any): Promise<import("axios").AxiosResponse<any, any>>;

package/build/classes/curtain-api.js

@@ -139,8 +139,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();
+            return this.user.saveIntoDB();
         });
     }
     getUserInfo() {
@@ -189,8 +188,7 @@ class CurtainWebAPI {
             this.user.refresh_token = response.data.refresh;
             this.user.loginStatus = true;
             console.log(this.user.loginStatus);
-            this.user.saveIntoDB().then();
-            return this.getUserInfo();
+            return this.user.saveIntoDB();
         });
     }
     checkIfRefreshTokenExpired() {

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 | undefined>;
+    saveIntoDB(): Promise<PouchDB.Core.Response>;
     loadFromDB(): Promise<void>;
     clearDB(): Promise<void>;
     reset(): void;

package/build/classes/curtain-user.js

@@ -87,7 +87,8 @@ class User {
         });
     }
     saveIntoDB() {
-        this.db.get("user").catch((error) => {
+        console.log(this.loginStatus);
+        return this.db.get("user").catch((error) => {
             if (error.name === "not_found") {
                 console.log(this.loginStatus);
                 return {
@@ -128,29 +129,6 @@ class User {
                 lastRefreshTokenUpdate: this.lastRefreshTokenUpdate
             });
         });
-        return this.db.put({
-            _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
-        }).then((response) => {
-            console.log(response);
-        }).catch((error) => {
-            console.log(error);
-            console.log(this.loginStatus);
-            if (error.name === "conflict") {
-                return this.updateDB();
-            }
-        });
     }
     loadFromDB() {
         return this.db.get("user").then((doc) => {

package/package.json

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

package/src/classes/curtain-api.ts

@@ -117,8 +117,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();
+            return this.user.saveIntoDB()
         });
     }
 
@@ -173,8 +172,7 @@ export class CurtainWebAPI {
             this.user.refresh_token = response.data.refresh;
             this.user.loginStatus = true;
             console.log(this.user.loginStatus)
-            this.user.saveIntoDB().then();
-            return this.getUserInfo();
+            return this.user.saveIntoDB()
         })
     }
 

package/src/classes/curtain-user.ts

@@ -95,7 +95,8 @@ export class User {
     }
 
     saveIntoDB() {
-        this.db.get("user").catch((error) => {
+        console.log(this.loginStatus)
+        return this.db.get("user").catch((error) => {
           if (error.name === "not_found") {
             console.log(this.loginStatus)
             return {
@@ -135,29 +136,6 @@ export class User {
                 lastRefreshTokenUpdate: this.lastRefreshTokenUpdate
             })
         })
-        return this.db.put({
-            _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
-        }).then((response) => {
-            console.log(response);
-        }).catch((error) => {
-            console.log(error);
-            console.log(this.loginStatus);
-            if (error.name === "conflict") {
-                return this.updateDB();
-            }
-        });
     }
 
     loadFromDB() {