#141 Added checking of auth of the request & inited api functional test

Author: Roman Glushko

app/code/Magento/QuoteGraphQl/Model/Resolver/CartItem/CustomizableOptions.php

@@ -8,6 +8,7 @@
 namespace Magento\QuoteGraphQl\Model\Resolver\CartItem;
 
 use Magento\Authorization\Model\UserContextInterface;
+use Magento\Catalog\Api\Data\ProductCustomOptionInterface;
 use Magento\Catalog\Model\Product\Option\Type\DefaultType as DefaultOptionType;
 use Magento\Catalog\Model\Product\Option\Type\Select as SelectOptionType;
 use Magento\Catalog\Model\Product\Option\Type\Text as TextOptionType;
@@ -108,7 +109,7 @@ private function getOptionData($cartItem, int $optionId): array
             ->setConfigurationItem($cartItem)
             ->setConfigurationItemOption($itemOption);
 
-        if ('file' == $option->getType()) {
+        if (ProductCustomOptionInterface::OPTION_GROUP_FILE == $option->getType()) {
             $downloadParams = $cartItem->getFileDownloadParams();
 
             if ($downloadParams) {
@@ -128,7 +129,9 @@ private function getOptionData($cartItem, int $optionId): array
             'label' => $optionTypeGroup->getFormattedOptionValue($itemOption->getValue()),
         ];
 
-        if ('drop_down' == $option->getType()) {
+        if (ProductCustomOptionInterface::OPTION_TYPE_DROP_DOWN == $option->getType()
+            || ProductCustomOptionInterface::OPTION_TYPE_RADIO == $option->getType()
+        ) {
             $optionValue = $option->getValueById($itemOption->getValue());
             $selectedOptionValueData['price'] = [
                 'type' => strtoupper($optionValue->getPriceType()),
@@ -139,7 +142,11 @@ private function getOptionData($cartItem, int $optionId): array
             $selectedOptionValueData = [$selectedOptionValueData];
         }
 
-        if ('field' == $option->getType() || 'date' == $option->getType()) {
+        if (ProductCustomOptionInterface::OPTION_TYPE_FIELD == $option->getType()
+            || ProductCustomOptionInterface::OPTION_TYPE_AREA == $option->getType()
+            || ProductCustomOptionInterface::OPTION_GROUP_DATE == $option->getType()
+            || ProductCustomOptionInterface::OPTION_TYPE_TIME == $option->getType()
+        ) {
             $selectedOptionValueData['price'] = [
                 'type' => strtoupper($option->getPriceType()),
                 'units' => '$',
@@ -149,7 +156,7 @@ private function getOptionData($cartItem, int $optionId): array
             $selectedOptionValueData = [$selectedOptionValueData];
         }
 
-        if ('multiple' == $option->getType()) {
+        if (ProductCustomOptionInterface::OPTION_TYPE_MULTIPLE == $option->getType()) {
             $selectedOptionValueData = [];
             $optionIds = explode(',', $itemOption->getValue());
 

app/code/Magento/SimpleProductGraphQl/Model/Resolver/Cart/AddSimpleProductsToCart.php

@@ -11,6 +11,7 @@
 use Magento\Catalog\Api\ProductRepositoryInterface;
 use Magento\Framework\DataObject;
 use Magento\Framework\DataObjectFactory;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\Resolver\Value;
@@ -19,17 +20,28 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\Message\AbstractMessage;
 use Magento\Framework\Stdlib\ArrayManager;
+use Magento\Quote\Api\CartRepositoryInterface;
 use Magento\Quote\Api\Data\CartInterface;
 use Magento\Quote\Api\GuestCartRepositoryInterface;
+use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
 use Magento\Quote\Model\Quote;
-use Magento\Quote\Model\QuoteRepository;
 use Magento\QuoteGraphQl\Model\Hydrator\CartHydrator;
 
 /**
  * {@inheritdoc}
  */
 class AddSimpleProductsToCart implements ResolverInterface
 {
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $cartRepository;
+
+    /**
+     * @var MaskedQuoteIdToQuoteIdInterface
+     */
+    private $maskedQuoteIdToQuoteId;
+
     /**
      * @var DataObjectFactory
      */
@@ -40,11 +52,6 @@ class AddSimpleProductsToCart implements ResolverInterface
      */
     private $guestCartRepository;
 
-    /**
-     * @var QuoteRepository
-     */
-    private $quoteRepository;
-
     /**
      * @var ProductRepositoryInterface
      */
@@ -74,8 +81,9 @@ class AddSimpleProductsToCart implements ResolverInterface
      * @param DataObjectFactory $dataObjectFactory
      * @param CartHydrator $cartHydrator
      * @param ArrayManager $arrayManager
+     * @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId
+     * @param CartRepositoryInterface $cartRepository
      * @param GuestCartRepositoryInterface $guestCartRepository
-     * @param QuoteRepository $quoteRepository
      * @param ProductRepositoryInterface $productRepository
      * @param ValueFactory $valueFactory
      * @param UserContextInterface $userContext
@@ -84,8 +92,9 @@ public function __construct(
         DataObjectFactory $dataObjectFactory,
         CartHydrator $cartHydrator,
         ArrayManager $arrayManager,
+        MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId,
+        CartRepositoryInterface $cartRepository,
         GuestCartRepositoryInterface $guestCartRepository,
-        QuoteRepository $quoteRepository,
         ProductRepositoryInterface $productRepository,
         ValueFactory $valueFactory,
         UserContextInterface $userContext
@@ -95,20 +104,21 @@ public function __construct(
         $this->arrayManager = $arrayManager;
         $this->productRepository = $productRepository;
         $this->cartHydrator = $cartHydrator;
-        $this->quoteRepository = $quoteRepository;
         $this->guestCartRepository = $guestCartRepository;
         $this->dataObjectFactory = $dataObjectFactory;
+        $this->cartRepository = $cartRepository;
+        $this->maskedQuoteIdToQuoteId = $maskedQuoteIdToQuoteId;
     }
 
     /**
      * {@inheritDoc}
      */
     public function resolve(Field $field, $context, ResolveInfo $info, array $value = null, array $args = null) : Value
     {
-        $cartId = $this->arrayManager->get('input/cart_id', $args);
+        $cartHash = $this->arrayManager->get('input/cart_id', $args);
         $cartItems = $this->arrayManager->get('input/cartItems', $args);
 
-        if (!isset($cartId)) {
+        if (!isset($cartHash)) {
             throw new GraphQlInputException(
                 __('Missing key %1 in cart data', ['cart_id'])
             );
@@ -120,8 +130,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             );
         }
 
-        /** @var CartInterface|Quote $cart */
-        $cart = $this->guestCartRepository->get($cartId);
+        $cart = $this->getCart((string) $cartHash);
 
         foreach ($cartItems as $cartItem) {
             $sku = $this->arrayManager->get('details/sku', $cartItem);
@@ -134,7 +143,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             }
         }
 
-        $this->quoteRepository->save($cart);
+        $this->cartRepository->save($cart);
 
         $result = function () use ($cart) {
             return [
@@ -184,4 +193,21 @@ private function getCartErrors($cart): string
 
         return implode(PHP_EOL, $errorMessages);
     }
+
+    /**
+     * @param string $cartHash
+     * @return CartInterface|Quote
+     * @throws NoSuchEntityException
+     */
+    private function getCart(string $cartHash): CartInterface
+    {
+        $customerId = $this->userContext->getUserId();
+
+        if (!$customerId) {
+            return $this->guestCartRepository->get($cartHash);
+        }
+
+        $cartId = $this->maskedQuoteIdToQuoteId->execute((string) $cartHash);
+        return $this->cartRepository->get($cartId);
+    }
 }