@tapni/auth 0.0.72 → 0.0.74

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tapni/auth",
-  "version": "0.0.72",
+  "version": "0.0.74",
   "type": "module",
   "main": "./dist/TapniAuth.umd.js",
   "module": "./dist/TapniAuth.es.js",

package/src/App.vue

@@ -128,7 +128,6 @@ export default {
   },
   methods: {
     async init () {
-
       // Make sure the function is called just once
       if (this.isSetup) return;
       this.isSetup = true;
@@ -136,7 +135,9 @@ export default {
       this.setToken(this.$storage.token);
       const refreshTokens = this.getRefreshTokens();
       this.setRefreshToken(refreshTokens[0]);
-      this.getLoggedInAccounts();
+      await this.getLoggedInAccounts();
+
+      // Let App know that the auth is ready
       this.$emit('ssoLibraryReady');
     },
     ssoOutgoingEvent (data) {
@@ -160,6 +161,12 @@ export default {
     display () {
       this.applyBgStyle()
     },
+    '$storageReady.value' (nv) {
+      if (nv && this.display === 'npm') {
+        // Initialize Library after all event listeners & storage are set
+        this.init()
+      }
+    }
   }
 }
 </script>

package/src/mixins/apple.mixin.js

@@ -45,8 +45,7 @@ export default {
           }
           await this.loginSetup(response)
           this.getLoggedInAccounts()
-          // TODO: Pass proper variable isModal
-          this.loginSuccess({ ...response, isModal: false });
+          this.loginSuccess({ ...response, isModal: this.isModal });
           setTimeout(() => {
             this.appleLoad = false
           }, 1000)

package/src/mixins/auth.mixin.js

@@ -246,7 +246,10 @@ export default {
       });
     },
     async refreshTokenAction(data) {
-      if (!this.refreshToken || this.refreshing) return;
+      if (!this.refreshToken || this.refreshing) {
+        console.log('return-refreshTokenAction', this.refreshToken, this.refreshing);
+        return;
+      }
 
       this.refreshing = true;
       const [err, response] = await to(
@@ -507,12 +510,13 @@ export default {
 
       this.$storage.refreshTokens = refreshTokens.join(",");
 
+      EventBus.$emit("setStorage", this.$storage);
       EventBus.$emit("ssoEvent", { name: "setRefreshToken", data: token });
     },
     setToken(token) {
       this.$storage.token = token;
       this.token = token;
-      EventBus.$emit("ssoEvent", { name: "setToken", data: token });
+      EventBus.$emit("setStorage", this.$storage);
     },
     setUserID(userID) {
       this.$storage.UserId = userID;

package/src/mixins/google.mixin.js

@@ -46,8 +46,7 @@ export default {
           }
           await this.loginSetup(response)
           this.getLoggedInAccounts()
-          // TODO: Pass proper variable isModal
-          this.loginSuccess({ ...response, isModal: false });
+          this.loginSuccess({ ...response, isModal: this.isModal });
           setTimeout(() => {
             this.googleLoad = false
           }, 1000)

package/src/mixins/microsoft.mixin.js

@@ -67,8 +67,7 @@ export default {
           }
           await this.loginSetup(response);
           this.getLoggedInAccounts();
-          // TODO: Pass proper variable isModal
-          this.loginSuccess({ ...response, isModal: false });
+          this.loginSuccess({ ...response, isModal: this.isModal });
           setTimeout(() => {
             this.microsoftLoad = false;
             this.microsoftSSOLoad = false;