magento/graphql-ce#486: Add customer account validation in Quote operations

naydav · naydav · commit 7fc549404f79 · 2019-06-20T15:23:09.000-05:00
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php
@@ -73,7 +73,7 @@ public function resolve(
         array $args = null
     ) {
         /** @var ContextInterface $context */
-        if (false === $context->getExtensionAttributes()->isCustomer()) {
+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
             throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
         }
 
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/CreateCustomerAddress.php
@@ -54,7 +54,7 @@ public function resolve(
         array $args = null
     ) {
         /** @var ContextInterface $context */
-        if (false === $context->getExtensionAttributes()->isCustomer()) {
+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
             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
@@ -53,7 +53,7 @@ public function resolve(
         array $args = null
     ) {
         /** @var ContextInterface $context */
-        if (false === $context->getExtensionAttributes()->isCustomer()) {
+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
             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
@@ -54,7 +54,7 @@ public function resolve(
         array $args = null
     ) {
         /** @var ContextInterface $context */
-        if (false === $context->getExtensionAttributes()->isCustomer()) {
+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
             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
@@ -44,7 +44,7 @@ public function resolve(
         array $args = null
     ) {
         /** @var ContextInterface $context */
-        if (false === $context->getExtensionAttributes()->isCustomer()) {
+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
             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
@@ -62,7 +62,7 @@ public function resolve(
         array $args = null
     ) {
         /** @var ContextInterface $context */
-        if (false === $context->getExtensionAttributes()->isCustomer()) {
+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
             throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
         }
 
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/UpdateCustomerAddress.php
@@ -63,7 +63,7 @@ public function resolve(
         array $args = null
     ) {
         /** @var ContextInterface $context */
-        if (false === $context->getExtensionAttributes()->isCustomer()) {
+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
             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
@@ -55,7 +55,7 @@ public function resolve(
         array $args = null
     ) {
         /** @var ContextInterface $context */
-        if (false === $context->getExtensionAttributes()->isCustomer()) {
+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
             throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
         }
 
diff --git a/app/code/Magento/DownloadableGraphQl/composer.json b/app/code/Magento/DownloadableGraphQl/composer.json
@@ -6,6 +6,7 @@
         "php": "~7.1.3||~7.2.0",
         "magento/module-catalog": "*",
         "magento/module-downloadable": "*",
+        "magento/module-graph-ql": "*",
         "magento/framework": "*"
     },
     "suggest": {
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetBillingAddressOnCart.php
@@ -102,7 +102,7 @@ private function createBillingAddress(
         if (null === $customerAddressId) {
             $billingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
         } else {
-            if (false === $context->getExtensionAttributes()->isCustomer()) {
+            if (false === $context->getExtensionAttributes()->getIsCustomer()) {
                 throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
             }
 
diff --git a/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php b/app/code/Magento/QuoteGraphQl/Model/Cart/SetShippingAddressesOnCart.php
@@ -68,7 +68,7 @@ public function execute(ContextInterface $context, CartInterface $cart, array $s
         if (null === $customerAddressId) {
             $shippingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);
         } else {
-            if (false === $context->getExtensionAttributes()->isCustomer()) {
+            if (false === $context->getExtensionAttributes()->getIsCustomer()) {
                 throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
             }
 
diff --git a/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php b/app/code/Magento/SalesGraphQl/Model/Resolver/Orders.php
@@ -44,7 +44,7 @@ public function resolve(
         array $args = null
     ) {
         /** @var ContextInterface $context */
-        if (false === $context->getExtensionAttributes()->isCustomer()) {
+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
             throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
         }
 
diff --git a/app/code/Magento/VaultGraphQl/Model/Resolver/DeletePaymentToken.php b/app/code/Magento/VaultGraphQl/Model/Resolver/DeletePaymentToken.php
@@ -55,7 +55,7 @@ public function resolve(
         array $args = null
     ) {
         /** @var ContextInterface $context */
-        if (false === $context->getExtensionAttributes()->isCustomer()) {
+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
             throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
         }
 
diff --git a/app/code/Magento/VaultGraphQl/Model/Resolver/PaymentTokens.php b/app/code/Magento/VaultGraphQl/Model/Resolver/PaymentTokens.php
@@ -44,7 +44,7 @@ public function resolve(
         array $args = null
     ) {
         /** @var ContextInterface $context */
-        if (false === $context->getExtensionAttributes()->isCustomer()) {
+        if (false === $context->getExtensionAttributes()->getIsCustomer()) {
             throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));
         }
 
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/ChangeCustomerPasswordTest.php
@@ -193,19 +193,6 @@ private function lockCustomer(int $customerId): void
         $this->customerAuthUpdate->saveAuth($customerId);
     }
 
-    /**
-     * @param int $customerId
-     *
-     * @return void
-     * @throws LocalizedException
-     */
-    private function setCustomerConfirmation(int $customerId): void
-    {
-        $customer = $this->customerRepository->getById($customerId);
-        $customer->setConfirmation('d5a21f15bd4cc21bd1b21ef6d9989a38');
-        $this->customerRepository->save($customer);
-    }
-
     /**
      * @param $currentPassword
      * @param $newPassword
diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/DeleteCustomerAddressTest.php
@@ -224,29 +224,6 @@ public function testDeleteAnotherCustomerAddress()
         $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
     }
 
-    /**
-     * @magentoApiDataFixture Magento/Customer/_files/inactive_customer.php
-     * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php
-     * @magentoApiDataFixture Magento/Customer/_files/customer_confirmation_config_enable.php
-     *
-     * @expectedException Exception
-     * @expectedExceptionMessage The account sign-in was incorrect or your account is disabled temporarily.
-     */
-    public function testDeleteInactiveCustomerAddress()
-    {
-        $userName = 'customer@needAconfirmation.com';
-        $password = 'password';
-        $addressId = 2;
-
-        $mutation
-            = <<<MUTATION
-mutation {
-  deleteCustomerAddress(id: {$addressId})
-}
-MUTATION;
-        $this->graphQlMutation($mutation, [], '', $this->getCustomerAuthHeaders($userName, $password));
-    }
-
     /**
      * @magentoApiDataFixture Magento/Customer/_files/customer.php
      * @magentoApiDataFixture Magento/Customer/_files/customer_two_addresses.php

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function resolve(`
`73`	`73`	`array $args = null`
`74`	`74`	`) {`
`75`	`75`	`/** @var ContextInterface $context */`
`76`		`- if (false === $context->getExtensionAttributes()->isCustomer()) {`
	`76`	`+ if (false === $context->getExtensionAttributes()->getIsCustomer()) {`
`77`	`77`	`throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));`
`78`	`78`	`}`
`79`	`79`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,7 @@ public function resolve(`
`54`	`54`	`array $args = null`
`55`	`55`	`) {`
`56`	`56`	`/** @var ContextInterface $context */`
`57`		`- if (false === $context->getExtensionAttributes()->isCustomer()) {`
	`57`	`+ if (false === $context->getExtensionAttributes()->getIsCustomer()) {`
`58`	`58`	`throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));`
`59`	`59`	`}`
`60`	`60`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ public function resolve(`
`53`	`53`	`array $args = null`
`54`	`54`	`) {`
`55`	`55`	`/** @var ContextInterface $context */`
`56`		`- if (false === $context->getExtensionAttributes()->isCustomer()) {`
	`56`	`+ if (false === $context->getExtensionAttributes()->getIsCustomer()) {`
`57`	`57`	`throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));`
`58`	`58`	`}`
`59`	`59`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public function resolve(`
`44`	`44`	`array $args = null`
`45`	`45`	`) {`
`46`	`46`	`/** @var ContextInterface $context */`
`47`		`- if (false === $context->getExtensionAttributes()->isCustomer()) {`
	`47`	`+ if (false === $context->getExtensionAttributes()->getIsCustomer()) {`
`48`	`48`	`throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));`
`49`	`49`	`}`
`50`	`50`
Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ public function resolve(`
`62`	`62`	`array $args = null`
`63`	`63`	`) {`
`64`	`64`	`/** @var ContextInterface $context */`
`65`		`- if (false === $context->getExtensionAttributes()->isCustomer()) {`
	`65`	`+ if (false === $context->getExtensionAttributes()->getIsCustomer()) {`
`66`	`66`	`throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));`
`67`	`67`	`}`
`68`	`68`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public function resolve(`
`63`	`63`	`array $args = null`
`64`	`64`	`) {`
`65`	`65`	`/** @var ContextInterface $context */`
`66`		`- if (false === $context->getExtensionAttributes()->isCustomer()) {`
	`66`	`+ if (false === $context->getExtensionAttributes()->getIsCustomer()) {`
`67`	`67`	`throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));`
`68`	`68`	`}`
`69`	`69`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function resolve(`
`55`	`55`	`array $args = null`
`56`	`56`	`) {`
`57`	`57`	`/** @var ContextInterface $context */`
`58`		`- if (false === $context->getExtensionAttributes()->isCustomer()) {`
	`58`	`+ if (false === $context->getExtensionAttributes()->getIsCustomer()) {`
`59`	`59`	`throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));`
`60`	`60`	`}`
`61`	`61`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ private function createBillingAddress(`
`102`	`102`	`if (null === $customerAddressId) {`
`103`	`103`	`$billingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);`
`104`	`104`	`} else {`
`105`		`- if (false === $context->getExtensionAttributes()->isCustomer()) {`
	`105`	`+ if (false === $context->getExtensionAttributes()->getIsCustomer()) {`
`106`	`106`	`throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));`
`107`	`107`	`}`
`108`	`108`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ public function execute(ContextInterface $context, CartInterface $cart, array $s`
`68`	`68`	`if (null === $customerAddressId) {`
`69`	`69`	`$shippingAddress = $this->quoteAddressFactory->createBasedOnInputData($addressInput);`
`70`	`70`	`} else {`
`71`		`- if (false === $context->getExtensionAttributes()->isCustomer()) {`
	`71`	`+ if (false === $context->getExtensionAttributes()->getIsCustomer()) {`
`72`	`72`	`throw new GraphQlAuthorizationException(__('The current customer isn\'t authorized.'));`
`73`	`73`	`}`
`74`	`74`