@graphcommerce/magento-payment-paypal 9.0.1 → 9.0.2-canary.0

package/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @graphcommerce/magento-payment-paypal
 
+## 9.0.2-canary.0
+
 ## 9.0.1
 
 ## 9.0.1-canary.1

package/components/PayPalPaymentHandler/PayPalPaymentHandler.graphql

@@ -5,6 +5,11 @@ mutation PayPalPaymentHandler($cartId: String!, $paymentMethod: PaymentMethodInp
     }
   }
   placeOrder(input: { cart_id: $cartId }) {
+    errors {
+      code
+      message
+    }
+
     order {
       order_number
     }

package/components/PayPalPaymentHandler/PayPalPaymentHandler.tsx

@@ -2,7 +2,10 @@ import { ApolloErrorSnackbar } from '@graphcommerce/ecommerce-ui'
 import { useMutation } from '@graphcommerce/graphql'
 import { useCurrentCartId } from '@graphcommerce/magento-cart'
 import type { PaymentHandlerProps } from '@graphcommerce/magento-cart-payment-method'
-import { usePaymentMethodContext } from '@graphcommerce/magento-cart-payment-method'
+import {
+  assertOrderPlaced,
+  usePaymentMethodContext,
+} from '@graphcommerce/magento-cart-payment-method'
 import { useRouter } from 'next/router'
 import { useEffect } from 'react'
 import { usePayPalCartLock } from '../../hooks/usePayPalCartLock'
@@ -41,15 +44,15 @@ export function PayPalPaymentHandler(props: PaymentHandlerProps) {
     if (!cartId) return
 
     const fetchData = async () => {
-      const res = await placeOrder()
+      const result = await placeOrder()
 
-      if (res.errors || !res.data?.placeOrder?.order) {
+      try {
+        assertOrderPlaced(result)
+        // eslint-disable-next-line @typescript-eslint/no-floating-promises
+        onSuccess(result.data.placeOrder.order.order_number)
+      } catch (e) {
         await unlock({ token: null, PayerID: null })
-        return
       }
-
-      // eslint-disable-next-line @typescript-eslint/no-floating-promises
-      onSuccess(res.data?.placeOrder?.order.order_number)
     }
 
     // eslint-disable-next-line @typescript-eslint/no-floating-promises

package/components/PayPalPaymentPlaceOrder/PayPalPaymentPlaceOrder.tsx

@@ -1,6 +1,11 @@
 import { useFormCompose } from '@graphcommerce/ecommerce-ui'
 import { useFormGqlMutationCart } from '@graphcommerce/magento-cart'
-import type { PaymentPlaceOrderProps } from '@graphcommerce/magento-cart-payment-method'
+import {
+  assertOrderPlaced,
+  type PaymentPlaceOrderProps,
+} from '@graphcommerce/magento-cart-payment-method'
+import { ApolloError } from '@apollo/client'
+import { GraphQLError } from 'graphql'
 import { useRouter } from 'next/router'
 import { usePayPalCartLock } from '../../hooks/usePayPalCartLock'
 import { PayPalPaymentPlaceOrderDocument } from './PayPalPaymentPlaceOrder.gql'
@@ -17,15 +22,16 @@ export function PayPalPaymentPlaceOrder(props: PaymentPlaceOrderProps) {
       urls: { cancel_url: 'checkout/payment', return_url: 'checkout/payment' },
     }),
     onComplete: async (result) => {
-      if (result.errors) return
+      if (result.errors && result.errors.length > 0) return
 
       const start = result.data?.createPaypalExpressToken?.paypal_urls?.start
       const token = result.data?.createPaypalExpressToken?.token
 
-      if (!start)
-        throw Error(
-          'Error while starting the PayPal payment, please try again with a different payment method',
-        )
+      if (!start) {
+        const message =
+          'Error while starting the PayPal payment, please try again with a different payment method'
+        throw new ApolloError({ graphQLErrors: [{ message }] })
+      }
 
       await lock({ token, method: code, PayerID: null })
       // We are going to redirect, but we're not waiting, because we need to complete the submission to release the buttons

package/package.json

@@ -2,7 +2,7 @@
   "name": "@graphcommerce/magento-payment-paypal",
   "homepage": "https://www.graphcommerce.org/",
   "repository": "github:graphcommerce-org/graphcommerce",
-  "version": "9.0.1",
+  "version": "9.0.2-canary.0",
   "sideEffects": false,
   "prettier": "@graphcommerce/prettier-config-pwa",
   "eslintConfig": {
@@ -12,16 +12,16 @@
     }
   },
   "peerDependencies": {
-    "@graphcommerce/ecommerce-ui": "^9.0.1",
-    "@graphcommerce/eslint-config-pwa": "^9.0.1",
-    "@graphcommerce/graphql": "^9.0.1",
-    "@graphcommerce/image": "^9.0.1",
-    "@graphcommerce/magento-cart": "^9.0.1",
-    "@graphcommerce/magento-cart-payment-method": "^9.0.1",
-    "@graphcommerce/magento-store": "^9.0.1",
-    "@graphcommerce/next-ui": "^9.0.1",
-    "@graphcommerce/prettier-config-pwa": "^9.0.1",
-    "@graphcommerce/typescript-config-pwa": "^9.0.1",
+    "@graphcommerce/ecommerce-ui": "^9.0.2-canary.0",
+    "@graphcommerce/eslint-config-pwa": "^9.0.2-canary.0",
+    "@graphcommerce/graphql": "^9.0.2-canary.0",
+    "@graphcommerce/image": "^9.0.2-canary.0",
+    "@graphcommerce/magento-cart": "^9.0.2-canary.0",
+    "@graphcommerce/magento-cart-payment-method": "^9.0.2-canary.0",
+    "@graphcommerce/magento-store": "^9.0.2-canary.0",
+    "@graphcommerce/next-ui": "^9.0.2-canary.0",
+    "@graphcommerce/prettier-config-pwa": "^9.0.2-canary.0",
+    "@graphcommerce/typescript-config-pwa": "^9.0.2-canary.0",
     "@lingui/core": "^4.2.1",
     "@lingui/macro": "^4.2.1",
     "@lingui/react": "^4.2.1",