nuxt-users 1.50.0 → 1.50.1

package/dist/module.json

@@ -4,7 +4,7 @@
   "compatibility": {
     "nuxt": ">=3.0.0"
   },
-  "version": "1.50.0",
+  "version": "1.50.1",
   "builder": {
     "@nuxt/module-builder": "1.0.3",
     "unbuild": "3.6.1"

package/dist/runtime/server/services/password.d.ts

@@ -8,7 +8,3 @@ export declare const sendPasswordResetLink: (email: string, options: ModuleOptio
  */
 export declare const resetPassword: (token: string, email: string, // Added email to quickly find the token
 newPassword: string, options: ModuleOptions) => Promise<boolean>;
-/**
- * Deletes expired password reset tokens from the database.
- */
-export declare const deleteExpiredPasswordResetTokens: (options: ModuleOptions) => Promise<void>;

package/dist/runtime/server/services/password.js

@@ -3,6 +3,7 @@ import crypto from "node:crypto";
 import bcrypt from "bcrypt";
 import { findUserByEmail, updateUserPassword, revokeUserTokens, useDb } from "../utils/index.js";
 import { escapeHtml } from "../utils/escape-html.js";
+import { isTokenExpired, findTokenRecordsByEmail } from "../utils/token-expiry.js";
 const TOKEN_EXPIRATION_HOURS = 1;
 export const sendPasswordResetLink = async (email, options, baseUrl) => {
   const user = await findUserByEmail(email, options);
@@ -82,17 +83,13 @@ If you did not request this password reset, please ignore this email.`,
 export const resetPassword = async (token, email, newPassword, options) => {
   const db = await useDb(options);
   const passwordResetTokensTable = options.tables.passwordResetTokens;
-  const tokenRecords = await db.sql`
-    SELECT * FROM {${passwordResetTokensTable}}
-    WHERE email = ${email}
-    ORDER BY created_at DESC
-  `;
-  if (tokenRecords.rows.length === 0) {
+  const tokenRecords = await findTokenRecordsByEmail(db, passwordResetTokensTable, email);
+  if (tokenRecords.length === 0) {
     console.log(`[Nuxt Users] No password reset tokens found for email: ${email}`);
     return false;
   }
   let validTokenRecord = null;
-  for (const record of tokenRecords.rows) {
+  for (const record of tokenRecords) {
     const tokenMatch = await bcrypt.compare(token, record.token);
     if (tokenMatch) {
       validTokenRecord = record;
@@ -103,30 +100,7 @@ export const resetPassword = async (token, email, newPassword, options) => {
     console.log(`[Nuxt Users] Invalid password reset token provided for email: ${email}`);
     return false;
   }
-  const now = /* @__PURE__ */ new Date();
-  const currentTimeString = now.toISOString().slice(0, 19).replace("T", " ");
-  const createdAtString = validTokenRecord.created_at instanceof Date ? validTokenRecord.created_at.toISOString().slice(0, 19).replace("T", " ") : String(validTokenRecord.created_at);
-  const [datePart, timePart] = createdAtString.split(/[ T]/);
-  if (!datePart || !timePart) {
-    console.log(`[Nuxt Users] Invalid timestamp format for token: ${createdAtString}`);
-    return false;
-  }
-  const [year, month, day] = datePart.split("-").map(Number);
-  const [hour, minute, second] = timePart.split(":").map(Number);
-  if (!year || !month || !day || hour === void 0 || minute === void 0 || second === void 0) {
-    console.log("[Nuxt Users] Invalid timestamp components");
-    return false;
-  }
-  let expirationHour = hour + TOKEN_EXPIRATION_HOURS;
-  let expirationDay = day;
-  const expirationMonth = month;
-  const expirationYear = year;
-  if (expirationHour >= 24) {
-    expirationHour -= 24;
-    expirationDay++;
-  }
-  const expirationTimeString = `${expirationYear.toString().padStart(4, "0")}-${expirationMonth.toString().padStart(2, "0")}-${expirationDay.toString().padStart(2, "0")} ${expirationHour.toString().padStart(2, "0")}:${minute.toString().padStart(2, "0")}:${second.toString().padStart(2, "0")}`;
-  if (currentTimeString > expirationTimeString) {
+  if (isTokenExpired(validTokenRecord.created_at, validTokenRecord.db_now, TOKEN_EXPIRATION_HOURS)) {
     console.log(`[Nuxt Users] Expired password reset token for email: ${email}`);
     await db.sql`DELETE FROM {${passwordResetTokensTable}} WHERE id = ${validTokenRecord.id}`;
     return false;
@@ -140,15 +114,3 @@ export const resetPassword = async (token, email, newPassword, options) => {
   console.log(`[Nuxt Users] Password reset successful for email: ${email}`);
   return true;
 };
-export const deleteExpiredPasswordResetTokens = async (options) => {
-  const db = await useDb(options);
-  const passwordResetTokensTable = options.tables.passwordResetTokens;
-  const expirationDate = /* @__PURE__ */ new Date();
-  expirationDate.setHours(expirationDate.getHours() - TOKEN_EXPIRATION_HOURS);
-  const expirationDateString = expirationDate.toISOString().slice(0, 19).replace("T", " ");
-  await db.sql`
-    DELETE FROM {${passwordResetTokensTable}}
-    WHERE created_at < ${expirationDateString}
-  `;
-  console.log(`[Nuxt Users] Expired password reset tokens older than ${expirationDateString} deleted.`);
-};

package/dist/runtime/server/services/registration.js

@@ -3,6 +3,7 @@ import crypto from "node:crypto";
 import bcrypt from "bcrypt";
 import { findUserByEmail, useDb, USER_EMAIL_ALREADY_EXISTS_MESSAGE } from "../utils/index.js";
 import { escapeHtml } from "../utils/escape-html.js";
+import { isTokenExpired, findTokenRecordsByEmail } from "../utils/token-expiry.js";
 import { validatePassword, getPasswordValidationOptions } from "nuxt-users/utils";
 const TOKEN_EXPIRATION_HOURS = 24;
 export const registerUser = async (userData, options, baseUrl) => {
@@ -130,17 +131,13 @@ export const confirmUserEmail = async (token, email, options) => {
   const db = await useDb(options);
   const passwordResetTokensTable = options.tables.passwordResetTokens;
   const usersTable = options.tables.users;
-  const tokenRecords = await db.sql`
-    SELECT * FROM {${passwordResetTokensTable}}
-    WHERE email = ${email}
-    ORDER BY created_at DESC
-  `;
-  if (tokenRecords.rows.length === 0) {
+  const tokenRecords = await findTokenRecordsByEmail(db, passwordResetTokensTable, email);
+  if (tokenRecords.length === 0) {
     console.log(`[Nuxt Users] No confirmation tokens found for email: ${email}`);
     return false;
   }
   let validTokenRecord = null;
-  for (const record of tokenRecords.rows) {
+  for (const record of tokenRecords) {
     const tokenMatch = await bcrypt.compare(token, record.token);
     if (tokenMatch) {
       validTokenRecord = record;
@@ -151,44 +148,7 @@ export const confirmUserEmail = async (token, email, options) => {
     console.log(`[Nuxt Users] Invalid confirmation token provided for email: ${email}`);
     return false;
   }
-  const now = /* @__PURE__ */ new Date();
-  const currentTimeString = now.toISOString().slice(0, 19).replace("T", " ");
-  const createdAtString = validTokenRecord.created_at instanceof Date ? validTokenRecord.created_at.toISOString().slice(0, 19).replace("T", " ") : String(validTokenRecord.created_at);
-  const [datePart, timePart] = createdAtString.split(/[ T]/);
-  if (!datePart || !timePart) {
-    console.log(`[Nuxt Users] Invalid timestamp format for token: ${createdAtString}`);
-    return false;
-  }
-  const [year, month, day] = datePart.split("-").map(Number);
-  const [hour, minute, second] = timePart.split(":").map(Number);
-  if (!year || !month || !day || hour === void 0 || minute === void 0 || second === void 0) {
-    console.log("[Nuxt Users] Invalid timestamp components");
-    return false;
-  }
-  let expirationHour = hour + TOKEN_EXPIRATION_HOURS;
-  let expirationDay = day;
-  let expirationMonth = month;
-  let expirationYear = year;
-  if (expirationHour >= 24) {
-    expirationHour -= 24;
-    expirationDay++;
-    const daysInMonth = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31];
-    if (expirationYear % 4 === 0 && (expirationYear % 100 !== 0 || expirationYear % 400 === 0)) {
-      daysInMonth[1] = 29;
-    }
-    const monthIndex = expirationMonth - 1;
-    const daysInCurrentMonth = daysInMonth[monthIndex];
-    if (daysInCurrentMonth && expirationDay > daysInCurrentMonth) {
-      expirationDay = 1;
-      expirationMonth++;
-      if (expirationMonth > 12) {
-        expirationMonth = 1;
-        expirationYear++;
-      }
-    }
-  }
-  const expirationTimeString = `${expirationYear.toString().padStart(4, "0")}-${expirationMonth.toString().padStart(2, "0")}-${expirationDay.toString().padStart(2, "0")} ${expirationHour.toString().padStart(2, "0")}:${minute.toString().padStart(2, "0")}:${second.toString().padStart(2, "0")}`;
-  if (currentTimeString > expirationTimeString) {
+  if (isTokenExpired(validTokenRecord.created_at, validTokenRecord.db_now, TOKEN_EXPIRATION_HOURS)) {
     console.log(`[Nuxt Users] Expired confirmation token for email: ${email}`);
     await db.sql`DELETE FROM {${passwordResetTokensTable}} WHERE id = ${validTokenRecord.id}`;
     return false;

package/dist/runtime/server/utils/token-expiry.d.ts

@@ -0,0 +1,27 @@
+import type { Database } from 'db0';
+/**
+ * A DB timestamp as returned by the driver: a Date (MySQL, PostgreSQL)
+ * or a 'YYYY-MM-DD HH:MM:SS' string (SQLite).
+ */
+export type DbTimestamp = Date | string;
+/**
+ * Decides whether a token is older than `hours`.
+ *
+ * `dbNow` must be the database's own CURRENT_TIMESTAMP, read in the same query as `createdAt`:
+ * both values then share the database's and the driver's time zone handling, so the difference
+ * is correct whatever time zones the database and the Node process use.
+ */
+export declare const isTokenExpired: (createdAt: DbTimestamp, dbNow: DbTimestamp, hours: number) => boolean;
+/** A row of the password reset / confirmation token table, with the database's own clock alongside */
+export interface TokenRecord {
+    id: number;
+    email: string;
+    token: string;
+    created_at: DbTimestamp;
+    db_now: DbTimestamp;
+}
+/**
+ * Finds the tokens for an email, newest first. `db_now` is read in the same query so that
+ * expiry can be judged on the database's own clock with `isTokenExpired` (issue #220).
+ */
+export declare const findTokenRecordsByEmail: (db: Database, table: string, email: string) => Promise<TokenRecord[]>;

package/dist/runtime/server/utils/token-expiry.js

@@ -0,0 +1,24 @@
+const toMilliseconds = (value) => {
+  if (value instanceof Date) {
+    return value.getTime();
+  }
+  if (typeof value !== "string") {
+    return Number.NaN;
+  }
+  return Date.parse(`${value.replace(" ", "T")}Z`);
+};
+export const isTokenExpired = (createdAt, dbNow, hours) => {
+  const ageMs = toMilliseconds(dbNow) - toMilliseconds(createdAt);
+  if (Number.isNaN(ageMs)) {
+    return true;
+  }
+  return ageMs > hours * 60 * 60 * 1e3;
+};
+export const findTokenRecordsByEmail = async (db, table, email) => {
+  const result = await db.sql`
+    SELECT *, CURRENT_TIMESTAMP AS db_now FROM {${table}}
+    WHERE email = ${email}
+    ORDER BY created_at DESC
+  `;
+  return result.rows;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-users",
-  "version": "1.50.0",
+  "version": "1.50.1",
   "description": "A comprehensive user management module for Nuxt applications with authentication, authorization, database support, and CLI tools",
   "keywords": [
     "nuxt",
@@ -68,7 +68,7 @@
     "release:publish:dry": "npm pack --dry-run --ignore-scripts",
     "release:preflight": "yarn prerelease && yarn check:npm_token && yarn check:npm_auth && sh scripts/release-preflight.sh",
     "prerelease": "node -v | grep -qE '^v(22|24)\\.' || (echo 'Please use Node.js v22 or v24 for deployment' && exit 1)",
-    "release": "yarn release:preflight && yarn lint && yarn check:translations && yarn check:locale-consistency && yarn test && yarn prepack && yarn release:publish:dry && dotenv -- changelogen --release && dotenv -- sh -c 'npm publish --//registry.npmjs.org/:_authToken=$NPM_TOKEN --registry https://registry.npmjs.org/' && git push --follow-tags",
+    "release": "yarn release:preflight && yarn lint && yarn check:translations && yarn check:locale-consistency && yarn test && yarn prepack && yarn release:publish:dry && dotenv -- changelogen --release --no-github && dotenv -- sh -c 'npm publish --//registry.npmjs.org/:_authToken=$NPM_TOKEN --registry https://registry.npmjs.org/' && git push --follow-tags && dotenv -- changelogen gh release",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
     "pretest": "node -v | grep -qE '^v(22|24)\\.' || (echo 'Please use Node.js v22 or v24 for testing' && exit 1)",