nuxt-users 1.6.6 → 1.6.7

package/CHANGELOG.md

@@ -1,6 +1,38 @@
 # Changelog
 
 
+## v1.6.7
+
+[compare changes](https://github.com/rrd108/nuxt-users/compare/v1.6.6...v1.6.7)
+
+### 🩹 Fixes
+
+- Authentication middleware logic ([18a3bb5](https://github.com/rrd108/nuxt-users/commit/18a3bb5))
+- Password validation and UI ([07b44b3](https://github.com/rrd108/nuxt-users/commit/07b44b3))
+- Type errors ([c403645](https://github.com/rrd108/nuxt-users/commit/c403645))
+
+### 💅 Refactors
+
+- API routes ([3c7603f](https://github.com/rrd108/nuxt-users/commit/3c7603f))
+- Authentication components and logic ([4da544f](https://github.com/rrd108/nuxt-users/commit/4da544f))
+- Token cleanup task and middleware ([d47a4a5](https://github.com/rrd108/nuxt-users/commit/d47a4a5))
+
+### 🏡 Chore
+
+- **release:** V1.6.6 ([7b37694](https://github.com/rrd108/nuxt-users/commit/7b37694))
+
+### ✅ Tests
+
+- Fix mock ([791dc94](https://github.com/rrd108/nuxt-users/commit/791dc94))
+- Adds unit tests for auth API endpoints ([d844630](https://github.com/rrd108/nuxt-users/commit/d844630))
+- Remove unused test ([3dc23ad](https://github.com/rrd108/nuxt-users/commit/3dc23ad))
+- Fix response ([db3b03c](https://github.com/rrd108/nuxt-users/commit/db3b03c))
+- Fix mysql field type ([2faf0c6](https://github.com/rrd108/nuxt-users/commit/2faf0c6))
+
+### ❤️ Contributors
+
+- Rrd108 ([@rrd108](https://github.com/rrd108))
+
 ## v1.6.6
 
 [compare changes](https://github.com/rrd108/nuxt-users/compare/v1.6.5...v1.6.6)

package/dist/cli.mjs

@@ -247,7 +247,7 @@ const main = defineCommand({
   meta: {
     name: "nuxt-users",
     description: "CLI for Nuxt Users Module - Manage users, migrations, and database operations",
-    version: "1.6.5"
+    version: "1.6.6"
   },
   subCommands: {
     migrate,

package/dist/module.d.mts

@@ -9,76 +9,7 @@ type DatabaseConfig = {
     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'> {
+interface ModuleOptions {
     connector: {
         name: DatabaseType;
         options: DatabaseConfig;
@@ -89,8 +20,11 @@ interface ModuleOptions extends Omit<RuntimeModuleOptions, 'tables' | 'auth' | '
         personalAccessTokens: string;
         passwordResetTokens: string;
     };
+    mailer?: MailerOptions;
+    passwordResetBaseUrl?: string;
     auth: {
         whitelist: string[];
+        tokenExpiration: number;
     };
     passwordValidation: {
         minLength: number;

package/dist/module.d.ts

@@ -9,76 +9,7 @@ type DatabaseConfig = {
     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'> {
+interface ModuleOptions {
     connector: {
         name: DatabaseType;
         options: DatabaseConfig;
@@ -89,8 +20,11 @@ interface ModuleOptions extends Omit<RuntimeModuleOptions, 'tables' | 'auth' | '
         personalAccessTokens: string;
         passwordResetTokens: string;
     };
+    mailer?: MailerOptions;
+    passwordResetBaseUrl?: string;
     auth: {
         whitelist: string[];
+        tokenExpiration: number;
     };
     passwordValidation: {
         minLength: number;

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-users",
   "configKey": "nuxtUsers",
-  "version": "1.6.6",
+  "version": "1.6.7",
   "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, addRouteMiddleware, addComponent } from '@nuxt/kit';
+import { defineNuxtModule, createResolver, addPlugin, addImportsDir, addRouteMiddleware, addServerHandler, addComponent } from '@nuxt/kit';
 import { defu } from 'defu';
 
 const defaultOptions = {
@@ -31,7 +31,9 @@ const defaultOptions = {
   },
   passwordResetBaseUrl: "http://localhost:3000",
   auth: {
-    whitelist: ["/login"]
+    whitelist: ["/login"],
+    tokenExpiration: 24 * 60
+    // 24 hours
   },
   passwordValidation: {
     minLength: 8,
@@ -61,7 +63,8 @@ const module = defineNuxtModule({
         passwordResetTokens: options.tables?.passwordResetTokens || defaultOptions.tables.passwordResetTokens
       },
       auth: {
-        whitelist: [...defaultOptions.auth?.whitelist || [], ...options.auth?.whitelist || []]
+        whitelist: [...defaultOptions.auth?.whitelist || [], ...options.auth?.whitelist || []],
+        tokenExpiration: options.auth?.tokenExpiration || defaultOptions.auth.tokenExpiration
       }
     };
     nuxt.options.runtimeConfig.public = nuxt.options.runtimeConfig.public || {};
@@ -83,10 +86,6 @@ 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"),
@@ -122,6 +121,12 @@ const module = defineNuxtModule({
       method: "post",
       handler: resolver.resolve("./runtime/server/api/auth/update-password.post")
     });
+    nuxt.hook("nitro:config", async (nitroConfig) => {
+      nitroConfig.experimental = nitroConfig.experimental || {};
+      nitroConfig.experimental.tasks = true;
+      nitroConfig.scanDirs = nitroConfig.scanDirs || [];
+      nitroConfig.scanDirs.push(resolver.resolve("./runtime/server/tasks"));
+    });
     addComponent({
       name: "LoginForm",
       filePath: resolver.resolve("./runtime/components/LoginForm.vue")

package/dist/runtime/server/api/auth/login.post.js

@@ -35,9 +35,11 @@ export default defineEventHandler(async (event) => {
   }
   const token = crypto.randomBytes(64).toString("hex");
   const tokenName = "auth_token";
+  const expiresAt = /* @__PURE__ */ new Date();
+  expiresAt.setMinutes(expiresAt.getMinutes() + options.auth.tokenExpiration);
   await db.sql`
-    INSERT INTO {${personalAccessTokensTable}} (tokenable_type, tokenable_id, name, token, created_at, updated_at)
-    VALUES ('user', ${user.id}, ${tokenName}, ${token}, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)
+    INSERT INTO {${personalAccessTokensTable}} (tokenable_type, tokenable_id, name, token, expires_at, created_at, updated_at)
+    VALUES ('user', ${user.id}, ${tokenName}, ${token}, ${expiresAt.toISOString().slice(0, 19).replace("T", " ")}, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)
   `;
   setCookie(event, "auth_token", token, {
     httpOnly: true,

package/dist/runtime/server/tasks/cleanup-tokens.d.ts

@@ -0,0 +1,2 @@
+declare const _default: import("nitropack").Task<"success">;
+export default _default;

package/dist/runtime/server/tasks/cleanup-tokens.js

@@ -0,0 +1,30 @@
+import { defineTask } from "nitropack/runtime/task";
+export default defineTask({
+  meta: {
+    name: "nuxt-users:cleanup-tokens",
+    description: "Clean up expired personal access tokens and tokens without expiration"
+  },
+  async run({ payload }) {
+    const { useRuntimeConfig } = await import("#imports");
+    const { cleanupPersonalAccessTokens } = await import("../utils/index.js");
+    const { nuxtUsers } = useRuntimeConfig();
+    const options = nuxtUsers;
+    if (!options) {
+      throw new Error("Nuxt Users module not configured");
+    }
+    const includeNoExpiration = payload?.includeNoExpiration ?? true;
+    try {
+      const result = await cleanupPersonalAccessTokens(options, includeNoExpiration);
+      return {
+        result: "success",
+        expiredTokensRemoved: result.expiredCount,
+        noExpirationTokensRemoved: result.noExpirationCount,
+        totalTokensCleaned: result.totalCount,
+        includeNoExpiration
+      };
+    } catch (error) {
+      console.error("[Nuxt Users] Token cleanup failed:", error);
+      throw error;
+    }
+  }
+});

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

@@ -1,5 +1,5 @@
 export { useDb, checkTableExists } from './db.js';
-export { createUser, findUserByEmail, updateUserPassword, getCurrentUserFromToken, hasAnyUsers } from './user.js';
+export { createUser, findUserByEmail, updateUserPassword, getCurrentUserFromToken, hasAnyUsers, deleteExpiredPersonalAccessTokens, deleteTokensWithoutExpiration, cleanupPersonalAccessTokens, revokeUserTokens } from './user.js';
 export { createUsersTable } from './create-users-table.js';
 export { createPersonalAccessTokensTable } from './create-personal-access-tokens-table.js';
 export { createPasswordResetTokensTable } from './create-password-reset-tokens-table.js';

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

@@ -1,5 +1,5 @@
 export { useDb, checkTableExists } from "./db.js";
-export { createUser, findUserByEmail, updateUserPassword, getCurrentUserFromToken, hasAnyUsers } from "./user.js";
+export { createUser, findUserByEmail, updateUserPassword, getCurrentUserFromToken, hasAnyUsers, deleteExpiredPersonalAccessTokens, deleteTokensWithoutExpiration, cleanupPersonalAccessTokens, revokeUserTokens } from "./user.js";
 export { createUsersTable } from "./create-users-table.js";
 export { createPersonalAccessTokensTable } from "./create-personal-access-tokens-table.js";
 export { createPasswordResetTokensTable } from "./create-password-reset-tokens-table.js";

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

@@ -24,4 +24,24 @@ export declare const hasAnyUsers: (options: ModuleOptions) => Promise<boolean>;
  * Gets the current user from an authentication token.
  */
 export declare const getCurrentUserFromToken: <T extends boolean = false>(token: string, options: ModuleOptions, withPass?: T) => Promise<T extends true ? User | null : UserWithoutPassword | null>;
+/**
+ * Deletes expired personal access tokens from the database.
+ */
+export declare const deleteExpiredPersonalAccessTokens: (options: ModuleOptions) => Promise<number>;
+/**
+ * Deletes tokens without expiration dates (legacy tokens or security cleanup).
+ */
+export declare const deleteTokensWithoutExpiration: (options: ModuleOptions) => Promise<number>;
+/**
+ * Comprehensive token cleanup: removes expired tokens and optionally tokens without expiration.
+ */
+export declare const cleanupPersonalAccessTokens: (options: ModuleOptions, includeNoExpiration?: boolean) => Promise<{
+    expiredCount: number;
+    noExpirationCount: number;
+    totalCount: number;
+}>;
+/**
+ * Revokes all tokens for a specific user.
+ */
+export declare const revokeUserTokens: (userId: number, options: ModuleOptions) => Promise<void>;
 export {};

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

@@ -76,13 +76,19 @@ export const getCurrentUserFromToken = async (token, options, withPass = false)
   const personalAccessTokensTable = options.tables.personalAccessTokens;
   const usersTable = options.tables.users;
   const tokenResult = await db.sql`
-    SELECT tokenable_id FROM {${personalAccessTokensTable}}
+    SELECT tokenable_id, expires_at FROM {${personalAccessTokensTable}}
     WHERE token = ${token}
+    AND (expires_at IS NULL OR expires_at > CURRENT_TIMESTAMP)
   `;
   if (tokenResult.rows.length === 0) {
     return null;
   }
   const userId = tokenResult.rows[0].tokenable_id;
+  await db.sql`
+    UPDATE {${personalAccessTokensTable}}
+    SET last_used_at = CURRENT_TIMESTAMP
+    WHERE token = ${token}
+  `;
   const userResult = await db.sql`
     SELECT * FROM {${usersTable}}
     WHERE id = ${userId}
@@ -97,3 +103,41 @@ export const getCurrentUserFromToken = async (token, options, withPass = false)
   const { password: _, ...userWithoutPassword } = user;
   return userWithoutPassword;
 };
+export const deleteExpiredPersonalAccessTokens = async (options) => {
+  const db = await useDb(options);
+  const personalAccessTokensTable = options.tables.personalAccessTokens;
+  const result = await db.sql`
+    DELETE FROM {${personalAccessTokensTable}}
+    WHERE expires_at IS NOT NULL AND expires_at <= CURRENT_TIMESTAMP
+  `;
+  const deletedCount = result.rows?.length || 0;
+  console.log(`[Nuxt Users] ${deletedCount} expired personal access tokens deleted.`);
+  return deletedCount;
+};
+export const deleteTokensWithoutExpiration = async (options) => {
+  const db = await useDb(options);
+  const personalAccessTokensTable = options.tables.personalAccessTokens;
+  const result = await db.sql`
+    DELETE FROM {${personalAccessTokensTable}}
+    WHERE expires_at IS NULL
+  `;
+  const deletedCount = result.rows?.length || 0;
+  console.log(`[Nuxt Users] ${deletedCount} tokens without expiration deleted.`);
+  return deletedCount;
+};
+export const cleanupPersonalAccessTokens = async (options, includeNoExpiration = true) => {
+  const expiredCount = await deleteExpiredPersonalAccessTokens(options);
+  const noExpirationCount = includeNoExpiration ? await deleteTokensWithoutExpiration(options) : 0;
+  const totalCount = expiredCount + noExpirationCount;
+  console.log(`[Nuxt Users] Token cleanup completed: ${expiredCount} expired + ${noExpirationCount} without expiration = ${totalCount} total tokens removed.`);
+  return { expiredCount, noExpirationCount, totalCount };
+};
+export const revokeUserTokens = async (userId, options) => {
+  const db = await useDb(options);
+  const personalAccessTokensTable = options.tables.personalAccessTokens;
+  await db.sql`
+    DELETE FROM {${personalAccessTokensTable}}
+    WHERE tokenable_type = 'user' AND tokenable_id = ${userId}
+  `;
+  console.log(`[Nuxt Users] All tokens revoked for user ID: ${userId}`);
+};

package/package.json

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