@tapni/auth 0.0.163 → 0.0.165

package/dist/style.css

@@ -1 +1 @@
-.app-store-icon[data-v-615ed484]{box-shadow:0 4px 10px #00000017;border-radius:12px}#codeInput[data-v-89d98ef3],#emailInput[data-v-89d98ef3],#emailInput[data-v-69a9cfa3]{text-align:center;padding-right:15%;font-size:17px}.fade-enter-to[data-v-17c95816]{opacity:1}.sso-img[data-v-11f19a09]{margin:2px auto 0;width:35px}input[data-v-11f19a09]{margin:0 auto;height:25px}.sso-img[data-v-4f821f65]{margin:2px auto 0;width:35px}input[data-v-4f821f65]{margin:0 auto;height:25px}.link-grid,.user-link-img{width:100%;display:inline-table;position:relative}.link-grid{width:30%;margin:1.6%;padding:1.6%}.link-grid .user-link-img img{border-radius:25%!important}.link-grid .edit-icon{border-radius:20px;right:-3%;top:-3%;position:absolute;z-index:3;max-width:23%;overflow:hidden;min-width:30px}.link-grid .direct-icon{border-radius:20px;left:-3%;top:-3%;position:absolute;z-index:555;max-width:23%;overflow:hidden;min-width:30px}.link-grid .link-text{min-height:20px;margin-top:3px!important;display:block;text-align:center;line-height:normal;overflow-wrap:anywhere}.link-list{width:93%;max-height:67px!important;margin:0 auto;display:flex;border-radius:15px!important;background-color:#fff;border:solid 1px #e8e8e8;position:relative;align-items:center}.link-list .user-link-img{display:inline-block;width:65px;border-radius:25%!important}.link-list .link-text{display:inline-block;padding:18px 0% 17px 10%;font-size:15px;font-weight:500;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;flex:1;text-align:left;border-radius:15px!important}.link-list .edit-icon{border-radius:20px;right:7%;top:30%;position:absolute;z-index:3;width:26px;overflow:hidden}.link-list .switching{width:45px}.link-list .direct-icon{border-radius:20px;left:-2%;top:-13%;position:absolute;z-index:555;width:26px;overflow:hidden}.small{width:22%!important;margin:2% 4% 0%;padding:0%}.small .link-text{margin-top:0!important;font-size:13px}.linkExternal{margin-right:20px;width:20px;display:inline-block!important;height:20px;background:#000;-webkit-mask:url(https://cdn.tapni.co/icons/link-external.svg) no-repeat center;mask:url(https://cdn.tapni.co/icons/link-external.svg) no-repeat center;transform:scale(1.5)}.user-img[data-v-a49a90e5]{margin:2px auto 0;width:65px}input[data-v-a49a90e5]{margin:0 auto;height:25px}html *{font-family:Inter,sans-serif}#bodyId{padding-top:3%;max-width:667px!important;margin:1.5% auto auto;height:95%!important;border-radius:20px}.action-block-top .default-text,.action-block-top .default-text:after{border-radius:50%;width:10em!important;height:10em!important}.action-block-top .default-text{margin:10px auto;font-size:3px;position:relative;text-indent:-9999em;border-left:.5em solid #000000;border-top:.5em solid rgba(0,0,0,.2);border-right:.5em solid rgba(0,0,0,.2);border-bottom:.5em solid rgba(0,0,0,.2);-webkit-transform:translateZ(0);-ms-transform:translateZ(0);transform:translateZ(0);-webkit-animation:load8 1.1s infinite linear;animation:load8 1.1s infinite linear}@-webkit-keyframes load8{0%{-webkit-transform:rotate(0deg);transform:rotate(0)}to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes load8{0%{-webkit-transform:rotate(0deg);transform:rotate(0)}to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.smartbanner-ios{background:linear-gradient(to bottom,#f4f4f4,#f4f4f4);box-shadow:0 0 #fff;border-bottom:1px solid #dddddd}.smartbanner-icon{border-radius:16px}.smartbanner-ios .smartbanner-button{font-size:13px;padding:9px 0;height:40px;border-radius:13px;background:#f4f4f4;color:#0a99d2;border:none;box-shadow:none;text-transform:uppercase}.snack-body{display:none;border-radius:40px;font-size:15px!important}#errorSnack{background-color:#fee3e3!important;border:2px solid #edd9d9!important;color:#000}#successSnack{background-color:#eff5eb!important;border:2px solid #e3ecd7!important;color:#000}.grecaptcha-badge{visibility:hidden}.header-logo{position:absolute;left:50%;transform:translate(-50%,-50%);margin-top:0;z-index:2}.header-logo-img{height:40px;margin-top:10px}.container[data-v-f536b602]{padding:20px 20px 100px!important;display:flex;flex-direction:column;gap:20px}.settingsCard[data-v-f536b602]{background-color:#fff;padding:20px;border-radius:26px;align-items:center}.device[data-v-f536b602]{display:flex;align-items:center}h4[data-v-f536b602]{margin-left:20px;font-weight:700}.middle[data-v-f536b602]{flex:1}.left img[data-v-f536b602]{background-color:#f7f8f9;border-radius:20px;padding:10px}.divider[data-v-f536b602]{height:1px;background-color:#f0f0f0;margin:20px 0}.moreFooter[data-v-f536b602]{display:flex;align-items:center;justify-content:space-between;padding:0 10px}
+.app-store-icon[data-v-615ed484]{box-shadow:0 4px 10px #00000017;border-radius:12px}#codeInput[data-v-89d98ef3],#emailInput[data-v-89d98ef3],#emailInput[data-v-69a9cfa3]{text-align:center;padding-right:15%;font-size:17px}.fade-enter-to[data-v-17c95816]{opacity:1}.sso-img[data-v-11f19a09]{margin:2px auto 0;width:35px}input[data-v-11f19a09]{margin:0 auto;height:25px}.sso-img[data-v-4f821f65]{margin:2px auto 0;width:35px}input[data-v-4f821f65]{margin:0 auto;height:25px}.link-grid,.user-link-img{width:100%;display:inline-table;position:relative}.link-grid{width:30%;margin:1.6%;padding:1.6%}.link-grid .user-link-img img{border-radius:25%!important}.link-grid .edit-icon{border-radius:20px;right:-3%;top:-3%;position:absolute;z-index:3;max-width:23%;overflow:hidden;min-width:30px}.link-grid .direct-icon{border-radius:20px;left:-3%;top:-3%;position:absolute;z-index:555;max-width:23%;overflow:hidden;min-width:30px}.link-grid .link-text{min-height:20px;margin-top:3px!important;display:block;text-align:center;line-height:normal;overflow-wrap:anywhere}.link-list{width:93%;max-height:67px!important;margin:0 auto;display:flex;border-radius:15px!important;background-color:#fff;border:solid 1px #e8e8e8;position:relative;align-items:center}.link-list .user-link-img{display:inline-block;width:65px;border-radius:25%!important}.link-list .link-text{display:inline-block;padding:18px 0% 17px 10%;font-size:15px;font-weight:500;white-space:nowrap;text-overflow:ellipsis;overflow:hidden;flex:1;text-align:left;border-radius:15px!important}.link-list .edit-icon{border-radius:20px;right:7%;top:30%;position:absolute;z-index:3;width:26px;overflow:hidden}.link-list .switching{width:45px}.link-list .direct-icon{border-radius:20px;left:-2%;top:-13%;position:absolute;z-index:555;width:26px;overflow:hidden}.small{width:22%!important;margin:2% 4% 0%;padding:0%}.small .link-text{margin-top:0!important;font-size:13px}.linkExternal{margin-right:20px;width:20px;display:inline-block!important;height:20px;background:#000;-webkit-mask:url(https://cdn.tapni.co/icons/link-external.svg) no-repeat center;mask:url(https://cdn.tapni.co/icons/link-external.svg) no-repeat center;transform:scale(1.5)}.user-img[data-v-a49a90e5]{margin:2px auto 0;width:65px}input[data-v-a49a90e5]{margin:0 auto;height:25px}html *{font-family:Inter,sans-serif}#bodyId{padding-top:3%;max-width:667px!important;margin:1.5% auto auto;height:95%!important;border-radius:20px}.action-block-top .default-text,.action-block-top .default-text:after{border-radius:50%;width:10em!important;height:10em!important}.action-block-top .default-text{margin:10px auto;font-size:3px;position:relative;text-indent:-9999em;border-left:.5em solid #000000;border-top:.5em solid rgba(0,0,0,.2);border-right:.5em solid rgba(0,0,0,.2);border-bottom:.5em solid rgba(0,0,0,.2);-webkit-transform:translateZ(0);-ms-transform:translateZ(0);transform:translateZ(0);-webkit-animation:load8 1.1s infinite linear;animation:load8 1.1s infinite linear}@-webkit-keyframes load8{0%{-webkit-transform:rotate(0deg);transform:rotate(0)}to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes load8{0%{-webkit-transform:rotate(0deg);transform:rotate(0)}to{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}.smartbanner-ios{background:linear-gradient(to bottom,#f4f4f4,#f4f4f4);box-shadow:0 0 #fff;border-bottom:1px solid #dddddd}.smartbanner-icon{border-radius:16px}.smartbanner-ios .smartbanner-button{font-size:13px;padding:9px 0;height:40px;border-radius:13px;background:#f4f4f4;color:#0a99d2;border:none;box-shadow:none;text-transform:uppercase}.snack-body{display:none;border-radius:40px;font-size:15px!important}#errorSnack{background-color:#fee3e3!important;border:2px solid #edd9d9!important;color:#000}#successSnack{background-color:#eff5eb!important;border:2px solid #e3ecd7!important;color:#000}.grecaptcha-badge{visibility:hidden}.header-logo{position:absolute;left:50%;transform:translate(-50%,-50%);margin-top:0;z-index:2}.header-logo-img{height:40px;margin-top:10px}.container[data-v-992c1e64]{padding:20px 20px 100px!important;display:flex;flex-direction:column;gap:20px}.settingsCard[data-v-992c1e64]{background-color:#fff;padding:20px;border-radius:26px;align-items:center}.device[data-v-992c1e64]{display:flex;align-items:center}h4[data-v-992c1e64]{margin-left:20px;font-weight:700}.middle[data-v-992c1e64]{flex:1}.left img[data-v-992c1e64]{background-color:#f7f8f9;border-radius:20px;padding:10px}.divider[data-v-992c1e64]{height:1px;background-color:#f0f0f0;margin:20px 0}.moreFooter[data-v-992c1e64]{display:flex;align-items:center;justify-content:space-between;padding:0 10px}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tapni/auth",
-  "version": "0.0.163",
+  "version": "0.0.165",
   "type": "module",
   "main": "./dist/TapniAuth.umd.js",
   "module": "./dist/TapniAuth.es.js",
@@ -43,7 +43,9 @@
     "vue": "^3.3.11",
     "vue-cookies": "^1.8.3",
     "vue-router": "^4.2.5",
-    "vuex": "^4.0.2"
+    "vuex": "^4.0.2",
+    "vuex-router-sync": "v6.0.0-rc.1"
+
   },
   "devDependencies": {
     "@rollup/plugin-inject": "^5.0.5",

package/src/main.js

@@ -6,11 +6,15 @@ import VueCookies from 'vue-cookies'
 import { App } from '@capacitor/app';
 import { Browser } from '@capacitor/browser';
 import store from './store/store.js';
+import { sync } from 'vuex-router-sync';
 
 const app = createApp(RootApp)
 
 app.config.productionTip = false
 
+// Vuex Router Sync
+sync(store, router);
+
 // Cookies
 app.use(VueCookies)
 

package/src/mixins/auth.mixin.js

@@ -37,7 +37,6 @@ export default {
       'setToken',
       'setView',
       'setStorage',
-      'setUserID',
       'updateLang',
       'login',
       'register',

package/src/mixins/global.mixin.js

@@ -4,7 +4,7 @@ export default {
   computed: {
     home() {
       if (this.$storex && this.$storex.token && this.$storex.username) {
-        if (import.meta.env.VITE_APP_MODE === 'npm') return '/' + this.$storex.username + '#gg'
+        if (import.meta.env.VITE_APP_MODE === 'npm') return '/' + this.$storex.username
         if (import.meta.env.VITE_APP_MODE === 'redirect') return '/account'
       } else return '/welcome'
     },

package/src/mixins/qr-auth.mixin.js

@@ -93,7 +93,7 @@ export default {
         }, this.$storex));
         if (err) return this.errorHandler(err);
         if (response.data.auth_code) {
-          if (this.display === 'npm') {
+          if (this.display !== 'popup') {
             this.loginSetup({ ...response, isModal: this.isModal });
             await this.getLoggedInAccounts();
           }

package/src/store/auth.js

@@ -97,15 +97,9 @@ export default {
       refreshTokens = [token, ...refreshTokens.filter(t => t !== token)];
       state.$storex.refreshTokens = refreshTokens.join(",");
     },
-    unsetRefreshToken(state, refreshToken) {
-      state.$storex.refreshTokens = state.$storex.refreshTokens?.filter(t => t !== refreshToken).join(",");
-    },
     setToken(state, token) {
       state.$storex.token = token;
     },
-    setUserID(state, userID) {
-      state.$storex.UserId = userID;
-    },
     updateLang(state, lang) {
       state.lang = lang;
     },
@@ -263,7 +257,7 @@ export default {
         }
         EventBus.$emit("ssoEvent", { name: "switchAccount",  data: { username }, });
       },
-      async refreshTokenAction({ commit, state, getters }, data) {
+      async refreshTokenAction({ dispatch, commit, state, getters }, data) {
           if (state.refreshing) {
             return null;
           }
@@ -277,7 +271,7 @@ export default {
               })
           );
           if (err && err.response && err.response.data.error === "ACCESS_DENIED") {
-            commit('logout', { refreshToken: data.refreshToken, sendRequest: false });
+            dispatch('logout', { refreshToken: data.refreshToken, sendRequest: false });
             return location.reload();
           }
 
@@ -292,7 +286,7 @@ export default {
         const [err, response] = await to(AuthService.login(data));
         if (err) return dispatch('errorHandler', err);
         if (response.data.success) {
-            if (state.display === 'npm') {
+            if (state.display !== 'popup') {
             dispatch('loginSetup', { ...response, isModal: data.isModal });
             await dispatch('getLoggedInAccounts');
           }
@@ -448,22 +442,23 @@ export default {
         }
         commit('setLoggedInUserId', '');
 
-        const remainingRefreshTokens = dispatch('unsetRefreshToken', refreshToken);
+        const remainingRefreshTokens = await dispatch('unsetRefreshToken', refreshToken);
 
         if (remainingRefreshTokens.length >= 1) {
           Object.keys(state.loggedInAccounts).forEach((username) => {
             if (state.loggedInAccounts[username].refreshToken === remainingRefreshTokens[0]) {
 
+              commit('setRefreshToken', remainingRefreshTokens[0]);
+              commit('setLoggedInUserId', state.loggedInAccounts[username].id);
               dispatch('refreshTokenAction', state.loggedInAccounts[username]).then(() => {
-                commit('setLoggedInUserId', state.loggedInAccounts[username].id);
-                if (state.$storex) {
-                  state.$storex.username = username;
-                  state.$storex.UserId = state.loggedInAccounts[username].id;
-                }
-                dispatch('getLoggedInAccounts');
+                  EventBus.$emit("ssoEvent", { name: "switchAccount",  data: { username }, });
               });
             }
           });
+        } else {
+            if (state.display === "redirect") {
+                return router.push('/');
+            }
         }
       },
       async getCompanyBySSOEmail({ commit, dispatch }, data) {
@@ -503,7 +498,7 @@ export default {
       setRefreshToken({ commit }, token) {
         commit('setRefreshToken', token);
       },
-      unsetRefreshToken({ commit, state, dispatch, getters }, refreshToken) {
+      async unsetRefreshToken({ commit, state, dispatch, getters }, refreshToken) {
           let refreshTokens = getters.refreshTokens;
 
           // Remove the specified refresh token from the list
@@ -517,9 +512,6 @@ export default {
       setToken({ commit }, token) {
           commit('setToken', token);
       },
-      setUserID({ commit }, userID) {
-          commit('setUserID', userID);
-      },
       updateLang({ commit }, lang) {
           commit('updateLang', lang);
       },
@@ -546,9 +538,9 @@ export default {
     isLoggedIn: state => {
       return !!state.$storex.token && state.$storex.token !== "" && state.$storex.token !== "null";
     },
-    renderView: state => {
+    renderView: (state, getters, rootState) => {
       if (state.display !== "npm") {
-        return '';
+          return rootState.route?.name;
       } else return state.view;
     },
     appRealm: state => {

package/src/views/Account.vue

@@ -160,6 +160,9 @@ export default {
     }
   },
   async mounted () {
+    if (!this.isLoggedIn) {
+      return this.$router.push('/');
+    }
     this.getAccountSettings();
   },
   methods: {

package/src/views/Register.vue

@@ -190,7 +190,7 @@ export default {
 	        this.successSnack(this.ssoLang[this.appLanguage].register_success);
 	        this.formButtonText = this.ssoLang[this.appLanguage].check_your_inbox
 	      } else if (response.data.message === 'SUCCESS_LOGIN') {
-			  if (this.display === 'npm') {
+			  if (this.display !== 'popup') {
 				  await this.loginSetup({ ...response, isModal: data.isModal });
 				  await this.getLoggedInAccounts();
 			  }