nuxt-users 1.6.3 → 1.6.5

package/CHANGELOG.md

@@ -1,6 +1,42 @@
 # 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)
+
+### 💅 Refactors
+
+- Move utils to runtime/server ([78a5b50](https://github.com/rrd108/nuxt-users/commit/78a5b50))
+
+### 🏡 Chore
+
+- **release:** V1.6.3 ([365cfe2](https://github.com/rrd108/nuxt-users/commit/365cfe2))
+- Fix formatting ([fdec442](https://github.com/rrd108/nuxt-users/commit/fdec442))
+
+### ❤️ Contributors
+
+- Rrd108 ([@rrd108](https://github.com/rrd108))
+
 ## v1.6.3
 
 [compare changes](https://github.com/rrd108/nuxt-users/compare/v1.6.2...v1.6.3)

package/dist/cli.mjs

@@ -1,10 +1,9 @@
 #!/usr/bin/env node
 import { defineCommand, runMain } from 'citty';
-import 'db0';
-import 'bcrypt';
-import { r as runMigrations, j as getPasswordValidationOptions, v as validatePassword, a as createUser$1, d as createUsersTable$1, e as createPersonalAccessTokensTable$1, h as createPasswordResetTokensTable$1, i as createMigrationsTable$1 } from './shared/nuxt-users.C_UkhLJ9.mjs';
+import { runMigrations, createUser as createUser$1, createUsersTable as createUsersTable$1, createPersonalAccessTokensTable as createPersonalAccessTokensTable$1, createPasswordResetTokensTable as createPasswordResetTokensTable$1, createMigrationsTable as createMigrationsTable$1 } from '../dist/runtime/server/utils/index.js';
 import { defaultOptions } from './module.mjs';
 import { loadNuxt } from '@nuxt/kit';
+import { getPasswordValidationOptions, validatePassword } from './utils.mjs';
 import 'defu';
 
 const getOptionsFromEnv = () => {
@@ -248,7 +247,7 @@ const main = defineCommand({
   meta: {
     name: "nuxt-users",
     description: "CLI for Nuxt Users Module - Manage users, migrations, and database operations",
-    version: "1.1.3"
+    version: "1.6.3"
   },
   subCommands: {
     migrate,

package/dist/module.d.mts

@@ -1,5 +1,118 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { M as ModuleOptions } from './shared/nuxt-users.CMEtv_Mw.mjs';
+
+type DatabaseType = 'sqlite' | 'mysql' | 'postgresql';
+type DatabaseConfig = {
+    path?: string;
+    host?: string;
+    port?: number;
+    user?: string;
+    password?: string;
+    database?: string;
+};
+interface RuntimeModuleOptions {
+    connector?: {
+        name: DatabaseType;
+        options: DatabaseConfig;
+    };
+    tables?: {
+        migrations?: string;
+        users?: string;
+        personalAccessTokens?: string;
+        passwordResetTokens?: string;
+    };
+    /**
+     * Mailer configuration options for sending emails (e.g., password resets)
+     * Uses nodemailer
+     */
+    mailer?: MailerOptions;
+    /**
+     * Base URL for password reset links
+     * @default 'http://localhost:3000' // Example, will be set in module defaults
+     */
+    passwordResetBaseUrl?: string;
+    /**
+     * Skip database checks during module setup to prevent hanging
+     * @default false
+     */
+    auth?: {
+        /**
+         * Whitelisted routes that do not require authentication
+         * @default ['/login']
+         * @example ['/login', '/register']
+         */
+        whitelist?: string[];
+    };
+    /**
+     * Password validation configuration
+     */
+    passwordValidation?: {
+        /**
+         * Minimum password length
+         * @default 8
+         */
+        minLength?: number;
+        /**
+         * Require uppercase letters
+         * @default true
+         */
+        requireUppercase?: boolean;
+        /**
+         * Require lowercase letters
+         * @default true
+         */
+        requireLowercase?: boolean;
+        /**
+         * Require numbers
+         * @default true
+         */
+        requireNumbers?: boolean;
+        /**
+         * Require special characters
+         * @default true
+         */
+        requireSpecialChars?: boolean;
+        /**
+         * Prevent common passwords
+         * @default true
+         */
+        preventCommonPasswords?: boolean;
+    };
+}
+interface ModuleOptions extends Omit<RuntimeModuleOptions, 'tables' | 'auth' | 'passwordValidation'> {
+    connector: {
+        name: DatabaseType;
+        options: DatabaseConfig;
+    };
+    tables: {
+        migrations: string;
+        users: string;
+        personalAccessTokens: string;
+        passwordResetTokens: string;
+    };
+    auth: {
+        whitelist: string[];
+    };
+    passwordValidation: {
+        minLength: number;
+        requireUppercase: boolean;
+        requireLowercase: boolean;
+        requireNumbers: boolean;
+        requireSpecialChars: boolean;
+        preventCommonPasswords: boolean;
+    };
+}
+interface MailerOptions {
+    host: string;
+    port: number;
+    secure?: boolean;
+    auth: {
+        user: string;
+        pass: string;
+    };
+    defaults?: {
+        from: string;
+    };
+}
 
 declare const defaultOptions: ModuleOptions;
 declare const _default: _nuxt_schema.NuxtModule<ModuleOptions, ModuleOptions, false>;

package/dist/module.d.ts

@@ -1,5 +1,118 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { M as ModuleOptions } from './shared/nuxt-users.CMEtv_Mw.js';
+
+type DatabaseType = 'sqlite' | 'mysql' | 'postgresql';
+type DatabaseConfig = {
+    path?: string;
+    host?: string;
+    port?: number;
+    user?: string;
+    password?: string;
+    database?: string;
+};
+interface RuntimeModuleOptions {
+    connector?: {
+        name: DatabaseType;
+        options: DatabaseConfig;
+    };
+    tables?: {
+        migrations?: string;
+        users?: string;
+        personalAccessTokens?: string;
+        passwordResetTokens?: string;
+    };
+    /**
+     * Mailer configuration options for sending emails (e.g., password resets)
+     * Uses nodemailer
+     */
+    mailer?: MailerOptions;
+    /**
+     * Base URL for password reset links
+     * @default 'http://localhost:3000' // Example, will be set in module defaults
+     */
+    passwordResetBaseUrl?: string;
+    /**
+     * Skip database checks during module setup to prevent hanging
+     * @default false
+     */
+    auth?: {
+        /**
+         * Whitelisted routes that do not require authentication
+         * @default ['/login']
+         * @example ['/login', '/register']
+         */
+        whitelist?: string[];
+    };
+    /**
+     * Password validation configuration
+     */
+    passwordValidation?: {
+        /**
+         * Minimum password length
+         * @default 8
+         */
+        minLength?: number;
+        /**
+         * Require uppercase letters
+         * @default true
+         */
+        requireUppercase?: boolean;
+        /**
+         * Require lowercase letters
+         * @default true
+         */
+        requireLowercase?: boolean;
+        /**
+         * Require numbers
+         * @default true
+         */
+        requireNumbers?: boolean;
+        /**
+         * Require special characters
+         * @default true
+         */
+        requireSpecialChars?: boolean;
+        /**
+         * Prevent common passwords
+         * @default true
+         */
+        preventCommonPasswords?: boolean;
+    };
+}
+interface ModuleOptions extends Omit<RuntimeModuleOptions, 'tables' | 'auth' | 'passwordValidation'> {
+    connector: {
+        name: DatabaseType;
+        options: DatabaseConfig;
+    };
+    tables: {
+        migrations: string;
+        users: string;
+        personalAccessTokens: string;
+        passwordResetTokens: string;
+    };
+    auth: {
+        whitelist: string[];
+    };
+    passwordValidation: {
+        minLength: number;
+        requireUppercase: boolean;
+        requireLowercase: boolean;
+        requireNumbers: boolean;
+        requireSpecialChars: boolean;
+        preventCommonPasswords: boolean;
+    };
+}
+interface MailerOptions {
+    host: string;
+    port: number;
+    secure?: boolean;
+    auth: {
+        user: string;
+        pass: string;
+    };
+    defaults?: {
+        from: string;
+    };
+}
 
 declare const defaultOptions: ModuleOptions;
 declare const _default: _nuxt_schema.NuxtModule<ModuleOptions, ModuleOptions, false>;

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-users",
   "configKey": "nuxtUsers",
-  "version": "1.6.3",
+  "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 { checkTableExists } from "../utils";
-import { useAuth } from "./composables/useAuth.js";
+import { defineNuxtPlugin, useRuntimeConfig } from "#app";
+import { checkTableExists } from "./server/utils/index.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/login.post.js

@@ -2,7 +2,7 @@ import { createError, defineEventHandler, readBody, setCookie } from "h3";
 import bcrypt from "bcrypt";
 import crypto from "node:crypto";
 import { useRuntimeConfig } from "#imports";
-import { useDb } from "../../../utils";
+import { useDb } from "../utils/index.js";
 export default defineEventHandler(async (event) => {
   const body = await readBody(event);
   const { email, password } = body;

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

@@ -1,6 +1,6 @@
 import { defineEventHandler, getCookie, setCookie } from "h3";
 import { useRuntimeConfig } from "#imports";
-import { useDb } from "../../../utils";
+import { useDb } from "../utils/index.js";
 export default defineEventHandler(async (event) => {
   const { nuxtUsers } = useRuntimeConfig();
   const options = nuxtUsers;

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

@@ -1,6 +1,6 @@
 import { createError, defineEventHandler, getCookie } from "h3";
 import { useRuntimeConfig } from "#imports";
-import { getCurrentUserFromToken } from "../../../utils";
+import { getCurrentUserFromToken } from "../utils/index.js";
 export default defineEventHandler(async (event) => {
   const { nuxtUsers } = useRuntimeConfig();
   const options = nuxtUsers;
@@ -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

@@ -1,7 +1,8 @@
 import { createError, defineEventHandler, getCookie, readBody } from "h3";
 import bcrypt from "bcrypt";
 import { useRuntimeConfig } from "#imports";
-import { getCurrentUserFromToken, updateUserPassword, validatePassword, getPasswordValidationOptions } from "../../../utils";
+import { getCurrentUserFromToken, updateUserPassword } from "../utils/index.js";
+import { validatePassword, getPasswordValidationOptions } from "../../../utils";
 export default defineEventHandler(async (event) => {
   const { nuxtUsers } = useRuntimeConfig();
   const options = nuxtUsers;
@@ -12,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/services/password.js

@@ -1,7 +1,7 @@
 import { createTransport } from "nodemailer";
 import crypto from "node:crypto";
 import bcrypt from "bcrypt";
-import { findUserByEmail, updateUserPassword, useDb } from "../../../utils";
+import { findUserByEmail, updateUserPassword, useDb } from "../utils/index.js";
 const TOKEN_EXPIRATION_HOURS = 1;
 export const sendPasswordResetLink = async (email, options) => {
   const user = await findUserByEmail(email, options);

package/dist/runtime/server/utils/create-migrations-table.d.ts

@@ -0,0 +1,2 @@
+import type { ModuleOptions } from '../../../types.js';
+export declare const createMigrationsTable: (options: ModuleOptions) => Promise<void>;

package/dist/runtime/server/utils/create-migrations-table.js

@@ -0,0 +1,35 @@
+import { useDb } from "./db.js";
+export const createMigrationsTable = async (options) => {
+  const connectorName = options.connector.name;
+  const db = await useDb(options);
+  const tableName = "migrations";
+  console.log(`[Nuxt Users] DB:Create Migrations ${connectorName} Table Creating ${tableName} table with ${connectorName} connector...`);
+  if (connectorName === "sqlite") {
+    await db.sql`
+    CREATE TABLE IF NOT EXISTS {${tableName}} (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      name TEXT NOT NULL UNIQUE,
+      executed_at DATETIME DEFAULT CURRENT_TIMESTAMP
+    )
+  `;
+  }
+  if (connectorName === "mysql") {
+    await db.sql`
+      CREATE TABLE IF NOT EXISTS {${tableName}} (
+        id INT AUTO_INCREMENT PRIMARY KEY,
+        name VARCHAR(255) NOT NULL UNIQUE,
+        executed_at DATETIME DEFAULT CURRENT_TIMESTAMP
+      )
+    `;
+  }
+  if (connectorName === "postgresql") {
+    await db.sql`
+      CREATE TABLE IF NOT EXISTS {${tableName}} (
+        id SERIAL PRIMARY KEY,
+        name VARCHAR(255) NOT NULL UNIQUE,
+        executed_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
+      )
+    `;
+  }
+  console.log(`[Nuxt Users] DB:Create Migrations ${connectorName} Table successfull \u2705`);
+};

package/dist/runtime/server/utils/create-password-reset-tokens-table.d.ts

@@ -0,0 +1,2 @@
+import type { ModuleOptions } from '../../../types.js';
+export declare const createPasswordResetTokensTable: (options: ModuleOptions) => Promise<void>;

package/dist/runtime/server/utils/create-password-reset-tokens-table.js

@@ -0,0 +1,40 @@
+import { useDb } from "./db.js";
+export const createPasswordResetTokensTable = async (options) => {
+  const connectorName = options.connector.name;
+  const db = await useDb(options);
+  const tableName = options.tables.passwordResetTokens;
+  console.log(`[Nuxt Users] DB:Create Password Reset Tokens ${connectorName} Table Creating ${tableName} table with ${connectorName} connector...`);
+  if (connectorName === "sqlite") {
+    await db.sql`
+    CREATE TABLE IF NOT EXISTS {${tableName}} (
+      id INTEGER PRIMARY KEY AUTOINCREMENT,
+      email TEXT NOT NULL,
+      token TEXT NOT NULL UNIQUE,
+      created_at DATETIME DEFAULT CURRENT_TIMESTAMP
+    )
+  `;
+  }
+  if (connectorName === "mysql") {
+    await db.sql`
+      CREATE TABLE IF NOT EXISTS {${tableName}} (
+        id INT AUTO_INCREMENT PRIMARY KEY,
+        email VARCHAR(255) NOT NULL,
+        token VARCHAR(255) NOT NULL UNIQUE,
+        created_at DATETIME DEFAULT CURRENT_TIMESTAMP
+      )
+    `;
+  }
+  if (connectorName === "postgresql") {
+    await db.sql`
+      CREATE TABLE IF NOT EXISTS {${tableName}} (
+        id SERIAL PRIMARY KEY,
+        email VARCHAR(255) NOT NULL,
+        token VARCHAR(255) NOT NULL UNIQUE,
+        created_at TIMESTAMPTZ DEFAULT CURRENT_TIMESTAMP
+      )
+    `;
+  }
+  await db.sql`CREATE INDEX IF NOT EXISTS idx_password_reset_tokens_email ON {${tableName}} (email)`;
+  await db.sql`CREATE INDEX IF NOT EXISTS idx_password_reset_tokens_token ON {${tableName}} (token)`;
+  console.log(`[Nuxt Users] DB:Create Password Reset Tokens ${connectorName} Table Fields: id, email, token, created_at \u2705`);
+};

package/dist/runtime/server/utils/create-personal-access-tokens-table.d.ts

@@ -0,0 +1,2 @@
+import type { ModuleOptions } from '../../../types.js';
+export declare const createPersonalAccessTokensTable: (options: ModuleOptions) => Promise<void>;