Minor modifications to PR#3

Author: michaeldzjap

.gitignore

@@ -1,4 +1,3 @@
+/.idea
 .DS_Store
 .Thumbs.db
-
-/.idea

src/Providers/BaseProvider.php

@@ -7,18 +7,19 @@
 abstract class BaseProvider
 {
     /**
-     * Check if two-factor authentication is enabled, dependent on the "enabled" config option.
+     * Check if two-factor authentication is enabled.
      *
      * @param  \App\User  $user
      * @return bool
      */
     public function enabled(User $user)
     {
-        $conf = config('twofactor-auth.enabled', 'user');
-        if ($conf === 'user') {
+        $enabled = config('twofactor-auth.enabled', 'user');
+
+        if ($enabled === 'user') {
             return !is_null($user->twoFactorAuth);
         }
 
-        return $conf === 'enabled';
+        return $enabled === 'always';
     }
 }

src/TwoFactorAuth.php

@@ -39,6 +39,10 @@ class TwoFactorAuth extends Model
      */
     public function user() : BelongsTo
     {
-        return $this->belongsTo(\App\User::class, 'user_id', config('twofactor-auth.models.user.primaryKey', 'id'));
+        return $this->belongsTo(
+            \App\User::class,
+            'user_id',
+            config('twofactor-auth.models.user.primaryKey', 'id')
+        );
     }
 }

src/TwoFactorAuthServiceProvider.php

@@ -8,13 +8,6 @@
 
 class TwoFactorAuthServiceProvider extends ServiceProvider
 {
-    /**
-     * Indicates if loading of the provider is deferred.
-     *
-     * @var bool
-     */
-    protected $defer = false;
-
     /**
      * Bootstrap the application services.
      *
@@ -74,8 +67,9 @@ protected function publishMigrations()
         $paths = [];
 
         foreach ($files as $file) {
-            $paths[__DIR__ . '/database/migrations/' . $file] = database_path('migrations/'.date('Y_m_d_His').'_'.$file);
+            $paths[__DIR__.'/database/migrations/'. $file] = database_path('migrations/'.date('Y_m_d_His').'_'.$file);
         }
+
         $this->publishes($paths, 'migrations');
     }
 

src/TwoFactorAuthenticable.php

@@ -15,24 +15,27 @@ trait TwoFactorAuthenticable
      */
     public function twoFactorAuth() : HasOne
     {
-        return $this->hasOne(TwoFactorAuth::class, 'user_id', $this->getKeyName());
+        return $this->hasOne(
+            TwoFactorAuth::class, 'user_id', $this->getKeyName()
+        );
     }
 
     /**
      * Set the two-factor auth id.
      *
-     * @param  string $id
+     * @param  string  $id
      * @return void
      */
     public function setTwoFactorAuthId(string $id) : void
     {
         $enabled = config('twofactor-auth.enabled', 'user');
+
         if ($enabled === 'user') {
             // respect when 2fa is not set for user, never insert
             $this->twoFactorAuth->update(['id' => $id]);
         }
 
-        if ($enabled === 'enabled') {
+        if ($enabled === 'always') {
             $this->upsertTwoFactorAuthId($id);
         }
     }
@@ -50,7 +53,7 @@ public function getTwoFactorAuthId() : string
     /**
      * Create or update a two-factor authentication record with the given id.
      *
-     * @param string $id
+     * @param  string  $id
      * @return void
      */
     private function upsertTwoFactorAuthId(string $id) : void

src/config/twofactor-auth.php

@@ -8,10 +8,10 @@
     |--------------------------------------------------------------------------
     |
     | Options:
-    | - 'enabled': always require two-factor authentication
-    | - 'disabled': disabled, never require two-factor authentication
-    | - 'user': look if a row exists in the two_factor_auths table for the
-    |   user
+    |
+    | - 'always': Always require two-factor authentication.
+    | - 'never': Never require two-factor authentication.
+    | - 'user': Specify manually for which users to enable 2fa.
     |
     */
 
@@ -72,26 +72,31 @@
     */
 
     'routes' => [
+
         'get' => [
             'url' => '/auth/token',
             'name' => 'auth.token',
         ],
+
         'post' => '/auth/token',
+
     ],
 
     /*
     |--------------------------------------------------------------------------
-    | Model setttings
+    | Model Setttings
     |--------------------------------------------------------------------------
     |
-    | \App\User is used, but its primary key can be specified
+    | Here you can specify some custom properties of the default user model.
     |
     */
 
     'models' => [
+
         'user' => [
-            'primaryKey' => 'id'
-        ]
+            'primaryKey' => 'id',
+        ],
+
     ],
 
 ];