bt-core-app 1.3.0 → 1.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "bt-core-app",
-  "version": "1.3.0",
+  "version": "1.3.2",
   "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,9 +352,17 @@ 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)
+        return await options.getToken()
     }
 
     /**if not demoing, then will decrypt the jwtToken and attempt to set credentials */

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')
+//     })
+// })