nuxt-users 1.34.1 → 1.34.3

package/CHANGELOG.md

@@ -1,6 +1,53 @@
 # Changelog
 
 
+## v1.34.3
+
+[compare changes](https://github.com/rrd108/nuxt-users/compare/v1.34.2...v1.34.3)
+
+### 🩹 Fixes
+
+- Remember me closes #3 ([#3](https://github.com/rrd108/nuxt-users/issues/3))
+- Hard reload ([187c828](https://github.com/rrd108/nuxt-users/commit/187c828))
+- Conflicting runtimeconfig ([563dcca](https://github.com/rrd108/nuxt-users/commit/563dcca))
+- Lint errors ([b590e6d](https://github.com/rrd108/nuxt-users/commit/b590e6d))
+
+### 🏡 Chore
+
+- **release:** V1.34.2 ([60d87dc](https://github.com/rrd108/nuxt-users/commit/60d87dc))
+
+### ✅ Tests
+
+- Add for config conflict ([59271e3](https://github.com/rrd108/nuxt-users/commit/59271e3))
+
+### ❤️ Contributors
+
+- Rrd108 ([@rrd108](https://github.com/rrd108))
+
+## v1.34.2
+
+[compare changes](https://github.com/rrd108/nuxt-users/compare/v1.34.1...v1.34.2)
+
+### 🩹 Fixes
+
+- Remember me closes #3 ([#3](https://github.com/rrd108/nuxt-users/issues/3))
+
+### 💅 Refactors
+
+- Component imports ([5b18736](https://github.com/rrd108/nuxt-users/commit/5b18736))
+
+### 📖 Documentation
+
+- Add getCurrentUser ([bc30658](https://github.com/rrd108/nuxt-users/commit/bc30658))
+
+### 🏡 Chore
+
+- **release:** V1.34.1 ([a335bfc](https://github.com/rrd108/nuxt-users/commit/a335bfc))
+
+### ❤️ Contributors
+
+- Rrd108 ([@rrd108](https://github.com/rrd108))
+
 ## v1.34.1
 
 [compare changes](https://github.com/rrd108/nuxt-users/compare/v1.34.0...v1.34.1)

package/dist/cli.mjs

@@ -50,12 +50,29 @@ const getOptionsFromEnv = () => {
 const loadOptions = async () => {
   try {
     console.log("[Nuxt Users] Loading Nuxt project...");
-    const nuxt = await loadNuxt({ cwd: process.cwd() });
-    const nuxtUsersConfig = nuxt.options.nuxtUsers;
+    const nuxt = await loadNuxt({ cwd: process.cwd(), ready: false });
+    const topLevelConfig = nuxt.options.nuxtUsers;
+    const originalRuntimeConfig = await (async () => {
+      try {
+        const configPath = await import('node:path').then((p) => p.resolve(process.cwd(), "nuxt.config.ts"));
+        const config = await import(configPath).then((m) => m.default);
+        return config?.runtimeConfig?.nuxtUsers;
+      } catch {
+        return nuxt.options.runtimeConfig?.nuxtUsers;
+      }
+    })();
     await nuxt.close();
-    if (nuxtUsersConfig) {
-      console.log("[Nuxt Users] Using configuration from Nuxt project");
-      return defu(nuxtUsersConfig, defaultOptions);
+    if (topLevelConfig || originalRuntimeConfig) {
+      console.log("[Nuxt Users] Using configuration from nuxt.config");
+      let mergedConfig = defu(topLevelConfig, originalRuntimeConfig, defaultOptions);
+      const configuredConnector = topLevelConfig?.connector || originalRuntimeConfig?.connector;
+      if (configuredConnector) {
+        mergedConfig = {
+          ...mergedConfig,
+          connector: configuredConnector
+        };
+      }
+      return mergedConfig;
     } else {
       console.log("[Nuxt Users] No nuxt-users configuration found, using environment variables");
       return getOptionsFromEnv();

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.BOm7L39P.mjs';
+import { R as RuntimeModuleOptions, M as ModuleOptions } from './shared/nuxt-users.BTVH9EyH.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.BOm7L39P.js';
+import { R as RuntimeModuleOptions, M as ModuleOptions } from './shared/nuxt-users.BTVH9EyH.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.34.1",
+  "version": "1.34.3",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "3.6.0"

package/dist/module.mjs

@@ -36,7 +36,9 @@ const defaultOptions = {
   auth: {
     whitelist: [],
     tokenExpiration: 24 * 60,
-    // 24 hours
+    // 24 hours in minutes
+    rememberMeExpiration: 30,
+    // 30 days
     permissions: {}
     // Empty by default - whitelist approach
   },

package/dist/runtime/components/NUsersLoginForm.vue

@@ -30,10 +30,11 @@ const handleSubmit = async () => {
       method: "POST",
       body: {
         email: formData.value.email,
-        password: formData.value.password
+        password: formData.value.password,
+        rememberMe: formData.value.rememberMe
       }
     });
-    emit("success", response.user);
+    emit("success", response.user, formData.value.rememberMe ?? false);
     if (props.redirectTo) {
       await navigateTo(props.redirectTo);
     }

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

@@ -26,13 +26,13 @@ type __VLS_Slots = {} & {
     'error-message'?: (props: typeof __VLS_15) => any;
 };
 declare const __VLS_component: import("vue").DefineComponent<Props, void, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {} & {
-    success: (user: UserWithoutPassword) => any;
+    success: (user: UserWithoutPassword, rememberMe: boolean) => any;
     error: (error: string) => any;
     submit: (data: LoginFormData) => any;
     "forgot-password-error": (error: string) => any;
     "forgot-password-success": () => any;
 }, string, import("vue").PublicProps, Readonly<Props> & Readonly<{
-    onSuccess?: ((user: UserWithoutPassword) => any) | undefined;
+    onSuccess?: ((user: UserWithoutPassword, rememberMe: boolean) => any) | undefined;
     onError?: ((error: string) => any) | undefined;
     onSubmit?: ((data: LoginFormData) => any) | undefined;
     "onForgot-password-error"?: ((error: string) => any) | undefined;

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

@@ -2,7 +2,7 @@ import type { User } from 'nuxt-users/utils';
 export declare const useAuthentication: () => {
     user: Readonly<import("vue").Ref<any, any>>;
     isAuthenticated: import("vue").ComputedRef<boolean>;
-    login: (userData: User) => void;
+    login: (userData: User, rememberMe?: boolean) => void;
     logout: () => Promise<void>;
     fetchUser: () => Promise<any>;
     initializeUser: () => Promise<void>;

package/dist/runtime/composables/useAuthentication.js

@@ -1,15 +1,22 @@
 import { useState, useRuntimeConfig } from "#app";
 import { computed, readonly } from "vue";
+let initializationPromise = null;
 export const useAuthentication = () => {
   const user = useState("user", () => null);
   const { public: { nuxtUsers } } = useRuntimeConfig();
   const apiBasePath = nuxtUsers?.apiBasePath;
   const isAuthenticated = computed(() => !!user.value);
-  const login = (userData) => {
+  const login = (userData, rememberMe = false) => {
     const { password: _, ...userWithoutPassword } = userData;
     user.value = userWithoutPassword;
     if (import.meta.client) {
-      localStorage.setItem("user", JSON.stringify(userWithoutPassword));
+      localStorage.removeItem("user");
+      sessionStorage.removeItem("user");
+      if (rememberMe) {
+        localStorage.setItem("user", JSON.stringify(userWithoutPassword));
+      } else {
+        sessionStorage.setItem("user", JSON.stringify(userWithoutPassword));
+      }
     }
   };
   const logout = async () => {
@@ -18,10 +25,15 @@ export const useAuthentication = () => {
       user.value = null;
       if (import.meta.client) {
         localStorage.removeItem("user");
+        sessionStorage.removeItem("user");
       }
     } catch (error) {
       console.error("Logout failed:", error);
       user.value = null;
+      if (import.meta.client) {
+        localStorage.removeItem("user");
+        sessionStorage.removeItem("user");
+      }
     }
   };
   const fetchUser = async () => {
@@ -29,7 +41,15 @@ export const useAuthentication = () => {
       const response = await $fetch(`${apiBasePath}/me`, { method: "GET" });
       user.value = response.user;
       if (import.meta.client) {
-        localStorage.setItem("user", JSON.stringify(response.user));
+        const wasInLocalStorage = localStorage.getItem("user") !== null;
+        const wasInSessionStorage = sessionStorage.getItem("user") !== null;
+        if (wasInLocalStorage) {
+          localStorage.setItem("user", JSON.stringify(response.user));
+        } else if (wasInSessionStorage) {
+          sessionStorage.setItem("user", JSON.stringify(response.user));
+        } else {
+          sessionStorage.setItem("user", JSON.stringify(response.user));
+        }
       }
       return response.user;
     } catch (error) {
@@ -37,6 +57,7 @@ export const useAuthentication = () => {
       user.value = null;
       if (import.meta.client) {
         localStorage.removeItem("user");
+        sessionStorage.removeItem("user");
       }
       return null;
     }
@@ -45,7 +66,9 @@ export const useAuthentication = () => {
     if (!import.meta.client) {
       return;
     }
-    const storedUser = localStorage.getItem("user");
+    const storedUserLocal = localStorage.getItem("user");
+    const storedUserSession = sessionStorage.getItem("user");
+    const storedUser = storedUserLocal || storedUserSession;
     if (storedUser) {
       try {
         user.value = JSON.parse(storedUser);
@@ -53,10 +76,15 @@ export const useAuthentication = () => {
       } catch (error) {
         console.error("Failed to parse stored user:", error);
         localStorage.removeItem("user");
+        sessionStorage.removeItem("user");
         user.value = null;
       }
     }
   };
+  if (import.meta.client && !initializationPromise) {
+    initializationPromise = initializeUser().catch(() => {
+    });
+  }
   return {
     user: readonly(user),
     isAuthenticated,

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

@@ -5,7 +5,7 @@ import { useRuntimeConfig } from "#imports";
 import { useDb } from "../../../utils/db.js";
 export default defineEventHandler(async (event) => {
   const body = await readBody(event);
-  const { email, password } = body;
+  const { email, password, rememberMe } = body;
   if (!email || !password) {
     throw createError({
       statusCode: 400,
@@ -42,21 +42,30 @@ 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);
+  if (rememberMe) {
+    const longTermDays = options.auth.rememberMeExpiration || 30;
+    expiresAt.setDate(expiresAt.getDate() + longTermDays);
+  } else {
+    expiresAt.setMinutes(expiresAt.getMinutes() + options.auth.tokenExpiration);
+  }
   await db.sql`
     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, {
+  const cookieOptions = {
     httpOnly: true,
     secure: process.env.NODE_ENV === "production",
     // Use secure cookies in production
     sameSite: "lax",
     // Adjust as needed
-    maxAge: 60 * 60 * 24 * 7,
-    // 7 days
     path: "/"
-  });
+  };
+  if (rememberMe) {
+    const longTermDays = options.auth.rememberMeExpiration || 30;
+    cookieOptions.maxAge = 60 * 60 * 24 * longTermDays;
+  } else {
+  }
+  setCookie(event, "auth_token", token, cookieOptions);
   const { password: _, ...userWithoutPassword } = user;
   return { user: userWithoutPassword };
 });

package/dist/shared/{nuxt-users.BOm7L39P.d.mts → nuxt-users.BTVH9EyH.d.mts}

@@ -60,6 +60,11 @@ interface RuntimeModuleOptions {
          * @default 1440
          */
         tokenExpiration?: number;
+        /**
+         * Remember me token expiration time in days
+         * @default 30
+         */
+        rememberMeExpiration?: number;
         /**
          * Role-based permissions configuration
          * @default {}
@@ -132,6 +137,7 @@ interface ModuleOptions {
     auth: {
         whitelist: string[];
         tokenExpiration: number;
+        rememberMeExpiration: number;
         permissions: Record<string, (string | Permission)[]>;
     };
     passwordValidation: {

package/dist/shared/{nuxt-users.BOm7L39P.d.ts → nuxt-users.BTVH9EyH.d.ts}

@@ -60,6 +60,11 @@ interface RuntimeModuleOptions {
          * @default 1440
          */
         tokenExpiration?: number;
+        /**
+         * Remember me token expiration time in days
+         * @default 30
+         */
+        rememberMeExpiration?: number;
         /**
          * Role-based permissions configuration
          * @default {}
@@ -132,6 +137,7 @@ interface ModuleOptions {
     auth: {
         whitelist: string[];
         tokenExpiration: number;
+        rememberMeExpiration: number;
         permissions: Record<string, (string | Permission)[]>;
     };
     passwordValidation: {

package/dist/utils.d.mts

@@ -1,4 +1,4 @@
-export { g as DatabaseConfig, f as DatabaseType, D as DisplayFieldsProps, L as LoginFormData, c as LoginFormProps, M as ModuleOptions, b as PasswordResetToken, e as Permission, P as PersonalAccessToken, d as ResetPasswordFormProps, R as RuntimeModuleOptions, U as User, a as UserWithoutPassword, h as defaultDisplayFields, i as defaultFieldLabels } from './shared/nuxt-users.BOm7L39P.mjs';
+export { g as DatabaseConfig, f as DatabaseType, D as DisplayFieldsProps, L as LoginFormData, c as LoginFormProps, M as ModuleOptions, b as PasswordResetToken, e as Permission, P as PersonalAccessToken, d as ResetPasswordFormProps, R as RuntimeModuleOptions, U as User, a as UserWithoutPassword, h as defaultDisplayFields, i as defaultFieldLabels } from './shared/nuxt-users.BTVH9EyH.mjs';
 
 interface PasswordValidationResult {
     isValid: boolean;

package/dist/utils.d.ts

@@ -1,4 +1,4 @@
-export { g as DatabaseConfig, f as DatabaseType, D as DisplayFieldsProps, L as LoginFormData, c as LoginFormProps, M as ModuleOptions, b as PasswordResetToken, e as Permission, P as PersonalAccessToken, d as ResetPasswordFormProps, R as RuntimeModuleOptions, U as User, a as UserWithoutPassword, h as defaultDisplayFields, i as defaultFieldLabels } from './shared/nuxt-users.BOm7L39P.js';
+export { g as DatabaseConfig, f as DatabaseType, D as DisplayFieldsProps, L as LoginFormData, c as LoginFormProps, M as ModuleOptions, b as PasswordResetToken, e as Permission, P as PersonalAccessToken, d as ResetPasswordFormProps, R as RuntimeModuleOptions, U as User, a as UserWithoutPassword, h as defaultDisplayFields, i as defaultFieldLabels } from './shared/nuxt-users.BTVH9EyH.js';
 
 interface PasswordValidationResult {
     isValid: boolean;

package/package.json

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