@plentymarkets/shop-core 1.9.8 → 1.10.0

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "shop-core",
   "configKey": "shopCore",
-  "version": "1.9.8",
+  "version": "1.10.0",
   "builder": {
     "@nuxt/module-builder": "0.8.4",
     "unbuild": "2.0.0"

package/dist/runtime/composables/sdk.client.js

@@ -20,6 +20,9 @@ export const httpClient = async (url, params, config) => {
     if (response.headers["x-csrf-token"] && response.data) {
       response.data.csrfToken = response.headers["x-csrf-token"];
     }
+    if (import.meta.server && response.headers["set-cookie"]) {
+      response.data.setCookie = response.headers["set-cookie"];
+    }
     return response.data;
   } catch (error) {
     handleHttpError(error);

package/dist/runtime/composables/useSdk.js

@@ -1,46 +1,84 @@
 import { initSDK, buildModule, middlewareModule } from "@vue-storefront/sdk";
 import { httpClient } from "./sdk.client.js";
-import { useCookie, useNuxtApp, useRequestHeaders, useRuntimeConfig } from "#imports";
+import { useCookie, useNuxtApp, useRequestHeaders, useRuntimeConfig, useState } from "#imports";
 import { useCsrfToken } from "./useCsrfToken.js";
 export const useSdk = () => {
+  const nuxtApp = useNuxtApp();
+  if (nuxtApp._sdk) {
+    return nuxtApp._sdk;
+  }
   const runtimeConfig = useRuntimeConfig();
   const moduleConfig = runtimeConfig.public.shopCore;
   const { $router, $i18n } = useNuxtApp();
-  const locale = $i18n.locale.value;
-  const referrerId = $router.currentRoute.value.query?.ReferrerID?.toString() ?? "";
-  const noCache = runtimeConfig.public.noCache || $router.currentRoute.value.query?.noCache?.toString() || "";
-  const configId = runtimeConfig.public.configId?.toString();
-  const pwaHashCookie = useCookie("pwa");
   const { token } = useCsrfToken();
-  const headers = {
-    ...configId && { "x-config-id": configId },
-    ...token.value && { "x-csrf-token": token.value },
-    ...pwaHashCookie.value && { "x-pwa-edit-hash": pwaHashCookie.value },
-    ...locale && { locale },
-    ...referrerId && { referrerID: referrerId },
-    ...noCache && { noCache },
-    ...useRequestHeaders()
+  const requestHeaders = useRequestHeaders(["cookie"]);
+  const ssrCookie = useState("ssr-cookie", () => requestHeaders.cookie ?? "");
+  const getFreshHeaders = () => {
+    const locale = $i18n.locale.value;
+    const referrerId = $router.currentRoute.value.query?.ReferrerID?.toString() ?? "";
+    const noCache = runtimeConfig.public.noCache || $router.currentRoute.value.query?.noCache?.toString() || "";
+    const configId = runtimeConfig.public.configId?.toString();
+    const pwaHashCookie = useCookie("pwa");
+    return {
+      ...configId && { "x-config-id": configId },
+      ...token.value && { "x-csrf-token": token.value },
+      ...pwaHashCookie.value && { "x-pwa-edit-hash": pwaHashCookie.value },
+      ...locale && { locale },
+      ...referrerId && { referrerID: referrerId },
+      ...noCache && { noCache },
+      ...useRequestHeaders(),
+      ...import.meta.server && ssrCookie.value && { cookie: ssrCookie.value }
+    };
   };
+  const headersProxy = new Proxy(
+    {},
+    {
+      get(_target, prop, receiver) {
+        return Reflect.get(getFreshHeaders(), prop, receiver);
+      },
+      ownKeys() {
+        return Reflect.ownKeys(getFreshHeaders());
+      },
+      getOwnPropertyDescriptor() {
+        return {
+          enumerable: true,
+          configurable: true
+        };
+      }
+    }
+  );
   const sdkConfig = {
     plentysystems: buildModule(
       middlewareModule,
       {
         apiUrl: moduleConfig.apiUrl + "/plentysystems",
         defaultRequestConfig: {
-          headers
+          headers: headersProxy
         },
         httpClient
       },
       () => ({
         subscribers: {
           "*_after": (payload) => {
+            const { ssrContext } = useNuxtApp();
             if (payload.csrfToken) {
               token.value = payload.csrfToken;
             }
+            if (import.meta.server && payload.setCookie && ssrContext?.event?.node?.res) {
+              const cookieValue = Array.isArray(payload.setCookie) ? payload.setCookie[0] : payload.setCookie;
+              const newCookie = cookieValue.split(";")[0];
+              if (newCookie) {
+                ssrCookie.value = newCookie;
+              }
+              ssrContext.event.node.res.setHeader("Access-Control-Expose-Headers", "Set-Cookie");
+              ssrContext.event.node.res.setHeader("Set-Cookie", payload.setCookie);
+            }
           }
         }
       })
     )
   };
-  return initSDK(sdkConfig);
+  const sdk = initSDK(sdkConfig);
+  nuxtApp._sdk = sdk;
+  return sdk;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plentymarkets/shop-core",
-  "version": "1.9.8",
+  "version": "1.10.0",
   "description": "Core module for PlentyONE Shop",
   "repository": {
     "type": "git",
@@ -42,7 +42,7 @@
     "test:types": "vue-tsc --noEmit && cd playground && vue-tsc --noEmit"
   },
   "dependencies": {
-    "@plentymarkets/shop-api": "^0.135.0",
+    "@plentymarkets/shop-api": "^0.136.0",
     "@vue-storefront/sdk": "^3.4.1",
     "js-sha256": "^0.11.0",
     "resolve": "^1.22.10"