From c939be97fb1d9196b6f4554fc46c4691cfccd7d2 Mon Sep 17 00:00:00 2001
From: James Cole <thegrumpydictator@gmail.com>
Date: Sat, 19 Mar 2016 16:22:20 +0100
Subject: [PATCH] These are some new middleware groups required to call the two
 factor auth routines at the right moments.

---
 app/Http/Kernel.php | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php
index e52e40814f..a33492fd8a 100644
--- a/app/Http/Kernel.php
+++ b/app/Http/Kernel.php
@@ -4,6 +4,7 @@ declare(strict_types = 1);
 namespace FireflyIII\Http;
 
 use FireflyIII\Http\Middleware\Authenticate;
+use FireflyIII\Http\Middleware\AuthenticateTwoFactor;
 use FireflyIII\Http\Middleware\Binder;
 use FireflyIII\Http\Middleware\EncryptCookies;
 use FireflyIII\Http\Middleware\Range;
@@ -43,14 +44,23 @@ class Kernel extends HttpKernel
      */
     protected $middlewareGroups
         = [
-            'web'            => [
+            'web'                    => [
                 EncryptCookies::class,
                 AddQueuedCookiesToResponse::class,
                 StartSession::class,
                 ShareErrorsFromSession::class,
                 VerifyCsrfToken::class,
             ],
-            'web-auth'       => [
+            'web-auth'               => [
+                EncryptCookies::class,
+                AddQueuedCookiesToResponse::class,
+                StartSession::class,
+                ShareErrorsFromSession::class,
+                VerifyCsrfToken::class,
+                Authenticate::class,
+                AuthenticateTwoFactor::class,
+            ],
+            'web-auth-no-two-factor' => [
                 EncryptCookies::class,
                 AddQueuedCookiesToResponse::class,
                 StartSession::class,
@@ -58,13 +68,14 @@ class Kernel extends HttpKernel
                 VerifyCsrfToken::class,
                 Authenticate::class,
             ],
-            'web-auth-range' => [
+            'web-auth-range'         => [
                 EncryptCookies::class,
                 AddQueuedCookiesToResponse::class,
                 StartSession::class,
                 ShareErrorsFromSession::class,
                 VerifyCsrfToken::class,
                 Authenticate::class,
+                AuthenticateTwoFactor::class,
                 Range::class,
                 Binder::class,
             ],