OXDEV-9927 Move classes to infrastructure

NikolaIvanovski · NikolaIvanovski · commit b1451510bc48 · 2025-12-03T16:48:44.000+02:00
diff --git a/src/Authentication/TwoFactorAuth/DTO/User.php b/src/Authentication/TwoFactorAuth/DTO/User.php
diff --git a/src/Authentication/TwoFactorAuth/DTO/UserInterface.php b/src/Authentication/TwoFactorAuth/DTO/UserInterface.php
diff --git a/src/Authentication/TwoFactorAuth/Infrastructure/Factory/UserFactory.php b/src/Authentication/TwoFactorAuth/Infrastructure/Factory/UserFactory.php
@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure;
+namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory;
 
 use OxidEsales\Eshop\Application\Model\User;
 
diff --git a/src/Authentication/TwoFactorAuth/Infrastructure/Factory/UserFactoryInterface.php b/src/Authentication/TwoFactorAuth/Infrastructure/Factory/UserFactoryInterface.php
@@ -5,7 +5,7 @@
  * See LICENSE file for license details.
  */
 
-namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure;
+namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory;
 
 use OxidEsales\Eshop\Application\Model\User;
 
diff --git a/src/Authentication/TwoFactorAuth/Infrastructure/Factory/services.yaml b/src/Authentication/TwoFactorAuth/Infrastructure/Factory/services.yaml
@@ -0,0 +1,7 @@
+services:
+  _defaults:
+    autowire: true
+    public: false
+
+  OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory\UserFactoryInterface:
+    class: OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory\UserFactory
diff --git a/src/Authentication/TwoFactorAuth/Infrastructure/Repository/UserRepository.php b/src/Authentication/TwoFactorAuth/Infrastructure/Repository/UserRepository.php
@@ -7,12 +7,9 @@
 
 declare(strict_types=1);
 
-namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Repository;
+namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Repository;
 
-use OxidEsales\Eshop\Application\Model\User as UserModel;
-use OxidEsales\SecurityModule\Authentication\OAuth2\DataObject\UserInterface;
-use OxidEsales\SecurityModule\Authentication\OAuth2\Exception\UserNotFoundException;
-use OxidEsales\SecurityModule\Authentication\OAuth2\Infrastructure\UserFactoryInterface;
+use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Factory\UserFactoryInterface;
 
 class UserRepository implements UserRepositoryInterface
 {
diff --git a/src/Authentication/TwoFactorAuth/Infrastructure/Repository/UserRepositoryInterface.php b/src/Authentication/TwoFactorAuth/Infrastructure/Repository/UserRepositoryInterface.php
@@ -5,9 +5,7 @@
  * See LICENSE file for license details.
  */
 
-namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Repository;
-
-use OxidEsales\SecurityModule\Authentication\OAuth2\DataObject\UserInterface;
+namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Repository;
 
 interface UserRepositoryInterface
 {
diff --git a/src/Authentication/TwoFactorAuth/Infrastructure/Repository/services.yaml b/src/Authentication/TwoFactorAuth/Infrastructure/Repository/services.yaml
@@ -0,0 +1,7 @@
+services:
+  _defaults:
+    autowire: true
+    public: false
+
+  OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Repository\UserRepositoryInterface:
+    class: OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Repository\UserRepository
diff --git a/src/Authentication/TwoFactorAuth/Infrastructure/services.yaml b/src/Authentication/TwoFactorAuth/Infrastructure/services.yaml
@@ -0,0 +1,3 @@
+imports:
+  - { resource: Factory/services.yaml }
+  - { resource: Repository/services.yaml }
diff --git a/src/Authentication/TwoFactorAuth/Service/AuthorizeService.php b/src/Authentication/TwoFactorAuth/Service/AuthorizeService.php
@@ -9,7 +9,7 @@
 
 namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Service;
 
-class AuthorizeService
+class AuthorizeService implements AuthorizeServiceInterface
 {
     public function validate()
     {
diff --git a/src/Authentication/TwoFactorAuth/Service/AuthorizeServiceInterface.php b/src/Authentication/TwoFactorAuth/Service/AuthorizeServiceInterface.php
@@ -0,0 +1,7 @@
+<?php
+
+namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Service;
+
+interface AuthorizeServiceInterface
+{
+}
diff --git a/src/Authentication/TwoFactorAuth/Service/ModuleSettingsServiceInterface.php b/src/Authentication/TwoFactorAuth/Service/ModuleSettingsServiceInterface.php
@@ -7,8 +7,6 @@
 
 namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Service;
 
-use Symfony\Component\String\UnicodeString;
-
 interface ModuleSettingsServiceInterface
 {
     public function isTwoFactorAuthEnabled(): bool;
diff --git a/src/Authentication/TwoFactorAuth/Service/Provider/OTP/Generator/OTPGenerator.php b/src/Authentication/TwoFactorAuth/Service/Provider/OTP/Generator/OTPGenerator.php
@@ -4,8 +4,7 @@
 
 use OxidEsales\Eshop\Application\Model\User as UserModel;
 use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\DTO\User;
-use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Repository\UserRepositoryInterface;
-use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Service\Provider\OTP\Validator\OTPValidatorInterface;
+use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Repository\UserRepositoryInterface;
 
 readonly class OTPGenerator implements OTPGeneratorInterface
 {
diff --git a/src/Authentication/TwoFactorAuth/Service/Provider/OTP/Generator/OTPGeneratorInterface.php b/src/Authentication/TwoFactorAuth/Service/Provider/OTP/Generator/OTPGeneratorInterface.php
@@ -7,5 +7,5 @@
 
 interface OTPGeneratorInterface
 {
-    public function generate(UserModel $user): User;
+    public function generateCode(UserModel $user): User;
 }
diff --git a/src/Authentication/TwoFactorAuth/Service/Provider/OTP/Service/OTPService.php b/src/Authentication/TwoFactorAuth/Service/Provider/OTP/Service/OTPService.php
@@ -11,9 +11,8 @@
 
 use OxidEsales\Eshop\Application\Model\User as UserModel;
 use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\DTO\User;
-use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Repository\UserRepositoryInterface;
+use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Repository\UserRepositoryInterface;
 use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Service\Provider\OTP\Validator\OTPValidatorInterface;
-use DateTimeImmutable;
 
 readonly class OTPService implements OTPServiceInterface
 {
diff --git a/src/Authentication/TwoFactorAuth/Service/Provider/OTP/Service/OTPServiceInterface.php b/src/Authentication/TwoFactorAuth/Service/Provider/OTP/Service/OTPServiceInterface.php
@@ -11,5 +11,5 @@
 
 interface OTPServiceInterface
 {
-    public function validateCode(UserModel $user, string $code): void;
+    public function validateCode(UserModel $user, string $inputCode): void;
 }
diff --git a/src/Authentication/TwoFactorAuth/Service/Provider/services.yaml b/src/Authentication/TwoFactorAuth/Service/Provider/services.yaml
@@ -1,8 +1,2 @@
 imports:
   - { resource: OTP/services.yaml }
-
-services:
-  _defaults:
-    public: false
-    autowire: true
-
diff --git a/src/Authentication/TwoFactorAuth/Service/services.yaml b/src/Authentication/TwoFactorAuth/Service/services.yaml
@@ -8,6 +8,8 @@ services:
 
   OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Service\ModuleSettingsServiceInterface:
     class: OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Service\ModuleSettingsService
+    public: true
 
   OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Service\AuthorizeServiceInterface:
     class: OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Service\AuthorizeService
+    public: true
diff --git a/src/Authentication/TwoFactorAuth/services.yaml b/src/Authentication/TwoFactorAuth/services.yaml
@@ -1,2 +1,3 @@
 imports:
+  - { resource: Infrastructure/services.yaml }
   - { resource: Service/services.yaml }
diff --git a/src/Shared/Model/User.php b/src/Shared/Model/User.php
@@ -17,7 +17,8 @@
 use OxidEsales\SecurityModule\Captcha\Captcha\HoneyPot\Exception\CaptchaValidateException as HoneyPotCaptchaException;
 use OxidEsales\SecurityModule\Captcha\Service\CaptchaServiceInterface;
 use OxidEsales\SecurityModule\Captcha\Service\ModuleSettingsServiceInterface as CaptchaSettingsServiceInterface;
-use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Service\ModuleSettingsServiceInterface as TwoFASettingsServiceInterface;
+use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Service\ModuleSettingsServiceInterface
+    as TwoFASettingsServiceInterface;
 use OxidEsales\SecurityModule\Shared\Core\InputValidator;
 
 /**
diff --git a/tests/Unit/Authentication/TwoFactorAuth/Service/Provider/OTP/Service/OTPServiceTest.php b/tests/Unit/Authentication/TwoFactorAuth/Service/Provider/OTP/Service/OTPServiceTest.php
@@ -13,6 +13,7 @@
 use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Exception\AttemptLimitExceededException;
 use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Exception\InvalidCodeException;
 use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Exception\TimeExpiredException;
+use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Repository\UserRepositoryInterface;
 use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Service\Provider\OTP\Service\OTPService;
 use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Service\Provider\OTP\Service\OTPServiceInterface;
 use OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Service\Provider\OTP\Validator\OTPValidatorInterface;
@@ -97,10 +98,12 @@ public function testAttemptsCode(): void
     }
 
     public function getSut(
-        OTPValidatorInterface $otpValidator = null
+        OTPValidatorInterface $otpValidator = null,
+        UserRepositoryInterface $userRepository = null
     ): OTPServiceInterface {
         return new OTPService(
-            otpValidator: $otpValidator ?? $this->createMock(OTPValidatorInterface::class)
+            otpValidator: $otpValidator ?? $this->createStub(OTPValidatorInterface::class),
+            userRepository: $userRepository ?? $this->createStub(UserRepositoryInterface::class),
         );
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -5,9 +5,7 @@`
`5`	`5`	`* See LICENSE file for license details.`
`6`	`6`	`*/`
`7`	`7`
`8`		`-namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Repository;`
`9`		`-`
`10`		`-use OxidEsales\SecurityModule\Authentication\OAuth2\DataObject\UserInterface;`
	`8`	`+namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Infrastructure\Repository;`
`11`	`9`
`12`	`10`	`interface UserRepositoryInterface`
`13`	`11`	`{`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+imports:`
	`2`	`+ - { resource: Factory/services.yaml }`
	`3`	`+ - { resource: Repository/services.yaml }`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@`
`9`	`9`
`10`	`10`	`namespace OxidEsales\SecurityModule\Authentication\TwoFactorAuth\Service;`
`11`	`11`
`12`		`-class AuthorizeService`
	`12`	`+class AuthorizeService implements AuthorizeServiceInterface`
`13`	`13`	`{`
`14`	`14`	`public function validate()`
`15`	`15`	`{`