Now not using too generic name for table columns. close #23

Author: imrealashu

database/migrations/2017_03_18_000012_add_two_factor_authentication_required_fields.php

@@ -14,8 +14,8 @@ class AddTwoFactorAuthenticationRequiredFields extends Migration
     public function up()
     {
         Schema::table('users', function (Blueprint $table) {
-            $table->smallInteger('is_2fa_enabled')->default(0)->before('create_at');
-            $table->string('secret_key')->nullable()->after('is_2fa_enabled');
+            $table->smallInteger('is_two_factor_enabled')->default(0)->before('create_at');
+            $table->string('two_factor_secret_key')->nullable()->after('is_2fa_enabled');
         });
     }
 
@@ -27,8 +27,8 @@ public function up()
     public function down()
     {
         Schema::table('users', function (Blueprint $table) {
-            $table->dropColumn('is_2fa_enabled');
-            $table->dropColumn('secret_key');
+            $table->dropColumn('is_two_factor_enabled');
+            $table->dropColumn('two_factor_secret_key');
         });
     }
 }

src/AuthenticatesUsersWith2FA.php

@@ -27,7 +27,7 @@ trait AuthenticatesUsersWith2FA
      */
     protected function authenticated(Request $request, $user)
     {
-        if ($user->is_2fa_enabled) {
+        if ($user->is_two_factor_enabled) {
             $request->session()->put('2fa:user:id', encrypt($user->id));
             $secret = getenv('HMAC_SECRET');
             $signature = hash_hmac('sha256', $user->id, $secret);
@@ -61,7 +61,7 @@ public function verifyToken(Request $request)
         Validator::extendImplicit('valid_token', function ($attribute, $value) {
             $totp = new TOTP(
                 config('2fa-config.account_name'),
-                $this->user->secret_key
+                $this->user->two_factor_secret_key
             );
 
             return $value == $totp->now();

src/Http/Controllers/TwoFactorAuthenticationController.php

@@ -24,7 +24,7 @@ public function setupTwoFactorAuthentication(Request $request)
     {
         $secret_key = $this->base32EncodedString(config('2fa-config.number_of_digits'));
         $user = User::find($request->user()->id);
-        $user->secret_key = $secret_key;
+        $user->two_factor_secret_key = $secret_key;
         $user->update();
         $totp = new TOTP(
             config('2fa-config.account_name'),
@@ -49,7 +49,7 @@ public function setupTwoFactorAuthentication(Request $request)
     public function enableTwoFactorAuthentication(Request $request)
     {
         $user = User::find($request->user()->id);
-        $user->is_2fa_enabled = 1;
+        $user->is_two_factor_enabled = 1;
         $user->update();
 
         return redirect('home');