@scayle/storefront-nuxt 7.37.2 → 7.38.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @scayle/storefront-nuxt
 
+## 7.38.0
+
+### Minor Changes
+
+- Ensure the session is not shared between different country shops
+
 ## 7.37.2
 
 ### Patch Changes

package/dist/module.json

@@ -4,5 +4,5 @@
   "compatibility": {
     "nuxt": "^3.7.0"
   },
-  "version": "7.37.1"
+  "version": "7.37.2"
 }

package/dist/module.mjs

@@ -82,16 +82,42 @@ const module = defineNuxtModule({
       handler: resolve("./runtime/server/middleware/bootstrap")
     });
     const apiBasePath = nuxt.options.runtimeConfig.storefront.apiBasePath || "/api";
-    addServerHandler({
-      route: `${apiBasePath}/purge/all`,
-      handler: resolve("./runtime/api/purgeAll"),
-      method: "post"
-    });
-    addServerHandler({
-      route: `${apiBasePath}/purge/tags`,
-      handler: resolve("./runtime/api/purgeTags"),
-      method: "post"
-    });
+    const rpcMethodNames = /* @__PURE__ */ new Set([
+      ...Object.keys(rpcMethods),
+      ...options.rpcMethodNames ?? []
+    ]);
+    function addRPCServerHandlers(base) {
+      rpcMethodNames.forEach((methodName) => {
+        addServerHandler({
+          route: `${base}/rpc/${methodName}`,
+          handler: resolve("./runtime/api/rpcHandler"),
+          method: "post"
+        });
+      });
+    }
+    function addCacheServerHandlers(base) {
+      addServerHandler({
+        route: `${base}/purge/all`,
+        handler: resolve("./runtime/api/purgeAll"),
+        method: "post"
+      });
+      addServerHandler({
+        route: `${base}/purge/tags`,
+        handler: resolve("./runtime/api/purgeTags"),
+        method: "post"
+      });
+    }
+    if (nuxt.options.runtimeConfig.storefront.shopSelector === "path") {
+      const stores = Array.isArray(nuxt.options.runtimeConfig.storefront.stores) ? nuxt.options.runtimeConfig.storefront.stores : Object.values(nuxt.options.runtimeConfig.storefront.stores);
+      stores.forEach((s) => {
+        const base = `/${s.path}${apiBasePath}`;
+        addCacheServerHandlers(base);
+        addRPCServerHandlers(base);
+      });
+    } else {
+      addCacheServerHandlers(apiBasePath);
+      addRPCServerHandlers(apiBasePath);
+    }
     addServerHandler({
       route: `${apiBasePath}/up`,
       handler: resolve("./runtime/api/up"),
@@ -119,17 +145,6 @@ const module = defineNuxtModule({
     nuxt.hook("prepare:types", ({ references }) => {
       references.push({ path: template.dst });
     });
-    const rpcMethodNames = /* @__PURE__ */ new Set([
-      ...Object.keys(rpcMethods),
-      ...options.rpcMethodNames ?? []
-    ]);
-    rpcMethodNames.forEach((methodName) => {
-      addServerHandler({
-        route: `${apiBasePath}/rpc/${methodName}`,
-        handler: resolve("./runtime/api/rpcHandler"),
-        method: "post"
-      });
-    });
     nuxt.hooks.hook("nitro:config", (nitroConfig) => {
       nitroConfig.externals = nitroConfig.externals || {};
       nitroConfig.externals.inline = nitroConfig.externals.inline || [];

package/dist/runtime/api/rpcHandler.mjs

@@ -5,7 +5,7 @@ export default defineEventHandler(async (event) => {
   const pathComponents = event.path.split("?")[0].split("/");
   const method = pathComponents[pathComponents.length - 1];
   const body = await readBody(event);
-  event.context.$rpcContext.log.space("sfc").debug(`RPC Handler: ${method}`);
+  event.context.$rpcContext.log.space("sfc").debug(`RPC Handler: ${method}, Payload: ${JSON.stringify(body?.payload)}`);
   try {
     return await handler(method, body?.payload, event.context.$rpcContext);
   } catch (e) {

package/dist/runtime/composables/core/useRpc.mjs

@@ -1,8 +1,18 @@
-import { useNuxtApp, useState } from "nuxt/app";
+import {
+  useNuxtApp,
+  useState
+} from "nuxt/app";
 import { useCoreLog } from "../useCoreLog.mjs";
 import { handleError } from "../../utils/error.mjs";
 import { useCurrentShop } from "./useCurrentShop.mjs";
 import { toValue } from "#imports";
+function getFetch(nuxtApp, log) {
+  const fetch = nuxtApp.ssrContext?.event.$fetch ?? $fetch;
+  if (nuxtApp.ssrContext?.event && !nuxtApp.ssrContext?.event.$fetch) {
+    log.error("event.$fetch was not found!");
+  }
+  return fetch;
+}
 export const useRpc = async (method, key, params, options = { autoFetch: true, lazy: false }) => {
   const currentShop = useCurrentShop();
   const log = useCoreLog("rpc");
@@ -20,7 +30,7 @@ export const useRpc = async (method, key, params, options = { autoFetch: true, l
       status.value = "pending";
       fetching.value = true;
       const apiBasePath = currentShop.value?.apiBasePath ?? "/api";
-      const fetch2 = useNuxtApp().ssrContext?.event.$fetch ?? $fetch;
+      const fetch2 = getFetch(useNuxtApp(), log);
       data.value = await fetch2(`/rpc/${method}`, {
         // @ts-ignore
         method: "POST",

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

@@ -124,7 +124,8 @@ async function bootstrap(event, log, url, $shopConfig, $storefrontConfig, apiBas
       maxAge: sessionConfig?.maxAge,
       // secure: sessionConfig.isHttps, TODO
       sameSite: sessionConfig.sameSite,
-      domain: sessionConfig?.domain
+      domain: sessionConfig?.domain,
+      path: $storefrontConfig.shopSelector === "path" && $shopConfig.path ? `/${$shopConfig.path}` : void 0
     },
     name: sessionConfig?.cookieName ?? "$session",
     secret: sessionConfig?.secret ?? "current-secret"
@@ -164,7 +165,7 @@ export default defineEventHandler(async (event) => {
     const config = useRuntimeConfig();
     const $storefrontConfig = config.storefront;
     const $shopConfig = getShopConfig(event, config);
-    const apiBasePath = $shopConfig.apiBasePath || $storefrontConfig.apiBasePath || "/api";
+    const apiBasePath = ($storefrontConfig.shopSelector === "path" && $shopConfig.path ? `/${$shopConfig.path}` : "") + ($shopConfig.apiBasePath || $storefrontConfig.apiBasePath || "/api");
     if (url.pathname === `${apiBasePath}/up`) {
       return;
     }

package/dist/types.d.mts

@@ -1,5 +1,6 @@
 
-import { ModuleOptions } from './module'
+import type { ModuleOptions } from './module'
+
 
 declare module '@nuxt/schema' {
   interface NuxtConfig { ['storefront']?: Partial<ModuleOptions> }
@@ -12,4 +13,4 @@ declare module 'nuxt/schema' {
 }
 
 
-export { AdditionalShopConfig, AppKeys, AuthenticationConfig, BapiConfig, CacheConfig, CheckoutEvent, CheckoutShopConfig, OauthConfig, PublicShopConfig, RedirectsConfig, RedisConfig, SessionConfig, ShopConfig, ShopConfigIndexed, StorageProvider, StorefrontConfig } from './module'
+export type { AdditionalShopConfig, AppKeys, AuthenticationConfig, BapiConfig, CacheConfig, CheckoutEvent, CheckoutShopConfig, OauthConfig, PublicShopConfig, RedirectsConfig, RedisConfig, SessionConfig, ShopConfig, ShopConfigIndexed, StorageProvider, StorefrontConfig } from './module'

package/dist/types.d.ts

@@ -1,5 +1,6 @@
 
-import { ModuleOptions } from './module'
+import type { ModuleOptions } from './module'
+
 
 declare module '@nuxt/schema' {
   interface NuxtConfig { ['storefront']?: Partial<ModuleOptions> }
@@ -12,4 +13,4 @@ declare module 'nuxt/schema' {
 }
 
 
-export { AdditionalShopConfig, AppKeys, AuthenticationConfig, BapiConfig, CacheConfig, CheckoutEvent, CheckoutShopConfig, OauthConfig, PublicShopConfig, RedirectsConfig, RedisConfig, SessionConfig, ShopConfig, ShopConfigIndexed, StorageProvider, StorefrontConfig } from './module'
+export type { AdditionalShopConfig, AppKeys, AuthenticationConfig, BapiConfig, CacheConfig, CheckoutEvent, CheckoutShopConfig, OauthConfig, PublicShopConfig, RedirectsConfig, RedisConfig, SessionConfig, ShopConfig, ShopConfigIndexed, StorageProvider, StorefrontConfig } from './module'

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@scayle/storefront-nuxt",
   "type": "module",
-  "version": "7.37.2",
+  "version": "7.38.0",
   "description": "Nuxt integration for the SCAYLE Commerce Engine and Storefront API",
   "author": "SCAYLE Commerce Engine",
   "license": "MIT",
@@ -76,14 +76,14 @@
     "yn": "^5.0.0"
   },
   "devDependencies": {
-    "@nuxt/module-builder": "0.5.3",
+    "@nuxt/module-builder": "0.5.4",
     "@nuxt/schema": "3.7.4",
     "@nuxt/test-utils": "3.7.4",
     "@scayle/eslint-config-storefront": "3.2.5",
     "@scayle/prettier-config-storefront": "2.0.2",
-    "@types/node": "20.8.10",
+    "@types/node": "20.9.0",
     "eslint": "8.53.0",
-    "eslint-formatter-gitlab": "5.0.0",
+    "eslint-formatter-gitlab": "5.1.0",
     "node-mocks-http": "1.13.0",
     "nuxt": "3.7.4",
     "prettier": "3.0.0",