@tapni/auth 0.0.119 → 0.0.129

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tapni/auth",
-  "version": "0.0.119",
+  "version": "0.0.129",
   "type": "module",
   "main": "./dist/TapniAuth.umd.js",
   "module": "./dist/TapniAuth.es.js",
@@ -34,7 +34,7 @@
     "@codetrix-studio/capacitor-google-auth": "^3.3.6",
     "@otplib/preset-browser": "^12.0.1",
     "@recognizebv/capacitor-plugin-msauth": "^3.5.1",
-    "@tapni/capacitor-reactive-localstorage-vue3": "^0.0.15",
+    "@tapni/capacitor-reactive-localstorage-vue3": "^0.0.16",
     "@tapni/styles": "^0.0.3",
     "await-to-js": "^3.0.0",
     "axios": "^1.6.5",

package/src/App.vue

@@ -96,8 +96,10 @@ import {EventBus} from "./store/event-bus.js";
 import AuthMixin from "@/mixins/auth.mixin.js";
 import Language from "@/components/Language.vue";
 import ReactiveStorage from '@tapni/capacitor-reactive-localstorage-vue3'
+import store from './store/auth.js';
 
 export default {
+  store,
   name: 'TapniAuth',
   mixins: [ReactiveStorage, AuthMixin],
   data () {
@@ -150,7 +152,7 @@ export default {
   async mounted() {
     console.log('eey');
     this.applyBgStyle()
-    this.$store.commit('setView', this.viewProp);
+    this.setView(this.viewProp);
 
     EventBus.$on('ssoEvent', this.ssoOutgoingEvent)
     EventBus.$on('ssoLogout',(data) => this.logout(data.refreshToken))
@@ -164,7 +166,7 @@ export default {
       console.log('initt');
 
       // Set $storage into vuex $storex
-      this.$store.commit('setStorage', this.storage);
+      this.setStorage(this.$storage);
 
       // Make sure the function is called just once
       if (this.isSetup) return;
@@ -199,7 +201,7 @@ export default {
     display () {
       this.applyBgStyle()
     },
-    'storageReady.value' (nv) {
+    '$storageReady.value' (nv) {
       if (nv) {
         // Initialize Library after all event listeners & storage are set
         this.$nextTick(() => {
@@ -212,7 +214,7 @@ export default {
         clearInterval(this.storeInterval);
         this.storeInterval = setTimeout(() => {
           Object.keys(nv).forEach(key => {
-            this.storage[key] = nv[key];
+            this.$storage[key] = nv[key];
           });
         }, 250)
       },

package/src/install.js

@@ -1,11 +1,14 @@
 import App from "./App.vue";
-import AuthMixin from './mixins/auth.mixin.js'
+import auth from './store/auth.js';
 
 // Export the component by default
 export default {
-    TapniAuth: App,
-    AuthMixin: AuthMixin,
-    install: (app, options) => {
+    install: (app, rootStore) => {
+        // Register the component
         app.component('TapniAuth', App);
+
+        if(!rootStore.hasModule('auth')) {
+            rootStore.registerModule('auth', auth);
+        }
     }
 };

package/src/mixins/auth.mixin.js

@@ -1,4 +1,5 @@
-import { mapState, mapActions, mapGetters } from 'vuex';
+import { createNamespacedHelpers } from 'vuex';
+const { mapState, mapActions, mapGetters } = createNamespacedHelpers('auth');
 import GlobalMixin from './global.mixin'
 
 export default {
@@ -32,6 +33,8 @@ export default {
       'setRefreshToken',
       'unsetRefreshToken',
       'setToken',
+      'setView',
+      'setStorage',
       'setUserID',
       'updateLang',
       'login',
@@ -50,16 +53,20 @@ export default {
       'getLoggedInAccounts',
       'loginUsingQR',
       'getAccountSettings',
+      'setRedirectUri',
+      'setDisplay',
+      'setState',
+      'setResponseType',
     ])
   },
   watch: {
     "$route.query": {
       handler: function handler() {
-        if (this.$route.query.redirect_uri) this.$store.dispatch('setRedirectUri', this.$route.query.redirect_uri);
-        if (this.$route.query.display) this.$store.dispatch('setDisplay', this.$route.query.display);
-        if (this.$route.query.state) this.$store.dispatch('setState', this.$route.query.state)
-        if (this.$route.query.response_type) this.$store.dispatch('setResponseType', this.$route.query.response_type);
-        if (this.$route.query.realm && this.$storage) this.$store.dispatch('setRealm', this.$route.query.realm);
+        if (this.$route.query.redirect_uri) this.setRedirectUri(this.$route.query.redirect_uri);
+        if (this.$route.query.display) this.setDisplay(this.$route.query.display);
+        if (this.$route.query.state) this.setState(this.$route.query.state)
+        if (this.$route.query.response_type) this.setResponseType(this.$route.query.response_type);
+        if (this.$route.query.realm && this.$storage) this.setRealm(this.$route.query.realm);
       },
       deep: true,
     },

package/src/services/Api.js

@@ -3,19 +3,18 @@ import { jwtDecode } from "jwt-decode";
 import { version } from "../../package.json"
 import store from '../store/store.js';
 
-
 export default (refreshTokenAction = null) => {
     const appInfo = version;
     let baseURL = import.meta.env.VITE_APP_API_ROOT + '/v1/';
 
-    if (store.getters.apiRoot) {
-      baseURL = store.getters.apiRoot;
+    if (store.getters['auth/apiRoot']) {
+      baseURL = store.getters['auth/apiRoot'];
     }
 
     let apiInstance = axios.create({
       baseURL,
       headers: {
-        Authorization: `Bearer ${store.getters.accessToken}`,
+        Authorization: `Bearer ${store.getters['auth/accessToken']}`,
         "X-Client-Name": "sso-" + appInfo.platform,
         "X-Client-Version": appInfo.version
       }
@@ -27,28 +26,28 @@ export default (refreshTokenAction = null) => {
       if (['post', 'put', 'delete'].includes(config.method.toLowerCase())) {
         config.data = {
           ...config.data,
-          lang: store.getters.appLanguage,
-          realm: store.getters.appRealm || 'app'
+          lang: store.getters['auth/appLanguage'],
+          realm: store.getters['auth/appRealm'] || 'app'
         }
       } else if (config.method.toLowerCase() === 'get') {
         config.params = {
           ...config.params,
-          lang: store.getters.appLanguage,
-          realm: store.getters.appRealm || 'app'
+          lang: store.getters['auth/appLanguage'],
+          realm: store.getters['auth/appRealm'] || 'app'
         }
       }
 
         // Check refresh token expiration before request is sent
-      if (store.getters.accessToken && !refreshTokenAction) {
-        const decoded = jwtDecode(store.getters.accessToken)
+      if (store.getters['auth/accessToken'] && !refreshTokenAction) {
+        const decoded = jwtDecode(store.getters['auth/accessToken'])
 
         // Check if access token expired
         if (decoded.exp - 30 < Math.floor(Date.now() / 1000)) {
-          return store.dispatch('refreshTokenAction', decoded)
+          return store.dispatch('auth/refreshTokenAction', decoded)
               .then(() => {
                 config.headers = {
                   ...config.headers,
-                  Authorization: `Bearer ${store.getters.accessToken}`
+                  Authorization: `Bearer ${store.getters['auth/accessToken']}`
                 }
                 return config;
               })