bt-core-app 1.2.9 → 1.3.1

package/dist/composables/urls.d.ts

@@ -11,7 +11,7 @@ export interface UrlSet {
     other?: any;
 }
 export declare function useDbName(): string;
-export declare function useAuthUrl(environment?: Environment): string;
+export declare function useAuthUrl(): string;
 /**
  *
  * @param microservice

package/package.json

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

@@ -233,7 +233,8 @@ export function createAuth(options: CreateAuthOptions): BTAuth {
 
     function getAuthorizeUrl(redirectPath?: string) {
         options.getAuthorizeUrl ??= (redirectPath?: string, state?: string) => {
-            return appendUrl(useAuthUrl(), `authorize?response_type=code&client_id=${options.oauthClientID}&redirect_uri=${redirectPath}&state=${state}`)
+            const path = appendUrl(useAuthUrl(), `authorize?response_type=code&client_id=${options.oauthClientID}&redirect_uri=${window.location.origin}/authentication&state=${state}`)
+            return redirectPath ? `${path}&redirect_path=${redirectPath}` : path
         }
 
         if (options.getAuthorizeUrl != null)
@@ -316,7 +317,7 @@ export function createAuth(options: CreateAuthOptions): BTAuth {
 
             let mCode = code ?? route.query?.code as string
             let mState = state ?? route.query?.state as string
-            let mRedirect = redirect_path ?? route.query?.redirect_path as string
+            let mRedirectPath = redirect_path ?? route.query?.redirect_path as string
             let mGrantType = options.oauthGrantType ?? 'authorization_token'
             let mClientID = options.oauthClientID ?? ''
             
@@ -333,7 +334,7 @@ export function createAuth(options: CreateAuthOptions): BTAuth {
                 return appendUrl(useAuthUrl(), 'token')
             }
     
-            url = options.getTokenUrl(mCode, mRedirect, mGrantType, mClientID)
+            url = options.getTokenUrl(mCode, `${window.location.origin}/authentication`, mGrantType, mClientID)
     
             const formData: any = {}
             formData['grant_type'] = mGrantType
@@ -351,6 +352,14 @@ export function createAuth(options: CreateAuthOptions): BTAuth {
             const data = await res.json()
     
             setAuth(data.value?.access_token)
+
+            if (mRedirectPath) {
+                window.location.href = mRedirectPath
+            }
+            else {
+                const router = useRouter()
+                router.push({ name: 'home' })
+            }
         }
 
         return await getToken(code, state, redirect_path)

package/src/composables/document-meta.ts

@@ -20,7 +20,7 @@ export function useDocumentMeta(options?: UseDocumentMetaOptions): BTDocumentMet
             document.title = nearestWithTitle.meta.title as string
         }
         else {
-            const env = import.meta.env.MODE as Environment
+            const env = import.meta.env.NODE_ENV as Environment
             let title = ''
 
             if (env == 'development')

package/src/composables/urls.ts

@@ -16,7 +16,7 @@ export interface UrlSet {
 let current: CreateUrlOptions
 
 export function useDbName(): string {
-    const env = import.meta.env.MODE as Environment
+    const env = import.meta.env.NODE_ENV as Environment
 
     if (current == null)
         return env as string
@@ -25,14 +25,13 @@ export function useDbName(): string {
     return urlSet.localDbName ?? env as string
 }
 
-export function useAuthUrl(environment?: Environment): string {
-    const env = environment ?? import.meta.env.MODE as Environment
+export function useAuthUrl(): string {
+    const env = import.meta.env.NODE_ENV as Environment
 
     if (current == null)
         return ''
 
     const urlSet = current[env] ?? current['development']
-    console.log(urlSet)
     return urlSet.auth ?? ''
 }
 
@@ -42,7 +41,7 @@ export function useAuthUrl(environment?: Environment): string {
  * @returns 
  */
 export function useDataUrl(microservice?: string): string {
-    const env = import.meta.env.MODE as Environment
+    const env = import.meta.env.NODE_ENV as Environment
 
     if (current == null)
         return ''

package/test/auth.test.ts

@@ -42,8 +42,7 @@ afterEach(() => server.resetHandlers())
 describe('default auth', () => {
     const auth = createAuth({
         defaultTimeZone: 'Aus',
-        getAuthItem: () => { return {}},
-        getAuthQuery: () => ''
+        getAuthItem: () => { return {}}
     })
 
     test('creates successfully', () => {
@@ -64,4 +63,12 @@ describe('default auth', () => {
     test('login', () => {
         auth.login()
     })
-})
+})
+
+// describe('auth', () => {
+//     const auth = createAuth({})
+
+//     test('get auth url', () => {
+//         expect(auth.getAuthorizeUrl('redirect')).toEqual('a')
+//     })
+// })