From a526877dd9f67431ca4192d47bb5b1aceaa5dcac Mon Sep 17 00:00:00 2001
From: Charlie McMackin <charlie.mac@gmail.com>
Date: Sat, 7 Sep 2024 14:17:13 -0500
Subject: [PATCH] Add hasConfig middleware and use it in GroupController

---
 app/Http/Controllers/GroupController.php |  2 +-
 app/Http/Kernel.php                      |  1 +
 app/Http/Middleware/HasConfig.php        | 22 ++++++++++++++++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)
 create mode 100644 app/Http/Middleware/HasConfig.php

diff --git a/app/Http/Controllers/GroupController.php b/app/Http/Controllers/GroupController.php
index 881d31f01..43bf121d7 100644
--- a/app/Http/Controllers/GroupController.php
+++ b/app/Http/Controllers/GroupController.php
@@ -27,7 +27,7 @@ class GroupController extends GroupFederationController
     public function __construct()
     {
         $this->middleware('auth');
-        abort_unless(config('groups.enabled'), 404);
+        $this->middleware('hasConfig:groups.enabled');
     }
 
     public function index(Request $request)
diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index 4ec8832e8..2721c72d4 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -71,6 +71,7 @@ class Kernel extends HttpKernel
         'interstitial'  => \App\Http\Middleware\AccountInterstitial::class,
         'scopes'        => \Laravel\Passport\Http\Middleware\CheckScopes::class,
         'scope'         => \Laravel\Passport\Http\Middleware\CheckForAnyScope::class,
+        'hasConfig'     => \App\Http\Middleware\HasConfig::class,
         // 'restricted'    => \App\Http\Middleware\RestrictedAccess::class,
     ];
 }
diff --git a/app/Http/Middleware/HasConfig.php b/app/Http/Middleware/HasConfig.php
new file mode 100644
index 000000000..5db9d18ff
--- /dev/null
+++ b/app/Http/Middleware/HasConfig.php
@@ -0,0 +1,22 @@
+<?php
+
+namespace App\Http\Middleware;
+
+use Closure;
+use Illuminate\Http\Request;
+use Symfony\Component\HttpFoundation\Response;
+
+class HasConfig
+{
+    /**
+     * Handle an incoming request.
+     *
+     * @param  \Closure(\Illuminate\Http\Request): (\Symfony\Component\HttpFoundation\Response)  $next
+     */
+    public function handle(Request $request, Closure $next, string $config): Response
+    {
+        abort_unless(config($config), 404);
+
+        return $next($request);
+    }
+}