@tapni/auth 0.0.93 → 0.0.95

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tapni/auth",
-  "version": "0.0.93",
+  "version": "0.0.95",
   "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 () {

package/src/mixins/auth.mixin.js

@@ -236,7 +236,7 @@ export default {
       this.$storage.UserId = this.loggedInAccounts[username].id;
       this.setLoggedInUserId(this.loggedInAccounts[username].id);
       this.setRefreshToken(this.loggedInAccounts[username].refreshToken);
-      await this.refreshTokenAction({ id: this.loggedInAccounts[username].id });
+      await this.refreshTokenAction(this.loggedInAccounts[username]);
 
       EventBus.$emit("ssoEvent", {
         name: "switchAccount",
@@ -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);
         }
 
@@ -253,9 +253,9 @@ export default {
         const [err, response] = await to(
             AuthService.refreshToken({
               id: data.id,
-              refreshToken: this.refreshToken,
-              refreshTokenAction: () => this.refreshTokenAction
-            }, this.$storage)
+              refreshToken: data.refreshToken,
+              refreshTokenAction: true
+            }, 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;
       })
     },
@@ -422,9 +422,7 @@ export default {
           if (
             this.loggedInAccounts[username].refreshToken === this.refreshToken
           ) {
-            this.refreshTokenAction({
-              id: this.loggedInAccounts[username].id,
-            }).then(() => {
+            this.refreshTokenAction(this.loggedInAccounts[username]).then(() => {
               this.setLoggedInUserId(this.loggedInAccounts[username].id);
               if (this.$storage) {
                 this.$storage.username = username;

package/src/services/Api.js

@@ -10,7 +10,7 @@ export default {
   setApiRootFromOptions(apiRoot) {
     apiRootFromOptions = apiRoot
   },
-  instance(storage, refreshTokenAction) {
+  instance(storage, refreshTokenAction = null) {
 
     const appInfo = version;
     let baseURL = import.meta.env.VITE_APP_API_ROOT + '/v1/';
@@ -28,7 +28,8 @@ export default {
       }
     })
 
-    const clbck = async function (config) {
+    // Add a request interceptor
+    apiInstance.interceptors.request.use(async function (config) {
 
       if (['post', 'put', 'delete'].includes(config.method.toLowerCase())) {
         config.data = {
@@ -49,13 +50,13 @@ export default {
       }
 
       // Check refresh token expiration before request is sent
-      if (storage && storage.token && refreshTokenAction !== undefined) {
+      if (storage && storage.token && !refreshTokenAction) {
         const decoded = jwtDecode(storage.token)
 
         // Check if access token expired
         if (decoded.exp - 30 < Math.floor(Date.now() / 1000)) {
 
-          return refreshTokenAction(decoded)
+          return refreshTokenAction({...decoded, refreshToken: storage.refreshTokens ? storage.refreshTokens.split(',')[0] : null, storage })
               .then((token) => {
                 config.headers = {
                   ...config.headers,
@@ -66,10 +67,7 @@ export default {
         }
       }
       return config;
-    }
-
-    // Add a request interceptor
-    apiInstance.interceptors.request.use(clbck);
+    });
 
     return apiInstance;
   }