middlewareの定義のテスト修正およびより効率的なmiddleware登録メソッドへの変更

baserproject · Oct 5, 2023 · 3bc8d85 · 3bc8d85
1 parent e9276f7
commit 3bc8d85
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/plugins/baser-core/src/Plugin.php b/plugins/baser-core/src/Plugin.php
@@ -279,8 +279,8 @@ function loadPlugin(PluginApplicationInterface $application, $plugin, $priority)
     public function middleware(MiddlewareQueue $middlewareQueue): MiddlewareQueue
     {
         $middlewareQueue
+            ->prepend(new BcRequestFilterMiddleware())
             ->insertBefore(CsrfProtectionMiddleware::class, new AuthenticationMiddleware($this))
-            ->insertBefore(AuthenticationMiddleware::class, new BcRequestFilterMiddleware($this))
             ->add(new BcAdminMiddleware())
             ->add(new BcFrontMiddleware())
             ->add(new BcRedirectSubSiteFilter());

diff --git a/plugins/baser-core/tests/TestCase/PluginTest.php b/plugins/baser-core/tests/TestCase/PluginTest.php
@@ -16,12 +16,12 @@
 use BaserCore\Service\SiteConfigsServiceInterface;
 use BaserCore\TestSuite\BcTestCase;
 use BaserCore\Utility\BcUtil;
+use BaserCore\Middleware\BcRequestFilterMiddleware;
 use Cake\Core\Configure;
 use Cake\Core\Container;
 use Cake\Event\EventManager;
 use Cake\Http\Middleware\CsrfProtectionMiddleware;
 use Cake\Http\MiddlewareQueue;
-use Authentication\Middleware\AuthenticationMiddleware;
 use Cake\Routing\Router;
 use Cake\Filesystem\File;
 
@@ -176,7 +176,8 @@ public function testMiddleware(): void
         $middleware = new MiddlewareQueue();
         $middleware->add(CsrfProtectionMiddleware::class);
         $middlewareQueue = $this->Plugin->middleware($middleware);
-        $this->assertInstanceOf(AuthenticationMiddleware::class, $middlewareQueue->current());
+        $this->assertInstanceOf(BcRequestFilterMiddleware::class, $middlewareQueue->current());
+        $this->assertEquals(6, $middlewareQueue->count());
     }
 
     /**