MC-41363: Customer API improvement

Author: OlgaVasyltsun

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

@@ -11,8 +11,8 @@
 use Magento\Framework\Webapi\Rest\Request as RestRequest;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Api\CustomerRepositoryInterface;
-use Magento\Customer\Model\Session;
 use Magento\Framework\App\ObjectManager;
+use Magento\Integration\Model\Oauth\Token;
 
 /**
  * Update customer by id from request param
@@ -25,21 +25,21 @@ class UpdateCustomer
     private $request;
 
     /**
-     * @var Session
+     * @var Token
      */
-    private $session;
+    private $token;
 
     /**
      * @param RestRequest $request
-     * @param Session|null $session
+     * @param Token|null $token
      */
     public function __construct(
         RestRequest $request,
-        Session $session = null
+        Token $token = null
     ) {
         $this->request = $request;
-        $this->session = $session ?: ObjectManager::getInstance()
-            ->get(Session::class);
+        $this->token = $token ?: ObjectManager::getInstance()
+            ->get(Token::class);
     }
 
     /**
@@ -56,9 +56,17 @@ public function beforeSave(
         ?string $passwordHash = null
     ): array {
         $customerId = $this->request->getParam('customerId');
-
-        if ($customerId && $customerId === $this->session->getData('customer_id')) {
-            $customer = $this->getUpdatedCustomer($customerRepository->getById($customerId), $customer);
+        $cookie = $this->request->getHeader('cookie');
+        $headerToken = $this->request->getHeader('Authorization');
+        if ($customerId && !str_contains($cookie, 'PHPSESSID')) {
+            if (str_contains($headerToken, 'Bearer')) {
+                $token = "Bearer " . $this->token->loadByCustomerId($customerId)->getData('token');
+                if ($headerToken === $token) {
+                    $customer = $this->getUpdatedCustomer($customerRepository->getById($customerId), $customer);
+                }
+            } else {
+                $customer = $this->getUpdatedCustomer($customerRepository->getById($customerId), $customer);
+            }
         }
 
         return [$customer, $passwordHash];