Merge branch 'magento2.4.x'

Author: thomas-kl1

Model/Customer/Anonymize/Processor/CustomerDataProcessor.php

@@ -7,20 +7,27 @@
 
 namespace Opengento\Gdpr\Model\Customer\Anonymize\Processor;
 
+use DateTime;
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\SessionCleanerInterface;
 use Magento\Customer\Model\CustomerRegistry;
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\App\Config\ScopeConfigInterface;
 use Magento\Framework\Exception\InputException;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Framework\Exception\State\InputMismatchException;
+use Magento\Framework\Stdlib\DateTime as DateTimeFormat;
 use Magento\Sales\Api\Data\OrderInterface;
 use Magento\Sales\Api\Data\OrderSearchResultInterface;
 use Magento\Sales\Api\OrderRepositoryInterface;
 use Magento\Store\Model\ScopeInterface;
 use Opengento\Gdpr\Service\Anonymize\AnonymizerInterface;
 use Opengento\Gdpr\Service\Erase\ProcessorInterface;
+use function mt_rand;
+use function sha1;
+use function uniqid;
+use const PHP_INT_MAX;
 
 final class CustomerDataProcessor implements ProcessorInterface
 {
@@ -51,6 +58,11 @@ final class CustomerDataProcessor implements ProcessorInterface
      */
     private $customerRegistry;
 
+    /**
+     * @var SessionCleanerInterface
+     */
+    private $sessionCleaner;
+
     /**
      * @var ScopeConfigInterface
      */
@@ -62,13 +74,15 @@ public function __construct(
         OrderRepositoryInterface $orderRepository,
         SearchCriteriaBuilder $criteriaBuilder,
         CustomerRegistry $customerRegistry,
+        SessionCleanerInterface $sessionCleaner,
         ScopeConfigInterface $scopeConfig
     ) {
         $this->anonymizer = $anonymizer;
         $this->customerRepository = $customerRepository;
         $this->orderRepository = $orderRepository;
         $this->criteriaBuilder = $criteriaBuilder;
         $this->customerRegistry = $customerRegistry;
+        $this->sessionCleaner = $sessionCleaner;
         $this->scopeConfig = $scopeConfig;
     }
 
@@ -91,6 +105,8 @@ public function execute(int $customerId): bool
             return false;
         }
 
+        $this->sessionCleaner->clearFor($customerId);
+
         return true;
     }
 
@@ -111,6 +127,12 @@ private function fetchOrdersList(int $customerId): OrderSearchResultInterface
     private function anonymizeCustomer(int $customerId): void
     {
         $this->customerRegistry->remove($customerId);
+
+        $secureData = $this->customerRegistry->retrieveSecureData($customerId);
+        $dateTime = (new DateTime())->setTimestamp(PHP_INT_MAX);
+        $secureData->setData('lock_expires', $dateTime->format(DateTimeFormat::DATETIME_PHP_FORMAT));
+        $secureData->setPasswordHash(sha1(uniqid(mt_rand(), true)));
+
         $this->customerRepository->save(
             $this->anonymizer->anonymize($this->customerRepository->getById($customerId))
         );

Model/Customer/Delete/Processor/CustomerDataProcessor.php

@@ -8,6 +8,7 @@
 namespace Opengento\Gdpr\Model\Customer\Delete\Processor;
 
 use Magento\Customer\Api\CustomerRepositoryInterface;
+use Magento\Customer\Api\SessionCleanerInterface;
 use Magento\Framework\Exception\LocalizedException;
 use Magento\Framework\Exception\NoSuchEntityException;
 use Opengento\Gdpr\Service\Erase\ProcessorInterface;
@@ -19,10 +20,17 @@ final class CustomerDataProcessor implements ProcessorInterface
      */
     private $customerRepository;
 
+    /**
+     * @var SessionCleanerInterface
+     */
+    private $sessionCleaner;
+
     public function __construct(
-        CustomerRepositoryInterface $customerRepository
+        CustomerRepositoryInterface $customerRepository,
+        SessionCleanerInterface $sessionCleaner
     ) {
         $this->customerRepository = $customerRepository;
+        $this->sessionCleaner = $sessionCleaner;
     }
 
     /**
@@ -31,6 +39,8 @@ public function __construct(
      */
     public function execute(int $customerId): bool
     {
+        $this->sessionCleaner->clearFor($customerId);
+
         try {
             $this->customerRepository->deleteById($customerId);
         } catch (NoSuchEntityException $e) {

Plugin/SessionChecker.php

@@ -78,7 +78,4 @@
             <argument name="action" xsi:type="object">Opengento\Gdpr\Model\Action\ExportCreateAction</argument>
         </arguments>
     </type>
-    <type name="Magento\Framework\App\ActionInterface">
-        <plugin name="opengento_gdpr_customer_session_checker" type="Opengento\Gdpr\Plugin\SessionChecker" sortOrder="10"/>
-    </type>
 </config>