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

-- fixes after merge with mainline
magento · Oct 9, 2018 · a1c4d33 · a1c4d33
1 parent 706af91
commit a1c4d33
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 31 deletions.
diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/ChangePassword.php
@@ -79,9 +79,9 @@ public function resolve(
 
  $currentUserId = $context->getUserId();
  $currentUserType = $context->getUserType();
- $currentUserId = (int)$currentUserId;
-
  $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
+
+ $currentUserId = (int)$currentUserId;
  $this->checkCustomerPassword->execute($args['currentPassword'], $currentUserId);
 
  $this->accountManagement->changePasswordById($currentUserId, $args['currentPassword'], $args['newPassword']);

diff --git a/app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php b/app/code/Magento/CustomerGraphQl/Model/Resolver/IsSubscribed.php
@@ -55,7 +55,7 @@ public function resolve(
 
  $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
 
- $status = $this->subscriberFactory->create()->loadByCustomerId($currentUserId)->isSubscribed();
+ $status = $this->subscriberFactory->create()->loadByCustomerId((int)$currentUserId)->isSubscribed();
  return (bool)$status;
  }
 }
diff --git a/.../Customer/Account/RevokeCustomerToken.php → ...Ql/Model/Resolver/RevokeCustomerToken.php b/.../Customer/Account/RevokeCustomerToken.php → ...Ql/Model/Resolver/RevokeCustomerToken.php
@@ -5,11 +5,10 @@
  */
 declare(strict_types=1);
 
-namespace Magento\CustomerGraphQl\Model\Resolver\Customer\Account;
+namespace Magento\CustomerGraphQl\Model\Resolver;
 
-use Magento\Authorization\Model\UserContextInterface;
+use Magento\CustomerGraphQl\Model\Customer\CheckCustomerAccount;
 use Magento\Framework\GraphQl\Config\Element\Field;
-use Magento\Framework\GraphQl\Exception\GraphQlAuthorizationException;
 use Magento\Framework\GraphQl\Query\ResolverInterface;
 use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Integration\Api\CustomerTokenServiceInterface;
@@ -20,24 +19,24 @@
 class RevokeCustomerToken implements ResolverInterface
 {
  /**
- * @var UserContextInterface
+ * @var CheckCustomerAccount
  */
- private $userContext;
+ private $checkCustomerAccount;
 
  /**
  * @var CustomerTokenServiceInterface
  */
  private $customerTokenService;
 
  /**
- * @param UserContextInterface $userContext
+ * @param CheckCustomerAccount $checkCustomerAccount
  * @param CustomerTokenServiceInterface $customerTokenService
  */
  public function __construct(
- UserContextInterface $userContext,
+ CheckCustomerAccount $checkCustomerAccount,
  CustomerTokenServiceInterface $customerTokenService
  ) {
- $this->userContext = $userContext;
+ $this->checkCustomerAccount = $checkCustomerAccount;
  $this->customerTokenService = $customerTokenService;
  }
 
@@ -51,17 +50,11 @@ public function resolve(
  array $value = null,
  array $args = null
  ) {
- $customerId = (int)$this->userContext->getUserId();
+ $currentUserId = $context->getUserId();
+ $currentUserType = $context->getUserType();
 
- if ($customerId === 0) {
- throw new GraphQlAuthorizationException(
- __(
- 'Current customer does not have access to the resource "%1"',
- [\Magento\Customer\Model\Customer::ENTITY]
- )
- );
- }
+ $this->checkCustomerAccount->execute($currentUserId, $currentUserType);
 
- return $this->customerTokenService->revokeCustomerAccessToken($customerId);
+ return $this->customerTokenService->revokeCustomerAccessToken((int)$currentUserId);
  }
 }
diff --git a/app/code/Magento/CustomerGraphQl/etc/schema.graphqls b/app/code/Magento/CustomerGraphQl/etc/schema.graphqls
@@ -9,7 +9,7 @@ type Mutation {
  generateCustomerToken(email: String!, password: String!): CustomerToken @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\GenerateCustomerToken") @doc(description:"Retrieve Customer token")
  changeCustomerPassword(currentPassword: String!, newPassword: String!): Customer @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\ChangePassword") @doc(description:"Changes password for logged in customer")
  updateCustomer (input: UpdateCustomerInput): UpdateCustomerOutput @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\UpdateCustomer") @doc(description:"Update customer personal information")
- revokeCustomerToken: Boolean @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\Customer\\Account\\RevokeCustomerToken") @doc(description:"Revoke Customer token")
+ revokeCustomerToken: Boolean @resolver(class: "\\Magento\\CustomerGraphQl\\Model\\Resolver\\RevokeCustomerToken") @doc(description:"Revoke Customer token")
 }
 
 type CustomerToken {

diff --git a/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/RevokeCustomerTokenTest.php b/dev/tests/api-functional/testsuite/Magento/GraphQl/Customer/RevokeCustomerTokenTest.php
@@ -7,6 +7,7 @@
 
 namespace Magento\GraphQl\Customer;
 
+use Magento\Integration\Api\CustomerTokenServiceInterface;
 use Magento\TestFramework\ObjectManager;
 use Magento\TestFramework\TestCase\GraphQlAbstract;
 
@@ -16,7 +17,6 @@
 class RevokeCustomerTokenTest extends GraphQlAbstract
 {
  /**
- * Verify customers with valid credentials
  * @magentoApiDataFixture Magento/Customer/_files/customer.php
  */
  public function testRevokeCustomerTokenValidCredentials()
@@ -30,8 +30,7 @@ public function testRevokeCustomerTokenValidCredentials()
  $userName = 'customer@example.com';
  $password = 'password';
  /** @var CustomerTokenServiceInterface $customerTokenService */
- $customerTokenService = ObjectManager::getInstance()
- ->get(\Magento\Integration\Api\CustomerTokenServiceInterface::class);
+ $customerTokenService = ObjectManager::getInstance()->get(CustomerTokenServiceInterface::class);
  $customerToken = $customerTokenService->createCustomerAccessToken($userName, $password);
 
  $headerMap = ['Authorization' => 'Bearer ' . $customerToken];
@@ -40,7 +39,8 @@ public function testRevokeCustomerTokenValidCredentials()
  }
 
  /**
- * Verify guest customers
+ * @expectedException \Exception
+ * @expectedExceptionMessage The current customer isn't authorized.
  */
  public function testRevokeCustomerTokenForGuestCustomer()
  {
@@ -49,11 +49,6 @@ public function testRevokeCustomerTokenForGuestCustomer()
  revokeCustomerToken
  }
 QUERY;
- $this->expectException(\Exception::class);
- $this->expectExceptionMessage(
- 'GraphQL response contains errors: Current customer' . ' ' .
- 'does not have access to the resource "customer"'
- );
  $this->graphQlQuery($query, [], '');
  }
 }