forked from magento/magento2
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '2.4-develop' into kishore/fix-28198
- Loading branch information
Showing
9 changed files
with
665 additions
and
3 deletions.
There are no files selected for viewing
116 changes: 116 additions & 0 deletions
116
app/code/Magento/CustomerGraphQl/Model/Resolver/RequestPasswordResetEmail.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| declare(strict_types=1); | ||
|
|
||
| namespace Magento\CustomerGraphQl\Model\Resolver; | ||
|
|
||
| use Magento\Customer\Api\AccountManagementInterface; | ||
| use Magento\Customer\Api\CustomerRepositoryInterface; | ||
| use Magento\Customer\Model\AccountManagement; | ||
| use Magento\Customer\Model\AuthenticationInterface; | ||
| use Magento\Framework\Exception\LocalizedException; | ||
| 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\Resolver\Value; | ||
| use Magento\Framework\GraphQl\Query\ResolverInterface; | ||
| use Magento\Framework\GraphQl\Schema\Type\ResolveInfo; | ||
| use Magento\Framework\Validator\EmailAddress as EmailValidator; | ||
|
|
||
| /** | ||
| * Class Resolver for RequestPasswordResetEmail | ||
| */ | ||
| class RequestPasswordResetEmail implements ResolverInterface | ||
| { | ||
| /** | ||
| * @var AuthenticationInterface | ||
| */ | ||
| private $authentication; | ||
|
|
||
| /** | ||
| * @var CustomerRepositoryInterface | ||
| */ | ||
| private $customerRepository; | ||
|
|
||
| /** | ||
| * @var AccountManagementInterface | ||
| */ | ||
| private $customerAccountManagement; | ||
|
|
||
| /** | ||
| * @var EmailValidator | ||
| */ | ||
| private $emailValidator; | ||
|
|
||
| /** | ||
| * RequestPasswordResetEmail constructor. | ||
| * | ||
| * @param AuthenticationInterface $authentication | ||
| * @param CustomerRepositoryInterface $customerRepository | ||
| * @param AccountManagementInterface $customerAccountManagement | ||
| * @param EmailValidator $emailValidator | ||
| */ | ||
| public function __construct( | ||
| AuthenticationInterface $authentication, | ||
| CustomerRepositoryInterface $customerRepository, | ||
| AccountManagementInterface $customerAccountManagement, | ||
| EmailValidator $emailValidator | ||
| ) { | ||
| $this->authentication = $authentication; | ||
| $this->customerRepository = $customerRepository; | ||
| $this->customerAccountManagement = $customerAccountManagement; | ||
| $this->emailValidator = $emailValidator; | ||
| } | ||
|
|
||
| /** | ||
| * Send password email request | ||
| * | ||
| * @param Field $field | ||
| * @param ContextInterface $context | ||
| * @param ResolveInfo $info | ||
| * @param array|null $value | ||
| * @param array|null $args | ||
| * | ||
| * @return bool|Value|mixed | ||
| * | ||
| * @throws GraphQlInputException | ||
| * @SuppressWarnings(PHPMD.UnusedFormalParameter) | ||
| */ | ||
| public function resolve( | ||
| Field $field, | ||
| $context, | ||
| ResolveInfo $info, | ||
| array $value = null, | ||
| array $args = null | ||
| ) { | ||
| if (empty($args['email'])) { | ||
| throw new GraphQlInputException(__('You must specify an email address.')); | ||
| } | ||
|
|
||
| if (!$this->emailValidator->isValid($args['email'])) { | ||
| throw new GraphQlInputException(__('The email address has an invalid format.')); | ||
| } | ||
|
|
||
| try { | ||
| $customer = $this->customerRepository->get($args['email']); | ||
| } catch (LocalizedException $e) { | ||
| throw new GraphQlInputException(__('Cannot reset the customer\'s password'), $e); | ||
| } | ||
|
|
||
| if (true === $this->authentication->isLocked($customer->getId())) { | ||
| throw new GraphQlInputException(__('The account is locked')); | ||
| } | ||
|
|
||
| try { | ||
| return $this->customerAccountManagement->initiatePasswordReset( | ||
| $args['email'], | ||
| AccountManagement::EMAIL_RESET | ||
| ); | ||
| } catch (LocalizedException $e) { | ||
| throw new GraphQlInputException(__('Cannot reset the customer\'s password'), $e); | ||
| } | ||
| } | ||
| } |
124 changes: 124 additions & 0 deletions
124
app/code/Magento/CustomerGraphQl/Model/Resolver/ResetPassword.php
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,124 @@ | ||
| <?php | ||
| /** | ||
| * Copyright © Magento, Inc. All rights reserved. | ||
| * See COPYING.txt for license details. | ||
| */ | ||
| declare(strict_types=1); | ||
|
|
||
| namespace Magento\CustomerGraphQl\Model\Resolver; | ||
|
|
||
| use Magento\Customer\Api\AccountManagementInterface; | ||
| use Magento\Customer\Api\CustomerRepositoryInterface; | ||
| use Magento\Customer\Model\AuthenticationInterface; | ||
| use Magento\Framework\Exception\LocalizedException; | ||
| 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\Resolver\Value; | ||
| use Magento\Framework\GraphQl\Query\ResolverInterface; | ||
| use Magento\Framework\GraphQl\Schema\Type\ResolveInfo; | ||
| use Magento\Framework\Validator\EmailAddress as EmailValidator; | ||
|
|
||
| /** | ||
| * Class Resolver for ResetPassword | ||
| */ | ||
| class ResetPassword implements ResolverInterface | ||
| { | ||
| /** | ||
| * @var AccountManagementInterface | ||
| */ | ||
| private $customerAccountManagement; | ||
|
|
||
| /** | ||
| * @var EmailValidator | ||
| */ | ||
| private $emailValidator; | ||
|
|
||
| /** | ||
| * @var AuthenticationInterface | ||
| */ | ||
| private $authentication; | ||
|
|
||
| /** | ||
| * @var CustomerRepositoryInterface | ||
| */ | ||
| private $customerRepository; | ||
|
|
||
| /** | ||
| * ResetPassword constructor. | ||
| * | ||
| * @param AuthenticationInterface $authentication | ||
| * @param CustomerRepositoryInterface $customerRepository | ||
| * @param AccountManagementInterface $customerAccountManagement | ||
| * @param EmailValidator $emailValidator | ||
| */ | ||
| public function __construct( | ||
| AuthenticationInterface $authentication, | ||
| CustomerRepositoryInterface $customerRepository, | ||
| AccountManagementInterface $customerAccountManagement, | ||
| EmailValidator $emailValidator | ||
| ) { | ||
| $this->authentication = $authentication; | ||
| $this->customerRepository = $customerRepository; | ||
| $this->customerAccountManagement = $customerAccountManagement; | ||
| $this->emailValidator = $emailValidator; | ||
| } | ||
|
|
||
| /** | ||
| * Reset old password and set new | ||
| * | ||
| * @param Field $field | ||
| * @param ContextInterface $context | ||
| * @param ResolveInfo $info | ||
| * @param array|null $value | ||
| * @param array|null $args | ||
| * | ||
| * @return bool|Value|mixed | ||
| * | ||
| * @throws GraphQlInputException | ||
| * @SuppressWarnings(PHPMD.UnusedFormalParameter) | ||
| */ | ||
| public function resolve( | ||
| Field $field, | ||
| $context, | ||
| ResolveInfo $info, | ||
| array $value = null, | ||
| array $args = null | ||
| ) { | ||
| if (empty($args['email'])) { | ||
| throw new GraphQlInputException(__('You must specify an email address.')); | ||
| } | ||
|
|
||
| if (!$this->emailValidator->isValid($args['email'])) { | ||
| throw new GraphQlInputException(__('The email address has an invalid format.')); | ||
| } | ||
|
|
||
| if (empty($args['resetPasswordToken'])) { | ||
| throw new GraphQlInputException(__('resetPasswordToken must be specified')); | ||
| } | ||
|
|
||
| if (empty($args['newPassword'])) { | ||
| throw new GraphQlInputException(__('newPassword must be specified')); | ||
| } | ||
|
|
||
| try { | ||
| $customer = $this->customerRepository->get($args['email']); | ||
| } catch (LocalizedException $e) { | ||
| throw new GraphQlInputException(__('Cannot set the customer\'s password'), $e); | ||
| } | ||
|
|
||
| if (true === $this->authentication->isLocked($customer->getId())) { | ||
| throw new GraphQlInputException(__('The account is locked')); | ||
| } | ||
|
|
||
| try { | ||
| return $this->customerAccountManagement->resetPassword( | ||
| $args['email'], | ||
| $args['resetPasswordToken'], | ||
| $args['newPassword'] | ||
| ); | ||
| } catch (LocalizedException $e) { | ||
| throw new GraphQlInputException(__('Cannot set the customer\'s password'), $e); | ||
| } | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.