@tapni/auth 0.0.77 → 0.0.79

package/package.json

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

package/src/mixins/auth.mixin.js

@@ -244,29 +244,34 @@ export default {
       });
     },
     async refreshTokenAction(data) {
-      if (!this.refreshToken || this.refreshing) {
-        console.log('return-refreshTokenAction', this.refreshToken, this.refreshing);
-        return;
-      }
+      return new Promise(async (resolve, reject) => {
+        console.log('auth-refreshTokenAction', data);
+        if (!this.refreshToken || this.refreshing) {
+          console.log('return-refreshTokenAction', this.refreshToken, this.refreshing);
+          return;
+        }
 
-      this.refreshing = true;
-      const [err, response] = await to(
-        AuthService.refreshToken({
-          id: data.id,
-          refreshToken: this.refreshToken,
-          refreshTokenAction: true
-        }, this.$storage)
-      );
-      if (err && err.response && err.response.data.error === "ACCESS_DENIED") {
-        this.logout(false);
-        return location.reload();
-      }
+        this.refreshing = true;
+        const [err, response] = await to(
+            AuthService.refreshToken({
+              id: data.id,
+              refreshToken: this.refreshToken,
+              refreshTokenAction: true
+            }, this.$storage)
+        );
+        if (err && err.response && err.response.data.error === "ACCESS_DENIED") {
+          this.logout(false);
+          return location.reload();
+        }
 
-      // Set new access token
-      if (response && response.data) {
-        this.setToken(response.data.token);
-      } else console.error('Invalid response setToken');
-      this.refreshing = false;
+        // Set new access token
+        if (response && response.data) {
+          this.setToken(response.data.token);
+          EventBus.$emit("ssoEvent", { name: "setStorage", data: this.$storage });
+          resolve(response.data.token);
+        } else reject('Invalid response setToken');
+        this.refreshing = false;
+      })
     },
     async login(data) {
       const [err, response] = await to(AuthService.login(data, this.$storage));

package/src/services/Api.js

@@ -49,6 +49,8 @@ export default {
         }
       }
 
+      console.log('before interceptor enter', storage, refreshTokenAction);
+
       // Check refresh token expiration before request is sent
       if (storage && storage.token && !refreshTokenAction) {
         const decoded = jwtDecode(storage.token)
@@ -59,10 +61,10 @@ export default {
         if (decoded.exp - 30 < Math.floor(Date.now() / 1000)) {
 
           return AuthMixin.methods.refreshTokenAction(decoded)
-              .then(() => {
+              .then((token) => {
                 config.headers = {
                   ...config.headers,
-                  Authorization: `Bearer ${storage.token}`
+                  Authorization: `Bearer ${token}`
                 }
                 return config;
               })