@scayle/storefront-nuxt 7.67.1 → 7.68.0

package/CHANGELOG.md

@@ -1,5 +1,40 @@
 # @scayle/storefront-nuxt
 
+## 7.68.0
+
+### Minor Changes
+
+- Use unique session cookie names for each shop
+
+  To simplify the implementation and improve the stability of session handling, we now use a differently named cookie for each shop instead of depending on the `Path` attribute.
+
+  This is a change only to the framework internals, and should not have any visible impact or require any code changes.
+
+  Before: `Set-Cookie: $session=s:fa3746f9-88c8-4065-a6c9-0c7bee473dd8.pSoaN6Q7iFHHyWKE7s9gQAqdDzGb9fS8a478P7PHLxw; Path=/de`
+
+  After: `Set-Cookie: $session-1001=s:fa3746f9-88c8-4065-a6c9-0c7bee473dd8.pSoaN6Q7iFHHyWKE7s9gQAqdDzGb9fS8a478P7PHLxw; Path=/`
+
+  When a cookie is found that uses the old format, it will be migrated to the new.
+
+### Patch Changes
+
+- We stop bootstrapping requests where we can't determine a shop based on the request parameters.
+  Previously, we fell back to the first shop configuration, which has now been removed.
+
+  In this case, no `$rpcContext` is available during the request event.
+
+  We also bootstrap the Nuxt Error Page with the correct shop config now.
+
+- Updated dependencies
+  - @scayle/h3-session@0.4.0
+
+## 7.67.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @scayle/storefront-core@7.49.3
+
 ## 7.67.1
 
 ### Patch Changes

package/dist/module.json

@@ -1,6 +1,6 @@
 {
   "name": "@scayle/storefront-nuxt",
-  "version": "7.67.0",
+  "version": "7.67.2",
   "configKey": "storefront",
   "compatibility": {
     "nuxt": "^3.9.0"

package/dist/module.mjs

@@ -40,7 +40,7 @@ export default {
 }`;
 }
 const PACKAGE_NAME = "@scayle/storefront-nuxt";
-const PACKAGE_VERSION = "7.67.0";
+const PACKAGE_VERSION = "7.67.2";
 const module = defineNuxtModule({
   meta: {
     name: PACKAGE_NAME,

package/dist/runtime/server/middleware/bootstrap.mjs

@@ -1,24 +1,20 @@
-import { defineEventHandler, getRequestURL } from "h3";
+import { defineEventHandler, getCookie, deleteCookie } from "h3";
 import { decodeJwt } from "jose";
 import { randomUUID } from "uncrypto";
-import { useSession } from "@scayle/h3-session";
+import {
+  useSession,
+  unsignCookie
+} from "@scayle/h3-session";
 import { buildContext } from "../../context.mjs";
 import { useCacheStorage, useSessionStorage } from "../utils/cacheStorage.mjs";
 import {
   convertStoresToList,
-  getCurrentShopForRequest,
-  getPublicShopData
+  getCurrentShopConfigForRequest,
+  getPublicShopData,
+  getBootstrapPath
 } from "./bootstrap.utils.mjs";
 import { useRedirects } from "./redirects.mjs";
 import { useRuntimeConfig } from "#imports";
-const getShopConfig = (event, config) => {
-  const storefrontConfig = config.storefront;
-  const $shopConfig = getCurrentShopForRequest(
-    event,
-    storefrontConfig
-  );
-  return $shopConfig;
-};
 const generateSessionId = (event) => {
   let userId;
   if (event?.context.session?.data?.accessToken) {
@@ -27,6 +23,16 @@ const generateSessionId = (event) => {
   }
   return userId ? `${userId}:${randomUUID()}` : randomUUID();
 };
+async function getOldSessionData(event, cookieName, store, secret) {
+  const rawCookie = getCookie(event, cookieName);
+  const normalizedSecrets = Array.isArray(secret) ? secret : [secret];
+  const sessionId = rawCookie ? await unsignCookie(rawCookie, normalizedSecrets) : null;
+  if (sessionId) {
+    const sessionData = await store.get(sessionId);
+    await store.destroy(sessionId);
+    return sessionData;
+  }
+}
 async function bootstrap(event, $shopConfig, $storefrontConfig, apiBasePath, config) {
   const log = event.context.$log;
   const bootstrapLog = log.space("bootstrap");
@@ -53,6 +59,14 @@ async function bootstrap(event, $shopConfig, $storefrontConfig, apiBasePath, con
   );
   bootstrapLog.debug("Attaching session to request");
   try {
+    const cookieName = sessionConfig?.cookieName ?? "$session";
+    const secret = sessionConfig?.secret ?? "current-secret";
+    const oldSessionData = await getOldSessionData(
+      event,
+      cookieName,
+      sessionStorage,
+      secret
+    );
     await useSession(event, {
       ...sessionConfig,
       store: sessionStorage,
@@ -62,12 +76,21 @@ async function bootstrap(event, $shopConfig, $storefrontConfig, apiBasePath, con
         maxAge: sessionConfig?.maxAge,
         // secure: sessionConfig.isHttps, TODO
         sameSite: sessionConfig.sameSite,
-        domain: sessionConfig?.domain,
-        path: $storefrontConfig.shopSelector === "path" && $shopConfig.path ? `/${$shopConfig.path}` : void 0
+        domain: sessionConfig?.domain
       },
-      name: sessionConfig?.cookieName ?? "$session",
-      secret: sessionConfig?.secret ?? "current-secret"
+      name: `${cookieName}-${$shopConfig.shopId}`,
+      secret
     });
+    if (oldSessionData) {
+      event.context.session.data = oldSessionData;
+      event.context.session.save();
+    }
+    const oldSessionCookie = getCookie(event, cookieName);
+    if (oldSessionCookie) {
+      deleteCookie(event, cookieName, {
+        path: $storefrontConfig.shopSelector === "path" && $shopConfig.path ? `/${$shopConfig.path}` : void 0
+      });
+    }
   } catch (e) {
     bootstrapLog.error("Error attaching session: ", e);
   }
@@ -102,11 +125,6 @@ async function bootstrap(event, $shopConfig, $storefrontConfig, apiBasePath, con
     event
   });
 }
-function getBootstrapPath(event) {
-  const url = getRequestURL(event);
-  const path = url.pathname === "/__nuxt_error" ? url.searchParams.get("url") ?? url.pathname : url.pathname;
-  return { path, originalPath: url.pathname };
-}
 export default defineEventHandler(async (event) => {
   try {
     const { path, originalPath } = getBootstrapPath(event);
@@ -121,7 +139,17 @@ export default defineEventHandler(async (event) => {
     if (path === `${$storefrontConfig.apiBasePath ?? "/api"}/up`) {
       return;
     }
-    const $shopConfig = getShopConfig(event, config);
+    const $shopConfig = getCurrentShopConfigForRequest(
+      event,
+      $storefrontConfig
+    );
+    if (!$shopConfig) {
+      event.context.$log.debug(
+        "Could not find shop config for this request",
+        path
+      );
+      return;
+    }
     const apiBasePath = ($storefrontConfig.shopSelector === "path" && $shopConfig.path ? `/${$shopConfig.path}` : "") + ($shopConfig.apiBasePath || $storefrontConfig.apiBasePath || "/api");
     if (!event.context.$rpcContext) {
       event.context.$log.debug("Bootstrapping request: " + path);

package/dist/runtime/server/middleware/bootstrap.utils.d.ts

@@ -1,7 +1,13 @@
 import { type H3Event } from 'h3';
 import type { ModuleOptions, PublicShopConfig, ShopConfig, ShopConfigIndexed } from '../../../module';
+type BootstrapPath = {
+    path: string;
+    originalPath: string;
+};
+export declare function getBootstrapPath(event: H3Event): BootstrapPath;
 export declare const convertStoresToList: (stores: ShopConfig[] | ShopConfigIndexed) => ShopConfig[];
-export declare function getCurrentShopForRequest(event: H3Event, config: Pick<ModuleOptions, 'stores' | 'shopSelector'>): ShopConfig;
+export declare function getCurrentShopConfigForRequest(event: H3Event, config: Pick<ModuleOptions, 'stores' | 'shopSelector'>): ShopConfig | undefined;
 export declare function getPublicShopData(data: ShopConfig, currentShopId: number, apiBasePath: string, publicShopData?: (keyof ShopConfig)[]): PublicShopConfig & {
     isActive: boolean;
 };
+export {};

package/dist/runtime/server/middleware/bootstrap.utils.mjs

@@ -1,18 +1,21 @@
-import { getRequestHeaders, getRequestHost } from "h3";
+import {
+  getRequestHeaders,
+  getRequestHost,
+  getRequestURL
+} from "h3";
 import { isArray, listify } from "radash";
+export function getBootstrapPath(event) {
+  const url = getRequestURL(event);
+  const path = url.pathname === "/__nuxt_error" ? url.searchParams.get("url") ?? url.pathname : url.pathname;
+  return { path, originalPath: url.pathname };
+}
 const getStoreByDomain = (event, stores) => {
   const host = getRequestHost(event, { xForwardedHost: true });
   return stores.find((s) => s.domain === host);
 };
 const getStoreByPath = (event, stores) => {
-  if (!event.path) {
-    return;
-  }
-  const url = new URL(
-    event.path,
-    `https://${getRequestHost(event, { xForwardedHost: true })}`
-  );
-  const prefix = url.pathname.split("/")[1];
+  const { path } = getBootstrapPath(event);
+  const prefix = path.split("/")[1];
   return stores.find((shop) => prefix === shop.path);
 };
 export const convertStoresToList = (stores) => {
@@ -21,7 +24,7 @@ export const convertStoresToList = (stores) => {
   }
   return listify(stores, (_key, value) => ({ ...value }));
 };
-export function getCurrentShopForRequest(event, config) {
+export function getCurrentShopConfigForRequest(event, config) {
   let $shopConfig;
   const { shopSelector, stores } = config;
   const storesList = convertStoresToList(stores);
@@ -34,10 +37,6 @@ export function getCurrentShopForRequest(event, config) {
   } else if (shopSelector === "path") {
     $shopConfig = getStoreByPath(event, storesList);
   }
-  $shopConfig = $shopConfig || storesList[0];
-  if (!$shopConfig) {
-    throw new Error("Could not find shop config");
-  }
   return $shopConfig;
 }
 export function getPublicShopData(data, currentShopId, apiBasePath, publicShopData = []) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@scayle/storefront-nuxt",
   "type": "module",
-  "version": "7.67.1",
+  "version": "7.68.0",
   "description": "Nuxt integration for the SCAYLE Commerce Engine and Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",
@@ -62,8 +62,8 @@
   "dependencies": {
     "@nuxt/kit": "3.11.1",
     "@opentelemetry/api": "1.8.0",
-    "@scayle/h3-session": "0.3.6",
-    "@scayle/storefront-core": "7.49.2",
+    "@scayle/h3-session": "0.4.0",
+    "@scayle/storefront-core": "7.49.3",
     "@scayle/unstorage-compression-driver": "0.1.3",
     "@vueuse/core": "10.9.0",
     "consola": "3.2.3",
@@ -80,23 +80,23 @@
     "yn": "5.0.0"
   },
   "devDependencies": {
-    "@nuxt/eslint": "0.3.10",
+    "@nuxt/eslint": "0.3.12",
     "@nuxt/module-builder": "0.5.5",
     "@nuxt/schema": "3.11.1",
     "@nuxt/test-utils": "3.12.1",
     "@scayle/eslint-config-storefront": "4.1.0",
     "@scayle/eslint-plugin-vue-composable": "0.1.1",
-    "@types/node": "20.12.7",
+    "@types/node": "20.12.10",
     "dprint": "0.45.1",
-    "eslint": "9.1.1",
+    "eslint": "9.2.0",
     "eslint-formatter-gitlab": "5.1.0",
     "h3": "1.11.1",
     "node-mocks-http": "1.14.1",
     "nuxi": "3.11.1",
     "nuxt": "3.11.1",
     "publint": "0.2.7",
-    "vitest": "1.5.2",
-    "vue-tsc": "2.0.14"
+    "vitest": "1.6.0",
+    "vue-tsc": "2.0.17"
   },
   "peerDependencies": {
     "h3": "^1.10.0",