@tapni/auth 0.0.64 → 0.0.65

package/package.json

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

package/src/App.vue

@@ -124,6 +124,7 @@ export default {
     EventBus.$on('ssoLogout',(data) => this.logout(data))
     EventBus.$on('getLoggedInAccounts',(data) => this.getLoggedInAccounts(data))
     EventBus.$on('refreshTokenAction',(data) => this.refreshTokenAction(data))
+    EventBus.$on('switchAccount',(data) => this.switchAccount(data))
   },
   methods: {
     async init () {

package/src/mixins/auth.mixin.js

@@ -25,6 +25,7 @@ export default {
       appLanguage: "en",
       token: "",
       refreshToken: "",
+      refreshing: "",
       loggedInUserId: "",
       ssoUser: {},
       ssoCompany: {},
@@ -240,8 +241,20 @@ export default {
       // await this.registerDevice();
       // if (Capacitor.isNativePlatform()) initPushNotifications();
     },
-    async refreshTokenAction(data) {
+    async switchAccount(username) {
+      this.$storage.username = username;
+      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 });
 
+      EventBus.$emit("ssoEvent", {
+        name: "switchAccount",
+        data: { lang: this.appLanguage, username },
+      });
+    },
+    async refreshTokenAction(data) {
+      this.refreshing = true;
       const [err, response] = await to(
         AuthService.refreshToken({
           id: data.id,
@@ -258,6 +271,7 @@ export default {
       if (response && response.data) {
         this.setToken(response.data.token);
       } else console.error('Invalid response setToken');
+      this.refreshing = false;
     },
     async login(data) {
       const [err, response] = await to(AuthService.login(data, this.$storage));
@@ -472,17 +486,29 @@ export default {
       }
     },
     getRefreshTokens() {
-      return this.$storage.refreshTokens.split(',');
+      if (this.$storage && this.$storage.refreshTokens) this.$storage.refreshTokens.split(',')
+      else return [];
     },
     setRefreshToken(token) {
+      // Get all refresh tokens
       let refreshTokens = this.getRefreshTokens();
-      if (token && !refreshTokens.includes(token)) refreshTokens.unshift(token);
-      else refreshTokens = refreshTokens.filter((t) => t !== this.refreshToken);
 
-      if (refreshTokens.length >= 1) this.refreshToken = refreshTokens[0];
-      else this.refreshToken = token;
+      // If token exists, add to the top of the list
+      // If it doesn't exist, get the list without the current one - delete refresh
+      if (token) {
+        if (!refreshTokens.includes(token)) {
+          refreshTokens.unshift(token);
+        }
+        this.refreshToken = token;
+      } else {
+        refreshTokens = refreshTokens.filter((t) => t !== this.refreshToken);
+
+        // Set the first token as the new refresh token
+        if (refreshTokens.length >= 1) this.refreshToken = refreshTokens[0];
+      }
 
       this.$storage.refreshTokens = refreshTokens.join(",");
+
       EventBus.$emit("ssoEvent", { name: "setRefreshToken", data: token });
     },
     setToken(token) {