From b6b7f3bffd189f7335c3c944759c0da704b34dad Mon Sep 17 00:00:00 2001 From: Awilum Date: Sun, 8 Mar 2020 18:37:21 +0300 Subject: [PATCH] feat(core): decouple AuthMiddleware from core. #406 AuthMiddleware moved from Flextype core to Admin Panel plugin and renamed to AdminPanelAuthMiddleware --- site/plugins/admin/composer.json | 3 ++- .../plugins/admin/middlewares/AdminPanelAuthMiddleware.php | 2 +- site/plugins/admin/routes/web.php | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) rename flextype/middlewares/AuthMiddleware.php => site/plugins/admin/middlewares/AdminPanelAuthMiddleware.php (94%) diff --git a/site/plugins/admin/composer.json b/site/plugins/admin/composer.json index ca43f2ef..fadfe6b3 100755 --- a/site/plugins/admin/composer.json +++ b/site/plugins/admin/composer.json @@ -28,7 +28,8 @@ "autoload": { "classmap": [ "app", - "twig" + "twig", + "middlewares" ] } } diff --git a/flextype/middlewares/AuthMiddleware.php b/site/plugins/admin/middlewares/AdminPanelAuthMiddleware.php similarity index 94% rename from flextype/middlewares/AuthMiddleware.php rename to site/plugins/admin/middlewares/AdminPanelAuthMiddleware.php index 2c329f45..33331607 100644 --- a/flextype/middlewares/AuthMiddleware.php +++ b/site/plugins/admin/middlewares/AdminPanelAuthMiddleware.php @@ -16,7 +16,7 @@ use Psr\Http\Message\ServerRequestInterface as Request; /** * @property Router $router */ -class AuthMiddleware extends Middleware +class AdminPanelAuthMiddleware extends Middleware { /** * __invoke diff --git a/site/plugins/admin/routes/web.php b/site/plugins/admin/routes/web.php index 45a32445..86876f1c 100644 --- a/site/plugins/admin/routes/web.php +++ b/site/plugins/admin/routes/web.php @@ -123,4 +123,4 @@ $app->group('/' . $admin_route, function () use ($app) : void { $app->post('/api/delivery/registry/edit', 'ApiDeliveryRegistryController:editProcess')->setName('admin.api_delivery_registry.editProcess'); $app->post('/api/delivery/registry/delete', 'ApiDeliveryRegistryController:deleteProcess')->setName('admin.api_delivery_registry.deleteProcess'); -})->add(new AuthMiddleware($flextype)); +})->add(new AdminPanelAuthMiddleware($flextype));