Merge remote-tracking branch 'origin/ACP2E-4191' into PR_2025_09_15_muntianu

Author: katmoon

app/code/Magento/Customer/Model/Session.php

@@ -108,8 +108,11 @@ class Session extends \Magento\Framework\Session\SessionManager
     private $accountConfirmation;
 
     /**
-     * Session constructor.
-     *
+     * @var CustomerRegistry
+     */
+    private $customerRegistry;
+
+    /**
      * @param \Magento\Framework\App\Request\Http $request
      * @param \Magento\Framework\Session\SidResolverInterface $sidResolver
      * @param \Magento\Framework\Session\Config\ConfigInterface $sessionConfig
@@ -132,6 +135,7 @@ class Session extends \Magento\Framework\Session\SessionManager
      * @param GroupManagementInterface $groupManagement
      * @param \Magento\Framework\App\Response\Http $response
      * @param AccountConfirmation $accountConfirmation
+     * @param CustomerRegistry|null $customerRegistry
      * @throws \Magento\Framework\Exception\SessionException
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
@@ -157,7 +161,8 @@ public function __construct(
         CustomerRepositoryInterface $customerRepository,
         GroupManagementInterface $groupManagement,
         \Magento\Framework\App\Response\Http $response,
-        ?AccountConfirmation $accountConfirmation = null
+        ?AccountConfirmation $accountConfirmation = null,
+        ?CustomerRegistry $customerRegistry = null,
     ) {
         $this->_coreUrl = $coreUrl;
         $this->_customerUrl = $customerUrl;
@@ -173,6 +178,9 @@ public function __construct(
         $this->response = $response;
         $this->accountConfirmation = $accountConfirmation ?: ObjectManager::getInstance()
             ->get(AccountConfirmation::class);
+        $this->customerRegistry = $customerRegistry ?: ObjectManager::getInstance()
+            ->get(CustomerRegistry::class);
+
         parent::__construct(
             $request,
             $sidResolver,
@@ -429,7 +437,7 @@ public function checkCustomerId($customerId)
         }
 
         try {
-            $this->customerRepository->getById($customerId);
+            $this->customerRegistry->retrieve($customerId);
             $this->_isCustomerIdChecked = $customerId;
             return true;
         } catch (\Exception $e) {

app/code/Magento/Customer/Test/Unit/Model/SessionTest.php

@@ -12,12 +12,14 @@
 use Magento\Customer\Model\Context as CustomerContext;
 use Magento\Customer\Model\Customer;
 use Magento\Customer\Model\CustomerFactory;
+use Magento\Customer\Model\CustomerRegistry;
 use Magento\Customer\Model\ResourceModel\Customer as ResourceCustomer;
 use Magento\Customer\Model\Session;
 use Magento\Customer\Model\Session\Storage;
 use Magento\Framework\App\Http\Context;
 use Magento\Framework\App\Response\Http;
 use Magento\Framework\Event\ManagerInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Session\SessionStartChecker;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper;
 use Magento\Framework\Url;
@@ -70,6 +72,11 @@ class SessionTest extends TestCase
      */
     protected $responseMock;
 
+    /**
+     * @var CustomerRegistry|MockObject
+     */
+    private $customerRegistryMock;
+
     /**
      * @var Session
      */
@@ -105,6 +112,7 @@ protected function setUp(): void
         ];
         $helper->prepareObjectManager($objects);
         $this->responseMock = $this->createMock(Http::class);
+        $this->customerRegistryMock = $this->createMock(CustomerRegistry::class);
         $this->_model = $helper->getObject(
             Session::class,
             [
@@ -115,7 +123,8 @@ protected function setUp(): void
                 'urlFactory' => $this->urlFactoryMock,
                 'customerRepository' => $this->customerRepositoryMock,
                 'response' => $this->responseMock,
-                '_customerResource' => $this->_customerResourceMock
+                '_customerResource' => $this->_customerResourceMock,
+                'customerRegistry' => $this->customerRegistryMock,
             ]
         );
     }
@@ -342,4 +351,27 @@ public function testSetCustomer(): void
 
         $this->_model->setCustomer($customer);
     }
+
+    public function testCheckCustomerId(): void
+    {
+        $customerId = 123;
+        $customer = $this->createMock(Customer::class);
+        $this->customerRegistryMock->expects($this->once())
+            ->method('retrieve')
+            ->with($customerId)
+            ->willReturn($customer);
+        $result = $this->_model->checkCustomerId($customerId);
+        $this->assertTrue($result);
+    }
+
+    public function testCheckCustomerIdInvalid(): void
+    {
+        $customerId = 123;
+        $this->customerRegistryMock->expects($this->once())
+            ->method('retrieve')
+            ->with($customerId)
+            ->willThrowException(new NoSuchEntityException());
+        $result = $this->_model->checkCustomerId($customerId);
+        $this->assertFalse($result);
+    }
 }

dev/tests/integration/testsuite/Magento/Customer/Model/SessionTest.php

@@ -1,16 +1,18 @@
 <?php
 /**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
 namespace Magento\Customer\Model;
 
+use Magento\Eav\Model\Cache\Type as EavCacheType;
 use Magento\Framework\App\PageCache\FormKey;
 use Magento\Framework\App\Response\Http as HttpResponse;
 use Magento\Framework\App\ResponseInterface;
 use Magento\Framework\Session\SidResolverInterface;
 use Magento\Framework\Stdlib\Cookie\CookieMetadataFactory;
 use Magento\Framework\Stdlib\Cookie\PublicCookieMetadata;
+use Magento\TestFramework\Fixture\Cache as CacheAlias;
 use Magento\TestFramework\Helper\Bootstrap;
 
 /**
@@ -167,4 +169,13 @@ public function testNoSid(): void
         $this->assertNotEmpty($location);
         $this->assertStringNotContainsString(SidResolverInterface::SESSION_ID_QUERY_PARAM . '=', $location);
     }
+
+    #[
+        CacheAlias(EavCacheType::TYPE_IDENTIFIER, false),
+    ]
+    public function testCheckCustomerId(): void
+    {
+        $result = $this->_customerSession->checkCustomerId(1);
+        $this->assertTrue($result);
+    }
 }