OXDEV-9078 Cleanup unused code

Author: Sieg

src/Authentication/TwoFactorAuth/DTO/NewUser.php

@@ -9,45 +9,19 @@
 
 namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\DTO;
 
-use DateTimeInterface;
-
 class User implements UserInterface
 {
     public function __construct(
-        private readonly string $userId,
-        private readonly string $email,
-        private readonly int $attempts,
-        private readonly ?string $code,
-        private readonly ?DateTimeInterface $expiresAt,
-        private readonly ?DateTimeInterface $lastSentAt
+        private string $userId,
+        private string $email,
     ) {
     }
 
-    public function getId(): string
+    public function getUserId(): string
     {
         return $this->userId;
     }
 
-    public function getCode(): ?string
-    {
-        return $this->code;
-    }
-
-    public function getAttempts(): int
-    {
-        return $this->attempts;
-    }
-
-    public function getExpiresAt(): ?DateTimeInterface
-    {
-        return $this->expiresAt;
-    }
-
-    public function getLastSentAt(): ?DateTimeInterface
-    {
-        return $this->lastSentAt;
-    }
-
     public function getEmail(): string
     {
         return $this->email;

src/Authentication/TwoFactorAuth/DTO/NewUserInterface.php

@@ -5,21 +5,13 @@
  * See LICENSE file for license details.
  */
 
-namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\DTO;
+declare(strict_types=1);
 
-use DateTimeInterface;
+namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\DTO;
 
 interface UserInterface
 {
-    public function getId(): string;
-
-    public function getCode(): ?string;
-
-    public function getAttempts(): int;
-
-    public function getExpiresAt(): ?DateTimeInterface;
-
-    public function getLastSentAt(): ?DateTimeInterface;
+    public function getUserId(): string;
 
     public function getEmail(): string;
 }

src/Authentication/TwoFactorAuth/DTO/User.php

@@ -10,14 +10,14 @@
 namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory;
 
 use OxidEsales\Eshop\Application\Model\User;
-use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\DTO\NewUser;
-use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\DTO\NewUserInterface;
+use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\DTO\User as UserDto;
+use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\DTO\UserInterface;
 
-class NewUserFactory implements NewUserFactoryInterface
+class UserFactory implements UserFactoryInterface
 {
-    public function createFromModel(User $userModel): NewUserInterface
+    public function createFromModel(User $userModel): UserInterface
     {
-        return new NewUser(
+        return new UserDto(
             userId: $userModel->getId(),
             email: $userModel->getFieldData('oxusername'),
         );

src/Authentication/TwoFactorAuth/DTO/UserInterface.php

@@ -10,9 +10,9 @@
 namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory;
 
 use OxidEsales\Eshop\Application\Model\User;
-use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\DTO\NewUserInterface;
+use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\DTO\UserInterface;
 
-interface NewUserFactoryInterface
+interface UserFactoryInterface
 {
-    public function createFromModel(User $userModel): NewUserInterface;
+    public function createFromModel(User $userModel): UserInterface;
 }

src/Authentication/TwoFactorAuth/Exception/VerificatorNotFoundException.php

@@ -6,8 +6,8 @@ services:
   OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory\UserModelFactoryInterface:
     class: OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory\UserModelFactory
 
-  OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory\NewUserFactoryInterface:
-    class: OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory\NewUserFactory
+  OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory\UserFactoryInterface:
+    class: OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory\UserFactory
 
   OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory\EmailFactoryInterface:
     class: OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory\EmailFactory