hl-core 0.0.10-beta.15 → 0.0.10-beta.16

package/composables/index.ts

@@ -1,10 +1,10 @@
 import { useDisplay } from 'vuetify';
-import jwt_decode from 'jwt-decode';
+import { jwtDecode as jwt_decode } from 'jwt-decode';
 import { XMLParser } from 'fast-xml-parser';
 import { AxiosError } from 'axios';
 import { DocumentReaderApi, Scenario, TextFieldType, LCID } from '@regulaforensics/document-reader-webclient';
 import { PolicyholderClass } from '../composables/classes';
-import type { EnvModes, NestedKeyOf, ResponseStructure } from '../types';
+import type { EnvModes, NestedKeyOf, ResponseStructure, Utils } from '../types';
 
 export const useEnv = () => {
   return {
@@ -102,13 +102,14 @@ export const formatPhone = (phone: string) => {
 
 export const cleanWhiteSpace = (str: string) => String(str).replace(/\s+/g, '');
 
-export const jwtDecode = (token: string): any => {
-  if (token) return jwt_decode(token);
+export const jwtDecode = (token?: string | null) => {
+  if (token) return jwt_decode<Utils.JwtToken>(token);
   else return null;
 };
 
 export const isValidToken = (token: string) => {
-  return (new Date(jwtDecode(token).exp * 1000).getTime() - Date.now()) / 1000 > 0;
+  const decoded = jwtDecode(token);
+  return !!decoded && (new Date(Number(decoded.exp) * 1000).getTime() - Date.now()) / 1000 > 0;
 };
 
 export const isValidGUID = (value: string) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hl-core",
-  "version": "0.0.10-beta.15",
+  "version": "0.0.10-beta.16",
   "license": "MIT",
   "private": false,
   "main": "nuxt.config.ts",
@@ -36,35 +36,35 @@
     "i:all": "cd .. && for /d %i in (.\\*) do echo Project: = %i && cd %i && yarn && cd .."
   },
   "devDependencies": {
-    "@nuxt/devtools": "1.0.6",
-    "@vueuse/components": "10.7.2",
-    "@vueuse/core": "10.7.2",
-    "@vueuse/nuxt": "10.7.2",
-    "nuxt": "3.10.2",
+    "@nuxt/devtools": "1.0.8",
+    "@vueuse/components": "10.8.0",
+    "@vueuse/core": "10.8.0",
+    "@vueuse/nuxt": "10.8.0",
+    "nuxt": "3.10.3",
     "prettier": "3.2.5",
     "vue": "3.4.19",
-    "vue-router": "4.2.5"
+    "vue-router": "4.3.0"
   },
   "dependencies": {
     "@intlify/unplugin-vue-i18n": "2.0.0",
     "@microsoft/signalr": "7.0.12",
-    "@nuxtjs/tailwindcss": "6.11.2",
+    "@nuxtjs/tailwindcss": "6.11.4",
     "@pinia/nuxt": "0.5.1",
     "@regulaforensics/document-reader-webclient": "6.9.5",
-    "@vite-pwa/nuxt": "0.4.0",
+    "@vite-pwa/nuxt": "0.5.0",
     "@vuepic/vue-datepicker": "7.4.1",
     "axios": "1.6.7",
     "fast-xml-parser": "4.0.12",
-    "jwt-decode": "3.1.2",
+    "jwt-decode": "4.0.0",
     "maska": "1.5.0",
     "ncalayer-js-client": "1.3.4",
     "pinia": "2.1.7",
     "qrcode.vue": "3.4.1",
     "typescript": "5.3.3",
     "vue-i18n": "9.9.1",
-    "vue-json-pretty": "2.2.4",
+    "vue-json-pretty": "2.3.0",
     "vue-toastification": "2.0.0-rc.5",
     "vue-uuid": "3.0.0",
-    "vuetify": "3.5.4"
+    "vuetify": "3.5.6"
   }
 }

package/store/data.store.ts

@@ -160,21 +160,23 @@ export const useDataStore = defineStore('data', {
     getUserRoles() {
       if (this.accessToken && this.user.roles.length === 0) {
         const decoded = jwtDecode(this.accessToken);
-        this.user.id = decoded.sub;
-        this.user.fullName = `${decoded.lastName} ${decoded.firstName} ${decoded.middleName ? decoded.middleName : ''}`;
-        const key = getKeyWithPattern(decoded, 'role');
-        if (key) {
-          const roles = decoded[key];
-          if (typeof roles === 'string') {
-            this.user.roles.push(roles);
-          } else if (typeof roles === 'object') {
-            this.user.roles = roles;
+        if (decoded) {
+          this.user.id = String(decoded.sub);
+          this.user.fullName = `${decoded.lastName} ${decoded.firstName} ${decoded.middleName ?? ''}`;
+          const key = getKeyWithPattern(decoded, 'role');
+          if (key) {
+            const roles = decoded[key as keyof Types.Utils.JwtToken];
+            if (typeof roles === 'string') {
+              this.user.roles.push(roles);
+            } else if (typeof roles === 'object') {
+              this.user.roles = roles;
+            }
           }
         }
       }
     },
     getUserData() {
-      return this.accessToken ? jwtDecode(this.accessToken) : null;
+      return jwtDecode(this.accessToken);
     },
     async getUserGroups() {
       try {
@@ -3253,13 +3255,16 @@ export const useDataStore = defineStore('data', {
       if (!this.accessToken) return null;
       try {
         const decoded = jwtDecode(this.accessToken);
-        const data = {
-          userName: decoded.code,
-          branchName: decoded.branchCode,
-          bin: bin.replace(/-/g, ''),
-        };
-        const gbdulResponse = await this.api.getGbdUl(data);
-        return gbdulResponse;
+        if (decoded) {
+          const data = {
+            userName: decoded.code,
+            branchName: decoded.branchCode,
+            bin: bin.replace(/-/g, ''),
+          };
+          const gbdulResponse = await this.api.getGbdUl(data);
+          return gbdulResponse;
+        }
+        return null;
       } catch (err) {
         return ErrorHandler(err);
       }

package/types/index.ts

@@ -2,6 +2,7 @@ import { Value } from '../composables/classes';
 import type { RouteLocationNormalizedLoaded, RouteLocationNormalized } from 'vue-router';
 import type { AxiosRequestConfig } from 'axios';
 import { Methods, CoreEnums, Actions, Statuses } from './enum';
+import type { JwtPayload } from 'jwt-decode';
 export { Methods, CoreEnums, Actions, Statuses };
 
 export type EnvModes = 'development' | 'test' | 'production';
@@ -732,6 +733,22 @@ export namespace Utils {
   export type VuetifyAnimations = 'expand' | 'fab' | 'fade' | 'scale' | 'scroll-x' | 'scroll-y' | 'slide-x' | 'slide-x-r' | 'slide-y' | 'slide-y-r';
   export type LabelSize = 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 | 11;
   export type VIcon = { mdi?: string; color?: string; bg?: string; size?: 'x-small' | 'small' | 'default' | 'large' | 'x-large' };
+  export type JwtToken = JwtPayload & {
+    lastName: string;
+    firstName: string;
+    middleName?: string;
+    code: string;
+    name?: string;
+    branchId: string;
+    branchCode: string;
+    branchName: string;
+    isAdmin: boolean;
+    iin: string;
+    phone: string;
+    email: string;
+    isChangePassword: boolean;
+    Permission: string[];
+  };
 }
 
 export namespace Api {