better-auth-nuxt 0.0.3 → 0.0.5

package/dist/module.d.mts

@@ -6,7 +6,6 @@ interface ModuleServerOptions extends Pick<BetterAuthOptions, 'appName' | 'baseU
 interface ModuleClientOptions extends Pick<ClientOptions, 'baseURL' | 'basePath' | 'disableDefaultFetchPlugins'> {
 }
 interface ModuleOptions {
-    baseUrl: string;
     /**
      * auth endpoint
      * @default 'api/auth/**'
@@ -24,19 +23,19 @@ interface ModuleOptions {
         /**
          * client options object or path to client setup script
          */
-        client: ModuleClientOptions;
+        client?: ModuleClientOptions;
         /**
          * server options object or path to server setup script
          */
-        server: ModuleServerOptions;
+        server?: ModuleServerOptions;
     };
     /**
      * redirect options
      */
     redirectOptions: {
-        redirectUserTo: string;
-        redirectGuestTo: string;
-        redirectUnauthorizedTo: string;
+        redirectUserTo?: string;
+        redirectGuestTo?: string;
+        redirectUnauthorizedTo?: string;
     };
 }
 interface ModulePublicRuntimeConfig {

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "better-auth",
   "configKey": "betterAuth",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "builder": {
     "@nuxt/module-builder": "1.0.1",
     "unbuild": "3.5.0"

package/dist/module.mjs

@@ -14,6 +14,11 @@ async function serverAuth({ options }) {
       return `import ${config.key} from "${config.path}"`;
     }),
     "const betterAuthConfigs = mergeDeep({all: true})({},",
+    "{",
+    ...options.moduleOptions?.options?.server ? Object.entries(options.moduleOptions.options.server).map(([key, value]) => {
+      return `    ${key}: ${JSON.stringify(value)},`;
+    }) : [],
+    "},",
     ...options.configs.map((config) => {
       return `${config.key},`;
     }),
@@ -52,6 +57,9 @@ async function useUserSession({ options }) {
     "",
     "  const authClient = createAuthClient({",
     "    baseURL: url.origin,",
+    ...options.moduleOptions?.options?.client ? Object.entries(options.moduleOptions.options.client).map(([key, value]) => {
+      return `    ${key}: ${JSON.stringify(value)},`;
+    }) : [],
     "    fetchOptions: {",
     ...options.configs.map((config) => {
       return `    ...${config.key}?.fetchOptions || {},`;
@@ -156,8 +164,8 @@ const module = defineNuxtModule({
     endpoint: "/api/auth/**",
     serverConfigs: [],
     redirectOptions: {
-      redirectUserTo: "/profile",
-      redirectGuestTo: "/signin",
+      redirectUserTo: "/auth/login",
+      redirectGuestTo: "/",
       redirectUnauthorizedTo: "/401"
     }
   },
@@ -173,7 +181,6 @@ const module = defineNuxtModule({
       logger.withTag("better-auth").error("Missing endpoint option");
     }
     nuxt.options.runtimeConfig.public.betterAuth = defu(nuxt.options.runtimeConfig.public.betterAuth, {
-      baseUrl: options.baseUrl,
       endpoint: options.endpoint,
       redirectOptions: options.redirectOptions
     });
@@ -222,7 +229,6 @@ const module = defineNuxtModule({
         continue;
       }
       for (const path of [...paths, ...pathsJS]) {
-        console.log("path", path);
         if (fs.existsSync(path)) {
           serverConfigs.push({
             key: pascalCase(hash(path)),
@@ -234,7 +240,7 @@ const module = defineNuxtModule({
     const server = registerTemplate({
       filename: "better-auth/server.mjs",
       getContents: serverAuth,
-      options: { configs: serverConfigs }
+      options: { configs: serverConfigs, moduleOptions: options }
     });
     addTypeTemplate({
       filename: "better-auth/server.d.ts",
@@ -274,7 +280,6 @@ const module = defineNuxtModule({
         continue;
       }
       for (const path of [...paths, ...pathsJS]) {
-        console.log("path", path);
         if (fs.existsSync(path)) {
           clientConfigs.push({
             key: pascalCase(hash(path)),
@@ -286,7 +291,7 @@ const module = defineNuxtModule({
     const client = registerTemplate({
       filename: "better-auth/client.mjs",
       getContents: useUserSession,
-      options: { configs: clientConfigs }
+      options: { configs: clientConfigs, moduleOptions: options }
     });
     addTypeTemplate({
       filename: "better-auth/client.d.ts",
@@ -333,10 +338,48 @@ const module = defineNuxtModule({
       }
     ]);
     addRouteMiddleware({
-      name: "better-auth",
-      path: resolver.resolve("./runtime/middleware/auth.global"),
+      name: "auth",
+      path: resolver.resolve("./runtime/middleware/auth.ts"),
       global: true
     });
+    addTypeTemplate({
+      filename: "types/better-auth-middleware.d.ts",
+      getContents: () => {
+        return [
+          " type MiddlewareOptions = false | {",
+          "   /**",
+          "    * Only apply auth middleware to guest or user",
+          "    */",
+          "   only?:",
+          '     | "guest"',
+          '     | "user"',
+          '     | "member"',
+          '     | "admin"',
+          "   /**",
+          "    * Redirect authenticated user to this route",
+          "    */",
+          "   redirectUserTo?: string",
+          "   /**",
+          "    * Redirect guest to this route",
+          "    */",
+          "   redirectGuestTo?: string",
+          "   redirectUnauthorizedTo?: string",
+          " }",
+          ' declare module "#app" {',
+          "   interface PageMeta {",
+          "     auth?: MiddlewareOptions",
+          "   }",
+          " }",
+          ' declare module "vue-router" {',
+          "   interface RouteMeta {",
+          "     auth?: MiddlewareOptions",
+          "   }",
+          " }",
+          "export {}"
+        ].join("\n");
+      },
+      write: true
+    });
     addPlugin(resolver.resolve("./runtime/plugin"));
   }
 });

package/dist/runtime/middleware/auth.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("#app").RouteMiddleware;
+export default _default;

package/dist/runtime/middleware/{auth.global.js → auth.js}

@@ -6,16 +6,8 @@ export default defineNuxtRouteMiddleware(async (to) => {
     return;
   }
   const { loggedIn, options, fetchSession, session } = useUserSession();
-  const { only, redirectUserTo, redirectGuestTo, redirectUnauthorizedTo } = defu(to.meta?.auth, options);
-  if (import.meta.client) {
-    await fetchSession();
-  }
-  if (loggedIn.value && to.path.startsWith("/auth/")) {
-    if (to.path === redirectUserTo) {
-      return;
-    }
-    return navigateTo(redirectUserTo);
-  }
+  const { only, redirectUserTo, redirectGuestTo, redirectUnauthorizedTo } = defu(to.meta.auth, options);
+  await fetchSession();
   if (only === "guest" && loggedIn.value) {
     if (to.path === redirectUserTo) {
       return;
@@ -27,9 +19,13 @@ export default defineNuxtRouteMiddleware(async (to) => {
       return;
     return navigateTo(redirectGuestTo);
   }
-  if (only && only !== "guest" && session.value) {
-    if (to.path === redirectUnauthorizedTo)
-      return;
-    return navigateTo(redirectUnauthorizedTo ?? "/401");
+  if (only && only !== "guest" && loggedIn.value && session.value) {
+    const userRole = session.value.role || "user";
+    const requiredRoles = Array.isArray(only) ? only : [only];
+    if (!requiredRoles.includes(userRole) && !requiredRoles.includes("user")) {
+      if (to.path === redirectUnauthorizedTo)
+        return;
+      return navigateTo(redirectUnauthorizedTo ?? "/401");
+    }
   }
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "better-auth-nuxt",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "description": "Better Auth Nuxt Module",
   "repository": "productdevbook/better-auth-nuxt",
   "license": "MIT",
@@ -52,6 +52,7 @@
     "@nuxt/module-builder": "^1.0.1",
     "@nuxt/schema": "^3.16.2",
     "@nuxt/test-utils": "^3.17.2",
+    "@tailwindcss/vite": "^4.1.4",
     "@types/better-sqlite3": "^7.6.13",
     "@types/node": "latest",
     "better-auth": "^1.2.7",

package/dist/runtime/middleware/auth.global.d.ts

@@ -1,27 +0,0 @@
-type MiddlewareOptions = false | {
-    /**
-     * Only apply auth middleware to guest or user
-     */
-    only?: 'guest' | 'user' | 'member' | 'admin';
-    /**
-     * Redirect authenticated user to this route
-     */
-    redirectUserTo?: string;
-    /**
-     * Redirect guest to this route
-     */
-    redirectGuestTo?: string;
-    redirectUnauthorizedTo?: string;
-};
-declare module '#app' {
-    interface PageMeta {
-        auth?: MiddlewareOptions;
-    }
-}
-declare module 'vue-router' {
-    interface RouteMeta {
-        auth?: MiddlewareOptions;
-    }
-}
-declare const _default: import("#app").RouteMiddleware;
-export default _default;