@bagelink/auth 1.12.25 → 1.12.29

package/dist/api.d.ts

@@ -1,10 +1,18 @@
+import { AxiosInstance } from 'axios';
 import { RegisterRequest, UpdateAccountRequest, ChangePasswordRequest, ForgotPasswordRequest, ResetPasswordRequest, SendVerificationRequest, VerifyEmailRequest, AuthenticationAccount, PasswordLoginRequest, EmailTokenSendRequest, EmailTokenVerifyRequest, OTPSendRequest, OTPVerifyRequest, SMSSendRequest, SMSVerifyRequest, GenerateTokenRequest, RedeemTokenRequest, SSOLoginRequest, LoginResponse, RegisterResponse, LogoutResponse, GetMeResponse, UpdateMeResponse, DeleteMeResponse, ChangePasswordResponse, ForgotPasswordResponse, ResetPasswordResponse, VerifyResetTokenResponse, SendVerificationResponse, VerifyEmailResponse, RefreshSessionResponse, GetSessionsResponse, DeleteSessionResponse, DeleteAllSessionsResponse, CleanupSessionsResponse, GetMethodsResponse, GetAuthStatusResponse, SendEmailTokenResponse, VerifyEmailTokenResponse, SendOTPResponse, VerifyOTPResponse, SendSMSResponse, VerifySMSResponse, GenerateLoginTokenResponse, RedeemLoginTokenResponse, LegacySSOLoginResponse, SSOProvider, SSOInitiateRequest, SSOCallbackRequest, SSOLinkRequest, InitiateSSOResponse, CallbackSSOResponse, LinkSSOResponse, UnlinkSSOResponse, GetTenantsResponse, GetTenantResponse, CreateTenantResponse, UpdateTenantResponse, DeleteTenantResponse, GetTenantMembersResponse, AddTenantMemberResponse, UpdateTenantMemberResponse, DeleteTenantMemberResponse, GetTenantRolesResponse, CreateInvitationResponse, GetInvitationResponse, AcceptInvitationResponse, CreateTenantRequest, UpdateTenantRequest, AddMemberRequest, UpdateMemberRequest, CreateInvitationRequest, AcceptInvitationRequest } from './types';
 export declare class AuthApi {
     private api;
     private currentTenantId;
+    private externalAxiosInstances;
     constructor(baseURL?: string);
     /**
-     * Set the current tenant ID for multi-tenant requests
+     * Register an external axios instance so that tenant headers
+     * are automatically applied to it when setTenantId() is called.
+     */
+    registerAxios(instance: AxiosInstance): void;
+    /**
+     * Set the current tenant ID for multi-tenant requests.
+     * Also updates the header on any externally registered axios instances.
      */
     setTenantId(tenantId: string | null): void;
     /**

package/dist/index.cjs

@@ -64,14 +64,33 @@ class AuthApi {
   constructor(baseURL = "") {
     __publicField(this, "api");
     __publicField(this, "currentTenantId", null);
+    __publicField(this, "externalAxiosInstances", /* @__PURE__ */ new Set());
     this.api = createAxiosInstance(baseURL);
     this.setupInterceptors();
   }
   /**
-   * Set the current tenant ID for multi-tenant requests
+   * Register an external axios instance so that tenant headers
+   * are automatically applied to it when setTenantId() is called.
+   */
+  registerAxios(instance) {
+    this.externalAxiosInstances.add(instance);
+    if (this.currentTenantId !== null) {
+      instance.defaults.headers.common["X-Tenant-ID"] = this.currentTenantId;
+    }
+  }
+  /**
+   * Set the current tenant ID for multi-tenant requests.
+   * Also updates the header on any externally registered axios instances.
    */
   setTenantId(tenantId) {
     this.currentTenantId = tenantId;
+    for (const instance of this.externalAxiosInstances) {
+      if (tenantId !== null) {
+        instance.defaults.headers.common["X-Tenant-ID"] = tenantId;
+      } else {
+        delete instance.defaults.headers.common["X-Tenant-ID"];
+      }
+    }
   }
   /**
    * Get the current tenant ID
@@ -1041,11 +1060,11 @@ function createAuth(params) {
      *
      * // Manual guard control (for custom composition)
      * auth.use(router, { guard: false })
-     * router.beforeEach(async (to, from, next) => {
+     * router.beforeEach(async (to, from) => {
      *   // Custom logic first
-     *   if (!hasOrgAccess(to)) return next('/no-access')
+     *   if (!hasOrgAccess(to)) return '/no-access'
      *   // Then run auth guard
-     *   return auth.routerGuard()(to, from, next)
+     *   return auth.routerGuard()(to, from)
      * })
      * ```
      */
@@ -1074,11 +1093,11 @@ function createAuth(params) {
      */
     routerGuard() {
       if (cachedAuthGuard === null) {
-        cachedAuthGuard = async (to, from, next) => {
+        cachedAuthGuard = async (to, from) => {
           const { authGuard: authGuard2 } = await Promise.resolve().then(() => router);
           const guard = authGuard2();
           cachedAuthGuard = guard;
-          return guard(to, from, next);
+          return guard(to, from);
         };
       }
       return cachedAuthGuard;
@@ -1255,13 +1274,10 @@ function useAuth() {
     try {
       const { data } = await api.getTenants();
       tenants.value = data;
-      console.log("[Auth] Loaded tenants:", tenants.value);
       if (currentTenant.value === null && tenants.value.length > 0) {
         const firstActiveTenant = tenants.value.find((t) => t.status === "active");
         if (firstActiveTenant !== void 0) {
-          console.log("[Auth] Auto-selecting tenant:", firstActiveTenant.id);
           setTenant(firstActiveTenant.id);
-          console.log("[Auth] Tenant set. Current tenant ID in API:", api.getTenantId());
         }
       }
       return tenants.value;
@@ -1510,7 +1526,9 @@ function useAuth() {
     // Invitations
     createInvitation,
     getInvitation,
-    acceptInvitation
+    acceptInvitation,
+    // Axios integration
+    registerAxios: (instance) => api.registerAxios(instance)
   };
 }
 const useAuth$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -1524,7 +1542,7 @@ function resetAuthState() {
   authInitialized = false;
 }
 function authGuard() {
-  return async function guard(to, _from, next) {
+  return async function guard(to, _from) {
     const auth = useAuth();
     const config = getRedirectConfig();
     const requiresAuth = to.meta[config.authMetaKey];
@@ -1536,43 +1554,31 @@ function authGuard() {
       }
       const isAuthenticated = !!auth.user.value;
       if (isAuthenticated && requiresNoAuth) {
-        next(config.authenticatedRedirect);
-        return;
+        return config.authenticatedRedirect;
       }
       if (!isAuthenticated && requiresAuth) {
         const query = buildLoginQuery(to.fullPath, config);
-        next({
+        return {
           name: config.loginRoute,
           query
-        });
-        return;
+        };
       }
-      next();
+      return true;
     } catch (error) {
       console.error("[Auth Guard] Error:", error);
-      next();
+      return true;
     }
   };
 }
 function composeGuards(guards) {
-  return async (to, from, next) => {
-    let guardIndex = 0;
-    const runNextGuard = async () => {
-      if (guardIndex >= guards.length) {
-        next();
-        return;
+  return async (to, from) => {
+    for (const guard of guards) {
+      const result = await guard(to, from);
+      if (result !== void 0 && result !== true) {
+        return result;
       }
-      const guard = guards[guardIndex];
-      guardIndex++;
-      await guard(to, from, (result) => {
-        if (result !== void 0) {
-          next(result);
-        } else {
-          runNextGuard();
-        }
-      });
-    };
-    await runNextGuard();
+    }
+    return true;
   };
 }
 const router = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -1583,14 +1589,13 @@ const router = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProper
 }, Symbol.toStringTag, { value: "Module" }));
 function createAuthGuard(config = {}) {
   const { redirectTo = "/" } = config;
-  return async (to, _from, next) => {
+  return async (to, _) => {
     const { useAuth: useAuth2 } = await Promise.resolve().then(() => useAuth$1);
     const { user } = useAuth2();
     if (to.meta.requiresAuth === false && user.value) {
-      next(redirectTo);
-    } else {
-      next();
+      return redirectTo;
     }
+    return true;
   };
 }
 exports.AuthApi = AuthApi;

package/dist/index.mjs

@@ -62,14 +62,33 @@ class AuthApi {
   constructor(baseURL = "") {
     __publicField(this, "api");
     __publicField(this, "currentTenantId", null);
+    __publicField(this, "externalAxiosInstances", /* @__PURE__ */ new Set());
     this.api = createAxiosInstance(baseURL);
     this.setupInterceptors();
   }
   /**
-   * Set the current tenant ID for multi-tenant requests
+   * Register an external axios instance so that tenant headers
+   * are automatically applied to it when setTenantId() is called.
+   */
+  registerAxios(instance) {
+    this.externalAxiosInstances.add(instance);
+    if (this.currentTenantId !== null) {
+      instance.defaults.headers.common["X-Tenant-ID"] = this.currentTenantId;
+    }
+  }
+  /**
+   * Set the current tenant ID for multi-tenant requests.
+   * Also updates the header on any externally registered axios instances.
    */
   setTenantId(tenantId) {
     this.currentTenantId = tenantId;
+    for (const instance of this.externalAxiosInstances) {
+      if (tenantId !== null) {
+        instance.defaults.headers.common["X-Tenant-ID"] = tenantId;
+      } else {
+        delete instance.defaults.headers.common["X-Tenant-ID"];
+      }
+    }
   }
   /**
    * Get the current tenant ID
@@ -1039,11 +1058,11 @@ function createAuth(params) {
      *
      * // Manual guard control (for custom composition)
      * auth.use(router, { guard: false })
-     * router.beforeEach(async (to, from, next) => {
+     * router.beforeEach(async (to, from) => {
      *   // Custom logic first
-     *   if (!hasOrgAccess(to)) return next('/no-access')
+     *   if (!hasOrgAccess(to)) return '/no-access'
      *   // Then run auth guard
-     *   return auth.routerGuard()(to, from, next)
+     *   return auth.routerGuard()(to, from)
      * })
      * ```
      */
@@ -1072,11 +1091,11 @@ function createAuth(params) {
      */
     routerGuard() {
       if (cachedAuthGuard === null) {
-        cachedAuthGuard = async (to, from, next) => {
+        cachedAuthGuard = async (to, from) => {
           const { authGuard: authGuard2 } = await Promise.resolve().then(() => router);
           const guard = authGuard2();
           cachedAuthGuard = guard;
-          return guard(to, from, next);
+          return guard(to, from);
         };
       }
       return cachedAuthGuard;
@@ -1253,13 +1272,10 @@ function useAuth() {
     try {
       const { data } = await api.getTenants();
       tenants.value = data;
-      console.log("[Auth] Loaded tenants:", tenants.value);
       if (currentTenant.value === null && tenants.value.length > 0) {
         const firstActiveTenant = tenants.value.find((t) => t.status === "active");
         if (firstActiveTenant !== void 0) {
-          console.log("[Auth] Auto-selecting tenant:", firstActiveTenant.id);
           setTenant(firstActiveTenant.id);
-          console.log("[Auth] Tenant set. Current tenant ID in API:", api.getTenantId());
         }
       }
       return tenants.value;
@@ -1508,7 +1524,9 @@ function useAuth() {
     // Invitations
     createInvitation,
     getInvitation,
-    acceptInvitation
+    acceptInvitation,
+    // Axios integration
+    registerAxios: (instance) => api.registerAxios(instance)
   };
 }
 const useAuth$1 = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -1522,7 +1540,7 @@ function resetAuthState() {
   authInitialized = false;
 }
 function authGuard() {
-  return async function guard(to, _from, next) {
+  return async function guard(to, _from) {
     const auth = useAuth();
     const config = getRedirectConfig();
     const requiresAuth = to.meta[config.authMetaKey];
@@ -1534,43 +1552,31 @@ function authGuard() {
       }
       const isAuthenticated = !!auth.user.value;
       if (isAuthenticated && requiresNoAuth) {
-        next(config.authenticatedRedirect);
-        return;
+        return config.authenticatedRedirect;
       }
       if (!isAuthenticated && requiresAuth) {
         const query = buildLoginQuery(to.fullPath, config);
-        next({
+        return {
           name: config.loginRoute,
           query
-        });
-        return;
+        };
       }
-      next();
+      return true;
     } catch (error) {
       console.error("[Auth Guard] Error:", error);
-      next();
+      return true;
     }
   };
 }
 function composeGuards(guards) {
-  return async (to, from, next) => {
-    let guardIndex = 0;
-    const runNextGuard = async () => {
-      if (guardIndex >= guards.length) {
-        next();
-        return;
+  return async (to, from) => {
+    for (const guard of guards) {
+      const result = await guard(to, from);
+      if (result !== void 0 && result !== true) {
+        return result;
       }
-      const guard = guards[guardIndex];
-      guardIndex++;
-      await guard(to, from, (result) => {
-        if (result !== void 0) {
-          next(result);
-        } else {
-          runNextGuard();
-        }
-      });
-    };
-    await runNextGuard();
+    }
+    return true;
   };
 }
 const router = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProperty({
@@ -1581,14 +1587,13 @@ const router = /* @__PURE__ */ Object.freeze(/* @__PURE__ */ Object.defineProper
 }, Symbol.toStringTag, { value: "Module" }));
 function createAuthGuard(config = {}) {
   const { redirectTo = "/" } = config;
-  return async (to, _from, next) => {
+  return async (to, _) => {
     const { useAuth: useAuth2 } = await Promise.resolve().then(() => useAuth$1);
     const { user } = useAuth2();
     if (to.meta.requiresAuth === false && user.value) {
-      next(redirectTo);
-    } else {
-      next();
+      return redirectTo;
     }
+    return true;
   };
 }
 export {

package/dist/router.d.ts

@@ -1,4 +1,4 @@
-import { NavigationGuard, NavigationGuardNext, RouteLocationNormalized } from 'vue-router';
+import { NavigationGuard, RouteLocationNormalized, RouteLocationRaw } from 'vue-router';
 /**
  * Reset auth initialization state
  * Useful for testing or app reload scenarios
@@ -19,10 +19,10 @@ export declare function resetAuthState(): void;
  * router.beforeEach(authGuard())
  * ```
  */
-export declare function authGuard(): (to: RouteLocationNormalized, _from: RouteLocationNormalized, next: NavigationGuardNext) => Promise<void>;
+export declare function authGuard(): (to: RouteLocationNormalized, _from: RouteLocationNormalized) => Promise<RouteLocationRaw | boolean | void>;
 /**
  * Compose multiple navigation guards into one
- * Guards are executed in order, stopping at the first one that calls next with a value
+ * Guards are executed in order, stopping at the first one that returns a redirect
  *
  * @example
  * ```ts

package/dist/routes.d.ts

@@ -10,4 +10,4 @@
  */
 export declare function createAuthGuard(config?: {
     redirectTo?: string;
-}): (to: any, _from: any, next: any) => Promise<void>;
+}): (to: any, _: any) => Promise<string | true>;

package/dist/useAuth.d.ts

@@ -25,7 +25,7 @@ export interface AuthInstance extends ObjectPlugin<[]> {
     use: (dependency: any, options?: {
         guard?: boolean;
     }) => AuthInstance;
-    routerGuard: () => (to: any, from: any, next: any) => Promise<void>;
+    routerGuard: () => (to: any, from: any) => Promise<any>;
     install: (app: App) => void;
 }
 /**
@@ -218,5 +218,6 @@ export declare function useAuth(): {
         last_name?: string | null;
     }>;
     acceptInvitation: (token: string, data?: AcceptInvitationRequest) => Promise<void>;
+    registerAxios: (instance: any) => void;
 };
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@bagelink/auth",
   "type": "module",
-  "version": "1.12.25",
+  "version": "1.12.29",
   "description": "Bagelink auth package",
   "author": {
     "name": "Bagel Studio",

package/src/api.ts

@@ -79,6 +79,7 @@ import { createAxiosInstance } from './utils'
 export class AuthApi {
 	private api: AxiosInstance
 	private currentTenantId: string | null = null
+	private externalAxiosInstances: Set<AxiosInstance> = new Set()
 
 	constructor(baseURL: string = '') {
 		this.api = createAxiosInstance(baseURL)
@@ -86,10 +87,31 @@ export class AuthApi {
 	}
 
 	/**
-	 * Set the current tenant ID for multi-tenant requests
+	 * Register an external axios instance so that tenant headers
+	 * are automatically applied to it when setTenantId() is called.
+	 */
+	registerAxios(instance: AxiosInstance) {
+		this.externalAxiosInstances.add(instance)
+		// Apply current tenant immediately if already set
+		if (this.currentTenantId !== null) {
+			instance.defaults.headers.common['X-Tenant-ID'] = this.currentTenantId
+		}
+	}
+
+	/**
+	 * Set the current tenant ID for multi-tenant requests.
+	 * Also updates the header on any externally registered axios instances.
 	 */
 	setTenantId(tenantId: string | null) {
 		this.currentTenantId = tenantId
+		// Update all registered external axios instances
+		for (const instance of this.externalAxiosInstances) {
+			if (tenantId !== null) {
+				instance.defaults.headers.common['X-Tenant-ID'] = tenantId
+			} else {
+				delete instance.defaults.headers.common['X-Tenant-ID']
+			}
+		}
 	}
 
 	/**

package/src/router.ts

@@ -1,4 +1,4 @@
-import type { NavigationGuard, NavigationGuardNext, RouteLocationNormalized } from 'vue-router'
+import type { NavigationGuard, RouteLocationNormalized, RouteLocationRaw } from 'vue-router'
 import { buildLoginQuery } from './redirect'
 import { useAuth, getRedirectConfig } from './useAuth'
 
@@ -34,11 +34,9 @@ export function resetAuthState() {
  */
 export function authGuard() {
 	return async function guard(
-
 		to: RouteLocationNormalized,
 		_from: RouteLocationNormalized,
-		next: NavigationGuardNext,
-	): Promise<void> {
+	): Promise<RouteLocationRaw | boolean | void> {
 		const auth = useAuth()
 		const config = getRedirectConfig()
 
@@ -60,34 +58,32 @@ export function authGuard() {
 
 			// Redirect authenticated users away from auth pages
 			if (isAuthenticated && requiresNoAuth) {
-				next(config.authenticatedRedirect)
-				return
+				return config.authenticatedRedirect
 			}
 
 			// Redirect unauthenticated users to login for protected pages
 			if (!isAuthenticated && requiresAuth) {
 				const query = buildLoginQuery(to.fullPath, config)
 
-				next({
+				return {
 					name: config.loginRoute,
 					query,
-				})
-				return
+				}
 			}
 
 			// Allow navigation
-			next()
+			return true
 		} catch (error) {
 			console.error('[Auth Guard] Error:', error)
 			// On error, allow navigation but log the issue
-			next()
+			return true
 		}
 	}
 }
 
 /**
  * Compose multiple navigation guards into one
- * Guards are executed in order, stopping at the first one that calls next with a value
+ * Guards are executed in order, stopping at the first one that returns a redirect
  *
  * @example
  * ```ts
@@ -99,31 +95,15 @@ export function authGuard() {
  * ```
  */
 export function composeGuards(guards: NavigationGuard[]): NavigationGuard {
-	return async (to, from, next) => {
-		let guardIndex = 0
-
-		const runNextGuard = async (): Promise<void> => {
-			if (guardIndex >= guards.length) {
-				// All guards passed, allow navigation
-				next()
-				return
+	return async (to, from) => {
+		for (const guard of guards) {
+			const result = await (guard as (to: RouteLocationNormalized, from: RouteLocationNormalized) => Promise<RouteLocationRaw | boolean | void>)(to, from)
+			if (result !== undefined && result !== true) {
+				// Guard blocked or redirected, stop here
+				return result
 			}
-
-			const guard = guards[guardIndex]
-			guardIndex++
-
-			// Run the current guard
-			await guard(to, from, (result?: any) => {
-				if (result !== undefined) {
-					// Guard blocked or redirected, stop here
-					next(result)
-				} else {
-					// Guard passed, run next guard
-					runNextGuard()
-				}
-			})
 		}
-
-		await runNextGuard()
+		// All guards passed, allow navigation
+		return true
 	}
 }

package/src/routes.ts

@@ -11,16 +11,15 @@
 export function createAuthGuard(config: { redirectTo?: string } = {}) {
 	const { redirectTo = '/' } = config
 
-	return async (to: any, _from: any, next: any) => {
+	return async (to: any, _: any) => {
 		// Import dynamically to avoid circular dependencies
 		const { useAuth } = await import('./useAuth')
 		const { user } = useAuth()
 
 		// If route doesn't require auth and user is authenticated, redirect
 		if (to.meta.requiresAuth === false && user.value) {
-			next(redirectTo)
-		} else {
-			next()
+			return redirectTo
 		}
+		return true
 	}
 }

package/src/useAuth.ts

@@ -69,7 +69,7 @@ export interface AuthInstance extends ObjectPlugin<[]> {
 	off: <K extends AuthState>(event: K, handler: AuthEventMap[K]) => void
 	removeAllListeners: <K extends AuthState>(event?: K) => void
 	use: (dependency: any, options?: { guard?: boolean }) => AuthInstance
-	routerGuard: () => (to: any, from: any, next: any) => Promise<void>
+	routerGuard: () => (to: any, from: any) => Promise<any>
 	install: (app: App) => void
 }
 
@@ -139,11 +139,11 @@ export function createAuth(params: InitParams): AuthInstance {
 		 *
 		 * // Manual guard control (for custom composition)
 		 * auth.use(router, { guard: false })
-		 * router.beforeEach(async (to, from, next) => {
+		 * router.beforeEach(async (to, from) => {
 		 *   // Custom logic first
-		 *   if (!hasOrgAccess(to)) return next('/no-access')
+		 *   if (!hasOrgAccess(to)) return '/no-access'
 		 *   // Then run auth guard
-		 *   return auth.routerGuard()(to, from, next)
+		 *   return auth.routerGuard()(to, from)
 		 * })
 		 * ```
 		 */
@@ -177,12 +177,12 @@ export function createAuth(params: InitParams): AuthInstance {
 		routerGuard() {
 			// Return factory that lazily loads authGuard to avoid circular dependency
 			if (cachedAuthGuard === null) {
-				cachedAuthGuard = async (to: any, from: any, next: any) => {
+				cachedAuthGuard = async (to: any, from: any) => {
 					const { authGuard } = await import('./router')
 					const guard = authGuard()
 					// Cache the actual guard for next time
 					cachedAuthGuard = guard
-					return guard(to, from, next)
+					return guard(to, from)
 				}
 			}
 			return cachedAuthGuard
@@ -436,15 +436,11 @@ export function useAuth() {
 			const { data } = await api.getTenants()
 			tenants.value = data
 
-			console.log('[Auth] Loaded tenants:', tenants.value)
-
 			// Auto-select first tenant if none selected and tenants available
 			if (currentTenant.value === null && tenants.value.length > 0) {
 				const firstActiveTenant = tenants.value.find(t => t.status === 'active')
 				if (firstActiveTenant !== undefined) {
-					console.log('[Auth] Auto-selecting tenant:', firstActiveTenant.id)
 					setTenant(firstActiveTenant.id)
-					console.log('[Auth] Tenant set. Current tenant ID in API:', api.getTenantId())
 				}
 			}
 
@@ -787,5 +783,8 @@ export function useAuth() {
 		createInvitation,
 		getInvitation,
 		acceptInvitation,
+
+		// Axios integration
+		registerAxios: (instance: any) => api.registerAxios(instance),
 	}
 }