Merge branch 'develop'

Author: michaeldzjap

composer.json

@@ -7,7 +7,7 @@
     "type": "package",
     "minimum-stability": "dev",
     "require": {
-        "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*|^6.0"
+        "illuminate/support": "5.5.*|5.6.*|5.7.*|5.8.*|6.*"
     },
     "extra": {
         "laravel": {

src/TwoFactorAuth.php

@@ -7,13 +7,20 @@
 
 class TwoFactorAuth extends Model
 {
+    /**
+     * The reference to the user model.
+     *
+     * @var string
+     */
+    private $model;
+
     /**
      * The attributes that are mass assignable.
      *
      * @var array
      */
     protected $fillable = [
-        'id', 'user_id'
+        'id', 'user_id',
     ];
 
     /**
@@ -22,7 +29,7 @@ class TwoFactorAuth extends Model
      * @var array
      */
     protected $hidden = [
-        'id'
+        'id',
     ];
 
     /**
@@ -39,10 +46,22 @@ class TwoFactorAuth extends Model
      */
     public function user() : BelongsTo
     {
-        return $this->belongsTo(
-            \App\User::class,
-            'user_id',
-            config('twofactor-auth.models.user.primaryKey', 'id')
-        );
+        $model = $this->model();
+
+        return $this->belongsTo($model, 'user_id', (new $model)->getKeyName());
+    }
+
+    /**
+     * Get the reference to the user model.
+     *
+     * @return string
+     */
+    private function model() : string
+    {
+        if (is_null($this->model)) {
+            $this->model = config('twofactor-auth.model');
+        }
+
+        return $this->model;
     }
 }

src/config/twofactor-auth.php

@@ -84,19 +84,14 @@
 
     /*
     |--------------------------------------------------------------------------
-    | Model Setttings
+    | Model
     |--------------------------------------------------------------------------
     |
-    | Here you can specify some custom properties of the default user model.
+    | Here you can optionally specify the user model that should be used. The
+    | standard "Eloquent" user model is configured by default.
     |
     */
 
-    'models' => [
-
-        'user' => [
-            'primaryKey' => 'id',
-        ],
-
-    ],
+    'model' => \App\User::class,
 
 ];