Merge pull request #20 from FriendsOfFlarum/im/middleware

Refactor middleware registration
FriendsOfFlarum · May 4, 2020 · 2613510 · 2613510
2 parents f5fdec3 + 43dda32
commit 2613510
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/extend.php b/extend.php
@@ -3,6 +3,7 @@
 namespace FoF\Terms;
 
 use Flarum\Extend;
+use FoF\Terms\Middlewares\RegisterMiddleware;
 use Illuminate\Contracts\Events\Dispatcher;
 
 return [
@@ -61,4 +62,6 @@ function (Dispatcher $events) {
         $events->subscribe(Access\PolicyPolicy::class);
         $events->subscribe(Access\UserPolicy::class);
     },
+
+    (new Extend\Middleware('forum'))->add(RegisterMiddleware::class),
 ];
diff --git a/src/Extenders/UserRegistration.php b/src/Extenders/UserRegistration.php
@@ -2,11 +2,9 @@
 
 namespace FoF\Terms\Extenders;
 
-use Flarum\Event\ConfigureMiddleware;
 use Flarum\Extend\ExtenderInterface;
 use Flarum\Extension\Extension;
 use Flarum\User\Event\Registered;
-use FoF\Terms\Middlewares\RegisterMiddleware;
 use FoF\Terms\Repositories\PolicyRepository;
 use Illuminate\Contracts\Container\Container;
 
@@ -15,7 +13,6 @@ class UserRegistration implements ExtenderInterface
     public function extend(Container $container, Extension $extension = null)
     {
         $container['events']->listen(Registered::class, [$this, 'registered']);
-        $container['events']->listen(ConfigureMiddleware::class, [$this, 'middlewares']);
     }
 
     public function registered(Registered $event)
@@ -27,9 +24,4 @@ public function registered(Registered $event)
 
         $policies->acceptAll($event->user);
     }
-
-    public function middlewares(ConfigureMiddleware $middleware)
-    {
-        $middleware->pipe->pipe(app(RegisterMiddleware::class));
-    }
 }