Merge pull request #36 from thecodework/analysis-qxeYV3

Apply fixes from StyleCI

Author: imrealashu

src/AuthenticatesUsersWith2FA.php

@@ -5,7 +5,6 @@
 use Auth;
 use Illuminate\Http\Request;
 use OTPHP\TOTP;
-use Thecodework\TwoFactorAuthentication\TwoFactorAuthenticationServiceProvider;
 use Validator;
 
 trait AuthenticatesUsersWith2FA
@@ -29,7 +28,7 @@ protected function authenticated(Request $request, $user)
     {
         if ($user->is_two_factor_enabled) {
             $request->session()->put('2fa:user:id', encrypt($user->id));
-            $secret    = getenv('HMAC_SECRET');
+            $secret = getenv('HMAC_SECRET');
             $signature = hash_hmac('sha256', $user->id, $secret);
             Auth::logout();
 
@@ -50,7 +49,7 @@ public function verifyToken(Request $request)
     {
         $userModel = TwoFactorAuthenticationServiceProvider::getUserModelInstance();
         // Pulling encrypted user id from session and getting user details
-        $userId     = $request->session()->get('2fa:user:id');
+        $userId = $request->session()->get('2fa:user:id');
         $this->user = $userModel->find(decrypt($userId));
 
         // If token is not valid then custom validation error message will be shown.
@@ -73,7 +72,7 @@ public function verifyToken(Request $request)
             'totp_token' => 'required|digits:6|valid_token',
         ], $messages);
 
-        $secret    = getenv('HMAC_SECRET');
+        $secret = getenv('HMAC_SECRET');
         $signature = hash_hmac('sha256', $this->user->id, $secret);
         if ($validator->fails()) {
             return redirect('verify-2fa?signature=' . $signature)

src/Exceptions/TwoFactorAuthenticationExceptions.php

@@ -2,15 +2,15 @@
 
 namespace Thecodework\TwoFactorAuthentication\Exceptions;
 
-class TwoFactorAuthenticationExceptions extends \Exception {
-
+class TwoFactorAuthenticationExceptions extends \Exception
+{
     /**
-     * Column Not Found
-     *
+     * Column Not Found.
      */
     public static function columnNotFound()
     {
         $table = config('2fa-config.table');
+
         return new static("Could not locate required column `two_factor_secret_key` or `is_two_factor_enabled` in `$table` table. Make sure the migrations ran properly.");
     }
-}
+}

src/Http/Controllers/TwoFactorAuthenticationController.php

@@ -17,7 +17,7 @@ class TwoFactorAuthenticationController extends Controller implements TwoFactorA
     use AuthenticatesUsersWith2FA;
 
     /**
-     * User Model
+     * User Model.
      */
     protected $userModel;
 
@@ -28,11 +28,13 @@ public function __construct()
     {
         $this->userModel = TwoFactorAuthenticationServiceProvider::getUserModelInstance();
     }
+
     /**
      * Setup two factor authentication.
      *
      * @param \Illuminate\Http\Request
      * @param \Illuminate\Http\Response
+     *
      * @throws \Thecodework\TwoFactorAuthentications\Exceptions\TwoFactorAuthenticationExceptions
      */
     public function setupTwoFactorAuthentication(Request $request)
@@ -72,7 +74,7 @@ public function setupTwoFactorAuthentication(Request $request)
      */
     public function enableTwoFactorAuthentication(Request $request)
     {
-        $user                        = $this->userModel->find($request->user()->id);
+        $user = $this->userModel->find($request->user()->id);
         $user->is_two_factor_enabled = 1;
         $user->update();
 
@@ -97,7 +99,7 @@ public function enableTwoFactorAuthentication(Request $request)
      */
     public function disableTwoFactorAuthentication(Request $request)
     {
-        $user                        = $this->userModel->find($request->user()->id);
+        $user = $this->userModel->find($request->user()->id);
         $user->is_two_factor_enabled = 0;
         $user->two_factor_secret_key = null;
         $user->update();
@@ -122,7 +124,7 @@ public function disableTwoFactorAuthentication(Request $request)
     public function verifyTwoFactorAuthentication(Request $request)
     {
         if ($request->session()->has('2fa:user:id')) {
-            $secret    = getenv('HMAC_SECRET');
+            $secret = getenv('HMAC_SECRET');
             $signature = hash_hmac('sha256', decrypt($request->session()->get('2fa:user:id')), $secret);
 
             if (md5($signature) !== md5($request->signature)) {
@@ -143,7 +145,8 @@ public function verifyTwoFactorAuthentication(Request $request)
      * @return string
      */
     private function base32EncodedString($length = 30):
-    string {
+    string
+    {
         return Base32::encode($this->strRandom($length));
     }
 
@@ -155,7 +158,8 @@ private function base32EncodedString($length = 30):
      * @return string
      */
     private function strRandom($length = 30):
-    string{
+    string
+    {
         $string = '';
 
         while (($len = strlen($string)) < $length) {

src/TwoFactorAuthenticationServiceProvider.php

@@ -2,8 +2,8 @@
 
 namespace Thecodework\TwoFactorAuthentication;
 
-use Illuminate\Support\ServiceProvider;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\ServiceProvider;
 
 class TwoFactorAuthenticationServiceProvider extends ServiceProvider
 {
@@ -36,7 +36,7 @@ public function boot()
     }
 
     /**
-     * Get User moded defined in config file
+     * Get User moded defined in config file.
      *
      * @return string
      */
@@ -50,8 +50,10 @@ public static function determineUserModel(): string
      *
      * @return \Illuminate\Database\Eloquent\Model
      */
-    public static function getUserModelInstance(): Model {
+    public static function getUserModelInstance(): Model
+    {
         $userModelClassName = self::determineUserModel();
+
         return new $userModelClassName();
     }
 }

tests/BaseTestCase.php

@@ -77,6 +77,6 @@ public function getEnvironmentSetUp($app)
         ]);
         $app['config']->set('auth.providers.users.model', User::class);
         $app['config']->set('app.key', '6rE9Nz59bGRbeMATftriyQjrpF7DcOQm');
-        $app['config']->set('2fa-config.table','users');
+        $app['config']->set('2fa-config.table', 'users');
     }
 }