nuxt-users 1.6.4 → 1.6.5

package/CHANGELOG.md

@@ -1,6 +1,25 @@
 # Changelog
 
 
+## v1.6.5
+
+[compare changes](https://github.com/rrd108/nuxt-users/compare/v1.6.4...v1.6.5)
+
+### 🩹 Fixes
+
+- Authentication middleware ([c7de8a4](https://github.com/rrd108/nuxt-users/commit/c7de8a4))
+- Lint and type errors ([dd6ee40](https://github.com/rrd108/nuxt-users/commit/dd6ee40))
+- Type errors ([65c81fb](https://github.com/rrd108/nuxt-users/commit/65c81fb))
+
+### 🏡 Chore
+
+- Fix formatting ([fdec442](https://github.com/rrd108/nuxt-users/commit/fdec442))
+- **release:** V1.6.4 ([c395d20](https://github.com/rrd108/nuxt-users/commit/c395d20))
+
+### ❤️ Contributors
+
+- Rrd108 ([@rrd108](https://github.com/rrd108))
+
 ## v1.6.4
 
 [compare changes](https://github.com/rrd108/nuxt-users/compare/v1.6.3...v1.6.4)

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-users",
   "configKey": "nuxtUsers",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "builder": {
     "@nuxt/module-builder": "1.0.1",
     "unbuild": "3.6.0"

package/dist/module.mjs

@@ -1,4 +1,4 @@
-import { defineNuxtModule, createResolver, addPlugin, addImportsDir, addServerHandler, addComponent } from '@nuxt/kit';
+import { defineNuxtModule, createResolver, addPlugin, addImportsDir, addServerHandler, addRouteMiddleware, addComponent } from '@nuxt/kit';
 import { defu } from 'defu';
 
 const defaultOptions = {
@@ -83,6 +83,15 @@ const module = defineNuxtModule({
       mode: "server"
     });
     addImportsDir(resolver.resolve("./runtime/composables"));
+    addServerHandler({
+      middleware: true,
+      handler: resolver.resolve("./runtime/server/middleware/auth.server")
+    });
+    addRouteMiddleware({
+      name: "auth.client",
+      path: resolver.resolve("./runtime/middleware/auth.client"),
+      global: true
+    });
     addServerHandler({
       route: "/api/login",
       method: "post",

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

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

package/dist/runtime/middleware/auth.client.js

@@ -0,0 +1,20 @@
+import { defineNuxtRouteMiddleware, navigateTo, useRuntimeConfig } from "#app";
+import { useAuth } from "../composables/useAuth.js";
+export default defineNuxtRouteMiddleware((to) => {
+  const { public: { nuxtUsers: publicNuxtUsers } } = useRuntimeConfig();
+  const publicOptions = publicNuxtUsers;
+  if (to.path === "/login") {
+    console.log("[Nuxt Users] client.middleware.auth.global: /login");
+    return;
+  }
+  if (publicOptions.auth.whitelist.includes(to.path)) {
+    console.log(`[Nuxt Users] client.middleware.auth.global: Whitelisted: ${to.path}`);
+    return;
+  }
+  const { user } = useAuth();
+  if (!user.value?.id) {
+    console.log("[Nuxt Users] client.middleware.auth.global: Unauthenticated, redirecting to /login");
+    return navigateTo("/login");
+  }
+  console.log("[Nuxt Users] client.middleware.auth.global", { user: user.value?.id, to: to.path });
+});

package/dist/runtime/plugin.js

@@ -1,55 +1,10 @@
-import { addRouteMiddleware, defineNuxtPlugin, useRuntimeConfig, navigateTo } from "#app";
+import { defineNuxtPlugin, useRuntimeConfig } from "#app";
 import { checkTableExists } from "./server/utils/index.js";
-import { useAuth } from "./composables/useAuth.js";
 export default defineNuxtPlugin(async (_nuxtApp) => {
   const { nuxtUsers } = useRuntimeConfig();
-  const { public: { nuxtUsers: publicNuxtUsers } } = useRuntimeConfig();
   const options = nuxtUsers;
-  const publicOptions = publicNuxtUsers;
   const hasMigrationsTable = await checkTableExists(options, options.tables.migrations);
   if (!hasMigrationsTable) {
     console.warn("[Nuxt Users] \u26A0\uFE0F  Migrations table does not exist, you should run the migration script to create it by running: npx nuxt-users migrate");
   }
-  const { initializeUser } = useAuth();
-  if (import.meta.client) {
-    await initializeUser();
-  }
-  addRouteMiddleware(
-    "auth.global",
-    (to, from) => {
-      if (to.path === "/login") {
-        return;
-      }
-      if (import.meta.server) {
-        console.log("[Nuxt Users] \u{1F510} Auth middleware: SSR - allowing request to proceed");
-        return;
-      }
-      const { user } = useAuth();
-      if (user.value || publicOptions.auth?.whitelist?.includes(to.path)) {
-        console.log("[Nuxt Users] \u{1F510} Auth middleware: Access allowed");
-        return;
-      }
-      console.log(`[Nuxt Users] \u{1F510} Auth middleware: Redirecting from ${from.path} to login - no user and not whitelisted`);
-      return navigateTo("/login");
-    },
-    { global: true }
-  );
-  if (import.meta.client) {
-    addRouteMiddleware(
-      "auth.client",
-      (to, from) => {
-        if (to.path === "/login") {
-          return;
-        }
-        const { user } = useAuth();
-        if (user.value || publicOptions.auth?.whitelist?.includes(to.path)) {
-          console.log("[Nuxt Users] \u{1F510} Client auth middleware: Access allowed");
-          return;
-        }
-        console.log(`[Nuxt Users] \u{1F510} Client auth middleware: Redirecting from ${from.path} to login - no user and not whitelisted`);
-        return navigateTo("/login");
-      },
-      { global: true }
-    );
-  }
 });

package/dist/runtime/server/api/auth/reset-password.post.js

@@ -5,9 +5,6 @@ import { validatePassword, getPasswordValidationOptions } from "../../../../util
 export default defineEventHandler(async (event) => {
   const body = await readBody(event);
   const { token, email, password, password_confirmation } = body;
-  if (!token || typeof token !== "string") {
-    throw createError({ statusCode: 400, statusMessage: "Token is required." });
-  }
   if (!email || typeof email !== "string") {
     throw createError({ statusCode: 400, statusMessage: "Email is required." });
   }

package/dist/runtime/server/api/profile.get.d.ts

@@ -1,11 +1,2 @@
-declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<{
-    user: {
-        id: number;
-        email: string;
-        name: string;
-        role: string;
-        created_at: string;
-        updated_at: string;
-    };
-}>>;
+declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<import("../../../types.js").UserWithoutPassword>>;
 export default _default;

package/dist/runtime/server/api/profile.get.js

@@ -18,6 +18,5 @@ export default defineEventHandler(async (event) => {
       statusMessage: "Unauthorized - Invalid authentication token"
     });
   }
-  const { password: _, ...userWithoutPassword } = user;
-  return { user: userWithoutPassword };
+  return user;
 });

package/dist/runtime/server/api/update-password.post.js

@@ -13,7 +13,7 @@ export default defineEventHandler(async (event) => {
       statusMessage: "Unauthorized - No authentication token found"
     });
   }
-  const user = await getCurrentUserFromToken(token, options);
+  const user = await getCurrentUserFromToken(token, options, true);
   if (!user) {
     throw createError({
       statusCode: 401,

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

@@ -0,0 +1,2 @@
+declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<void>>;
+export default _default;

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

@@ -0,0 +1,31 @@
+import { defineEventHandler, getCookie, sendRedirect } from "h3";
+import { useRuntimeConfig } from "#imports";
+import { getCurrentUserFromToken } from "../utils/index.js";
+export default defineEventHandler(async (event) => {
+  const { nuxtUsers } = useRuntimeConfig();
+  const options = nuxtUsers;
+  const isPageOrApiRoute = !event.path.includes(".") && (event.path === "/" || event.path.startsWith("/api/") || !event.path.startsWith("/_"));
+  if (!isPageOrApiRoute) {
+    return;
+  }
+  if (event.path === "/login" || event.path === "/api/login") {
+    console.log("[Nuxt Users] server.middleware.auth.global: /login");
+    return;
+  }
+  if (options.auth.whitelist.includes(event.path)) {
+    console.log(`[Nuxt Users] server.middleware.auth.global: whitelisted: ${event.path}`);
+    return;
+  }
+  const token = getCookie(event, "auth_token");
+  if (!token) {
+    console.log(`[Nuxt Users] server.middleware.auth.global: ${event.path} No token found redirecting to login`);
+    return sendRedirect(event, "/login");
+  }
+  const user = await getCurrentUserFromToken(token, options);
+  if (!user) {
+    console.log(`[Nuxt Users] server.middleware.auth.global: ${event.path} No user found redirecting to login`);
+    return sendRedirect(event, "/login");
+  }
+  console.log(`[Nuxt Users] server.middleware.auth.global: Authenticated request for ${user.id}`);
+  return;
+});

package/dist/runtime/server/utils/user.d.ts

@@ -1,4 +1,4 @@
-import type { ModuleOptions, User } from '../../../types.js';
+import type { ModuleOptions, User, UserWithoutPassword } from '../../../types.js';
 interface CreateUserParams {
     email: string;
     name: string;
@@ -23,5 +23,5 @@ export declare const hasAnyUsers: (options: ModuleOptions) => Promise<boolean>;
 /**
  * Gets the current user from an authentication token.
  */
-export declare const getCurrentUserFromToken: (token: string, options: ModuleOptions) => Promise<User | null>;
+export declare const getCurrentUserFromToken: <T extends boolean = false>(token: string, options: ModuleOptions, withPass?: T) => Promise<T extends true ? User | null : UserWithoutPassword | null>;
 export {};

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

@@ -71,7 +71,7 @@ export const hasAnyUsers = async (options) => {
     return false;
   }
 };
-export const getCurrentUserFromToken = async (token, options) => {
+export const getCurrentUserFromToken = async (token, options, withPass = false) => {
   const db = await useDb(options);
   const personalAccessTokensTable = options.tables.personalAccessTokens;
   const usersTable = options.tables.users;
@@ -90,5 +90,10 @@ export const getCurrentUserFromToken = async (token, options) => {
   if (userResult.rows.length === 0) {
     return null;
   }
-  return userResult.rows[0];
+  const user = userResult.rows[0];
+  if (withPass === true) {
+    return user;
+  }
+  const { password: _, ...userWithoutPassword } = user;
+  return userWithoutPassword;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-users",
-  "version": "1.6.4",
+  "version": "1.6.5",
   "description": "A comprehensive user management module for Nuxt 3 applications with authentication, database support, and CLI tools",
   "keywords": [
     "nuxt",