Autoload middleware if StageFront is enabled

Author: ivanvermeyen

src/StageFrontServiceProvider.php

@@ -2,6 +2,8 @@
 
 namespace CodeZero\StageFront;
 
+use CodeZero\StageFront\Middleware\RedirectIfStageFrontIsEnabled;
+use Illuminate\Contracts\Http\Kernel;
 use Illuminate\Support\ServiceProvider;
 
 class StageFrontServiceProvider extends ServiceProvider
@@ -23,6 +25,7 @@ public function boot()
         $this->loadRoutes();
         $this->loadViews();
         $this->loadTranslations();
+        $this->loadMiddleware();
         $this->registerPublishableFiles();
     }
 
@@ -66,6 +69,20 @@ protected function loadTranslations()
         $this->loadTranslationsFrom(__DIR__.'/../resources/lang', $this->name);
     }
 
+    /**
+     * Load package middleware.
+     *
+     * @return void
+     */
+    protected function loadMiddleware()
+    {
+        if (config('stagefront.enabled') === true) {
+            app(Kernel::class)->prependMiddleware(
+                RedirectIfStageFrontIsEnabled::class
+            );
+        }
+    }
+
     /**
      * Register the publishable files.
      *

tests/Feature/StageFrontTest.php

@@ -2,8 +2,10 @@
 
 namespace CodeZero\StageFront\Tests\Feature;
 
+use CodeZero\StageFront\Middleware\RedirectIfStageFrontIsEnabled;
 use CodeZero\StageFront\Tests\Stubs\User;
 use CodeZero\StageFront\Tests\TestCase;
+use Illuminate\Contracts\Http\Kernel;
 use Route;
 
 class StageFrontTest extends TestCase
@@ -12,9 +14,9 @@ public function setUp()
     {
         parent::setUp();
 
-        // Note that changing the URL or middleware config in the tests has no effect.
-        // These settings are used in the routes file, which has already been
-        // loaded before the tests run.
+        // Note that changing the URL or middleware config in the tests
+        // has no effect until you call $this->enableStageFront().
+        // It is disabled by default so nothing is loaded by default.
         $this->url = config('stagefront.url');
 
         Route::get('/page', function () {
@@ -45,11 +47,10 @@ public function the_login_route_does_not_exist_when_stagefront_is_disabled()
     /** @test */
     public function it_redirects_to_the_intended_url_when_you_provide_valid_credentials()
     {
-        $this->enableStageFront();
-
         config()->set('stagefront.login', 'tester');
         config()->set('stagefront.password', 'p4ssw0rd');
 
+        $this->enableStageFront();
         $this->setIntendedUrl('/page');
 
         $response = $this->submitForm([
@@ -63,11 +64,10 @@ public function it_redirects_to_the_intended_url_when_you_provide_valid_credenti
     /** @test */
     public function it_does_not_allow_access_when_you_provide_invalid_credentials()
     {
-        $this->enableStageFront();
-
         config()->set('stagefront.login', 'tester');
         config()->set('stagefront.password', 'p4ssw0rd');
 
+        $this->enableStageFront();
         $this->setIntendedUrl('/page');
 
         $response = $this->submitForm([
@@ -82,12 +82,11 @@ public function it_does_not_allow_access_when_you_provide_invalid_credentials()
     /** @test */
     public function the_password_may_be_stored_encrypted()
     {
-        $this->enableStageFront();
-
         config()->set('stagefront.login', 'tester');
         config()->set('stagefront.password', bcrypt('p4ssw0rd'));
         config()->set('stagefront.encrypted', true);
 
+        $this->enableStageFront();
         $this->setIntendedUrl('/page');
 
         $response = $this->submitForm([
@@ -109,13 +108,12 @@ public function the_users_in_the_database_can_be_used_for_logging_in()
             'password' => bcrypt('str0ng p4ssw0rd'),
         ]);
 
-        $this->enableStageFront();
-
         config()->set('stagefront.database', true);
         config()->set('stagefront.database_table', 'users');
         config()->set('stagefront.database_login_field', 'email');
         config()->set('stagefront.database_password_field', 'password');
 
+        $this->enableStageFront();
         $this->setIntendedUrl('/page');
 
         $response = $this->submitForm([
@@ -147,14 +145,14 @@ public function you_can_limit_which_database_users_have_access()
             'password' => bcrypt('str0ng p4ssw0rd'),
         ]);
 
-        $this->enableStageFront();
-
         config()->set('stagefront.database', true);
         config()->set('stagefront.database_whitelist', 'john@doe.io,jane@doe.io');
         config()->set('stagefront.database_table', 'users');
         config()->set('stagefront.database_login_field', 'email');
         config()->set('stagefront.database_password_field', 'password');
 
+        $this->enableStageFront();
+
         $this->setIntendedUrl('/page')->submitForm([
             'login' => 'john@doe.io',
             'password' => 'str0ng p4ssw0rd',
@@ -208,7 +206,7 @@ protected function submitForm(array $credentials)
 
     /**
      * Enable StageFront.
-     * Routes haven't been loaded, so we should do this now.
+     * Routes and middleware haven't been loaded, so we should do this now.
      *
      * @return void
      */
@@ -217,5 +215,9 @@ protected function enableStageFront()
         config()->set('stagefront.enabled', true);
 
         include __DIR__.'/../../routes/routes.php';
+
+        app(Kernel::class)->prependMiddleware(
+            RedirectIfStageFrontIsEnabled::class
+        );
     }
 }

tests/TestCase.php

@@ -2,9 +2,7 @@
 
 namespace CodeZero\StageFront\Tests;
 
-use CodeZero\StageFront\Middleware\RedirectIfStageFrontIsEnabled;
 use CodeZero\StageFront\StageFrontServiceProvider;
-use Illuminate\Contracts\Http\Kernel;
 use Orchestra\Testbench\TestCase as BaseTestCase;
 
 abstract class TestCase extends BaseTestCase
@@ -17,10 +15,6 @@ public function setUp()
         parent::setUp();
 
         config()->set('app.key', str_random(32));
-
-        app(Kernel::class)->prependMiddleware(
-            RedirectIfStageFrontIsEnabled::class
-        );
     }
 
     /**