Merge pull request #33 from LIN3S/feature/cart-token-by-parameters

Allow cart token's cookie name to be passed in config parameters
LIN3S · Nov 26, 2018 · 0b60e0f · 0b60e0f
2 parents 47a8f42 + 301592e
commit 0b60e0f
Show file tree

Hide file tree

Showing 4 changed files with 67 additions and 60 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,8 @@ This changelog references the relevant changes done between versions.
 To get the diff for a specific change, go to https://github.com/LIN3S/SyliusShopApiClient/commit/XXX where XXX is the change hash 
 To get the diff between two versions, go to https://github.com/LIN3S/SyliusShopApiClient/compare/v0.2.0...v0.3.0
 
+* 0.8.0
+    * [FEATURE] Config will accept a new parameters `cartTokenCookie` that will be cart cookie's name if any
 * 0.7.7
     * [FEATURE] Add locale params to checkout complete method
 * 0.7.6

diff --git a/README.md b/README.md
@@ -35,6 +35,7 @@ const api = createSyliusApiClient({
     locale: 'en_US',
     cartCookieExpiration: 604800000,
     userCookieExpiration: 2592000000,
+    cartTokenCookie: 'cart-token',
 })
 ```
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lin3s-sylius-shop-api-client",
-  "version": "0.7.7",
+  "version": "0.8.0",
   "author": "LIN3S",
   "license": "MIT",
   "description": "JavaScript client on top of SyliusShopApiPlugin to build integrations with ease.",

diff --git a/src/session.js b/src/session.js
@@ -27,68 +27,72 @@ export class CartDoesNotExist {
   message = 'Cart has not been initialized';
 }
 
-const session = config => ({
-  Cart: {
-    id: () => {
-      const id = getCookie(CART_TOKEN_COOKIE);
-
-      if (typeof id === 'undefined') {
-        throw new CartDoesNotExist();
-      }
-
-      return id;
-    },
-    generateId: () => {
-      const newSessionId = uuid();
-      const params = {
-        name: CART_TOKEN_COOKIE,
-        value: newSessionId,
-        expiration: config.cartCookieExpiration || 604800000 // 7 days
-      };
-
-      if (config.cookieDomain) {
-        params.domain = config.cookieDomain;
-      }
-
-      setCookie(params);
-
-      return newSessionId;
-    },
-    remove: () => {
-      const params = {};
-
-      if (config.cookieDomain) {
-        params.domain = config.cookieDomain;
+const session = config => {
+  const cartTokenCookie = config.cartTokenCookie || CART_TOKEN_COOKIE;
+
+  return ({
+    Cart: {
+      id: () => {
+        const id = getCookie(cartTokenCookie);
+
+        if (typeof id === 'undefined') {
+          throw new CartDoesNotExist();
+        }
+
+        return id;
+      },
+      generateId: () => {
+        const newSessionId = uuid();
+        const params = {
+          name: cartTokenCookie,
+          value: newSessionId,
+          expiration: config.cartCookieExpiration || 604800000 // 7 days
+        };
+
+        if (config.cookieDomain) {
+          params.domain = config.cookieDomain;
+        }
+
+        setCookie(params);
+
+        return newSessionId;
+      },
+      remove: () => {
+        const params = {};
+
+        if (config.cookieDomain) {
+          params.domain = config.cookieDomain;
+        }
+
+        return removeCookie(cartTokenCookie, params);
       }
-
-      return removeCookie(CART_TOKEN_COOKIE, params);
-    }
-  },
-  User: {
-    token: () => getCookie(USER_TOKEN_COOKIE),
-    set: (token) => {
-      const params = {
-        name: USER_TOKEN_COOKIE,
-        value: token,
-        expiration: config.userCookieExpiration || 2592000000 // 1 month
-      };
-
-      if (config.cookieDomain) {
-        params.domain = config.cookieDomain;
-      }
-
-      setCookie(params);
     },
-    remove: () => {
-      const params = {};
-
-      if (config.cookieDomain) {
-        params.domain = config.cookieDomain;
+    User: {
+      token: () => getCookie(USER_TOKEN_COOKIE),
+      set: (token) => {
+        const params = {
+          name: USER_TOKEN_COOKIE,
+          value: token,
+          expiration: config.userCookieExpiration || 2592000000 // 1 month
+        };
+
+        if (config.cookieDomain) {
+          params.domain = config.cookieDomain;
+        }
+
+        setCookie(params);
+      },
+      remove: () => {
+        const params = {};
+
+        if (config.cookieDomain) {
+          params.domain = config.cookieDomain;
+        }
+
+        return removeCookie(USER_TOKEN_COOKIE, params);
       }
-
-      return removeCookie(USER_TOKEN_COOKIE, params);
     }
-  }
-});
+  });
+};
 
 export default session;