fix: repetitive requests on forum frontend (#11)

* fix: repetitive requests when debugging forum frontend * revert admin check change * feat: add middleware event
FriendsOfFlarum · Jul 11, 2022 · 8c75555 · 8c75555
1 parent 1436b19
commit 8c75555
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/src/Clockwork/FlarumDataSource.php b/src/Clockwork/FlarumDataSource.php
@@ -114,9 +114,11 @@ public function listenToEvents()
     {
         $this->container['events']->listen('clockwork.middleware.start', function () {
             $this->timeline->event('Request processing')->color('purple')->begin();
+            $this->timeline->event('Middleware')->color('yellow')->begin();
         });
 
         $this->container['events']->listen('clockwork.controller.start', function () {
+            $this->timeline->event('Middleware')->end();
             $this->timeline->event('Controller logic')->color('purple')->begin();
         });
 

diff --git a/src/Middleware/ClockworkMiddleware.php b/src/Middleware/ClockworkMiddleware.php
@@ -56,6 +56,8 @@ public function process(ServerRequestInterface $request, RequestHandlerInterface
             $request = $request->withUri($uri->withPath('/api'.$uri->getPath()));
         } elseif ($requestHandler == 'flarum.admin.middleware') {
             $request = $request->withUri($uri->withPath('/admin'.$uri->getPath()));
+        } elseif ($requestHandler == 'flarum.forum.handler') {
+            $request = $request->withUri($uri->withPath('/forum'.$uri->getPath()));
         }
 
         $this->container['clockwork.flarum']

diff --git a/src/Provider/ClockworkServiceProvider.php b/src/Provider/ClockworkServiceProvider.php
@@ -24,6 +24,7 @@
 use FoF\Clockwork\Clockwork\FlarumAuthenticator;
 use FoF\Clockwork\Clockwork\FlarumDataSource;
 use FoF\Clockwork\Middleware\BeforeRouteExecutionMiddleware;
+use FoF\Clockwork\Middleware\ClockworkMiddleware;
 use Illuminate\Support\ServiceProvider;
 
 class ClockworkServiceProvider extends ServiceProvider
@@ -48,6 +49,13 @@ public function boot()
                 return $middleware;
             });
         }
+
+        // Remove the clockwork middleware from API Client handling
+        $this->app->extend('flarum.api_client.exclude_middleware', function (array $exlusions) {
+            $exlusions[] = ClockworkMiddleware::class;
+
+            return $exlusions;
+        });
     }
 
     public function register()