GraphQL-39: Manage Shipping methods on Cart

Author: Valeriy Nayda

app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressOnCart.php

@@ -7,9 +7,8 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
-use Magento\Authorization\Model\UserContextInterface;
 use Magento\Customer\Api\Data\AddressInterface;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
+use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Quote\Api\Data\CartInterface;
@@ -37,19 +36,27 @@ class SetShippingAddressOnCart implements SetShippingAddressesOnCartInterface
      */
     private $addressModel;
 
+    /**
+     * @var CheckCustomerAccount
+     */
+    private $checkCustomerAccount;
+
     /**
      * @param ShippingAddressManagementInterface $shippingAddressManagement
      * @param AddressRepositoryInterface $addressRepository
      * @param Address $addressModel
+     * @param CheckCustomerAccount $checkCustomerAccount
      */
     public function __construct(
         ShippingAddressManagementInterface $shippingAddressManagement,
         AddressRepositoryInterface $addressRepository,
-        Address $addressModel
+        Address $addressModel,
+        CheckCustomerAccount $checkCustomerAccount
     ) {
         $this->shippingAddressManagement = $shippingAddressManagement;
         $this->addressRepository = $addressRepository;
         $this->addressModel = $addressModel;
+        $this->checkCustomerAccount = $checkCustomerAccount;
     }
 
     /**
@@ -66,7 +73,7 @@ public function execute(ContextInterface $context, CartInterface $cart, array $s
         $customerAddressId = $shippingAddress['customer_address_id'] ?? null;
         $addressInput = $shippingAddress['address'] ?? null;
 
-        if (!$customerAddressId && !$addressInput) {
+        if (null === $customerAddressId && null === $addressInput) {
             throw new GraphQlInputException(
                 __('The shipping address must contain either "customer_address_id" or "address".')
             );
@@ -76,19 +83,14 @@ public function execute(ContextInterface $context, CartInterface $cart, array $s
                 __('The shipping address cannot contain "customer_address_id" and "address" at the same time.')
             );
         }
-        if ($customerAddressId) {
-            if ((!$context->getUserId()) || $context->getUserType() == UserContextInterface::USER_TYPE_GUEST) {
-                throw new GraphQlAuthorizationException(
-                    __(
-                        'Guest users cannot manage addresses.'
-                    )
-                );
-            }
+        if (null === $customerAddressId) {
+            $shippingAddress = $this->addressModel->addData($addressInput);
+        } else {
+            $this->checkCustomerAccount->execute($context->getUserId(), $context->getUserType());
+
             /** @var AddressInterface $customerAddress */
             $customerAddress = $this->addressRepository->getById($customerAddressId);
             $shippingAddress = $this->addressModel->importCustomerAddressData($customerAddress);
-        } else {
-            $shippingAddress = $this->addressModel->addData($addressInput);
         }
 
         $this->shippingAddressManagement->assign($cart->getId(), $shippingAddress);

app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCartInterface.php

@@ -15,11 +15,10 @@
  * Extension point for setting shipping addresses for a specified shopping cart
  *
  * All objects that are responsible for setting shipping addresses on a cart via GraphQl
- *should implement this interface.
+ * should implement this interface.
  */
 interface SetShippingAddressesOnCartInterface
 {
-
     /**
      * Set shipping addresses for a specified shopping cart
      *

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

@@ -93,7 +93,7 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
         return [
             'cart' => [
                 'cart_id' => $maskedCartId,
-                'model' => $cart
+                'model' => $cart,
             ]
         ];
     }

app/code/Magento/QuoteGraphQl/composer.json

@@ -9,8 +9,7 @@
         "magento/module-checkout": "*",
         "magento/module-catalog": "*",
         "magento/module-store": "*",
-        "magento/module-customer": "*",
-        "magento/module-authorization": "*"
+        "magento/module-customer": "*"
     },
     "suggest": {
         "magento/module-graph-ql": "*"

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

@@ -139,7 +139,7 @@ public function testSetSavedShippingAddressOnCartByGuest()
   }
 }
 QUERY;
-        self::expectExceptionMessage('Guest users cannot manage addresses.');
+        self::expectExceptionMessage('The current customer isn\'t authorized.');
         $this->graphQlQuery($query);
     }