Support for trailing / in urls by producing alternate version and checking the disk for both

refactored simple file checks to use a loop.

Author: benmAltDesign

src/Http/Middleware/CheckForRedirects.php

@@ -18,25 +18,32 @@ class CheckForRedirects
      */
     public function handle(Request $request, Closure $next, string ...$guards): Response
     {
-        //Handle simple redirects
+        // Grab uri, make alternate / permutation
         $uri = $request->getRequestUri();
-        $b64 = base64_encode($uri);
-        $toCheck = hash( 'sha512', $b64);
-
-        if (\Statamic\Facades\File::exists('content/alt-redirect/' . $toCheck . '.yaml')) {
-            $redirect = Yaml::parse(\Statamic\Facades\File::get('content/alt-redirect/' . $toCheck . '.yaml'));
-            if (!($redirect['sites'] ?? false) || (in_array(Site::current(), $redirect['sites']))) {
-                return redirect(($redirect['to'] ?? '/'), $redirect['redirect_type'] ?? 301);
-            }
+        if (str_ends_with($uri, '/')) {
+            $permuURI = substr($uri, 0, strlen($uri) - 1);
+        } else {
+            $permuURI = $uri . '/';
         }
 
-        if (\Statamic\Facades\File::exists('content/alt-redirect/' . $b64 . '.yaml')) {
-            $redirect = Yaml::parse(\Statamic\Facades\File::get('content/alt-redirect/' . $b64 . '.yaml'));
-            if (!($redirect['sites'] ?? false) || (in_array(Site::current(), $redirect['sites']))) {
-                return redirect(($redirect['to'] ?? '/'), $redirect['redirect_type'] ?? 301);
+        //Build all potential versions
+        $possibleSimple = [];
+        $possibleSimple[] = $b64 = base64_encode($uri);
+        $possibleSimple[] = hash( 'sha512', $b64);
+        $possibleSimple[] = $permuB64 = base64_encode($permuURI);
+        $possibleSimple[] = hash( 'sha512', $permuB64);
+
+        //Check potentials
+        foreach($possibleSimple as $simple) {
+            if (\Statamic\Facades\File::exists('content/alt-redirect/' . $simple . '.yaml')) {
+                $redirect = Yaml::parse(\Statamic\Facades\File::get('content/alt-redirect/' . $simple . '.yaml'));
+                if (!($redirect['sites'] ?? false) || (in_array(Site::current(), $redirect['sites']))) {
+                    return redirect(($redirect['to'] ?? '/'), $redirect['redirect_type'] ?? 301);
+                }
             }
         }
 
+        //Regex checks
         $data = new Data('redirect', true);
         foreach ($data->regexData as $redirect) {
             if (preg_match('#' . $redirect['from'] . '#', $uri)) {
@@ -47,6 +54,7 @@ public function handle(Request $request, Closure $next, string ...$guards): Resp
             }
         }
 
+        //No redirect
         return $next($request);
     }
 }