Merge pull request #5445 from magento-honey-badgers/honeycombined24

[honey] MC-32270: Cart.applied_gift_cards resolver exception message thrown when removing an item from cart need to be refactored

Author: cpartica

app/code/Magento/PageCache/etc/varnish4.vcl

@@ -108,6 +108,11 @@ sub vcl_recv {
         #unset req.http.Cookie;
     }
 
+     # Authenticated GraphQL requests should not be cached by default
+    if (req.url ~ "/graphql" && req.http.Authorization ~ "^Bearer") {
+        return (pass);
+    }
+
     return (hash);
 }
 

app/code/Magento/PageCache/etc/varnish5.vcl

@@ -109,6 +109,11 @@ sub vcl_recv {
         #unset req.http.Cookie;
     }
 
+    # Authenticated GraphQL requests should not be cached by default
+    if (req.url ~ "/graphql" && req.http.Authorization ~ "^Bearer") {
+        return (pass);
+    }
+
     return (hash);
 }
 

app/code/Magento/PageCache/etc/varnish6.vcl

@@ -109,6 +109,11 @@ sub vcl_recv {
         #unset req.http.Cookie;
     }
 
+    # Authenticated GraphQL requests should not be cached by default
+    if (req.url ~ "/graphql" && req.http.Authorization ~ "^Bearer") {
+        return (pass);
+    }
+
     return (hash);
 }
 

app/code/Magento/Quote/i18n/en_US.csv

@@ -31,6 +31,7 @@ Subtotal,Subtotal
 "Cart %1 does not contain item %2","Cart %1 does not contain item %2"
 "Could not save quote","Could not save quote"
 "Cart %1 doesn't contain item  %2","Cart %1 doesn't contain item  %2"
+"The cart doesn't contain the item","The cart doesn't contain the item"
 "Could not remove item from quote","Could not remove item from quote"
 "The qty value is required to update quote item.","The qty value is required to update quote item."
 "Minimum order amount is %1","Minimum order amount is %1"

app/code/Magento/QuoteGraphQl/Model/Resolver/RemoveItemFromCart.php

@@ -65,7 +65,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         try {
             $this->cartItemRepository->deleteById((int)$cart->getId(), $itemId);
         } catch (NoSuchEntityException $e) {
-            throw new GraphQlNoSuchEntityException(__($e->getMessage()), $e);
+            throw new GraphQlNoSuchEntityException(__('The cart doesn\'t contain the item'));
         } catch (LocalizedException $e) {
             throw new GraphQlInputException(__($e->getMessage()), $e);
         }

app/code/Magento/SendFriendGraphQl/Model/Resolver/SendEmailToFriend.php

@@ -48,8 +48,14 @@ public function __construct(
      */
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
     {
+        $storeId = $context->getExtensionAttributes()->getStore()->getId();
+
+        if (!$this->sendFriendHelper->isEnabled($storeId)) {
+            throw new GraphQlInputException(__('"Email to a Friend" is not enabled.'));
+        }
+
         /** @var ContextInterface $context */
-        if (!$this->sendFriendHelper->isAllowForGuest()
+        if (!$this->sendFriendHelper->isAllowForGuest($storeId)
             && false === $context->getExtensionAttributes()->getIsCustomer()
         ) {
             throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));

app/code/Magento/SendFriendGraphQl/Model/Resolver/SendFriendConfiguration.php

@@ -0,0 +1,46 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\SendFriendGraphQl\Model\Resolver;
+
+use Magento\Framework\GraphQl\Config\Element\Field;
+use Magento\Framework\GraphQl\Query\ResolverInterface;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
+use Magento\SendFriend\Helper\Data as SendFriendHelper;
+
+/**
+ * Resolve Store Config information for SendFriend
+ */
+class SendFriendConfiguration implements ResolverInterface
+{
+    /**
+     * @var SendFriendHelper
+     */
+    private $sendFriendHelper;
+
+    /**
+     * @param SendFriendHelper $sendFriendHelper
+     */
+    public function __construct(SendFriendHelper $sendFriendHelper)
+    {
+        $this->sendFriendHelper = $sendFriendHelper;
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null)
+    {
+        $store = $context->getExtensionAttributes()->getStore();
+        $storeId = $store->getId();
+
+        return [
+            'enabled_for_customers' => $this->sendFriendHelper->isEnabled($storeId),
+            'enabled_for_guests' => $this->sendFriendHelper->isAllowForGuest($storeId)
+        ];
+    }
+}

app/code/Magento/SendFriendGraphQl/etc/schema.graphqls

@@ -37,3 +37,12 @@ type SendEmailToFriendRecipient {
     name: String!
     email: String!
 }
+
+type StoreConfig {
+    send_friend: SendFriendConfiguration @resolver(class: "\\Magento\\SendFriendGraphQl\\Model\\Resolver\\SendFriendConfiguration") @doc(description: "Email to a Friend configuration.")
+}
+
+type SendFriendConfiguration {
+    enabled_for_customers: Boolean! @doc(description: "Indicates whether the Email to a Friend feature is enabled.")
+    enabled_for_guests: Boolean! @doc(description: "Indicates whether the Email to a Friend feature is enabled for guests.")
+}

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Customer/RemoveItemFromCartTest.php

@@ -84,7 +84,7 @@ public function testRemoveNonExistentItem()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $notExistentItemId = 999;
 
-        $this->expectExceptionMessage("Cart doesn't contain the {$notExistentItemId} item.");
+        $this->expectExceptionMessage("The cart doesn't contain the item");
 
         $query = $this->getQuery($maskedQuoteId, $notExistentItemId);
         $this->graphQlMutation($query, [], '', $this->getHeaderMap());
@@ -106,7 +106,7 @@ public function testRemoveItemIfItemIsNotBelongToCart()
             'virtual-product'
         );
 
-        $this->expectExceptionMessage("Cart doesn't contain the {$secondQuoteItemId} item.");
+        $this->expectExceptionMessage("The cart doesn't contain the item");
 
         $query = $this->getQuery($firstQuoteMaskedId, $secondQuoteItemId);
         $this->graphQlMutation($query, [], '', $this->getHeaderMap());

dev/tests/api-functional/testsuite/Magento/GraphQl/Quote/Guest/RemoveItemFromCartTest.php

@@ -74,7 +74,7 @@ public function testRemoveNonExistentItem()
         $maskedQuoteId = $this->getMaskedQuoteIdByReservedOrderId->execute('test_quote');
         $notExistentItemId = 999;
 
-        $this->expectExceptionMessage("Cart doesn't contain the {$notExistentItemId} item.");
+        $this->expectExceptionMessage("The cart doesn't contain the item");
 
         $query = $this->getQuery($maskedQuoteId, $notExistentItemId);
         $this->graphQlMutation($query);
@@ -95,7 +95,7 @@ public function testRemoveItemIfItemIsNotBelongToCart()
             'virtual-product'
         );
 
-        $this->expectExceptionMessage("Cart doesn't contain the {$secondQuoteItemId} item.");
+        $this->expectExceptionMessage("The cart doesn't contain the item");
 
         $query = $this->getQuery($firstQuoteMaskedId, $secondQuoteItemId);
         $this->graphQlMutation($query);