GraphQL-55: [Mutations] My Account > Change account information

magento · Oct 9, 2018 · 661988b · 661988b
1 parent 20e3393
commit 661988b
Show file tree

Hide file tree

Showing 14 changed files with 146 additions and 270 deletions.
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php
@@ -13,7 +13,6 @@
 use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 
@@ -44,8 +43,8 @@ class ChangePassword implements ResolverInterface
 
     /**
      * @param CheckCustomerAccount $checkCustomerAccount
-     * @param CheckCustomerAccount $checkCustomerPassword
-     * @param CheckCustomerPassword $accountManagement
+     * @param CheckCustomerPassword $checkCustomerPassword
+     * @param AccountManagementInterface $accountManagement
      * @param CustomerDataProvider $customerDataProvider
      */
     public function __construct(
@@ -78,7 +77,6 @@ public function resolve(
             throw new GraphQlInputException(__('"newPassword" value should be specified'));
         }
 
-        /** @var ContextInterface $context */
         $currentUserId = $context->getUserId();
         $currentUserType = $context->getUserType();
         $currentUserId = (int)$currentUserId;

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer.php
@@ -11,7 +11,6 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\CustomerGraphQl\Model\Customer\CustomerDataProvider;
 use Magento\Framework\GraphQl\Config\Element\Field;
-use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 
 /**
@@ -51,7 +50,6 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        /** @var ContextInterface $context */
         $currentUserId = $context->getUserId();
         $currentUserType = $context->getUserType();
 

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php
@@ -10,7 +10,6 @@
 use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
-use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Newsletter\Model\SubscriberFactory;
 
@@ -51,7 +50,6 @@ public function resolve(
         array $value = null,
         array $args = null
     ) {
-        /** @var ContextInterface $context */
         $currentUserId = $context->getUserId();
         $currentUserType = $context->getUserType();
 

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php
@@ -14,7 +14,6 @@
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\CustomerGraphQl\Model\Customer\CustomerDataProvider;
 use Magento\Framework\GraphQl\Config\Element\Field;
-use Magento\Framework\GraphQl\Query\Resolver\ContextInterface;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 
 /**
@@ -74,7 +73,6 @@ public function resolve(
             throw new GraphQlInputException(__('"input" value should be specified'));
         }
 
-        /** @var ContextInterface $context */
         $currentUserId = $context->getUserId();
         $currentUserType = $context->getUserType();
 

diff --git a/app/code/Magento/QuoteGraphQl/Model/Authorization/IsCartMutationAllowedForCurrentUser.php b/app/code/Magento/QuoteGraphQl/Model/Authorization/IsCartMutationAllowedForCurrentUser.php
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/AddProductsToCart.php
@@ -7,71 +7,47 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
-use Magento\Framework\Exception\NoSuchEntityException;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
-use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
 use Magento\Framework\Message\AbstractMessage;
 use Magento\Quote\Api\CartRepositoryInterface;
-use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
 use Magento\Quote\Model\Quote;
-use Magento\QuoteGraphQl\Model\Authorization\IsCartMutationAllowedForCurrentUser;
 
 /**
  * Add products to cart
  */
 class AddProductsToCart
 {
-    /**
-     * @var MaskedQuoteIdToQuoteIdInterface
-     */
-    private $maskedQuoteIdToQuoteId;
-
     /**
      * @var CartRepositoryInterface
      */
     private $cartRepository;
 
-    /**
-     * @var IsCartMutationAllowedForCurrentUser
-     */
-    private $isCartMutationAllowedForCurrentUser;
-
     /**
      * @var AddSimpleProductToCart
      */
     private $addProductToCart;
 
     /**
-     * @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId
      * @param CartRepositoryInterface $cartRepository
-     * @param IsCartMutationAllowedForCurrentUser $isCartMutationAllowedForCurrentUser
      * @param AddSimpleProductToCart $addProductToCart
      */
     public function __construct(
-        MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId,
         CartRepositoryInterface $cartRepository,
-        IsCartMutationAllowedForCurrentUser $isCartMutationAllowedForCurrentUser,
         AddSimpleProductToCart $addProductToCart
     ) {
-        $this->maskedQuoteIdToQuoteId = $maskedQuoteIdToQuoteId;
         $this->cartRepository = $cartRepository;
-        $this->isCartMutationAllowedForCurrentUser = $isCartMutationAllowedForCurrentUser;
         $this->addProductToCart = $addProductToCart;
     }
 
     /**
      * Add products to cart
      *
-     * @param string $cartHash
+     * @param Quote $cart
      * @param array $cartItems
-     * @return Quote
      * @throws GraphQlInputException
      */
-    public function execute(string $cartHash, array $cartItems): Quote
+    public function execute(Quote $cart, array $cartItems): void
     {
-        $cart = $this->getCart($cartHash);
-
         foreach ($cartItems as $cartItemData) {
             $this->addProductToCart->execute($cart, $cartItemData);
         }
@@ -83,39 +59,6 @@ public function execute(string $cartHash, array $cartItems): Quote
         }
 
         $this->cartRepository->save($cart);
-        return $cart;
-    }
-
-    /**
-     * Get cart
-     *
-     * @param string $cartHash
-     * @return Quote
-     * @throws GraphQlNoSuchEntityException
-     * @throws GraphQlAuthorizationException
-     */
-    private function getCart(string $cartHash): Quote
-    {
-        try {
-            $cartId = $this->maskedQuoteIdToQuoteId->execute($cartHash);
-            $cart = $this->cartRepository->get($cartId);
-        } catch (NoSuchEntityException $e) {
-            throw new GraphQlNoSuchEntityException(
-                __('Could not find a cart with ID "%masked_cart_id"', ['masked_cart_id' => $cartHash])
-            );
-        }
-
-        if (false === $this->isCartMutationAllowedForCurrentUser->execute($cartId)) {
-            throw new GraphQlAuthorizationException(
-                __(
-                    'The current user cannot perform operations on cart "%masked_cart_id"',
-                    ['masked_cart_id' => $cartHash]
-                )
-            );
-        }
-
-        /** @var Quote $cart */
-        return $cart;
     }
 
     /**

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php b/app/code/Magento/QuoteGraphQl/Model/Cart/GetCartForUser.php
@@ -0,0 +1,89 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\QuoteGraphQl\Model\Cart;
+
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthenticationException;
+use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
+use Magento\Quote\Api\CartRepositoryInterface;
+use Magento\Quote\Model\MaskedQuoteIdToQuoteIdInterface;
+use Magento\Quote\Model\Quote;
+
+/**
+ * Get cart
+ */
+class GetCartForUser
+{
+    /**
+     * @var MaskedQuoteIdToQuoteIdInterface
+     */
+    private $maskedQuoteIdToQuoteId;
+
+    /**
+     * @var CartRepositoryInterface
+     */
+    private $cartRepository;
+
+    /**
+     * @param MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId
+     * @param CartRepositoryInterface $cartRepository
+     */
+    public function __construct(
+        MaskedQuoteIdToQuoteIdInterface $maskedQuoteIdToQuoteId,
+        CartRepositoryInterface $cartRepository
+    ) {
+        $this->maskedQuoteIdToQuoteId = $maskedQuoteIdToQuoteId;
+        $this->cartRepository = $cartRepository;
+    }
+
+    /**
+     * Get cart for user
+     *
+     * @param string $cartHash
+     * @param int|null $userId
+     * @return Quote
+     * @throws GraphQlAuthenticationException
+     * @throws GraphQlNoSuchEntityException
+     */
+    public function execute(string $cartHash, ?int $userId): Quote
+    {
+        try {
+            $cartId = $this->maskedQuoteIdToQuoteId->execute($cartHash);
+        } catch (NoSuchEntityException $exception) {
+            throw new GraphQlNoSuchEntityException(
+                __('Could not find a cart with ID "%masked_cart_id"', ['masked_cart_id' => $cartHash])
+            );
+        }
+
+        try {
+            /** @var Quote $cart */
+            $cart = $this->cartRepository->get($cartId);
+        } catch (NoSuchEntityException $e) {
+            throw new GraphQlNoSuchEntityException(
+                __('Could not find a cart with ID "%masked_cart_id"', ['masked_cart_id' => $cartHash])
+            );
+        }
+
+        $customerId = (int)$cart->getCustomerId();
+
+        /* Guest cart, allow operations */
+        if (!$customerId) {
+            return $cart;
+        }
+
+        if ($customerId !== $userId) {
+            throw new GraphQlAuthenticationException(
+                __(
+                    'The current user cannot perform operations on cart "%masked_cart_id"',
+                    ['masked_cart_id' => $cartHash]
+                )
+            );
+        }
+        return $cart;
+    }
+}
diff --git a/app/code/Magento/QuoteGraphQl/Model/Resolver/AddSimpleProductsToCart.php b/app/code/Magento/QuoteGraphQl/Model/Resolver/AddSimpleProductsToCart.php
@@ -14,6 +14,7 @@
 use Magento\Framework\Stdlib\ArrayManager;
 use Magento\QuoteGraphQl\Model\Cart\AddProductsToCart;
 use Magento\QuoteGraphQl\Model\Cart\ExtractDataFromCart;
+use Magento\QuoteGraphQl\Model\Cart\GetCartForUser;
 
 /**
  * Add simple products to cart GraphQl resolver
@@ -26,6 +27,11 @@ class AddSimpleProductsToCart implements ResolverInterface
      */
     private $arrayManager;
 
+    /**
+     * @var GetCartForUser
+     */
+    private $getCartForUser;
+
     /**
      * @var AddProductsToCart
      */
@@ -38,15 +44,18 @@ class AddSimpleProductsToCart implements ResolverInterface
 
     /**
      * @param ArrayManager $arrayManager
+     * @param GetCartForUser $getCartForUser
      * @param AddProductsToCart $addProductsToCart
      * @param ExtractDataFromCart $extractDataFromCart
      */
     public function __construct(
         ArrayManager $arrayManager,
+        GetCartForUser $getCartForUser,
         AddProductsToCart $addProductsToCart,
         ExtractDataFromCart $extractDataFromCart
     ) {
         $this->arrayManager = $arrayManager;
+        $this->getCartForUser = $getCartForUser;
         $this->addProductsToCart = $addProductsToCart;
         $this->extractDataFromCart = $extractDataFromCart;
     }
@@ -67,7 +76,10 @@ public function resolve(Field $field, $context, ResolveInfo $info, array $value
             throw new GraphQlInputException(__('Missing key "cartItems" in cart data'));
         }
 
-        $cart = $this->addProductsToCart->execute((string)$cartHash, $cartItems);
+        $currentUserId = $context->getUserId();
+        $cart = $this->getCartForUser->execute((string)$cartHash, $currentUserId);
+
+        $this->addProductsToCart->execute($cart, $cartItems);
         $cartData = $this->extractDataFromCart->execute($cart);
 
         return [