nuxt-users 1.15.5 → 1.16.0

package/CHANGELOG.md

@@ -1,6 +1,36 @@
 # Changelog
 
 
+## v1.16.0
+
+[compare changes](https://github.com/rrd108/nuxt-users/compare/v1.15.5...v1.16.0)
+
+### 🚀 Enhancements
+
+- Add inactive user functionality ([67f8fbe](https://github.com/rrd108/nuxt-users/commit/67f8fbe))
+
+### 🩹 Fixes
+
+- Exposed server utils ([abe8f20](https://github.com/rrd108/nuxt-users/commit/abe8f20))
+
+### 💅 Refactors
+
+- Exports ([db41f7c](https://github.com/rrd108/nuxt-users/commit/db41f7c))
+
+### 🏡 Chore
+
+- **release:** V1.15.5 ([8e9e665](https://github.com/rrd108/nuxt-users/commit/8e9e665))
+- Fixes formatting issue in test file ([bfdc4d2](https://github.com/rrd108/nuxt-users/commit/bfdc4d2))
+
+### ✅ Tests
+
+- Fix failing test ([4a0f9e4](https://github.com/rrd108/nuxt-users/commit/4a0f9e4))
+- Fix postgres connection error ([eae0b33](https://github.com/rrd108/nuxt-users/commit/eae0b33))
+
+### ❤️ Contributors
+
+- Rrd108 ([@rrd108](https://github.com/rrd108))
+
 ## v1.15.5
 
 [compare changes](https://github.com/rrd108/nuxt-users/compare/v1.15.4...v1.15.5)

package/dist/cli.mjs

@@ -5,6 +5,7 @@ import { loadNuxt } from '@nuxt/kit';
 import { defu } from 'defu';
 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 { getPasswordValidationOptions, validatePassword } from './utils.mjs';
+import { addActiveToUsers as addActiveToUsers$1 } from '../dist/runtime/server/utils/add-active-to-users.js';
 import '../dist/runtime/server/internal/index.js';
 
 const getOptionsFromEnv = () => {
@@ -208,6 +209,24 @@ const createMigrationsTable = defineCommand({
   }
 });
 
+const addActiveToUsers = defineCommand({
+  meta: {
+    name: "add-active-to-users",
+    description: "Add the active field to the users table in the database"
+  },
+  async run() {
+    console.log("[Nuxt Users] Adding active field to users table...");
+    const options = await loadOptions();
+    try {
+      await addActiveToUsers$1(options);
+      console.log("[Nuxt Users] Active field added to users table successfully!");
+    } catch (error) {
+      console.error("[Nuxt Users] DB:Add Active to Users Error:", error);
+      process.exit(1);
+    }
+  }
+});
+
 const projectInfo = defineCommand({
   meta: {
     name: "project-info",
@@ -248,7 +267,7 @@ const main = defineCommand({
   meta: {
     name: "nuxt-users",
     description: "CLI for Nuxt Users Module - Manage users, migrations, and database operations",
-    version: "1.15.4"
+    version: "1.15.5"
   },
   subCommands: {
     migrate,
@@ -257,6 +276,7 @@ const main = defineCommand({
     "create-personal-access-tokens-table": createPersonalAccessTokensTable,
     "create-password-reset-tokens-table": createPasswordResetTokensTable,
     "create-migrations-table": createMigrationsTable,
+    "add-active-to-users": addActiveToUsers,
     "project-info": projectInfo
   }
 });

package/dist/module.d.mts

@@ -1,5 +1,5 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { R as RuntimeModuleOptions, M as ModuleOptions } from './shared/nuxt-users.u7N4meyI.mjs';
+import { R as RuntimeModuleOptions, M as ModuleOptions } from './shared/nuxt-users.CAfpTSaE.mjs';
 export * from '../dist/runtime/server/internal/index.js';
 
 declare const defaultOptions: ModuleOptions;

package/dist/module.d.ts

@@ -1,5 +1,5 @@
 import * as _nuxt_schema from '@nuxt/schema';
-import { R as RuntimeModuleOptions, M as ModuleOptions } from './shared/nuxt-users.u7N4meyI.js';
+import { R as RuntimeModuleOptions, M as ModuleOptions } from './shared/nuxt-users.CAfpTSaE.js';
 export * from '../dist/runtime/server/internal/index.js';
 
 declare const defaultOptions: ModuleOptions;

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "nuxt-users",
   "configKey": "nuxtUsers",
-  "version": "1.15.5",
+  "version": "1.16.0",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.0"

package/dist/runtime/components/NUsersList.vue.d.ts

@@ -10,6 +10,7 @@ declare var __VLS_1: {}, __VLS_3: {
         name: string;
         password: string;
         role: string;
+        active: boolean;
         created_at: string;
         updated_at: string;
         last_login_at?: string | undefined;

package/dist/runtime/composables/useAuthentication.d.ts

@@ -5,6 +5,7 @@ export declare const useAuthentication: () => {
         readonly email: string;
         readonly name: string;
         readonly role: string;
+        readonly active: boolean;
         readonly created_at: string;
         readonly updated_at: string;
         readonly last_login_at?: string | undefined;
@@ -13,6 +14,7 @@ export declare const useAuthentication: () => {
         readonly email: string;
         readonly name: string;
         readonly role: string;
+        readonly active: boolean;
         readonly created_at: string;
         readonly updated_at: string;
         readonly last_login_at?: string | undefined;

package/dist/runtime/server/api/nuxt-users/[id].patch.js

@@ -12,6 +12,13 @@ export default defineEventHandler(async (event) => {
     });
   }
   const body = await readBody(event);
+  const currentUser = event.context.user;
+  if (currentUser && currentUser.id === userId && typeof body.active !== "undefined") {
+    throw createError({
+      statusCode: 403,
+      statusMessage: "You cannot change your own active status."
+    });
+  }
   try {
     const updatedUser = await updateUser(userId, body, options);
     return { user: updatedUser };

package/dist/runtime/server/api/nuxt-users/inactive.get.d.ts

@@ -0,0 +1,20 @@
+declare const _default: import("h3").EventHandler<import("h3").EventHandlerRequest, Promise<{
+    users: {
+        id: number;
+        email: string;
+        name: string;
+        role: string;
+        created_at: string;
+        updated_at: string;
+        last_login_at: string | null;
+    }[];
+    pagination: {
+        page: number;
+        limit: number;
+        total: number;
+        totalPages: number;
+        hasNext: boolean;
+        hasPrev: boolean;
+    };
+}>>;
+export default _default;

package/dist/runtime/server/api/nuxt-users/inactive.get.js

@@ -0,0 +1,59 @@
+import { createError, defineEventHandler, getQuery } from "h3";
+import { useRuntimeConfig } from "#imports";
+import { useDb } from "../../utils/db.js";
+import { getLastLoginTime } from "../../utils/user.js";
+export default defineEventHandler(async (event) => {
+  const { nuxtUsers } = useRuntimeConfig();
+  const options = nuxtUsers;
+  const db = await useDb(options);
+  const usersTable = options.tables.users;
+  const query = getQuery(event);
+  const page = Number(query.page) || 1;
+  const limit = Number(query.limit) || 10;
+  const offset = (page - 1) * limit;
+  if (page < 1 || limit < 1 || limit > 100) {
+    throw createError({
+      statusCode: 400,
+      statusMessage: "Invalid pagination parameters. Page must be >= 1, limit must be between 1 and 100."
+    });
+  }
+  try {
+    const countResult = await db.sql`SELECT COUNT(*) as total FROM {${usersTable}} WHERE active = FALSE`;
+    const total = countResult.rows[0].total;
+    const usersResult = await db.sql`
+      SELECT id, email, name, role, created_at, updated_at
+      FROM {${usersTable}}
+      WHERE active = FALSE
+      ORDER BY name ASC
+      LIMIT ${limit} OFFSET ${offset}
+    `;
+    const users = await Promise.all(usersResult.rows.map(async (user) => {
+      const lastLoginTime = await getLastLoginTime(user.id, options);
+      return {
+        id: user.id,
+        email: user.email,
+        name: user.name,
+        role: user.role,
+        created_at: user.created_at instanceof Date ? user.created_at.toISOString() : user.created_at,
+        updated_at: user.updated_at instanceof Date ? user.updated_at.toISOString() : user.updated_at,
+        last_login_at: lastLoginTime
+      };
+    }));
+    return {
+      users,
+      pagination: {
+        page,
+        limit,
+        total,
+        totalPages: Math.ceil(total / limit),
+        hasNext: page * limit < total,
+        hasPrev: page > 1
+      }
+    };
+  } catch (error) {
+    throw createError({
+      statusCode: 500,
+      statusMessage: `Error fetching users: ${error instanceof Error ? error.message : String(error)}`
+    });
+  }
+});

package/dist/runtime/server/api/nuxt-users/index.get.js

@@ -18,11 +18,12 @@ export default defineEventHandler(async (event) => {
     });
   }
   try {
-    const countResult = await db.sql`SELECT COUNT(*) as total FROM {${usersTable}}`;
+    const countResult = await db.sql`SELECT COUNT(*) as total FROM {${usersTable}} WHERE active = TRUE`;
     const total = countResult.rows[0].total;
     const usersResult = await db.sql`
       SELECT id, email, name, role, created_at, updated_at 
       FROM {${usersTable}} 
+      WHERE active = TRUE
       ORDER BY name ASC 
       LIMIT ${limit} OFFSET ${offset}
     `;

package/dist/runtime/server/api/nuxt-users/session/index.post.d.ts

@@ -4,6 +4,7 @@ declare const _default: import("h3").EventHandler<import("h3").EventHandlerReque
         email: string;
         name: string;
         role: string;
+        active: boolean;
         created_at: string;
         updated_at: string;
         last_login_at?: string;

package/dist/runtime/server/api/nuxt-users/session/index.post.js

@@ -25,6 +25,12 @@ export default defineEventHandler(async (event) => {
     });
   }
   const user = userResult.rows[0];
+  if (!user.active) {
+    throw createError({
+      statusCode: 403,
+      statusMessage: "User account is inactive"
+    });
+  }
   const storedPassword = user.password;
   const passwordMatch = await bcrypt.compare(password, storedPassword);
   if (!passwordMatch) {

package/dist/runtime/server/utils/add-active-to-users.d.ts

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

package/dist/runtime/server/utils/add-active-to-users.js

@@ -0,0 +1,23 @@
+import { useDb } from "./db.js";
+export const addActiveToUsers = async (options) => {
+  const connectorName = options.connector.name;
+  const db = await useDb(options);
+  const tableName = options.tables.users;
+  console.log(`[Nuxt Users] DB:Add active to ${connectorName} Users Table in ${tableName}...`);
+  if (connectorName === "sqlite" || connectorName === "mysql" || connectorName === "postgresql") {
+    try {
+      const result = await db.sql`PRAGMA table_info({${tableName}})`;
+      const hasActiveColumn = result.rows.some((row) => row.name === "active");
+      if (!hasActiveColumn) {
+        await db.sql`ALTER TABLE {${tableName}} ADD COLUMN active BOOLEAN DEFAULT TRUE`;
+      }
+    } catch {
+      try {
+        await db.sql`ALTER TABLE {${tableName}} ADD COLUMN active BOOLEAN DEFAULT TRUE`;
+      } catch (alterError) {
+        console.log(`[Nuxt Users] Active column might already exist: ${alterError}`);
+      }
+    }
+  }
+  console.log(`[Nuxt Users] DB:Add active to ${connectorName} Users Table \u2705`);
+};

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

@@ -3,6 +3,7 @@ import { createUsersTable } from "./create-users-table.js";
 import { createPersonalAccessTokensTable } from "./create-personal-access-tokens-table.js";
 import { createPasswordResetTokensTable } from "./create-password-reset-tokens-table.js";
 import { createMigrationsTable } from "./create-migrations-table.js";
+import { addActiveToUsers } from "./add-active-to-users.js";
 const migrations = [
   {
     name: "create_migrations_table",
@@ -19,6 +20,10 @@ const migrations = [
   {
     name: "create_password_reset_tokens_table",
     run: createPasswordResetTokensTable
+  },
+  {
+    name: "add_active_to_users",
+    run: addActiveToUsers
   }
 ];
 export const getAppliedMigrations = async (options) => {

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

@@ -4,6 +4,7 @@ interface CreateUserParams {
     name: string;
     password: string;
     role?: string;
+    active?: boolean;
 }
 /**
  * Creates a new user in the database.

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

@@ -15,7 +15,7 @@ export const createUser = async (userData, options) => {
     INSERT INTO {${usersTable}} (email, name, password, role, created_at, updated_at)
     VALUES (${userData.email}, ${userData.name}, ${hashedPassword}, ${role}, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)
   `;
-  const result = await db.sql`SELECT id, email, name, role, created_at, updated_at FROM {${usersTable}} WHERE email = ${userData.email}`;
+  const result = await db.sql`SELECT id, email, name, role, created_at, updated_at, active FROM {${usersTable}} WHERE email = ${userData.email}`;
   if (result.rows.length === 0) {
     throw new Error("Failed to retrieve created user.");
   }
@@ -26,7 +26,8 @@ export const createUser = async (userData, options) => {
     name: user.name,
     role: user.role,
     created_at: user.created_at instanceof Date ? user.created_at.toISOString() : user.created_at,
-    updated_at: user.updated_at instanceof Date ? user.updated_at.toISOString() : user.updated_at
+    updated_at: user.updated_at instanceof Date ? user.updated_at.toISOString() : user.updated_at,
+    active: user.active
   };
 };
 export const findUserByEmail = async (email, options) => {
@@ -43,8 +44,9 @@ export const findUserByEmail = async (email, options) => {
     name: user.name,
     password: user.password,
     role: user.role,
-    created_at: user.created_at instanceof Date ? user.created_at.toISOString() : user.created_at,
-    updated_at: user.updated_at instanceof Date ? user.updated_at.toISOString() : user.updated_at
+    created_at: user.created_at,
+    updated_at: user.updated_at,
+    active: user.active
   };
 };
 export const findUserById = async (id, options, withPass = false) => {
@@ -69,7 +71,7 @@ export const findUserById = async (id, options, withPass = false) => {
 export const updateUser = async (id, userData, options) => {
   const db = await useDb(options);
   const usersTable = options.tables.users;
-  const allowedFields = ["name", "email", "role"];
+  const allowedFields = ["name", "email", "role", "active"];
   const updates = [];
   const values = [];
   for (const field of allowedFields) {
@@ -78,6 +80,9 @@ export const updateUser = async (id, userData, options) => {
       values.push(userData[field]);
     }
   }
+  if (userData.active === false) {
+    await revokeUserTokens(id, options);
+  }
   if (updates.length === 0) {
     const currentUser = await findUserById(id, options);
     if (!currentUser) {
@@ -153,6 +158,9 @@ export const getCurrentUserFromToken = async (token, options, withPass = false)
     return null;
   }
   const user = userResult.rows[0];
+  if (!user.active) {
+    return null;
+  }
   if (withPass === true) {
     return user;
   }

package/dist/shared/{nuxt-users.u7N4meyI.d.mts → nuxt-users.CAfpTSaE.d.mts}

@@ -147,6 +147,7 @@ interface User {
     name: string;
     password: string;
     role: string;
+    active: boolean;
     created_at: string;
     updated_at: string;
     last_login_at?: string;

package/dist/shared/{nuxt-users.u7N4meyI.d.ts → nuxt-users.CAfpTSaE.d.ts}

@@ -147,6 +147,7 @@ interface User {
     name: string;
     password: string;
     role: string;
+    active: boolean;
     created_at: string;
     updated_at: string;
     last_login_at?: string;

package/dist/utils.d.mts

@@ -1,4 +1,4 @@
-export { L as LoginFormData, M as ModuleOptions, b as PasswordResetToken, P as PersonalAccessToken, U as User, a as UserWithoutPassword } from './shared/nuxt-users.u7N4meyI.mjs';
+export { L as LoginFormData, M as ModuleOptions, b as PasswordResetToken, P as PersonalAccessToken, U as User, a as UserWithoutPassword } from './shared/nuxt-users.CAfpTSaE.mjs';
 
 interface PasswordValidationResult {
     isValid: boolean;

package/dist/utils.d.ts

@@ -1,4 +1,4 @@
-export { L as LoginFormData, M as ModuleOptions, b as PasswordResetToken, P as PersonalAccessToken, U as User, a as UserWithoutPassword } from './shared/nuxt-users.u7N4meyI.js';
+export { L as LoginFormData, M as ModuleOptions, b as PasswordResetToken, P as PersonalAccessToken, U as User, a as UserWithoutPassword } from './shared/nuxt-users.CAfpTSaE.js';
 
 interface PasswordValidationResult {
     isValid: boolean;

package/package.json

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