Merge pull request #14 from storefront-foundation/fixing-endpoints

Not sending response for home and session endpoints

Author: dijs

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-storefront-magento2-connector",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "description": "Magento 2 Connector",
   "module": "./index.js",
   "watch": {

src/home/home.ts

@@ -2,18 +2,20 @@ import withAppData from '../app/withAppData'
 import Result from 'react-storefront-connector/Result'
 
 export default async function home(req, res): Promise<Result<any>> {
-  const data = await withAppData(req, () => Promise.resolve({
-    title: `Home`,
-    slots: {
-      heading: 'Home',
-      description: 'Welcome!',
-    },
-    breadcrumbs: [
-      {
-        text: 'Home',
-        href: '/',
+  const data = await withAppData(req, () =>
+    Promise.resolve({
+      title: `Home`,
+      slots: {
+        heading: 'Home',
+        description: 'Welcome!',
       },
-    ],
-  }))
-  return res.status(200).send({ ...data })
-}
+      breadcrumbs: [
+        {
+          text: 'Home',
+          href: '/',
+        },
+      ],
+    })
+  )
+  return { ...data }
+}

src/session/session.ts

@@ -1,31 +1,39 @@
-import { getCookieValue, setCookies, prepareSetCookie, prepareKillCookie } from '../helpers/nodeCookieHelpers'
+import {
+  getCookieValue,
+  setCookies,
+  prepareSetCookie,
+  prepareKillCookie,
+} from '../helpers/nodeCookieHelpers'
 import obtainSession from './guest/obtainSession'
 import guestCart from './guest/cart'
 import customerCart from './customer/cart'
 import { COOKIES } from '../constants'
-import Session from 'react-storefront-connector/Session'
 
-export default async function session(req, res): Promise<Session> {
-  const cookiesToSet = [];
+export default async function session(req, res): Promise<any> {
+  const cookiesToSet = []
 
   // ### 1 - LOGGED IN SESSION
   const tokenCookieValue = getCookieValue(req, COOKIES.M2_CUSTOMER_TOKEN)
   if (tokenCookieValue) {
     const customerCartData = await customerCart(tokenCookieValue)
     if (customerCartData.error) {
-      return res.status(400).json({
+      return {
         error: customerCartData.error,
-      })
+      }
     }
     const { cart, customerCartId } = customerCartData
-    cookiesToSet.push(prepareSetCookie(COOKIES.M2_CUSTOMER_TOKEN, tokenCookieValue, { maxAge: 3600 * 24 * 30 })) // renew customer token cookie for 30 more days
-    cookiesToSet.push(prepareSetCookie(COOKIES.M2_CUSTOMER_CART_ID, customerCartId, { maxAge: 3600 * 24 * 30 })) // set/renew customer cart ID cookie for 30 days
+    cookiesToSet.push(
+      prepareSetCookie(COOKIES.M2_CUSTOMER_TOKEN, tokenCookieValue, { maxAge: 3600 * 24 * 30 })
+    ) // renew customer token cookie for 30 more days
+    cookiesToSet.push(
+      prepareSetCookie(COOKIES.M2_CUSTOMER_CART_ID, customerCartId, { maxAge: 3600 * 24 * 30 })
+    ) // set/renew customer cart ID cookie for 30 days
     cookiesToSet.push(prepareKillCookie(COOKIES.M2_GUEST_CART_ID)) // kill guest cart ID cookie just in case (prevents possible cart merges issues)
     setCookies(res, cookiesToSet)
-    return res.status(200).json({
+    return {
       signedIn: true,
       cart,
-    })
+    }
   }
 
   // ### 2 - GUEST SESSION
@@ -36,34 +44,38 @@ export default async function session(req, res): Promise<Session> {
     const guestCartData = await guestCart(guestCartIdCookieValue)
     if (guestCartData.error) {
       setCookies(res, cookiesToSet)
-      return res.status(400).json({
+      return {
         error: guestCartData.error,
-      })
+      }
     }
     const { cart } = guestCartData
-    cookiesToSet.push(prepareSetCookie(COOKIES.M2_GUEST_CART_ID, guestCartIdCookieValue, { maxAge: 3600 * 24 * 7 })) // renew cookie for 7 more days
+    cookiesToSet.push(
+      prepareSetCookie(COOKIES.M2_GUEST_CART_ID, guestCartIdCookieValue, { maxAge: 3600 * 24 * 7 })
+    ) // renew cookie for 7 more days
     setCookies(res, cookiesToSet)
-    return res.status(200).json({
+    return {
       signedIn: false,
       cart,
-    })
+    }
   }
 
   // # 2.2 - Obtain new guest session
   const obtainSessionData = await obtainSession()
   if (obtainSessionData.error) {
     setCookies(res, cookiesToSet)
-    return res.status(400).json({
+    return {
       error: obtainSessionData.error,
-    })
+    }
   }
   const { guestCartId } = obtainSessionData
-  cookiesToSet.push(prepareSetCookie(COOKIES.M2_GUEST_CART_ID, guestCartId, { maxAge: 3600 * 24 * 7 })) // set guest cart id cookie for 7 days
+  cookiesToSet.push(
+    prepareSetCookie(COOKIES.M2_GUEST_CART_ID, guestCartId, { maxAge: 3600 * 24 * 7 })
+  ) // set guest cart id cookie for 7 days
   setCookies(res, cookiesToSet)
-  return res.status(200).json({
+  return {
     signedIn: false,
     cart: {
       items: [],
     },
-  })
+  }
 }