bt-core-app 1.3.2 → 1.3.4

package/dist/composables/auth.d.ts

@@ -36,7 +36,7 @@ export interface CreateAuthOptions {
     /**OVERRIDES DEFAULT. use the given code and generate the url to convert to an access token */
     getTokenUrl?: (code: string, redirect_uri: string, grant_type: string, client_id: string) => string;
     /**OVERRIDES DEFAULT.  */
-    getToken?: () => Promise<void>;
+    getToken?: (code?: string, state?: string) => Promise<void>;
     oauthGrantType?: string;
     oauthClientID?: string;
     /**sets current credentials on top of default function
@@ -57,7 +57,7 @@ export interface BTAuth {
     doShowByNav: (navName?: string | AuthItem, includeChildren?: boolean) => boolean;
     getAuthorizeUrl: (redirectPath?: string) => string;
     getTimeZone: () => string;
-    getToken: () => Promise<void>;
+    getToken: (code?: string, state?: string) => Promise<void>;
     login: (redirectPath?: string) => void;
     logout: (navNameRedirect?: string) => void;
     setAuth: (jwtToken?: string) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bt-core-app",
-  "version": "1.3.2",
+  "version": "1.3.4",
   "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/composables/auth.ts

@@ -2,9 +2,10 @@ import { appendUrl, isLengthyArray } from '../composables/helpers'
 import { DateTime } from 'luxon'
 import { type RemovableRef, useStorage } from '@vueuse/core'
 import { type BTDemo } from '../composables/demo'
-import { useRoute, useRouter } from 'vue-router'
+import { useRouter } from 'vue-router'
 import { toValue } from 'vue'
 import { useAuthUrl } from './urls'
+import { useApi } from './api'
 
 export interface AuthItem {
     children?: AuthItem[]
@@ -48,7 +49,7 @@ export interface CreateAuthOptions {
     /**OVERRIDES DEFAULT. use the given code and generate the url to convert to an access token */
     getTokenUrl?: (code: string, redirect_uri: string, grant_type: string, client_id: string) => string
     /**OVERRIDES DEFAULT.  */
-    getToken?: () => Promise<void>
+    getToken?: (code?: string, state?: string) => Promise<void>
     oauthGrantType?: string
     oauthClientID?: string
     /**sets current credentials on top of default function
@@ -70,7 +71,7 @@ export interface BTAuth {
     doShowByNav: (navName?: string | AuthItem, includeChildren?: boolean) => boolean
     getAuthorizeUrl: (redirectPath?: string) => string
     getTimeZone: () => string
-    getToken: () => Promise<void>
+    getToken: (code?: string, state?: string) => Promise<void>
     login: (redirectPath?: string) => void
     logout: (navNameRedirect?: string) => void
     setAuth: (jwtToken?: string) => void
@@ -311,13 +312,10 @@ export function createAuth(options: CreateAuthOptions): BTAuth {
     }
 
     /**defaults to find parameters from route query */
-    async function getToken(code?: string, state?: string, redirect_path?: string) {
+    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,27 +340,25 @@ 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 data = await res.json()
-    
-            setAuth(data.value?.access_token)
 
-            if (mRedirectPath) {
-                window.location.href = mRedirectPath
-            }
-            else {
-                const router = useRouter()
-                router.push({ name: 'home' })
-            }
+            // const res = await fetch(url, {
+            //     method: 'POST',
+            //     mode: 'cors',
+            //     cache: 'no-cache',
+            //     body: JSON.stringify(formData)
+            // })
+
+            // const data = await res.json()
+    
+            setAuth(res.access_token)
         }
 
-        return await options.getToken()
+        return await options.getToken(code, state)
     }
 
     /**if not demoing, then will decrypt the jwtToken and attempt to set credentials */