bt-core-app 1.3.3 → 1.3.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bt-core-app",
-  "version": "1.3.3",
+  "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

@@ -5,6 +5,7 @@ import { type BTDemo } from '../composables/demo'
 import { useRouter } from 'vue-router'
 import { toValue } from 'vue'
 import { useAuthUrl } from './urls'
+import { useApi } from './api'
 
 export interface AuthItem {
     children?: AuthItem[]
@@ -313,11 +314,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 +340,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)