Move security middleware to core module

pi-engine · Nov 10, 2024 · 72366c8 · 72366c8
1 parent e857736
commit 72366c8
Show file tree

Hide file tree

Showing 8 changed files with 70 additions and 252 deletions.
diff --git a/config/module.config.php b/config/module.config.php
diff --git a/src/Factory/Middleware/AuthenticationMiddlewareFactory.php b/src/Factory/Middleware/AuthenticationMiddlewareFactory.php
@@ -2,8 +2,8 @@
 
 namespace User\Factory\Middleware;
 
-use Core\Security\Account\AccountLocked;
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\Core\Security\Account\AccountLocked;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;

diff --git a/src/Factory/Middleware/AvatarUploadMiddlewareFactory.php b/src/Factory/Middleware/AvatarUploadMiddlewareFactory.php
@@ -3,14 +3,14 @@
 namespace User\Factory\Middleware;
 
 use Laminas\ServiceManager\Factory\FactoryInterface;
+use Pi\Core\Middleware\SecurityMiddleware;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\StreamFactoryInterface;
 use User\Handler\ErrorHandler;
 use User\Middleware\AvatarUploadMiddleware;
-use User\Middleware\SecurityMiddleware;
 use User\Service\AccountService;
 use User\Service\AvatarService;
 

diff --git a/src/Factory/Middleware/SecurityMiddlewareFactory.php b/src/Factory/Middleware/SecurityMiddlewareFactory.php
diff --git a/src/Factory/Service/AccountServiceFactory.php b/src/Factory/Service/AccountServiceFactory.php
@@ -2,10 +2,10 @@
 
 namespace User\Factory\Service;
 
-use Core\Security\Account\AccountLocked;
-use Core\Security\Account\AccountLoginAttempts;
 use Laminas\ServiceManager\Factory\FactoryInterface;
 use Notification\Service\NotificationService;
+use Pi\Core\Security\Account\AccountLocked;
+use Pi\Core\Security\Account\AccountLoginAttempts;
 use Psr\Container\ContainerExceptionInterface;
 use Psr\Container\ContainerInterface;
 use Psr\Container\NotFoundExceptionInterface;

diff --git a/src/Middleware/AuthenticationMiddleware.php b/src/Middleware/AuthenticationMiddleware.php
@@ -2,8 +2,8 @@
 
 namespace User\Middleware;
 
-use Core\Security\Account\AccountLocked;
 use Fig\Http\Message\StatusCodeInterface;
+use Pi\Core\Security\Account\AccountLocked;
 use Psr\Http\Message\ResponseFactoryInterface;
 use Psr\Http\Message\ResponseInterface;
 use Psr\Http\Message\ServerRequestInterface;

diff --git a/src/Middleware/SecurityMiddleware.php b/src/Middleware/SecurityMiddleware.php
diff --git a/src/Service/AccountService.php b/src/Service/AccountService.php
@@ -2,11 +2,11 @@
 
 namespace User\Service;
 
-use Core\Security\Account\AccountLocked;
-use Core\Security\Account\AccountLoginAttempts;
 use Fig\Http\Message\StatusCodeInterface;
 use Laminas\Math\Rand;
 use Notification\Service\NotificationService;
+use Pi\Core\Security\Account\AccountLocked;
+use Pi\Core\Security\Account\AccountLoginAttempts;
 use RobThree\Auth\Algorithm;
 use RobThree\Auth\Providers\Qr\EndroidQrCodeProvider;
 use RobThree\Auth\TwoFactorAuth;