Little Refactoration of codebase.

Author: imrealashu

config/2fa-config.php

@@ -11,7 +11,8 @@
     /*
      * Routes
      * Change the routes if your existing routes
-     * conflicts with existing routes.
+     * conflicts with existing routes. or for
+     * any customization.
      */
     'setup_2fa'   => 'setup-2fa',
     'enable_2fa'  => 'enable-2fa',

src/AuthenticatesUsersWith2FA.php

@@ -47,10 +47,10 @@ protected function authenticated(Request $request, $user)
      */
     public function verifyToken(Request $request)
     {
-        $userModel = TwoFactorAuthenticationServiceProvider::getUserModelInstance();
+        $TwoFAModel = TwoFactorAuthenticationServiceProvider::getTwoFAModelInstance();
         // Pulling encrypted user id from session and getting user details
         $userId = $request->session()->get('2fa:user:id');
-        $this->user = $userModel->find(decrypt($userId));
+        $this->user = $TwoFAModel->find(decrypt($userId));
 
         // If token is not valid then custom validation error message will be shown.
         $messages = [
@@ -87,4 +87,14 @@ public function verifyToken(Request $request)
 
         return redirect()->intended(config('2fa-config.redirect_to'));
     }
+
+    public function setUser($user)
+    {
+        $this->user = $user;
+    }
+
+    public function getUser()
+    {
+        return $this->user;
+    }
 }

src/Http/Controllers/TwoFactorAuthenticationController.php

@@ -19,14 +19,19 @@ class TwoFactorAuthenticationController extends Controller implements TwoFactorA
     /**
      * User Model.
      */
-    protected $userModel;
+    protected $TwoFAModel;
 
     /**
      * Assigns $usersModel Property a Model instance.
      */
     public function __construct()
     {
-        $this->userModel = TwoFactorAuthenticationServiceProvider::getUserModelInstance();
+        $this->TwoFAModel = TwoFactorAuthenticationServiceProvider::getTwoFAModelInstance();
+
+        $this->middleware(function ($request, $next) {
+            $this->setUser(auth()->user());
+            return $next($request);
+        });
     }
 
     /**
@@ -39,14 +44,8 @@ public function __construct()
      */
     public function setupTwoFactorAuthentication(Request $request)
     {
-        $user = $this->userModel->find($request->user()->id);
-        if (!Schema::hasColumn(config('2fa-config.table'), 'two_factor_secret_key') ||
-            !Schema::hasColumn(config('2fa-config.table'), 'is_two_factor_enabled')) {
-            throw TwoFactorAuthenticationExceptions::columnNotFound();
-        }
-        $user->two_factor_secret_key = $user->two_factor_secret_key ?? $this->base32EncodedString(config('2fa-config.number_of_digits'));
-        $user->update();
-
+        $this->updateUserWith2FAGeneratedKey();
+        $user = $this->getUser();
         $totp = new TOTP(
             config('2fa-config.account_name'),
             $user->two_factor_secret_key,
@@ -74,7 +73,7 @@ public function setupTwoFactorAuthentication(Request $request)
      */
     public function enableTwoFactorAuthentication(Request $request)
     {
-        $user = $this->userModel->find($request->user()->id);
+        $user = $this->TwoFAModel->find($request->user()->id);
         $user->is_two_factor_enabled = 1;
         $user->update();
 
@@ -99,7 +98,7 @@ public function enableTwoFactorAuthentication(Request $request)
      */
     public function disableTwoFactorAuthentication(Request $request)
     {
-        $user = $this->userModel->find($request->user()->id);
+        $user = $this->TwoFAModel->find($request->user()->id);
         $user->is_two_factor_enabled = 0;
         $user->two_factor_secret_key = null;
         $user->update();
@@ -134,7 +133,7 @@ public function verifyTwoFactorAuthentication(Request $request)
             return view('2fa::verify');
         }
 
-        return redirect()->back(); //shoud be configurabel
+        return redirect()->back(); //shoud be configurable
     }
 
     /**
@@ -172,4 +171,15 @@ private function strRandom($length = 30):
 
         return $string;
     }
+
+    private function updateUserWith2FAGeneratedKey()
+    {
+        $user = $this->TwoFAModel->find($this->getUser()->id);
+        if (!Schema::hasColumn(config('2fa-config.table'), 'two_factor_secret_key') ||
+            !Schema::hasColumn(config('2fa-config.table'), 'is_two_factor_enabled')) {
+            throw TwoFactorAuthenticationExceptions::columnNotFound();
+        }
+        $user->two_factor_secret_key = $user->two_factor_secret_key ?? $this->base32EncodedString(config('2fa-config.number_of_digits'));
+        $user->update();
+    }
 }

src/TwoFactorAuthenticationServiceProvider.php

@@ -40,7 +40,7 @@ public function boot()
      *
      * @return string
      */
-    public static function determineUserModel(): string
+    public static function determineTwoFAModel(): string
     {
         return config('2fa-config.model');
     }
@@ -50,10 +50,10 @@ public static function determineUserModel(): string
      *
      * @return \Illuminate\Database\Eloquent\Model
      */
-    public static function getUserModelInstance(): Model
+    public static function getTwoFAModelInstance(): Model
     {
-        $userModelClassName = self::determineUserModel();
+        $TwoFAModelClassName = self::determineTwoFAModel();
 
-        return new $userModelClassName();
+        return new $TwoFAModelClassName();
     }
 }