bt-core-app 1.2.4 → 1.2.6

package/dist/composables/auth.d.ts

@@ -29,12 +29,20 @@ export interface CreateAuthOptions {
     demo?: BTDemo;
     /**expiry token date format.  Defaults to 'd/MM/yyyy h:mm:ss a' */
     expiryTokenFormat?: string;
-    /**retrieve the auth item */
-    getAuthItem: (navName?: string | AuthItem) => AuthItem | null;
-    /**retrieve the url to navigate to for the OAuth 2.0 process */
-    getAuthQuery: (redirectPath?: string, state?: string) => string;
-    /**sets current credentials on top of default function*/
-    setCredentials?: (state: RemovableRef<any>, payload: any) => void;
+    /**OVERRIDES CORE DEFAULT. retrieve the auth item */
+    getAuthItem?: (navName?: string | AuthItem) => AuthItem | null;
+    /**OVERRIDES DEFAULT. the url to start the OAuth 2.0 process */
+    getAuthorizeUrl?: (redirectPath?: string, state?: string) => string;
+    /**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>;
+    oauthGrantType?: string;
+    oauthClientID?: string;
+    /**sets current credentials on top of default function
+     * for processing the token payload and applying to state
+    */
+    processTokenPayload?: (state: RemovableRef<any>, payload: any) => void;
     /**suboptions */
     subscriptionOptions?: AuthSubscription[];
 }
@@ -47,8 +55,9 @@ export interface BTAuth {
     credentials: any;
     doShow: (subcodes?: string[], permissions?: string[], action?: 'view' | 'edit') => boolean;
     doShowByNav: (navName?: string | AuthItem, includeChildren?: boolean) => boolean;
-    getAuthUrl: (redirectPath?: string) => string;
+    getAuthorizeUrl: (redirectPath?: string) => string;
     getTimeZone: () => string;
+    getToken: () => Promise<void>;
     login: (redirectPath?: string) => void;
     logout: (navNameRedirect?: string) => void;
     setAuth: (jwtToken?: string) => void;

package/dist/core.d.ts

@@ -1,19 +1,17 @@
-import { RemovableRef } from '@vueuse/core';
 import { CreateUrlOptions } from './composables/urls';
 import { NavigationItem } from './composables/navigation';
 import { BaseCosmeticTheme, UseCosmeticsOptions } from './composables/cosmetics';
-import { AuthSubscription } from './composables/auth';
+import { CreateAuthOptions, AuthSubscription } from './composables/auth';
 import { App } from 'vue';
 
 export interface CoreApp {
     install(app: App): void;
 }
 export interface CreateCoreOptions extends UseCosmeticsOptions<BaseCosmeticTheme> {
+    auth: CreateAuthOptions;
     defaultCacheExpiryHours?: number;
-    getAuthQuery: (redirectPath?: string, state?: string) => string;
     navItems?: NavigationItem[];
     presets: any;
-    setCredentials?: (state: RemovableRef<any>, payload: any) => void;
     /**suboptions */
     subscriptionOptions?: AuthSubscription[];
     urls: CreateUrlOptions;

package/package.json

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

@@ -1,8 +1,8 @@
-import { isLengthyArray } from '../composables/helpers'
+import { appendUrl, isLengthyArray } from '../composables/helpers'
 import { DateTime } from 'luxon'
 import { type RemovableRef, useStorage } from '@vueuse/core'
 import { type BTDemo } from '../composables/demo'
-import { useRouter } from 'vue-router'
+import { useRoute, useRouter } from 'vue-router'
 import { toValue } from 'vue'
 import { useAuthUrl } from './urls'
 
@@ -41,12 +41,20 @@ export interface CreateAuthOptions {
     demo?: BTDemo,
     /**expiry token date format.  Defaults to 'd/MM/yyyy h:mm:ss a' */
     expiryTokenFormat?: string
-    /**retrieve the auth item */
-    getAuthItem: (navName?: string | AuthItem) => AuthItem | null
-    /**retrieve the url to navigate to for the OAuth 2.0 process */
-    getAuthQuery: (redirectPath?: string, state?: string) => string
-    /**sets current credentials on top of default function*/
-    setCredentials?: (state: RemovableRef<any>, payload: any) => void
+    /**OVERRIDES CORE DEFAULT. retrieve the auth item */
+    getAuthItem?: (navName?: string | AuthItem) => AuthItem | null
+    /**OVERRIDES DEFAULT. the url to start the OAuth 2.0 process */
+    getAuthorizeUrl?: (redirectPath?: string, state?: string) => string
+    /**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>
+    oauthGrantType?: string
+    oauthClientID?: string
+    /**sets current credentials on top of default function
+     * for processing the token payload and applying to state
+    */
+    processTokenPayload?: (state: RemovableRef<any>, payload: any) => void
     /**suboptions */
     subscriptionOptions?: AuthSubscription[]
 }
@@ -60,8 +68,9 @@ export interface BTAuth {
     credentials: any
     doShow: (subcodes?: string[], permissions?: string[], action?: 'view' | 'edit') => boolean
     doShowByNav: (navName?: string | AuthItem, includeChildren?: boolean) => boolean
-    getAuthUrl: (redirectPath?: string) => string
+    getAuthorizeUrl: (redirectPath?: string) => string
     getTimeZone: () => string
+    getToken: () => Promise<void>
     login: (redirectPath?: string) => void
     logout: (navNameRedirect?: string) => void
     setAuth: (jwtToken?: string) => void
@@ -83,7 +92,7 @@ export function createAuth(options: CreateAuthOptions): BTAuth {
     function canEdit(navName?: string): boolean {
         if (navName == null) return true
 
-        var navItem = options.getAuthItem(navName);
+        var navItem = options.getAuthItem != null ? options.getAuthItem(navName) : null;
         if (navItem == null) return false
         if (navItem.requiresAuth === false) return true
 
@@ -125,7 +134,7 @@ export function createAuth(options: CreateAuthOptions): BTAuth {
     function canView(navName: string | undefined): boolean {
         if (navName == null) return true
         
-        var navItem = options.getAuthItem(navName);
+        var navItem = options.getAuthItem != null ? options.getAuthItem(navName) : null;
         if (navItem == null) return false
         if (navItem.requiresAuth === false) return true
 
@@ -199,7 +208,7 @@ export function createAuth(options: CreateAuthOptions): BTAuth {
     }
 
     function doShowByNav(navName?: string | AuthItem, includeChildren: boolean = false) {
-        var navItem = options.getAuthItem(navName);
+        var navItem = options.getAuthItem != null ? options.getAuthItem(navName) : null;
         let doShowRes = false;
 
         if (navItem == null) return false
@@ -222,9 +231,15 @@ export function createAuth(options: CreateAuthOptions): BTAuth {
         return doShowRes;
     }
 
-    function getAuthUrl(redirectPath?: string) {
-        return `${useAuthUrl()}?${options.getAuthQuery(redirectPath, authState.value)}`
-        //return options.getAuthUrl(redirectPath, authState.value)
+    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}`)
+        }
+
+        if (options.getAuthorizeUrl != null)
+            return options.getAuthorizeUrl(redirectPath, authState.value) ?? ''
+
+        return ''
     }
 
     /**undefined or unfound is worth 0 */
@@ -289,11 +304,58 @@ export function createAuth(options: CreateAuthOptions): BTAuth {
             options.demo?.endDemo()
             if (tokenExpired()) {
                 logout()
-                window.location.href = getAuthUrl(redirectPath) //}response_type=code&client_id=appClient1&redirect_path=${redirectPath}` : getAuthUrl()
+                window.location.href = getAuthorizeUrl(redirectPath) //}response_type=code&client_id=appClient1&redirect_path=${redirectPath}` : getAuthUrl()
             }
         }
     }
 
+    /**defaults to find parameters from route query */
+    async function getToken(code?: string, state?: string, redirect_path?: string) {
+        options.getToken ??= async () => {
+            const route = useRoute()
+
+            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 mGrantType = options.oauthGrantType ?? 'authorization_token'
+            let mClientID = options.oauthClientID ?? ''
+            
+            if (mCode == null || mState == null) {
+                throw new Error('Code and State required in OAuth token process')
+            }
+    
+            if (mState != authState.value)
+                throw new Error('state does not match')
+    
+            let url = ''
+    
+            options.getTokenUrl ??= () => {
+                return appendUrl(useAuthUrl(), 'token')
+            }
+    
+            url = options.getTokenUrl(mCode, mRedirect, mGrantType, mClientID)
+    
+            const formData: any = {}
+            formData['grant_type'] = mGrantType
+            formData['code'] = mCode
+            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 data = await res.json()
+    
+            setAuth(data.value?.access_token)
+        }
+
+        return await getToken(code, state, redirect_path)
+    }
+
     /**if not demoing, then will decrypt the jwtToken and attempt to set credentials */
     function setAuth(jwtToken?: string) {
         if (jwtToken == null) return
@@ -303,9 +365,8 @@ export function createAuth(options: CreateAuthOptions): BTAuth {
             
             setDefaultAuth(d)
             
-            if (options.setCredentials != null) {
-                options.setCredentials(state as RemovableRef<any>, d)
-            }
+            if (options.processTokenPayload != null)
+                options.processTokenPayload(state, d)
         }
     }
 
@@ -341,7 +402,7 @@ export function createAuth(options: CreateAuthOptions): BTAuth {
         //what if no internet?
         if (mState.isLoggedIn && tokenExpired()) {
             logout()
-            window.location.href = getAuthUrl()
+            window.location.href = getAuthorizeUrl()
         }
 
         return mState.isLoggedIn
@@ -367,8 +428,9 @@ export function createAuth(options: CreateAuthOptions): BTAuth {
         credentials: state.value,
         doShow,
         doShowByNav,
-        getAuthUrl,
+        getAuthorizeUrl,
         getTimeZone,
+        getToken,
         login,
         logout,
         setAuth,

package/src/core.ts

@@ -1,6 +1,6 @@
 import { App } from 'vue'
 import { createApi } from './composables/api'
-import { createAuth, type AuthSubscription } from './composables/auth'
+import { CreateAuthOptions, createAuth, type AuthSubscription } from './composables/auth'
 import { BaseCosmeticTheme, createCosmetics, UseCosmeticsOptions } from './composables/cosmetics'
 import { createDates } from './composables/dates'
 import { createDemo } from './composables/demo'
@@ -10,7 +10,6 @@ import { createPresets } from './composables/presets'
 import { createPWA } from './composables/pwa'
 import { createStoreBuilder } from './composables/stores'
 import { CreateUrlOptions, createUrl } from './composables/urls'
-import { RemovableRef } from '@vueuse/core'
 
 
 import BTBtn from './components/BT-Btn.vue'
@@ -36,11 +35,12 @@ export interface CoreApp {
 }
 
 export interface CreateCoreOptions extends UseCosmeticsOptions<BaseCosmeticTheme> {
+    auth: CreateAuthOptions
     defaultCacheExpiryHours?: number
-    getAuthQuery: (redirectPath?: string, state?: string) => string
+    // getAuthQuery: (redirectPath?: string, state?: string) => string
     navItems?: NavigationItem[]
     presets: any
-    setCredentials?: (state: RemovableRef<any>, payload: any) => void
+    // setCredentials?: (state: RemovableRef<any>, payload: any) => void
     /**suboptions */
     subscriptionOptions?: AuthSubscription[]
     urls: CreateUrlOptions
@@ -50,7 +50,6 @@ export function createCore(options: CreateCoreOptions): CoreApp {
     
     return {
         install(app: App) {
-            // const core = this
 
             //register components
             app.component('bt-btn', BTBtn)
@@ -82,13 +81,18 @@ export function createCore(options: CreateCoreOptions): CoreApp {
 
             createPresets(options)
 
-            const auth = createAuth({ 
-                demo: demo,
-                getAuthItem: navigation.findItem,
-                getAuthQuery: options.getAuthQuery,
-                setCredentials: options.setCredentials,
-                subscriptionOptions: options.subscriptionOptions
-            })
+            options.auth.demo ??= demo
+            options.auth.getAuthItem = navigation.findItem
+
+            const auth = createAuth(options.auth)
+
+            //     { 
+            //     demo: demo,
+            //     getAuthItem: navigation.findItem,
+            //     getAuthorizeUrl: options.auth
+            //     setCredentials: options.setCredentials,
+            //     subscriptionOptions: options.subscriptionOptions
+            // })
 
             const api = createApi({
                 auth: auth,