@nuxtjs/better-auth 0.3.4 → 0.3.6

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuxtjs/better-auth",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "configKey": "auth",
   "compatibility": {
     "nuxt": ">=4.0.0"

package/dist/module.mjs

@@ -10,9 +10,10 @@ import { defu } from 'defu';
 import { toRouteMatcher, createRouter } from 'radix3';
 import { randomBytes } from 'node:crypto';
 import { isCI, isTest } from 'std-env';
+import { isInternalAssetPath } from '../dist/runtime/internal/auth-route-rules.js';
 export { defineClientAuth, defineServerAuth } from '../dist/runtime/config.js';
 
-const version = "0.3.4";
+const version = "0.3.6";
 
 const CONFIG_EXTENSIONS = [".ts", ".js", ".mts", ".cts", ".mjs", ".cjs"];
 const CONFIG_EXTENSION_RE = /\.[cm]?[jt]s$/;
@@ -331,8 +332,7 @@ function registerPrepareTypesHook(input) {
     nodeTsConfig.compilerOptions.paths ||= {};
     const projectReferenceTypePaths = [
       join(nuxt.options.buildDir, "types/nitro-imports.d.ts"),
-      join(nuxt.options.buildDir, "types/auth-database.d.ts"),
-      join(nuxt.options.buildDir, "types/auth-schema.d.ts")
+      join(nuxt.options.buildDir, "types/auth-database.d.ts")
     ];
     if (hasHubDb)
       projectReferenceTypePaths.push(join(nuxt.options.buildDir, "hub/db.d.ts"));
@@ -341,7 +341,8 @@ function registerPrepareTypesHook(input) {
       "#auth/server": nuxt.options.alias["#auth/server"],
       "#auth/client": nuxt.options.alias["#auth/client"],
       "#auth/database": nuxt.options.alias["#auth/database"],
-      "#auth/schema": nuxt.options.alias["#auth/schema"],
+      // An exact .mjs path bypasses declaration lookup in TypeScript paths.
+      "#auth/schema": join(nuxt.options.buildDir, "better-auth/schema"),
       "#auth/route-rules": nuxt.options.alias["#auth/route-rules"]
     };
     for (const [key, value] of Object.entries(exactNodeAliases)) {
@@ -933,6 +934,36 @@ export const verification = getGeneratedTable('verification')
 export const schema = { ...generatedSchema, user, session, account, verification }
 `;
 }
+function buildSchemaExportTypes(hasHubDb, hubDialect) {
+  if (!hasHubDb) {
+    return `export declare const user: undefined
+export declare const session: undefined
+export declare const account: undefined
+export declare const verification: undefined
+export declare const schema: undefined
+`;
+  }
+  return `export * from './schema.${hubDialect}.js'
+
+type GeneratedSchema = typeof import('./schema.${hubDialect}.js')
+type GeneratedTable<Name extends string> = Name extends keyof GeneratedSchema
+  ? GeneratedSchema[Name]
+  : \`\${Name}s\` extends keyof GeneratedSchema
+    ? GeneratedSchema[\`\${Name}s\`]
+    : undefined
+
+export declare const user: GeneratedTable<'user'>
+export declare const session: GeneratedTable<'session'>
+export declare const account: GeneratedTable<'account'>
+export declare const verification: GeneratedTable<'verification'>
+export declare const schema: GeneratedSchema & {
+  user: typeof user
+  session: typeof session
+  account: typeof account
+  verification: typeof verification
+}
+`;
+}
 function buildAuthRouteRulesCode(authRouteRules) {
   return `export const authRouteRules = ${JSON.stringify(authRouteRules, null, 2)}
 `;
@@ -991,6 +1022,8 @@ function assertSafeAuthRouteRules(routeRules) {
   for (const path of collectRouteRulePaths(patterns, ""))
     paths.add(path);
   const conflicts = [...paths].flatMap((path) => {
+    if (isInternalAssetPath(path))
+      return [];
     const matches = matcher.matchAll(path);
     const effectiveRule = defu({}, ...matches.reverse());
     if (effectiveRule.auth === void 0 || effectiveRule.auth === false)
@@ -1162,24 +1195,6 @@ declare module '#auth/database' {
   export function createDatabase(event?: import('${h3TypesPath}').H3Event): BetterAuthOptions['database']
   export const db: ${hasHubDb ? `typeof import('@nuxthub/db')['db']` : "undefined"}
 }
-`
-  }, { nitro: true });
-  addTypeTemplate({
-    filename: "types/auth-schema.d.ts",
-    getContents: () => `
-declare module '#auth/schema' {
-  export const user: any
-  export const session: any
-  export const account: any
-  export const verification: any
-  export const schema: {
-    user: any
-    session: any
-    account: any
-    verification: any
-    [key: string]: any
-  } | undefined
-}
 `
   }, { nitro: true });
   addTypeTemplate({
@@ -1187,7 +1202,6 @@ declare module '#auth/schema' {
     getContents: () => `
 /// <reference path="./nitro-imports.d.ts" />
 /// <reference path="./auth-database.d.ts" />
-/// <reference path="./auth-schema.d.ts" />
 ${hasHubDb ? '/// <reference path="../hub/db.d.ts" />' : ""}
 
 export {}
@@ -1676,6 +1690,11 @@ const module$1 = defineNuxtModule({
           write: true
         });
         nuxt.options.alias["#auth/schema"] = schemaTemplate.dst;
+        addTemplate({
+          filename: "better-auth/schema.d.ts",
+          getContents: () => buildSchemaExportTypes(setup.database.hasHubDb, setup.database.buildContext?.hubDialect ?? "sqlite"),
+          write: true
+        });
         if (setup.schemaGeneration)
           await ensureSchemaBootstrap(schemaTemplate.dst, setup.database.buildContext?.hubDialect ?? "sqlite");
       }

package/dist/runtime/app/composables/useAuthClient.js

@@ -1,5 +1,6 @@
 import createAppAuthClient from "#auth/client";
 import { useRequestURL, useRuntimeConfig } from "#imports";
+import { resolveAuthBaseURL } from "../../internal/auth-base-url.js";
 import { createVueSafeAuthProxy } from "../internal/vue-safe-auth-proxy.js";
 let _client = null;
 let _clientFacade = null;
@@ -27,7 +28,9 @@ export function useRawAuthClient() {
   const requestURL = useRequestURL();
   const configuredSiteUrl = runtimeConfig.public.siteUrl;
   const siteUrl = typeof configuredSiteUrl === "string" && configuredSiteUrl ? configuredSiteUrl : requestURL.origin;
-  return getClient(siteUrl);
+  const clientOnly = runtimeConfig.public.auth?.clientOnly;
+  const appBaseURL = runtimeConfig.app?.baseURL;
+  return getClient(clientOnly ? siteUrl : resolveAuthBaseURL(siteUrl, appBaseURL));
 }
 export function useAuthClient() {
   const rawClient = useRawAuthClient();

package/dist/runtime/internal/auth-base-url.d.ts

@@ -0,0 +1,2 @@
+/** Better Auth treats a path in baseURL as the complete auth endpoint path. */
+export declare function resolveAuthBaseURL(siteUrl: string, appBaseURL?: string): string;

package/dist/runtime/internal/auth-base-url.js

@@ -0,0 +1,5 @@
+import { joinURL } from "ufo";
+export function resolveAuthBaseURL(siteUrl, appBaseURL) {
+  const origin = new URL(siteUrl).origin;
+  return appBaseURL && appBaseURL !== "/" ? joinURL(origin, appBaseURL, "/api/auth") : origin;
+}

package/dist/runtime/internal/auth-route-rules.d.ts

@@ -1,4 +1,5 @@
 import type { AuthRouteRules } from '../types.js';
+export declare function isInternalAssetPath(path: string): boolean;
 export declare function normalizeAuthRoutePath(path: string, baseURL?: string): string;
 export declare function normalizeAuthRouteRule(rule: unknown): AuthRouteRules['auth'];
 export declare function shouldSkipAuthRouteRules(path: string): boolean;

package/dist/runtime/internal/auth-route-rules.js

@@ -1,22 +1,21 @@
 import { withoutBase } from "ufo";
+const internalAssetPaths = ["/_fonts", "/_ipx", "/_nuxt", "/api/_nuxt_icon"];
+export function isInternalAssetPath(path) {
+  const pathname = path.split(/[?#]/, 1)[0] || "/";
+  return internalAssetPaths.some((prefix) => pathname === prefix || pathname.startsWith(`${prefix}/`));
+}
 const internalRouteRuleAuthPaths = /* @__PURE__ */ new Set([
-  "/_ipx",
-  "/_nuxt",
   "/__better-auth-devtools",
   "/__nuxt_devtools__",
   "/__nuxt_error",
   "/__nuxt_vite_node__",
   "/api/_better-auth",
-  "/api/_nuxt_icon",
   "/api/auth"
 ]);
 const internalRouteRuleAuthPrefixes = [
-  "/_ipx/",
-  "/_nuxt/",
   "/__nuxt_devtools__/",
   "/__nuxt_vite_node__/",
   "/api/_better-auth/",
-  "/api/_nuxt_icon/",
   "/api/auth/"
 ];
 export function normalizeAuthRoutePath(path, baseURL = "/") {
@@ -30,5 +29,5 @@ export function normalizeAuthRouteRule(rule) {
 }
 export function shouldSkipAuthRouteRules(path) {
   const pathname = path.split(/[?#]/, 1)[0] || "/";
-  return internalRouteRuleAuthPaths.has(pathname) || internalRouteRuleAuthPrefixes.some((prefix) => pathname.startsWith(prefix));
+  return isInternalAssetPath(pathname) || internalRouteRuleAuthPaths.has(pathname) || internalRouteRuleAuthPrefixes.some((prefix) => pathname.startsWith(prefix));
 }

package/dist/runtime/server/api/_better-auth/_schema.d.ts

@@ -1,3 +1,5 @@
+import type { Account, Session, User } from 'better-auth/types';
+import type { AnyColumn, Table } from 'drizzle-orm';
 import { z } from 'zod';
 export declare const paginationQuerySchema: z.ZodObject<{
     page: z.ZodDefault<z.ZodCoercedNumber<unknown>>;
@@ -6,3 +8,8 @@ export declare const paginationQuerySchema: z.ZodObject<{
 }, z.core.$strip>;
 export type PaginationQuery = z.infer<typeof paginationQuerySchema>;
 export declare function sanitizeSearchPattern(search: string): string;
+export type DevtoolsSchema = {
+    user?: Table & Record<keyof User, AnyColumn>;
+    session?: Table & Record<keyof Session, AnyColumn>;
+    account?: Table & Record<keyof Account, AnyColumn>;
+} | undefined;

package/dist/runtime/server/utils/auth.js

@@ -3,6 +3,7 @@ import { withoutProtocol } from "ufo";
 import { createDatabase, db } from "#auth/database";
 import createServerAuth from "#auth/server";
 import { getRequestHost, getRequestProtocol, useRuntimeConfig } from "../internal/nitro-compat.js";
+import { resolveAuthBaseURL } from "../../internal/auth-base-url.js";
 import { resolveCustomSecondaryStorageRequirement } from "./custom-secondary-storage.js";
 const _authCache = /* @__PURE__ */ new Map();
 const requestAuthKey = Symbol.for("nuxt-better-auth.requestAuth");
@@ -254,7 +255,7 @@ export function serverAuth(event) {
     ...rateLimit ? { rateLimit } : {},
     ...database ? { database } : {},
     secret: betterAuthSecret,
-    baseURL: siteUrl,
+    baseURL: resolveAuthBaseURL(siteUrl, runtimeConfig.app?.baseURL),
     trustedOrigins
   };
   const auth = betterAuth(authOptions);

package/dist/runtime/server/virtual-modules.d.ts

@@ -8,10 +8,6 @@ declare module '#imports' {
   export function useRuntimeConfig(): any
 }
 
-declare module '#auth/schema' {
-  export const schema: any
-}
-
 declare module '#auth/server' {
   const createServerAuth: any
   export default createServerAuth

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nuxtjs/better-auth",
   "type": "module",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "description": "Nuxt module for Better Auth integration with NuxtHub, route protection, session management, and role-based access",
   "author": "onmax",
   "license": "MIT",
@@ -94,6 +94,7 @@
     "@libsql/client": "^0.17.4",
     "@libsql/linux-x64-gnu": "0.5.29",
     "@nuxt/devtools": "^3.4.1",
+    "@nuxt/fonts": "0.14.0",
     "@nuxt/module-builder": "^1.0.3",
     "@nuxt/schema": "^4.5.2",
     "@nuxt/test-utils": "^4.1.0",