@tapni/auth 0.0.94 → 0.0.96

package/package.json

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

package/src/App.vue

@@ -123,8 +123,9 @@ export default {
     EventBus.$on('ssoEvent', this.ssoOutgoingEvent)
     EventBus.$on('ssoLogout',(data) => this.logout(data))
     EventBus.$on('getLoggedInAccounts',(data) => this.getLoggedInAccounts(data))
-    EventBus.$on('refreshTokenAction',(data) => this.refreshTokenAction(data))
+    EventBus.$on('refreshTokenAction',(data) => this.refreshTokenAction({...data, storage: this.$storage}))
     EventBus.$on('switchAccount',(data) => this.switchAccount(data))
+    EventBus.$on('setToken',(data) => this.setToken(data))
   },
   methods: {
     async init () {
@@ -134,7 +135,6 @@ export default {
 
       this.setToken(this.$storage.token);
       const refreshTokens = this.getRefreshTokens();
-      console.log({refreshTokens});
       this.setRefreshToken(refreshTokens[0]);
       await this.getLoggedInAccounts(refreshTokens);
 

package/src/mixins/auth.mixin.js

@@ -245,7 +245,7 @@ export default {
     },
     async refreshTokenAction(data) {
       return new Promise(async (resolve, reject) => {
-        if (!this.refreshToken || this.refreshing) {
+        if (!data.refreshToken || this.refreshing) {
           return resolve(null);
         }
 
@@ -255,7 +255,7 @@ export default {
               id: data.id,
               refreshToken: data.refreshToken,
               refreshTokenAction: true
-            }, this.$storage)
+            }, data.storage)
         );
         if (err && err.response && err.response.data.error === "ACCESS_DENIED") {
           this.logout(false);
@@ -264,10 +264,10 @@ export default {
 
         // Set new access token
         if (response && response.data) {
-          this.setToken(response.data.token);
+          EventBus.$emit("setToken", response.data.token);
           EventBus.$emit("ssoEvent", { name: "setStorage", data: this.$storage });
           resolve(response.data.token);
-        } else reject('Invalid response setToken');
+        }
         this.refreshing = false;
       })
     },

package/src/services/Api.js

@@ -10,7 +10,7 @@ export default {
   setApiRootFromOptions(apiRoot) {
     apiRootFromOptions = apiRoot
   },
-  instance(storage, refreshTokenAction = false) {
+  instance(storage, refreshTokenAction = null) {
 
     const appInfo = version;
     let baseURL = import.meta.env.VITE_APP_API_ROOT + '/v1/';
@@ -56,7 +56,7 @@ export default {
         // Check if access token expired
         if (decoded.exp - 30 < Math.floor(Date.now() / 1000)) {
 
-          return AuthMixin.methods.refreshTokenAction({...decoded, refreshToken: storage.refreshTokens ? storage.refreshTokens.split(',')[0] : null })
+          return AuthMixin.methods.refreshTokenAction({...decoded, refreshToken: storage.refreshTokens ? storage.refreshTokens.split(',')[0] : null, storage })
               .then((token) => {
                 config.headers = {
                   ...config.headers,