Fix customer route compability with AccountInterface

opengento · Aug 24, 2024 · 7bb6f02 · 7bb6f02
1 parent 79040b7
commit 7bb6f02
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 33 deletions.
diff --git a/Api/Data/EraseEntityInterface.php b/Api/Data/EraseEntityInterface.php
@@ -47,14 +47,7 @@ public function setEraseId(int $eraseId): EraseEntityInterface;
 
     public function getEntityId(): int;
 
-    /**
-     * Set the entity ID
-     *
-     * @param int $entityId
-     * @return EraseEntityInterface
-     * @todo force type in php7.4
-     */
-    public function setEntityId($entityId): EraseEntityInterface;
+    public function setEntityId(int $entityId): EraseEntityInterface;
 
     public function getEntityType(): string;
 

diff --git a/Api/Data/ExportEntityInterface.php b/Api/Data/ExportEntityInterface.php
@@ -30,14 +30,7 @@ public function setExportId(int $exportId): ExportEntityInterface;
 
     public function getEntityId(): int;
 
-    /**
-     * Set the entity ID
-     *
-     * @param int $entityId
-     * @return ExportEntityInterface
-     * @todo force type in php7.4
-     */
-    public function setEntityId($entityId): ExportEntityInterface;
+    public function setEntityId(int $entityId): ExportEntityInterface;
 
     public function getEntityType(): string;
 

diff --git a/Controller/AbstractAction.php b/Controller/AbstractAction.php
@@ -26,7 +26,7 @@ public function __construct(
         protected Config $config
     ) {}
 
-    public function execute(): ResultInterface|ResponseInterface
+    public function execute()
     {
         return $this->isAllowed() ? $this->executeAction() : $this->forwardNoRoute();
     }

diff --git a/Model/Customer/Anonymize/Processor/CustomerDataProcessor.php b/Model/Customer/Anonymize/Processor/CustomerDataProcessor.php
@@ -7,7 +7,6 @@
 
 namespace Opengento\Gdpr\Model\Customer\Anonymize\Processor;
 
-use DateTime;
 use Magento\Customer\Api\CustomerRepositoryInterface;
 use Magento\Customer\Api\Data\CustomerInterface;
 use Magento\Customer\Api\SessionCleanerInterface;
@@ -19,21 +18,14 @@
 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\Framework\Math\Random;
 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\Model\Customer\OrigDataRegistry;
 use Opengento\Gdpr\Service\Anonymize\AnonymizerInterface;
 use Opengento\Gdpr\Service\Erase\ProcessorInterface;
-use Random\RandomException;
-
-use function random_int;
-use function sha1;
-use function uniqid;
-
-use const PHP_INT_MAX;
 
 class CustomerDataProcessor implements ProcessorInterface
 {
@@ -47,12 +39,12 @@ public function __construct(
         private CustomerRegistry $customerRegistry,
         private OrigDataRegistry $origDataRegistry,
         private SessionCleanerInterface $sessionCleaner,
-        private ScopeConfigInterface $scopeConfig
+        private ScopeConfigInterface $scopeConfig,
+        private Random $random
     ) {}
 
     /**
      * @throws LocalizedException
-     * @throws RandomException
      */
     public function execute(int $entityId): bool
     {
@@ -72,7 +64,6 @@ public function execute(int $entityId): bool
      * @throws InputMismatchException
      * @throws LocalizedException
      * @throws NoSuchEntityException
-     * @throws RandomException
      */
     private function processCustomerData(int $customerId): void
     {
@@ -100,16 +91,14 @@ private function fetchOrdersList(CustomerInterface $customer): OrderSearchResult
      * @throws NoSuchEntityException
      * @throws InputException
      * @throws InputMismatchException
-     * @throws RandomException
      */
     private function anonymizeCustomer(CustomerInterface $customer): void
     {
         $this->customerRegistry->remove($customer->getId());
 
         $secureData = $this->customerRegistry->retrieveSecureData($customer->getId());
-        $dateTime = (new DateTime())->setTimestamp(PHP_INT_MAX);
-        $secureData->setData('lock_expires', $dateTime->format(DateTimeFormat::DATETIME_PHP_FORMAT));
-        $secureData->setPasswordHash(sha1(uniqid((string)random_int(), true)));
+        $secureData->setData('lock_expires', '9999-12-31 23:59:59');
+        $secureData->setPasswordHash($this->random->getUniqueHash());
 
         $customer = $this->anonymizer->anonymize($customer);
         if ($customer instanceof DataObject) {