Fix and add tests for user error mapping

kdaviduik · kdaviduik · commit db5e3ed75552 · 2025-03-12T19:45:27.000-04:00
diff --git a/src/handle-cart-mutation.js b/src/handle-cart-mutation.js
@@ -9,13 +9,15 @@ export default function handleCartMutation(mutationRootKey, client) {
     if (rootData && rootData.cart) {
       return client.fetchAllPages(rootModel.cart.lines, {pageSize: 250}).then((lines) => {
         rootModel.cart.attrs.lines = lines;
-        rootModel.cart.errors = errors;
-        rootModel.cart.userErrors = rootData.userErrors;
+        const checkoutUserErrors = checkoutUserErrorsMapper(rootData.userErrors, rootData.warnings);
 
         try {
-          return mapCartPayload(rootModel.cart, mutationRootKey);
+          return Object.assign({},
+            mapCartPayload(rootModel.cart, mutationRootKey),
+            {userErrors: checkoutUserErrors, errors: rootModel.cart.errors}
+          );
         } catch (error) {
-          return Promise.reject(new Error(JSON.stringify(error.message)));
+          return Promise.reject(error);
         }
       });
     }
@@ -24,10 +26,10 @@ export default function handleCartMutation(mutationRootKey, client) {
       return Promise.reject(new Error(JSON.stringify(errors)));
     }
 
-    if (rootData && (rootData.userErrors || rootData.warnings)) {
+    if (rootData && (rootData.userErrors.length || rootData.warnings.length)) {
       const checkoutUserErrors = checkoutUserErrorsMapper(rootData.userErrors, rootData.warnings);
 
-      return Promise.reject(new Error(JSON.stringify(checkoutUserErrors)));
+      return Promise.reject(checkoutUserErrors);
     }
 
     return Promise.reject(new Error(`The ${mutationRootKey} mutation failed due to an unknown error.`));
diff --git a/test/client-checkout-integration-test.js b/test/client-checkout-integration-test.js
@@ -123,6 +123,36 @@ suite('client-checkout-integration-test', () => {
       });
     });
 
+    test('it rejects the promise if there is an error with the input', () => {
+      const input = {
+        lineItems: [
+          {
+            variantId: 'gid://shopify/ProductVariant/50850334310456',
+            quantity: 99999999
+          },
+          {
+            variantId: 'gid://shopify/ProductVariant/50850336211000',
+            quantity: 1
+          }
+        ]
+      };
+
+      return client.checkout.create(input).catch((error) => {
+        assert.deepStrictEqual(error, [
+          {
+            code: 'INVALID',
+            field: [
+              'input',
+              'lines',
+              '0',
+              'quantity'
+            ],
+            message: 'The quantity for merchandise with id gid://shopify/ProductVariant/50850334310456 must be greater than zero but less than 1000000.'
+          }
+        ]);
+      });
+    });
+
     test('it resolves a localized non-empty checkout created with buyerIdentity.countryCode', () => {
       const input = {
         buyerIdentity: {
@@ -525,5 +555,41 @@ suite('client-checkout-integration-test', () => {
         });
       });
     });
+
+    test('it returns any user errors', () => {
+      const inputWithHtmlTags = {
+        shippingAddress: {
+          address1: '<html>123 Oak St</html>',
+          address2: '<script>Unit 2</script>',
+          city: '<script>Ottawa</script>',
+          company: '<script>Shopify</script>',
+          country: '<script>Canada</script>',
+          firstName: 'John',
+          lastName: 'Doe',
+          phone: '+16135551111',
+          province: 'ON',
+          zip: '123 ABC'
+        }
+      };
+
+      return client.checkout.create({}).then((checkout) => {
+
+        return client.checkout.updateShippingAddress(checkout.id, inputWithHtmlTags.shippingAddress).then((updatedCheckout) => {
+          assert.deepStrictEqual(updatedCheckout.userErrors, [
+            {
+              code: 'INVALID',
+              field: [
+                'buyerIdentity',
+                'deliveryAddressPreferences',
+                '0',
+                'deliveryAddress',
+                'country'
+              ],
+              message: 'invalid value'
+            }
+          ]);
+        });
+      });
+    });
   });
 });
