From fff5091311c66f28927ceb3e326d7f35073d06f5 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sat, 26 Aug 2017 18:36:17 -0600
Subject: [PATCH] More progress on 2fa

---
 classes/admin.php           | 4 +++-
 classes/admincontroller.php | 4 ++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/classes/admin.php b/classes/admin.php
index b96a605a..7afa0345 100644
--- a/classes/admin.php
+++ b/classes/admin.php
@@ -384,10 +384,12 @@ class Admin
             $this->grav->redirect($this->base . '/twofa');
         }
 
+        $user->authenticated = true;
+
 
         if ($user->authorize('admin.login')) {
 
-            $user->authenticated = true;
+
 
             $this->user = $this->session->user = $user;
 
diff --git a/classes/admincontroller.php b/classes/admincontroller.php
index e36d4edd..7f6090c7 100644
--- a/classes/admincontroller.php
+++ b/classes/admincontroller.php
@@ -710,6 +710,10 @@ class AdminController extends AdminBaseController
             $this->admin->setMessage($this->admin->translate('PLUGIN_ADMIN.2FA_FAILED'), 'error');
             return true;
         }
+
+        $user->authenticated = true;
+        $this->setRedirect($this->post['redirect']);
+        return true;
     }
 
     /**