Move middleware logic to dedicated Shield class

Author: ivanvermeyen

src/Middleware/RedirectIfStageFrontIsEnabled.php

@@ -3,52 +3,44 @@
 namespace CodeZero\StageFront\Middleware;
 
 use Closure;
+use CodeZero\StageFront\Shield;
 use Illuminate\Support\Facades\Config;
-use Illuminate\Support\Facades\Session;
 
 class RedirectIfStageFrontIsEnabled
 {
     /**
-     * Handle an incoming request.
+     * Shield instance.
      *
-     * @param \Illuminate\Http\Request $request
-     * @param \Closure $next
+     * @var \CodeZero\StageFront\Shield
+     */
+    protected $shield;
+
+    /**
+     * Create a new RedirectIfStageFrontIsEnabled instance.
      *
-     * @return mixed
+     * @param \CodeZero\StageFront\Shield $shield
      */
-    public function handle($request, Closure $next)
+    public function __construct(Shield $shield)
     {
-        $disabled = ! Config::get('stagefront.enabled', false);
-        $unlocked = Session::get('stagefront.unlocked', false);
-        $stageFrontUrl = Config::get('stagefront.url');
-        $ignoredUrls = Config::get('stagefront.ignore_urls', []);
-        array_push($ignoredUrls, $stageFrontUrl);
-
-        if ($unlocked || $disabled || $this->urlIsIgnored($request, $ignoredUrls)) {
-            return $next($request);
-        }
-
-        return redirect($stageFrontUrl);
+        $this->shield = $shield;
     }
 
     /**
-     * Check if a URL should be ignored.
+     * Handle an incoming request.
      *
      * @param \Illuminate\Http\Request $request
-     * @param array $ignoredUrls
+     * @param \Closure $next
      *
-     * @return bool
+     * @return mixed
      */
-    protected function urlIsIgnored($request, $ignoredUrls)
+    public function handle($request, Closure $next)
     {
-        foreach ($ignoredUrls as $url) {
-            $url = trim($url, '/');
+        $stageFrontUrl = Config::get('stagefront.url');
 
-            if ($request->is($url)) {
-                return true;
-            }
+        if ($this->shield->requiresLogin()) {
+            return redirect($stageFrontUrl);
         }
 
-        return false;
+        return $next($request);
     }
 }

src/Shield.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace CodeZero\StageFront;
+
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Request;
+use Illuminate\Support\Facades\Session;
+
+class Shield
+{
+    /**
+     * Check if StageFront requires the user to log in.
+     *
+     * @return bool
+     */
+    public function requiresLogin()
+    {
+        $enabled = Config::get('stagefront.enabled', false);
+        $unlocked = Session::get('stagefront.unlocked', false);
+
+        return $enabled && ! $unlocked && ! $this->currentUrlIsIgnored();
+    }
+
+    /**
+     * Check if the current URL should be ignored.
+     *
+     * @return bool
+     */
+    protected function currentUrlIsIgnored()
+    {
+        $ignoredUrls = Config::get('stagefront.ignore_urls', []);
+        $ignoredUrls[] = Config::get('stagefront.url');
+
+        foreach ($ignoredUrls as $url) {
+            $url = trim($url, '/');
+
+            if (Request::is($url)) {
+                return true;
+            }
+        }
+
+        return false;
+    }
+}