fix(nuxt module): redirect 302 issue on apple devices (#1817)

vuestorefront · Feb 24, 2022 · e96f114 · e96f114
1 parent d095445
commit e96f114
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 0 deletions.
diff --git a/packages/nuxt-module/plugins/api-client.js b/packages/nuxt-module/plugins/api-client.js
@@ -23,6 +23,25 @@ export default async ({ app }, inject) => {
  if (!app.$cookies) {
  throw "Error cookie-universal-nuxt module is not applied in nuxt.config.js";
  }
+
+ /**
+ * get contextToken from sessionStorage when cookie lost in redirects
+ * https://github.com/vuestorefront/shopware-pwa/pull/1817
+ */
+ if (process.client && navigator?.userAgent.includes('WebKit')) {
+ if (!app.$cookies.get("sw-context-token") && typeof sessionStorage !== "undefined") {
+ app.$cookies.set(
+ "sw-context-token",
+ sessionStorage.getItem("sw-context-token"),
+ {
+ maxAge: 60 * 60 * 24 * 365,
+ sameSite: "Lax",
+ path: "/",
+ }
+ )
+ }
+ sessionStorage.removeItem("sw-context-token")
+ }
 
  function getCookiesConfig(app) {
  return {

diff --git a/packages/shopware-6-client/src/services/checkoutService.ts b/packages/shopware-6-client/src/services/checkoutService.ts
@@ -54,6 +54,16 @@ export async function handlePayment(
  if (!params?.orderId) {
  throw new Error("handlePayment method requires orderId");
  }
+
+ /**
+ * save contextToken in sessionStorage when using Webkit
+ * https://github.com/vuestorefront/shopware-pwa/pull/1817
+ */
+ if(navigator?.userAgent.includes('WebKit')){
+ if (typeof sessionStorage !== "undefined") {
+ sessionStorage.setItem("sw-context-token", contextInstance?.config?.contextToken as string)
+ }
+ }
 
  const resp = await contextInstance.invoke.get(
  handlePaymentEndpoint(),