@tapni/auth 0.0.92 → 0.0.94

package/package.json

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

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",
@@ -253,8 +253,8 @@ export default {
         const [err, response] = await to(
             AuthService.refreshToken({
               id: data.id,
-              refreshToken: this.refreshToken,
-              refreshTokenAction: () => this.refreshTokenAction
+              refreshToken: data.refreshToken,
+              refreshTokenAction: true
             }, this.$storage)
         );
         if (err && err.response && err.response.data.error === "ACCESS_DENIED") {
@@ -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 = null) {
+  instance(storage, refreshTokenAction = false) {
 
     const appInfo = version;
     let baseURL = import.meta.env.VITE_APP_API_ROOT + '/v1/';
@@ -50,13 +50,13 @@ export default {
       }
 
       // Check refresh token expiration before request is sent
-      if (storage && storage.token && refreshTokenAction !== null) {
+      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 AuthMixin.methods.refreshTokenAction({...decoded, refreshToken: storage.refreshTokens ? storage.refreshTokens.split(',')[0] : null })
               .then((token) => {
                 config.headers = {
                   ...config.headers,