Merge pull request #28 from mlanin-forks/feature/passport-support

Fix Passport bridge

src/Passport/PassportServiceProvider.php

@@ -17,8 +17,5 @@ public function register()
         $loader->alias('Laravel\Passport\Client', Client::class);
         $loader->alias('Laravel\Passport\PersonalAccessClient', PersonalAccessClient::class);
         $loader->alias('Laravel\Passport\Token', Token::class);
-        $loader->alias('Laravel\Passport\TokenRepository', TokenRepository::class);
-
-        $loader->alias('Laravel\Passport\Bridge\AccessTokenRepository', Bridge\AccessTokenRepository::class);
     }
 }

src/Passport/Token.php

@@ -6,6 +6,13 @@
 
 class Token extends Model
 {
+    /**
+     * The primary key for the model.
+     *
+     * @var string
+     */
+    protected $primaryKey = 'id';
+
     /**
      * The database table used by the model.
      *
@@ -33,7 +40,6 @@ class Token extends Model
      * @var array
      */
     protected $casts = [
-        'scopes'  => 'array',
         'revoked' => 'bool',
     ];
 
@@ -47,11 +53,21 @@ class Token extends Model
     ];
 
     /**
-     * Indicates if the model should be timestamped.
+     * Overwrite scopes setter to handle default passport JSON string
+     * and save native array.
      *
-     * @var bool
+     * @param mixed $scopes
      */
-    public $timestamps = false;
+    public function setScopesAttribute($scopes)
+    {
+        if (is_string($scopes)) {
+            $scopes = json_decode($scopes, true);
+        }
+
+        // If successfully decoded into array, then it will be saved as array.
+        // If still string, will be converted to array to preserve consistency.
+        $this->attributes['scopes'] = (array) $scopes;
+    }
 
     /**
      * Get the client that the token belongs to.