bt-core-app 1.3.3 → 1.3.5

package/dist/composables/auth.d.ts

@@ -1,3 +1,4 @@
+import { ComputedRef } from 'vue';
 import { BTDemo } from '../composables/demo';
 import { RemovableRef } from '@vueuse/core';
 
@@ -52,15 +53,17 @@ export interface BTAuth {
     canEditPermit: (permit: string) => boolean;
     canView: (navName?: string) => boolean;
     canViewPermit: (permit: string) => boolean;
-    credentials: any;
+    credentials: RemovableRef<any>;
     doShow: (subcodes?: string[], permissions?: string[], action?: 'view' | 'edit') => boolean;
     doShowByNav: (navName?: string | AuthItem, includeChildren?: boolean) => boolean;
     getAuthorizeUrl: (redirectPath?: string) => string;
     getTimeZone: () => string;
     getToken: (code?: string, state?: string) => Promise<void>;
+    isLoggedIn: ComputedRef<boolean>;
     login: (redirectPath?: string) => void;
     logout: (navNameRedirect?: string) => void;
     setAuth: (jwtToken?: string) => void;
+    timeZone: ComputedRef<string>;
     tryLogin: () => boolean | undefined;
 }
 export declare function useAuth(): BTAuth;

package/dist/composables/cosmetics.d.ts

@@ -1,3 +1,5 @@
+import { RemovableRef } from '@vueuse/core';
+
 interface CosmeticData {
     dark?: BaseCosmeticTheme;
     drawer?: boolean;
@@ -22,7 +24,7 @@ export interface UseCosmeticsOptions<T extends BaseCosmeticTheme> {
     defaultTheme?: string;
 }
 export interface BTCosmetics {
-    state: CosmeticData;
+    state: RemovableRef<CosmeticData>;
     initiate: () => void;
     resetCosmetics: (toDefault: boolean) => void;
     setTemporaryColor: (color: string) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bt-core-app",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "description": "Core app tools for some basic features like navigation, authentication, server apis, and cosmetics",
   "homepage": "https://github.com/BlitzItTech/bt-core",
   "bugs": {

package/src/components/BT-Field-Date.vue

@@ -25,7 +25,7 @@
                 inline
                 :is-24="false"
                 :time-picker-inline="useTime"
-                :timezone="auth.credentials.timeZone.value"
+                :timezone="auth.timeZone.value"
                 utc
                 v-bind="$attrs"
                 v-model="value" />

package/src/components/Dialog-Select-Date.vue

@@ -16,7 +16,7 @@
                         :model-auto="range"
                         :range="range"
                         :time-picker-inline="!range && useTime"
-                        :timezone="credentials.timeZone"
+                        :timezone="timeZone"
                         utc
                         v-bind="$attrs"
                         v-model="date" />
@@ -50,7 +50,7 @@
 
     const emit = defineEmits(['confirm', 'cancel'])
     const date = ref()
-    const { credentials } = useAuth()
+    const { timeZone } = useAuth()
 
     const canAccept = computed(() => {
         return !props.required || date.value

package/src/composables/api.ts

@@ -188,13 +188,13 @@ export function createApi(options?: UseApiOptions): BTApi {
 
     function defaultBuildHeaders(path: PathOptions): HeadersInit {
         let fetchOptions:any = { ...path.headers }
-        const auth = options?.auth?.credentials
+        //const auth = options?.auth?.credentials
 
         if (path.proxyID)
             fetchOptions.ManagedCompanyAccountID ??= path.proxyID
 
-        if (options?.useBearerToken != false && auth?.isLoggedIn == true)
-            fetchOptions.authorization ??= `bearer ${auth.token}`
+        if (options?.useBearerToken != false && options?.auth?.isLoggedIn.value == true)
+            fetchOptions.authorization ??= `bearer ${options?.auth?.credentials.value.token}`
         
         fetchOptions['Content-Type'] ??= (path.contentType ?? options?.defaultContentType ?? 'application/json')
 

package/src/composables/auth.ts

@@ -3,8 +3,9 @@ import { DateTime } from 'luxon'
 import { type RemovableRef, useStorage } from '@vueuse/core'
 import { type BTDemo } from '../composables/demo'
 import { useRouter } from 'vue-router'
-import { toValue } from 'vue'
+import { computed, type ComputedRef, toValue } from 'vue'
 import { useAuthUrl } from './urls'
+import { useApi } from './api'
 
 export interface AuthItem {
     children?: AuthItem[]
@@ -65,15 +66,17 @@ export interface BTAuth {
     canEditPermit: (permit: string) => boolean
     canView: (navName?: string) => boolean
     canViewPermit: (permit: string) => boolean
-    credentials: any
+    credentials: RemovableRef<any>
     doShow: (subcodes?: string[], permissions?: string[], action?: 'view' | 'edit') => boolean
     doShowByNav: (navName?: string | AuthItem, includeChildren?: boolean) => boolean
     getAuthorizeUrl: (redirectPath?: string) => string
     getTimeZone: () => string
     getToken: (code?: string, state?: string) => Promise<void>
+    isLoggedIn: ComputedRef<boolean>
     login: (redirectPath?: string) => void
     logout: (navNameRedirect?: string) => void
     setAuth: (jwtToken?: string) => void
+    timeZone: ComputedRef<string>
     tryLogin: () => boolean | undefined
 }
 
@@ -313,11 +316,8 @@ export function createAuth(options: CreateAuthOptions): BTAuth {
     /**defaults to find parameters from route query */
     async function getToken(code?: string, state?: string) {
         options.getToken ??= async () => {
-            // const route = useRoute()
-
-            let mCode = code // ?? route.query?.code as string
-            let mState = state //?? route.query?.state as string
-            // let mRedirectPath = redirect_path // ?? route.query?.redirect_path as string
+            let mCode = code
+            let mState = state
             let mGrantType = options.oauthGrantType ?? 'authorization_token'
             let mClientID = options.oauthClientID ?? ''
             
@@ -342,24 +342,22 @@ export function createAuth(options: CreateAuthOptions): BTAuth {
             formData['redirect_uri'] = `${window.location.origin}/authentication`
             formData['client_id'] = mClientID
     
-            const res = await fetch(url, {
-                method: 'POST',
-                mode: 'cors',
-                cache: 'no-cache',
-                body: JSON.stringify(formData)
+            const api = useApi()
+            const res = await api.post<any>({
+                additionalUrl: url,
+                data: formData
             })
+
+            // const res = await fetch(url, {
+            //     method: 'POST',
+            //     mode: 'cors',
+            //     cache: 'no-cache',
+            //     body: JSON.stringify(formData)
+            // })
+
+            // const data = await res.json()
     
-            const data = await res.json()
-    
-            setAuth(data.value?.access_token)
-
-            // if (mRedirectPath) {
-            //     window.location.href = mRedirectPath
-            // }
-            // else {
-            //     const router = useRouter()
-            //     router.push({ name: 'home' })
-            // }
+            setAuth(res.access_token)
         }
 
         return await options.getToken(code, state)
@@ -434,15 +432,19 @@ export function createAuth(options: CreateAuthOptions): BTAuth {
         canEditPermit,
         canView,
         canViewPermit,
-        credentials: state.value,
+        credentials: state,
         doShow,
         doShowByNav,
         getAuthorizeUrl,
         getTimeZone,
         getToken,
+        isLoggedIn: computed(() => state.value.isLoggedIn === true),
         login,
         logout,
         setAuth,
+        timeZone: computed(() => {
+            return state.value.timeZone ?? options.defaultTimeZone ?? defaultTimeZone
+        }),
         tryLogin
     }
 

package/src/composables/cosmetics.ts

@@ -48,7 +48,7 @@ export interface UseCosmeticsOptions<T extends BaseCosmeticTheme> {
 }
 
 export interface BTCosmetics {
-    state: CosmeticData
+    state: RemovableRef<CosmeticData>
     initiate: () => void
     resetCosmetics: (toDefault: boolean) => void
     setTemporaryColor: (color: string) => void
@@ -153,7 +153,7 @@ export function useCosmetics(): BTCosmetics {
     }
 
     return {
-        state: state.value,
+        state: state,
         initiate: loadCosmetics,
         resetCosmetics,
         setTemporaryColor,

package/src/composables/stores.ts

@@ -193,14 +193,14 @@ export function createSessionStoreDefinition(options: UseSessionStoreOptions): B
         // const authData = useAuthData()
         
         function getKey(dOptions: PathOptions) {
-            return `${options.storeName}_${options.auth?.credentials.userID ?? 'no-user-id'}_${dOptions.id ?? dOptions.data?.id ?? 'no-item-id'}`
+            return `${options.storeName}_${options.auth?.credentials.value.userID ?? 'no-user-id'}_${dOptions.id ?? dOptions.data?.id ?? 'no-item-id'}`
         }
 
         async function getAll<T extends BaseModel>(dOptions: PathOptions): Promise<StoreGetAllReturn<T>> {
             dOptions.additionalUrl ??= '/getAll'
             
             const path = buildPath(dOptions)
-            const key = `${options.storeName}_${options.auth?.credentials.userID ?? 'no-user-id'}_${path}`
+            const key = `${options.storeName}_${options.auth?.credentials.value.userID ?? 'no-user-id'}_${path}`
             const refresh = dOptions.refresh
 
             if (!refresh && searchMemory.value[key] !== undefined)
@@ -508,7 +508,7 @@ export function createWholeLastUpdateStoreDefinition(options: UseWholeLastUpdate
         const cacheLocally = options.storageMode == 'local-cache'
         
         function getKey() {
-            return `${options.storeName}_${options.auth?.credentials.userID ?? 'no-user-id'}`
+            return `${options.storeName}_${options.auth?.credentials.value.userID ?? 'no-user-id'}`
         }
 
         async function trySaveToLocalCache() {

package/test/auth.test.ts

@@ -47,7 +47,7 @@ describe('default auth', () => {
 
     test('creates successfully', () => {
         const state = auth.authState
-        const creds = auth.credentials
+        const creds = auth.credentials.value
         
         expect(state).not.toBeNull()
         expect(auth.credentials).not.toBeNull()