@sowell/quasar-app-extension-auth 0.2.1 → 0.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sowell/quasar-app-extension-auth",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "description": "A Quasar app extension to manage Authentication",
   "main": "src/index.js",
   "repository": "https://github.com/sowell-ai/quasar.extension.auth",

package/src/boot/router-guards.ts

@@ -9,8 +9,10 @@ export default boot(({ router, store }: BootInterface) => {
   } = prompts;
 
   router.beforeEach((to, from, next) => {
-    const token = store.state.auth.token;
+    let isValid = store.getters["token/getIsValid"]
+    let token = store.getters["token/getRaw"]
     if (
+      !isValid &&
       !token &&
       to.path !== LOCAL_LOGIN_ROUTE &&
       to.path !== LOCAL_CHECK_CODE_ROUTE

package/src/boot/store.ts

@@ -1,10 +1,10 @@
 //@ts-ignore
 import { boot } from "quasar/wrappers";
 import { BootInterface } from "../interfaces";
-import authModule from "../store";
+import tokenModule from "../store";
 
 export default boot(({ app, store }: BootInterface) => {
   // Register store module
-  store.registerModule("auth", authModule);
+  store.registerModule("token", tokenModule);
   app.provide("$store", store);
 });

package/src/components/pages/Auth.vue

@@ -136,11 +136,11 @@ export default defineComponent({
     } = $prompts();
     const $q = useQuasar();
     const { push, replace } = $router();
-    const { state, dispatch } = $store();
+    const { dispatch, getters } = $store();
     const { t } = useI18n();
 
     onMounted(() => {
-      if (state.auth.token) {
+      if (getters["token/getRaw"]) {
         replace(LOCAL_SUCCESS_REDIRECTION_ROUTE);
       }
     });
@@ -188,11 +188,7 @@ export default defineComponent({
       post(AUTH_SERVER_SIGNING_ROUTE, data)
         .then((response: AxiosResponse) => {
           const token = response.data.jwt;
-          dispatch("auth/updateToken", token);
-          const payload = parseJwt(token);
-          const user = { roles: payload.roles };
-          dispatch("auth/updateUser", user);
-
+          dispatch("token/updateRaw", token);
           push(LOCAL_SUCCESS_REDIRECTION_ROUTE);
         })
         .catch((error: AxiosError) => {
@@ -214,10 +210,6 @@ export default defineComponent({
       );
     };
 
-    const parseJwt = (token: string) => {
-      return JSON.parse(window.atob(token.split(".")[1]));
-    };
-
     return {
       email,
       password,

package/src/interfaces/TokenStateInterface.ts

@@ -0,0 +1,11 @@
+export interface payload {
+  company_hp?: number
+  exp?: number
+  gm_key: string
+  roles: string[] | []
+  sub: number | null
+}
+export interface tokenStateInterface {
+  raw: string
+  payload: payload
+}

package/src/interfaces/index.ts

@@ -1,2 +1,2 @@
 export * from "./Boot";
-export * from "./AuthState";
+export * from "./TokenStateInterface";

package/src/store/index.ts

@@ -1,16 +1,56 @@
-import { Module } from "vuex";
-import state from "./state";
-import actions from "./actions";
-import getters from "./getters";
-import mutations from "./mutations";
-import { AuthStateInterface } from "../interfaces";
+import { Module, GetterTree, MutationTree, ActionTree } from "vuex";
+import { tokenStateInterface, payload } from "../interfaces";
 
-const authModule: Module<AuthStateInterface, any> = {
+const state: tokenStateInterface = {
+  raw: "",
+  payload: {
+    company_hp: undefined,
+    exp: undefined,
+    gm_key: "",
+    roles: [],
+    sub: null
+  }
+}
+
+const getters: GetterTree<tokenStateInterface, any> = {
+  getRaw(state) {
+    return state.raw
+  },
+  getPayload(state) {
+    return state.payload
+  },
+  getIsValid(state) {
+    if (state.payload.exp) {
+      return new Date(state.payload.exp * 1000) >= new Date() ? true : false;
+    } else {
+      return false
+    }
+  }
+}
+
+const mutations: MutationTree<tokenStateInterface> = {
+  setRaw(state, value: string) {
+    state.raw = value
+  },
+  setPayload(state, value: payload) {
+    state.payload = {...value}
+  }
+}
+
+const actions: ActionTree<tokenStateInterface, any> = {
+  updateRaw({ commit }, value: string) {
+    commit("setRaw", value);
+    const parseJwt = JSON.parse(window.atob(value.split(".")[1]));
+    commit("setPayload", parseJwt)
+  }
+}
+
+const tokenModule: Module<tokenStateInterface, any> = {
   namespaced: true,
-  actions,
   getters,
   mutations,
-  state,
-};
+  actions,
+  state
+}
 
-export default authModule;
+export default tokenModule;

package/src/interfaces/AuthState.ts

@@ -1,7 +0,0 @@
-export interface UserInterface {
-  roles: string[];
-}
-export interface AuthStateInterface {
-  token: string | null;
-  user: UserInterface;
-}

package/src/store/actions.ts

@@ -1,13 +0,0 @@
-import { ActionTree } from "vuex";
-import { AuthStateInterface, UserInterface } from "../interfaces";
-
-const actions: ActionTree<AuthStateInterface, any> = {
-  updateToken({ commit }, value: string) {
-    commit("setToken", value);
-  },
-  updateUser({ commit }, value: UserInterface) {
-    commit("setUser", value);
-  },
-};
-
-export default actions;

package/src/store/getters.ts

@@ -1,13 +0,0 @@
-import { GetterTree } from "vuex";
-import { AuthStateInterface } from "../interfaces";
-
-const getters: GetterTree<AuthStateInterface, any> = {
-  getToken(state) {
-    return state.token;
-  },
-  getUser(state) {
-    return state.user;
-  },
-};
-
-export default getters;

package/src/store/mutations.ts

@@ -1,13 +0,0 @@
-import { MutationTree } from "vuex";
-import { AuthStateInterface, UserInterface } from "../interfaces";
-
-const mutation: MutationTree<AuthStateInterface> = {
-  setToken(state, value: string) {
-    return (state.token = value);
-  },
-  setUser(state, value: UserInterface) {
-    return (state.user = value);
-  },
-};
-
-export default mutation;

package/src/store/state.ts

@@ -1,12 +0,0 @@
-import { AuthStateInterface } from "../interfaces";
-
-function state(): AuthStateInterface {
-  return {
-    token: "",
-    user: {
-      roles: [],
-    },
-  };
-}
-
-export default state;