magento#486: Add customer account validation in Quote operations

vovsky · Jun 14, 2019 · 1bf1312 · 1bf1312
1 parent 8893cb7
commit 1bf1312
Show file tree

Hide file tree

Showing 17 changed files with 23 additions and 128 deletions.
diff --git a/app/code/Magento/CustomerGraphQl/Model/Context/GetCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Context/GetCustomer.php
@@ -57,7 +57,7 @@ public function __construct(
  * Get customer
  *
  * @param int $customerId
- * @return void
+ * @return CustomerInterface
  * @throws GraphQlAuthenticationException
  * @throws GraphQlAuthorizationException
  * @throws GraphQlInputException

diff --git a/app/code/Magento/CustomerGraphQl/Model/Customer/GetCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Customer/GetCustomer.php
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php
@@ -10,7 +10,6 @@
 use Magento\Customer\Api\AccountManagementInterface;
 use Magento\CustomerGraphQl\Model\Customer\CheckCustomerPassword;
 use Magento\CustomerGraphQl\Model\Customer\ExtractCustomerData;
-use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
@@ -23,11 +22,6 @@
  */
 class ChangePassword implements ResolverInterface
 {
- /**
- * @var GetCustomer
- */
- private $getCustomer;
-
  /**
  * @var CheckCustomerPassword
  */
@@ -44,18 +38,15 @@ class ChangePassword implements ResolverInterface
  private $extractCustomerData;
 
  /**
- * @param GetCustomer $getCustomer
  * @param CheckCustomerPassword $checkCustomerPassword
  * @param AccountManagementInterface $accountManagement
  * @param ExtractCustomerData $extractCustomerData
  */
  public function __construct(
- GetCustomer $getCustomer,
  CheckCustomerPassword $checkCustomerPassword,
  AccountManagementInterface $accountManagement,
  ExtractCustomerData $extractCustomerData
  ) {
- $this->getCustomer = $getCustomer;
  $this->checkCustomerPassword = $checkCustomerPassword;
  $this->accountManagement = $accountManagement;
  $this->extractCustomerData = $extractCustomerData;
@@ -71,7 +62,8 @@ public function resolve(
  array $value = null,
  array $args = null
  ) {
- if (true === $context->isGuest()) {
+ $customer = $context->getExtensionAttributes()->getCustomer();
+ if (null === $customer) {
  throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
  }
 
@@ -83,9 +75,7 @@ public function resolve(
  throw new GraphQlInputException(__('Specify the "newPassword" value.'));
  }
 
- $customer = $this->getCustomer->execute($context->getUserId());
  $customerId = (int)$customer->getId();
-
  $this->checkCustomerPassword->execute($args['currentPassword'], $customerId);
 
  try {

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php
@@ -52,7 +52,7 @@ public function resolve(
  array $value = null,
  array $args = null
  ) {
- if (true === $context->isGuest()) {
+ if (null === $context->getExtensionAttributes()->getCustomer()) {
  throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
  }
 

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/Customer.php
@@ -7,7 +7,6 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\CustomerGraphQl\Model\Customer\ExtractCustomerData;
@@ -19,25 +18,17 @@
  */
 class Customer implements ResolverInterface
 {
- /**
- * @var GetCustomer
- */
- private $getCustomer;
-
  /**
  * @var ExtractCustomerData
  */
  private $extractCustomerData;
 
  /**
- * @param GetCustomer $getCustomer
  * @param ExtractCustomerData $extractCustomerData
  */
  public function __construct(
- GetCustomer $getCustomer,
  ExtractCustomerData $extractCustomerData
  ) {
- $this->getCustomer = $getCustomer;
  $this->extractCustomerData = $extractCustomerData;
  }
 
@@ -51,12 +42,11 @@ public function resolve(
  array $value = null,
  array $args = null
  ) {
- if (true === $context->isGuest()) {
+ $customer = $context->getExtensionAttributes()->getCustomer();
+
+ if (null === $customer) {
  throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
  }
-
- $customer = $this->getCustomer->execute($context->getUserId());
-
  return $this->extractCustomerData->execute($customer);
  }
 }
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CustomerAddresses.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CustomerAddresses.php
@@ -44,7 +44,7 @@ public function resolve(
  array $value = null,
  array $args = null
  ) {
- if (true === $context->isGuest()) {
+ if (null === $context->getExtensionAttributes()->getCustomer()) {
  throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
  }
 

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/DeleteCustomerAddress.php
@@ -52,7 +52,7 @@ public function resolve(
  array $value = null,
  array $args = null
  ) {
- if (true === $context->isGuest()) {
+ if (null === $context->getExtensionAttributes()->getCustomer()) {
  throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
  }
 

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php
@@ -7,8 +7,8 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\Framework\Exception\LocalizedException;
+use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
@@ -43,7 +43,7 @@ public function resolve(
  array $value = null,
  array $args = null
  ) {
- if (true === $context->isGuest()) {
+ if (null === $context->getExtensionAttributes()->getCustomer()) {
  throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
  }
 

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/RevokeCustomerToken.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/RevokeCustomerToken.php
@@ -42,7 +42,7 @@ public function resolve(
  array $value = null,
  array $args = null
  ) {
- if (true === $context->isGuest()) {
+ if (null === $context->getExtensionAttributes()->getCustomer()) {
  throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
  }
 

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomer.php
@@ -7,7 +7,6 @@
 
 namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\CustomerGraphQl\Model\Customer\UpdateCustomerAccount;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
@@ -21,11 +20,6 @@
  */
 class UpdateCustomer implements ResolverInterface
 {
- /**
- * @var GetCustomer
- */
- private $getCustomer;
-
  /**
  * @var UpdateCustomerAccount
  */
@@ -37,16 +31,13 @@ class UpdateCustomer implements ResolverInterface
  private $extractCustomerData;
 
  /**
- * @param GetCustomer $getCustomer
  * @param UpdateCustomerAccount $updateCustomerAccount
  * @param ExtractCustomerData $extractCustomerData
  */
  public function __construct(
- GetCustomer $getCustomer,
  UpdateCustomerAccount $updateCustomerAccount,
  ExtractCustomerData $extractCustomerData
  ) {
- $this->getCustomer = $getCustomer;
  $this->updateCustomerAccount = $updateCustomerAccount;
  $this->extractCustomerData = $extractCustomerData;
  }
@@ -61,15 +52,15 @@ public function resolve(
  array $value = null,
  array $args = null
  ) {
- if (true === $context->isGuest()) {
+ $customer = $context->getExtensionAttributes()->getCustomer();
+ if (null === $customer) {
  throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
  }
 
  if (!isset($args['input']) || !is_array($args['input']) || empty($args['input'])) {
  throw new GraphQlInputException(__('"input" value should be specified'));
  }
 
- $customer = $this->getCustomer->execute($context->getUserId());
  $this->updateCustomerAccount->execute($customer, $args['input']);
 
  $data = $this->extractCustomerData->execute($customer);

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
@@ -61,7 +61,7 @@ public function resolve(
  array $value = null,
  array $args = null
  ) {
- if (true === $context->isGuest()) {
+ if (null === $context->getExtensionAttributes()->getCustomer()) {
  throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
  }
 

diff --git a/app/code/Magento/DownloadableGraphQl/Model/Resolver/CustomerDownloadableProducts.php b/app/code/Magento/DownloadableGraphQl/Model/Resolver/CustomerDownloadableProducts.php
@@ -54,7 +54,7 @@ public function resolve(
  array $value = null,
  array $args = null
  ) {
- if (true === $context->isGuest()) {
+ if (null === $context->getExtensionAttributes()->getCustomer()) {
  throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
  }
 

diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
@@ -7,7 +7,6 @@
 
 namespace Magento\QuoteGraphQl\Model\Cart;
 
-use Magento\CustomerGraphQl\Model\Customer\GetCustomer;
 use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Exception\GraphQlInputException;
 use Magento\Framework\GraphQl\Exception\GraphQlNoSuchEntityException;
@@ -24,28 +23,20 @@ class SetBillingAddressOnCart
  */
  private $quoteAddressFactory;
 
- /**
- * @var GetCustomer
- */
- private $getCustomer;
-
  /**
  * @var AssignBillingAddressToCart
  */
  private $assignBillingAddressToCart;
 
  /**
  * @param QuoteAddressFactory $quoteAddressFactory
- * @param GetCustomer $getCustomer
  * @param AssignBillingAddressToCart $assignBillingAddressToCart
  */
  public function __construct(
  QuoteAddressFactory $quoteAddressFactory,
- GetCustomer $getCustomer,
  AssignBillingAddressToCart $assignBillingAddressToCart
  ) {
  $this->quoteAddressFactory = $quoteAddressFactory;
- $this->getCustomer = $getCustomer;
  $this->assignBillingAddressToCart = $assignBillingAddressToCart;
  }
 
@@ -89,10 +80,10 @@ public function execute(ContextInterface $context, CartInterface $cart, array $b
  if (null === $customerAddressId) {
  $billingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
  } else {
- if (true === $context->isGuest()) {
+ $customer = $context->getExtensionAttributes()->getCustomer();
+ if (null === $customer) {
  throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
  }
- $customer = $this->getCustomer->execute($context->getUserId());
  $billingAddress = $this->quoteAddressFactory->createBasedOnCustomerAddress(
  (int)$customerAddressId,
  (int)$customer->getId()