curtain-web-api 1.0.32 → 1.0.33

package/build/classes/curtain-api.js

@@ -184,10 +184,13 @@ class CurtainWebAPI {
         let headers = new axios_1.AxiosHeaders();
         headers["Accept"] = "application/json";
         headers["Content-Type"] = "application/json";
-        return this.axiosInstance.post(this.orcidLoginURL, JSON.stringify({ "auth_token": authorizationCode, "redirect_uri": redirectURI }), { headers: headers, responseType: "json" }).then((response) => {
-            return this.user.saveIntoDB(response.data.access, response.data.refresh).then((response) => {
-                console.log(this.user);
-                return this.getUserInfo();
+        return this.user.loadFromDB().then((response) => {
+            console.log(this.user);
+            return this.axiosInstance.post(this.orcidLoginURL, JSON.stringify({ "auth_token": authorizationCode, "redirect_uri": redirectURI }), { headers: headers, responseType: "json" }).then((response) => {
+                return this.user.saveIntoDB(response.data.access, response.data.refresh).then((response) => {
+                    console.log(this.user);
+                    return this.getUserInfo();
+                });
             });
         });
     }

package/build/classes/curtain-user.js

@@ -112,6 +112,7 @@ class User {
                 throw error;
             }
         }).then((doc) => {
+            console.log(accessToken, refreshToken);
             return this.db.put({
                 _id: "user",
                 _rev: doc._rev,

package/package.json

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

package/src/classes/curtain-api.ts

@@ -126,6 +126,7 @@ export class CurtainWebAPI {
         headers["Accept"] = "application/json";
         headers["Content-Type"] = "application/json";
         console.log(this.user)
+
         return this.axiosInstance.post(this.userInfoURL, {}, {headers: headers, responseType: "json"}).then((response) => {
             this.user.canDelete = response.data.can_delete;
             this.user.id = response.data.id;
@@ -167,12 +168,17 @@ export class CurtainWebAPI {
         let headers = new AxiosHeaders();
         headers["Accept"] = "application/json";
         headers["Content-Type"] = "application/json";
-        return this.axiosInstance.post(this.orcidLoginURL, JSON.stringify({"auth_token": authorizationCode, "redirect_uri": redirectURI}), {headers: headers, responseType:"json"}).then((response) => {
-            return this.user.saveIntoDB(response.data.access, response.data.refresh).then((response) => {
-              console.log(this.user)
-                return this.getUserInfo()
-            })
-        })
+        return this.user.loadFromDB().then(
+            (response) => {
+                console.log(this.user)
+                return this.axiosInstance.post(this.orcidLoginURL, JSON.stringify({"auth_token": authorizationCode, "redirect_uri": redirectURI}), {headers: headers, responseType:"json"}).then((response) => {
+                    return this.user.saveIntoDB(response.data.access, response.data.refresh).then((response) => {
+                      console.log(this.user)
+                        return this.getUserInfo()
+                    })
+                })
+            }
+        )
     }
 
     checkIfRefreshTokenExpired() {

package/src/classes/curtain-user.ts

@@ -119,6 +119,7 @@ export class User {
             throw error
           }
         }).then((doc: any) => {
+            console.log(accessToken, refreshToken)
             return this.db.put({
                 _id: "user",
                 _rev: doc._rev,