npm - curtain-web-api - Versions diffs - 1.0.10 → 1.0.12 - Mend

curtain-web-api 1.0.10 → 1.0.12

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/build/classes/curtain-api.js +13 -6
package/package.json +1 -1
package/src/classes/curtain-api.ts +18 -8

package/build/classes/curtain-api.js CHANGED Viewed

@@ -183,13 +183,20 @@ class CurtainWebAPI {
         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) => {
             this.user.clearDB().then(() => {
-                this.user.access_token = response.data.access;
-                this.user.refresh_token = response.data.refresh;
-                this.user.loginStatus = true;
-                this.user.saveIntoDB().then(() => {
-                });
+                if (this.user.loginStatus) {
+                    this.user.access_token = response.data.access;
+                    this.user.refresh_token = response.data.refresh;
+                    this.user.loginStatus = true;
+                    this.user.updateDB().then();
+                }
+                else {
+                    this.user.access_token = response.data.access;
+                    this.user.refresh_token = response.data.refresh;
+                    this.user.loginStatus = true;
+                    this.user.saveIntoDB().then(() => {
+                    });
+                }
             });
-            ;
             return response;
         }).then((response) => {
             return this.getUserInfo();

package/package.json CHANGED Viewed

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

package/src/classes/curtain-api.ts CHANGED Viewed

@@ -166,18 +166,28 @@ export class CurtainWebAPI {
         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) => {
-            this.user.clearDB().then(() => {
-                this.user.access_token = response.data.access;
-                this.user.refresh_token = response.data.refresh;
-                this.user.loginStatus = true;
-                this.user.saveIntoDB().then(
-                    () => {
+            this.user.clearDB().then(
+                () => {
+                    if (this.user.loginStatus) {
+                        this.user.access_token = response.data.access;
+                        this.user.refresh_token = response.data.refresh;
+                        this.user.loginStatus = true;
+                        this.user.updateDB().then();
+                    } else {
+                        this.user.access_token = response.data.access;
+                        this.user.refresh_token = response.data.refresh;
+                        this.user.loginStatus = true;
+                        this.user.saveIntoDB().then(
+                            () => {
+                            }
+                        )
                     }
-                )
                 }
             );
-            ;
             return response;
         }).then((response) => {
             return this.getUserInfo();