Skip to content

Commit 96f232d

Browse files
committed
MC-41363: Customer API improvement
1 parent c75cc9b commit 96f232d

File tree

1 file changed

+5
-25
lines changed

1 file changed

+5
-25
lines changed

app/code/Magento/Customer/Model/Plugin/UpdateCustomer.php

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@
1111
use Magento\Framework\Webapi\Rest\Request as RestRequest;
1212
use Magento\Customer\Api\Data\CustomerInterface;
1313
use Magento\Customer\Api\CustomerRepositoryInterface;
14-
use Magento\Framework\App\ObjectManager;
15-
use Magento\Integration\Model\Oauth\Token;
1614

1715
/**
1816
* Update customer by id from request param
@@ -24,22 +22,12 @@ class UpdateCustomer
2422
*/
2523
private $request;
2624

27-
/**
28-
* @var Token
29-
*/
30-
private $token;
31-
3225
/**
3326
* @param RestRequest $request
34-
* @param Token|null $token
3527
*/
36-
public function __construct(
37-
RestRequest $request,
38-
Token $token = null
39-
) {
28+
public function __construct(RestRequest $request)
29+
{
4030
$this->request = $request;
41-
$this->token = $token ?: ObjectManager::getInstance()
42-
->get(Token::class);
4331
}
4432

4533
/**
@@ -56,17 +44,9 @@ public function beforeSave(
5644
?string $passwordHash = null
5745
): array {
5846
$customerId = $this->request->getParam('customerId');
59-
$cookie = $this->request->getHeader('cookie');
60-
$headerToken = $this->request->getHeader('Authorization');
61-
if ($customerId && !str_contains($cookie, 'PHPSESSID')) {
62-
if (str_contains($headerToken, 'Bearer')) {
63-
$token = "Bearer " . $this->token->loadByCustomerId($customerId)->getData('token');
64-
if ($headerToken === $token) {
65-
$customer = $this->getUpdatedCustomer($customerRepository->getById($customerId), $customer);
66-
}
67-
} else {
68-
$customer = $this->getUpdatedCustomer($customerRepository->getById($customerId), $customer);
69-
}
47+
$bodyParams = $this->request->getBodyParams();
48+
if (!isset($bodyParams['customer']['Id']) && $customerId) {
49+
$customer = $this->getUpdatedCustomer($customerRepository->getById($customerId), $customer);
7050
}
7151

7252
return [$customer, $passwordHash];

0 commit comments

Comments
 (0)