Rename user method to tokenable

README.md

@@ -175,7 +175,7 @@ Within your web application's UI, you may wish to list each of the user's tokens
 
 ## Customization
 
-You may customize the "user" model and the personal access token model used by Airlock via the `useUserModel` and `usePersonalAccessTokenModel` methods. Typically, you should call these methods from the `boot` method of your `AppServiceProvider`:
+You may customize the the personal access token model used by Airlock via the `usePersonalAccessTokenModel` methods. Typically, you should call this method from the `boot` method of your `AppServiceProvider`:
 
 ```php
 use App\Airlock\CustomPersonalAccessToken;
@@ -184,8 +184,6 @@ use Laravel\Airlock\Airlock;
 
 public function boot()
 {
-    Airlock::useUserModel(CustomUser::class);
-
     Airlock::usePersonalAccessTokenModel(
         CustomPersonalAccessToken::class
     );

database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php

@@ -15,7 +15,7 @@ public function up()
     {
         Schema::create('personal_access_tokens', function (Blueprint $table) {
             $table->bigIncrements('id');
-            $table->morphs('model');
+            $table->morphs('tokenable');
             $table->string('name');
             $table->string('token', 64)->unique();
             $table->text('abilities')->nullable();

src/Guard.php

@@ -60,22 +60,22 @@ public function __invoke(Request $request)
                 return;
             }
 
-            return $this->supportsTokens($accessToken->user) ? $accessToken->user->withAccessToken(
+            return $this->supportsTokens($accessToken->tokenable) ? $accessToken->tokenable->withAccessToken(
                 tap($accessToken->forceFill(['last_used_at' => now()]))->save()
             ) : null;
         }
     }
 
     /**
-     * Determine if the user model supports API tokens.
+     * Determine if the tokenable model supports API tokens.
      *
      * @param \Illuminate\Contracts\Auth\Authenticatable|null $user
      * @return bool
      */
-    protected function supportsTokens($user = null)
+    protected function supportsTokens($tokenable = null)
     {
         return in_array(HasApiTokens::class, class_uses_recursive(
-            $user ? get_class($user) : null
+            $tokenable ? get_class($tokenable) : null
         ));
     }
 }

src/HasApiTokens.php

@@ -14,11 +14,11 @@ trait HasApiTokens
     protected $accessToken;
 
     /**
-     * Get the access tokens that belong to the user.
+     * Get the access tokens that belong to model.
      */
     public function tokens()
     {
-        return $this->morphMany(Airlock::$personalAccessTokenModel, 'model');
+        return $this->morphMany(Airlock::$personalAccessTokenModel, 'tokenable');
     }
 
     /**

src/PersonalAccessToken.php

@@ -38,11 +38,11 @@ class PersonalAccessToken extends Model implements HasAbilities
     ];
 
     /**
-     * Get the user that the access token belongs to.
+     * Get the tokenable model that the access token belongs to.
      */
-    public function user()
+    public function tokenable()
     {
-        return $this->morphTo('model');
+        return $this->morphTo('tokenable');
     }
 
     /**

tests/GuardTest.php

@@ -107,8 +107,8 @@ public function test_authentication_with_token_fails_if_expired()
         ]);
 
         $token = PersonalAccessToken::forceCreate([
-            'model_id' => $user->id,
-            'model_type' => get_class($user),
+            'tokenable_id' => $user->id,
+            'tokenable_type' => get_class($user),
             'name' => 'Test',
             'token' => hash('sha256', 'test'),
             'created_at' => now()->subMinutes(60),
@@ -148,8 +148,8 @@ public function test_authentication_is_successful_with_token_if_no_session_prese
         ]);
 
         $token = PersonalAccessToken::forceCreate([
-            'model_id' => $user->id,
-            'model_type' => get_class($user),
+            'tokenable_id' => $user->id,
+            'tokenable_type' => get_class($user),
             'name' => 'Test',
             'token' => hash('sha256', 'test'),
         ]);