bt-core-app 1.2.5 → 1.2.6

package/dist/composables/auth.d.ts

@@ -29,12 +29,13 @@ 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;
-    /**the url to start the OAuth 2.0 process */
+    /**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;
-    /**use the given code and generate the url to convert to an access token */
+    /**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;

package/package.json

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

@@ -41,12 +41,13 @@ 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
-    /**the url to start the OAuth 2.0 process */
+    /**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
-    /**use the given code and generate the url to convert to an access token */
+    /**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
@@ -91,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
 
@@ -133,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
 
@@ -207,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
@@ -231,6 +232,10 @@ 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}`)
+        }
+
         if (options.getAuthorizeUrl != null)
             return options.getAuthorizeUrl(redirectPath, authState.value) ?? ''
 

package/src/core.ts

@@ -82,6 +82,7 @@ export function createCore(options: CreateCoreOptions): CoreApp {
             createPresets(options)
 
             options.auth.demo ??= demo
+            options.auth.getAuthItem = navigation.findItem
 
             const auth = createAuth(options.auth)