@devcoffee/nuxt-core 1.2.5 → 1.3.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## v1.3.0
+
+[compare changes](https://github.com/coolkg1412/devcoffee-nuxt-core/compare/v1.2.5...v1.3.0)
+
+### 🚀 Enhancements
+
+- Enhance locale and timezone handling with session support in formatters plugin ([c36f621](https://github.com/coolkg1412/devcoffee-nuxt-core/commit/c36f621))
+
+### 🩹 Fixes
+
+- Harden useAuthContext composable and logging infrastructure ([2a89ebf](https://github.com/coolkg1412/devcoffee-nuxt-core/commit/2a89ebf))
+- Correct sessionCookieId reference in validateSession call in authts.ts tests ([2c8b343](https://github.com/coolkg1412/devcoffee-nuxt-core/commit/2c8b343))
+
+### ❤️ Contributors
+
+- Hieu Nguyen <hieu.nguyen@devcoffee.tech>
+
 ## v1.2.5
 
 [compare changes](https://github.com/coolkg1412/devcoffee-nuxt-core/compare/v1.2.4...v1.2.5)

package/dist/module.d.mts

@@ -264,6 +264,9 @@ type LoggingModuleOptions = {
   server: LoggingOptions
   ssr: LoggingOptions
   client: LoggingOptions
+  loggers?: {
+    [key: string]: Omit<LoggingOptions, 'tag'>
+  }
 }
 
 type ModuleOptions = {
@@ -276,7 +279,7 @@ type ModuleOptions = {
 }
 
 type ModulePublicRuntimeConfig = Pick<ModuleOptions, 'defaultLocale' | 'defaultTimeZone' | 'defaultLanguage'> & {
-  logging: ModuleOptions['logging']['client']
+  logging: ModuleOptions['logging']['client'] & { loggers: ModuleOptions['logging']['loggers'] }
 
   authts: Pick<
     AuthtsModuleOptions['auth'],

package/dist/module.d.ts

@@ -264,6 +264,9 @@ type LoggingModuleOptions = {
   server: LoggingOptions
   ssr: LoggingOptions
   client: LoggingOptions
+  loggers?: {
+    [key: string]: Omit<LoggingOptions, 'tag'>
+  }
 }
 
 type ModuleOptions = {
@@ -276,7 +279,7 @@ type ModuleOptions = {
 }
 
 type ModulePublicRuntimeConfig = Pick<ModuleOptions, 'defaultLocale' | 'defaultTimeZone' | 'defaultLanguage'> & {
-  logging: ModuleOptions['logging']['client']
+  logging: ModuleOptions['logging']['client'] & { loggers: ModuleOptions['logging']['loggers'] }
 
   authts: Pick<
     AuthtsModuleOptions['auth'],

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "nuxt-core",
-  "version": "1.2.5",
+  "version": "1.3.0",
   "configKey": "nuxtCore",
   "compatibility": {
     "nuxt": "^4.0.0"

package/dist/module.mjs

@@ -2,7 +2,7 @@ import { addCustomTab } from '@nuxt/devtools-kit';
 import { defineNuxtModule, useLogger, createResolver, addTemplate, addServerImports, addServerImportsDir, addServerPlugin, addImportsDir, addPlugin, addRouteMiddleware, addServerHandler } from '@nuxt/kit';
 import { deepMerge, pick } from '../dist/runtime/utils.js';
 
-const version = "1.2.5";
+const version = "1.3.0";
 
 const defaultLocale = "vi-VN";
 const defaultLanguage = "vi";
@@ -95,7 +95,7 @@ function normalizePublicRuntimeConfig(inputOpts) {
   const { redirectUri } = inputOpts.authts.openid;
   const { redirectUrl: redirectCookie, sessionId: sessionCookie } = inputOpts.authts.sessions.names;
   return {
-    logging: { ...inputOpts.logging.client },
+    logging: { ...inputOpts.logging.client, loggers: inputOpts.logging.loggers },
     authts: {
       enabled,
       loginUri,

package/dist/runtime/app/composables/useAuthContext.d.ts

@@ -1,3 +1,6 @@
+import type { AuthorizedUser } from '@devcoffee/nuxt-core';
+import { type NuxtSessionContext } from '#app';
+import { type ComputedRef, type Ref } from '#imports';
 /**
  * 🧩 Provides reactive authentication state and actions for user login and authorization.
  *
@@ -16,10 +19,10 @@
  * @since 1.0.0
  */
 export declare function useAuthContext(initiator?: string): {
-    user: any;
-    session: any;
-    processing: any;
-    isAuthenticated: any;
+    user: ComputedRef<AuthorizedUser>;
+    session: ComputedRef<NuxtSessionContext>;
+    processing: Ref<boolean>;
+    isAuthenticated: ComputedRef<boolean>;
     login: (redirectTo?: string) => Promise<void>;
     authorize: (parameters: URLSearchParams) => Promise<void>;
     logout: () => Promise<void>;

package/dist/runtime/app/composables/useAuthContext.js

@@ -14,7 +14,7 @@ export function useAuthContext(initiator) {
   const { callHook, runWithContext } = useNuxtApp();
   const { getValue } = useSessionContext();
   const fetchRequest = useRequestFetch();
-  const logger = useLogger({ level: 2, tag: "authContext" });
+  const logger = useLogger({ tag: "auth.context" });
   const processing = ref(false);
   const session = computed(() => getValue(initiator, "useAuthContext.session"));
   const isAuthenticated = computed(() => {

package/dist/runtime/app/middleware/authts.js

@@ -52,7 +52,7 @@ function getRedirectCookie(name) {
 export default defineNuxtRouteMiddleware(async (to) => {
   const nuxtApp = useNuxtApp();
   await nuxtApp.$sessionReady;
-  const logger = useLogger({ tag: "authts.middleware", level: 3 });
+  const logger = useLogger({ tag: "authts.middleware" });
   const {
     loginUri,
     defaultLoginRedirectUri,

package/dist/runtime/app/plugins/formatters.js

@@ -1,11 +1,20 @@
-import { defineNuxtPlugin, useRuntimeConfig } from "#app";
-import { ref, useLogger } from "#imports";
+import { defineNuxtPlugin, useRequestEvent, useRuntimeConfig, useState } from "#app";
+import { useLogger } from "#imports";
 export default defineNuxtPlugin((_nuxtApp) => {
-  const logger = useLogger({ tag: "formatters", level: 3 });
+  const logger = useLogger({ tag: "formatters" });
   const { defaultLocale, defaultLanguage, defaultTimeZone } = useRuntimeConfig().public.nuxtCore;
-  const currentLocale = ref(defaultLocale);
-  const currentLanguage = ref(defaultLanguage);
-  const currentTimeZone = ref(defaultTimeZone);
+  const currentLocale = useState("devcoffee.formatters.locale", () => defaultLocale);
+  const currentLanguage = useState("devcoffee.formatters.language", () => defaultLanguage);
+  const currentTimeZone = useState("devcoffee.formatters.timeZone", () => defaultTimeZone);
+  if (import.meta.server) {
+    const event = useRequestEvent();
+    const session = event?.context?.session ?? null;
+    if (session?.user) {
+      if (session.user.locale) currentLocale.value = session.user.locale;
+      if (session.user.language) currentLanguage.value = session.user.language;
+      if (session.user.timezone) currentTimeZone.value = session.user.timezone;
+    }
+  }
   _nuxtApp.hooks.addHooks({
     "dfLocale:changed": (value) => {
       const { locale = defaultLocale, timeZone = defaultTimeZone, language = defaultLanguage } = value;

package/dist/runtime/app/plugins/locale.js

@@ -1,7 +1,7 @@
 import { defineNuxtPlugin, useRuntimeConfig, useState } from "#app";
 import { useAuthContext, useLogger, watch } from "#imports";
 export default defineNuxtPlugin(async (_nuxtApp) => {
-  const logger = useLogger({ tag: "plugin.locale", level: 3 });
+  const logger = useLogger({ tag: "plugin.locale" });
   const { defaultLocale, defaultLanguage, defaultTimeZone } = useRuntimeConfig().public.nuxtCore;
   const localeState = useState("devecoffee.locale", () => ({
     locale: defaultLocale,

package/dist/runtime/app/plugins/logging.js

@@ -13,13 +13,16 @@ function initLogger() {
 }
 export default defineNuxtPlugin(async (_nuxtApp) => {
   const logger = reactive(initLogger());
+  const loggers = useRuntimeConfig().public.nuxtCore.logging.loggers;
   function getLogger(opts) {
-    const { tag, level } = opts || {};
+    opts = opts || {};
     let _logger = logger;
-    if (level != void 0) {
-      _logger = _logger.create({ level });
+    const _opts = opts.tag && loggers && loggers[opts.tag] ? loggers[opts.tag] : { level: logger.level };
+    if (opts.level) {
+      _opts.level = opts.level;
     }
-    return tag != void 0 ? _logger.withTag(tag) : _logger;
+    _logger = _logger.create(_opts);
+    return opts.tag != void 0 ? _logger.withTag(opts.tag) : _logger;
   }
   return { provide: { logging: { getLogger } } };
 });

package/dist/runtime/server/composables/useServerLogger.d.ts

@@ -3,5 +3,5 @@ import type { H3Event } from 'h3';
 export default function useServerLogger(options?: Partial<{
     event?: H3Event;
     tag?: string;
-    level: LogLevel;
+    level?: LogLevel;
 }>): ConsolaInstance;

package/dist/runtime/server/composables/useServerLogger.js

@@ -2,14 +2,23 @@ import { consola } from "consola";
 import { useRuntimeConfig } from "nitropack/runtime";
 let globalServerLogger;
 export default function useServerLogger(options) {
-  const { tag, ...opts } = useRuntimeConfig(options?.event).nuxtCore.logging.server;
+  options = options || {};
+  const { server, loggers = {} } = useRuntimeConfig(options?.event).nuxtCore.logging;
+  const { tag: rootTag, ...opts } = server;
   if (!globalServerLogger) {
-    globalServerLogger = consola.create(opts).withTag(tag);
+    globalServerLogger = consola.create(opts).withTag(rootTag);
   }
   let _logger = globalServerLogger;
-  const { level } = opts || {};
-  if (level != void 0) {
-    _logger = _logger.create({ level });
+  if (!options.tag && options.level != opts.level) {
+    return _logger;
   }
-  return tag != void 0 ? _logger.withTag(tag) : _logger;
+  let _opt = { level: opts.level };
+  if (options.tag && options.tag in loggers) {
+    _opt = loggers[options.tag];
+  }
+  if (options.level) {
+    _opt.level = options.level;
+  }
+  _logger = _logger.create(_opt);
+  return options.tag != void 0 ? _logger.withTag(options.tag) : _logger;
 }

package/dist/runtime/server/core/helpers.js

@@ -66,7 +66,7 @@ export async function getSession(sessionId, opts) {
       const decrypted = decryptTokenSet(session.auth.tokenSet, opts.secret);
       session.auth.tokenSet = decrypted ?? void 0;
     } else {
-      const logger = useServerLogger({ tag: "authts-helper", level: 3 });
+      const logger = useServerLogger({ tag: "authts-helper" });
       logger.warn(
         "[getSession] tokenSet is encrypted but sessions.secret is not configured \u2014 tokenSet will be inaccessible"
       );
@@ -172,7 +172,7 @@ export async function deleteSession(sessionId, opts) {
   }
 }
 export async function discoveryOpendId(wellKnownUrl, opts) {
-  const logger = useServerLogger({ tag: "authts-helper", level: 3 });
+  const logger = useServerLogger({ tag: "authts-helper" });
   const {
     cache: { prefix: cachedPrefix, expires },
     clientId,
@@ -304,7 +304,7 @@ export function constructTokenSet(input) {
   };
 }
 export async function refreshTokenIfNeeded(session, opts) {
-  const logger = useServerLogger({ tag: "authts-helper", level: 3 });
+  const logger = useServerLogger({ tag: "authts-helper" });
   let updateSession2 = {
     auth: { status: "unauthenticated", tokenSet: void 0 },
     user: getAnonymousUser()

package/dist/runtime/server/core/mutex.js

@@ -1,7 +1,7 @@
 import useServerLogger from "#devcoffee-core/server/composables/useServerLogger";
 import { useStorage } from "nitropack/runtime";
-const logger = useServerLogger({ tag: "authts-mutex", level: 3 });
 export async function tryAcquireLock(storage, lockKey, ttlSeconds, useAtomic) {
+  const logger = useServerLogger({ tag: "authts-mutex" });
   if (useAtomic) {
     try {
       const baseStorage = useStorage();

package/dist/runtime/server/core/nuxtAuthtsHandler.js

@@ -10,6 +10,7 @@ import {
   useRuntimeConfig
 } from "#devcoffee-core/server/adapters/http";
 import { deepMerge, omit } from "#devcoffee-core/server/adapters/utils";
+import useServerLogger from "#devcoffee-core/server/composables/useServerLogger";
 import { useNitroApp, useStorage } from "nitropack/runtime";
 import {
   authorizationCodeGrant,
@@ -71,6 +72,7 @@ export default function NuxtAuthtsHandler(options) {
     const requestUrl = getRequestURL(event);
     const queryParams = getQuery(event);
     const authAction = getAuthAction(requestUrl);
+    const logger = useServerLogger({ event, tag: "auth.handler" });
     let session = event.context.session;
     if (!session) {
       throw createError({
@@ -97,6 +99,7 @@ export default function NuxtAuthtsHandler(options) {
           const userInfoCacheKey = `${openid.cache.prefix}:userinfo:${session.id}`;
           let cachedUser = await cacheStorage2.getItem(userInfoCacheKey);
           if (!cachedUser) {
+            logger.debug("Re-fetch user info");
             cachedUser = await nuxtAuthOptions.userInfo(session.user, { tokenSet: session.auth.tokenSet });
             await cacheStorage2.setItem(userInfoCacheKey, cachedUser, { ttl: openid.autoFetchUserTtl });
           }

package/dist/runtime/server/core/nuxtForwardHandler.js

@@ -22,8 +22,8 @@ function resolveOptions(opts) {
   return deepMerge({ ...defaultOpts }, resolvedOpts || {});
 }
 export default function NuxtForwardRequestHandler(opts) {
-  const { logLevel, targetBaseUrl, proxyPrefix, onBeforeRequest } = resolveOptions(opts);
-  const logger = useServerLogger({ tag: "forward-request", level: logLevel });
+  const { targetBaseUrl, proxyPrefix, onBeforeRequest } = resolveOptions(opts);
+  const logger = useServerLogger({ tag: "forward-request" });
   if (!targetBaseUrl) {
     logger.error("no targetBaseUrl");
     throw createError({

package/dist/runtime/server/plugins/authts.js

@@ -1,4 +1,5 @@
 import { defineNitroPlugin, getCookie, setCookie, useRuntimeConfig } from "#devcoffee-core/server/adapters/http";
+import useServerLogger from "#devcoffee-core/server/composables/useServerLogger";
 import { signSessionId } from "#devcoffee-core/server/core/crypto";
 import { refreshTokenIfNeeded, updateSession, validateSession } from "#devcoffee-core/server/core/helpers";
 import { useNitroApp, useStorage } from "nitropack/runtime";
@@ -23,7 +24,9 @@ export default defineNitroPlugin((nitroApp) => {
         names: { sessionId: cookieName }
       }
     } = useRuntimeConfig(event).nuxtCore.authts;
-    let session = await validateSession(getCookie(event, cookieName), {
+    const sessionCookieId = getCookie(event, cookieName);
+    const logger = useServerLogger({ event, tag: "plugin.auth" });
+    let session = await validateSession(sessionCookieId, {
       storageName,
       storagePrefix,
       expiresIn,
@@ -47,6 +50,7 @@ export default defineNitroPlugin((nitroApp) => {
         const userInfoCacheKey = `${cache.prefix}:userinfo:${session.id}`;
         let cachedUser = await cacheStorage.getItem(userInfoCacheKey);
         if (!cachedUser) {
+          logger.debug("refetch user info sessionid=%s", sessionCookieId);
           const userInfoFn = useNitroApp()._sessionUserInfo;
           if (userInfoFn && session.auth.tokenSet) {
             cachedUser = await userInfoFn(session.user, { tokenSet: session.auth.tokenSet });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@devcoffee/nuxt-core",
-  "version": "1.2.5",
+  "version": "1.3.0",
   "publishConfig": {
     "access": "public"
   },