From bfd4a785388a444ca1091fd9150c22329173bfd2 Mon Sep 17 00:00:00 2001
From: cond0r <pinte_catalin@yahoo.com>
Date: Fri, 26 Feb 2021 18:41:35 +0200
Subject: [PATCH] Changed cookie expiration

---
 framework/shopify/api/index.ts                  |  3 ++-
 framework/shopify/cart/utils/checkout-create.ts |  8 ++++++--
 framework/shopify/const.ts                      |  2 ++
 framework/shopify/utils/customer-token.ts       | 17 +++++++++++++----
 framework/shopify/wishlist/use-wishlist.tsx     |  2 --
 5 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/framework/shopify/api/index.ts b/framework/shopify/api/index.ts
index 387ed02fc..4f15cae15 100644
--- a/framework/shopify/api/index.ts
+++ b/framework/shopify/api/index.ts
@@ -5,6 +5,7 @@ import {
   API_TOKEN,
   SHOPIFY_CHECKOUT_ID_COOKIE,
   SHOPIFY_CUSTOMER_TOKEN_COOKIE,
+  SHOPIFY_COOKIE_EXPIRE,
 } from '../const'
 
 if (!API_URL) {
@@ -47,7 +48,7 @@ const config = new Config({
   commerceUrl: API_URL,
   apiToken: API_TOKEN!,
   cartCookie: SHOPIFY_CHECKOUT_ID_COOKIE,
-  cartCookieMaxAge: 60 * 60 * 24 * 30,
+  cartCookieMaxAge: SHOPIFY_COOKIE_EXPIRE,
   fetch: fetchGraphqlApi,
   customerCookie: SHOPIFY_CUSTOMER_TOKEN_COOKIE,
 })
diff --git a/framework/shopify/cart/utils/checkout-create.ts b/framework/shopify/cart/utils/checkout-create.ts
index 6c4f81c21..e950cc7e4 100644
--- a/framework/shopify/cart/utils/checkout-create.ts
+++ b/framework/shopify/cart/utils/checkout-create.ts
@@ -1,6 +1,7 @@
 import {
   SHOPIFY_CHECKOUT_ID_COOKIE,
   SHOPIFY_CHECKOUT_URL_COOKIE,
+  SHOPIFY_COOKIE_EXPIRE,
 } from '../../const'
 
 import checkoutCreateMutation from '../../utils/mutations/checkout-create'
@@ -15,8 +16,11 @@ export const checkoutCreate = async (fetch: any) => {
   const checkoutId = checkout?.id
 
   if (checkoutId) {
-    Cookies.set(SHOPIFY_CHECKOUT_ID_COOKIE, checkoutId)
-    Cookies.set(SHOPIFY_CHECKOUT_URL_COOKIE, checkout?.webUrl)
+    const options = {
+      expires: SHOPIFY_COOKIE_EXPIRE,
+    }
+    Cookies.set(SHOPIFY_CHECKOUT_ID_COOKIE, checkoutId, options)
+    Cookies.set(SHOPIFY_CHECKOUT_URL_COOKIE, checkout?.webUrl, options)
   }
 
   return checkout
diff --git a/framework/shopify/const.ts b/framework/shopify/const.ts
index a6e9e8d90..06fbe5054 100644
--- a/framework/shopify/const.ts
+++ b/framework/shopify/const.ts
@@ -6,6 +6,8 @@ export const SHOPIFY_CUSTOMER_TOKEN_COOKIE = 'shopify_customerToken'
 
 export const STORE_DOMAIN = process.env.NEXT_PUBLIC_SHOPIFY_STORE_DOMAIN
 
+export const SHOPIFY_COOKIE_EXPIRE = 30
+
 export const API_URL = `https://${STORE_DOMAIN}/api/2021-01/graphql.json`
 
 export const API_TOKEN = process.env.NEXT_PUBLIC_SHOPIFY_STOREFRONT_ACCESS_TOKEN
diff --git a/framework/shopify/utils/customer-token.ts b/framework/shopify/utils/customer-token.ts
index beae54765..85454cb83 100644
--- a/framework/shopify/utils/customer-token.ts
+++ b/framework/shopify/utils/customer-token.ts
@@ -1,12 +1,21 @@
-import Cookies from 'js-cookie'
-import { SHOPIFY_CUSTOMER_TOKEN_COOKIE } from '../const'
+import Cookies, { CookieAttributes } from 'js-cookie'
+import { SHOPIFY_COOKIE_EXPIRE, SHOPIFY_CUSTOMER_TOKEN_COOKIE } from '../const'
 
 export const getCustomerToken = () => Cookies.get(SHOPIFY_CUSTOMER_TOKEN_COOKIE)
 
-export const setCustomerToken = (token: string | null, options?: any) => {
+export const setCustomerToken = (
+  token: string | null,
+  options?: CookieAttributes
+) => {
   if (!token) {
     Cookies.remove(SHOPIFY_CUSTOMER_TOKEN_COOKIE)
   } else {
-    Cookies.set(SHOPIFY_CUSTOMER_TOKEN_COOKIE, token, options)
+    Cookies.set(
+      SHOPIFY_CUSTOMER_TOKEN_COOKIE,
+      token,
+      options ?? {
+        expires: SHOPIFY_COOKIE_EXPIRE,
+      }
+    )
   }
 }
diff --git a/framework/shopify/wishlist/use-wishlist.tsx b/framework/shopify/wishlist/use-wishlist.tsx
index 13632bb95..d2ce9db5b 100644
--- a/framework/shopify/wishlist/use-wishlist.tsx
+++ b/framework/shopify/wishlist/use-wishlist.tsx
@@ -2,9 +2,7 @@
 // Shopify doesn't have a wishlist
 
 import { HookFetcher } from '@commerce/utils/types'
-import useCommerceWishlist from '@commerce/wishlist/use-wishlist'
 import { Product } from '../schema'
-import useCustomer from '../customer/use-customer'
 
 const defaultOpts = {}