Fix issue multi auth

src/ClientRepository.php

@@ -106,23 +106,31 @@ public function activeForUser($userId)
     /**
      * Get the personal access token client for the application.
      *
+     * @param  string|null  $provider
      * @return \Laravel\Passport\Client
      *
      * @throws \RuntimeException
      */
-    public function personalAccessClient()
+    public function personalAccessClient($provider = null)
     {
         if ($this->personalAccessClientId) {
             return $this->find($this->personalAccessClientId);
         }
 
         $client = Passport::personalAccessClient();
 
-        if (! $client->exists()) {
+        $personalAccessClient = $client
+            ->when($provider, function ($query, $provider) {
+                $query->whereRelation('client', 'provider', $provider);
+            })
+            ->latest($client->getKeyName())
+            ->first();
+
+        if (is_null($personalAccessClient)) {
             throw new RuntimeException('Personal access client not found. Please create one.');
         }
 
-        return $client->orderBy($client->getKeyName(), 'desc')->first()->client;
+        return $client->client;
     }
 
     /**
@@ -161,11 +169,12 @@ public function create($userId, $name, $redirect, $provider = null, $personalAcc
      * @param  int  $userId
      * @param  string  $name
      * @param  string  $redirect
+     * @param  string|null  $provider
      * @return \Laravel\Passport\Client
      */
-    public function createPersonalAccessClient($userId, $name, $redirect)
+    public function createPersonalAccessClient($userId, $name, $redirect, $provider = null)
     {
-        return tap($this->create($userId, $name, $redirect, null, true), function ($client) {
+        return tap($this->create($userId, $name, $redirect, $provider, true), function ($client) {
             $accessClient = Passport::personalAccessClient();
             $accessClient->client_id = $client->id;
             $accessClient->save();

src/Console/ClientCommand.php

@@ -63,8 +63,10 @@ protected function createPersonalClient(ClientRepository $clients)
             config('app.name').' Personal Access Client'
         );
 
+        $provider = $this->choiceProvider();
+
         $client = $clients->createPersonalAccessClient(
-            null, $name, 'http://localhost'
+            null, $name, 'http://localhost', $provider
         );
 
         $this->info('Personal access client created successfully.');
@@ -85,13 +87,7 @@ protected function createPasswordClient(ClientRepository $clients)
             config('app.name').' Password Grant Client'
         );
 
-        $providers = array_keys(config('auth.providers'));
-
-        $provider = $this->option('provider') ?: $this->choice(
-            'Which user provider should this client use to retrieve users?',
-            $providers,
-            in_array('users', $providers) ? 'users' : null
-        );
+        $provider = $this->choiceProvider();
 
         $client = $clients->createPasswordGrantClient(
             null, $name, 'http://localhost', $provider
@@ -170,4 +166,20 @@ protected function outputClientDetails(Client $client)
         $this->line('<comment>Client ID:</comment> '.$client->id);
         $this->line('<comment>Client secret:</comment> '.$client->plainSecret);
     }
+
+    /**
+     * Choice what the provider.
+     *
+     * @return string
+     */
+    protected function choiceProvider()
+    {
+        $providers = array_keys(config('auth.providers'));
+
+        return $this->option('provider') ?: $this->choice(
+            'Which user provider should this client use to retrieve users?',
+            $providers,
+            in_array('users', $providers) ? 'users' : null
+        );
+    }
 }

src/Console/InstallCommand.php

@@ -39,7 +39,7 @@ public function handle()
             $this->configureUuids();
         }
 
-        $this->call('passport:client', ['--personal' => true, '--name' => config('app.name').' Personal Access Client']);
+        $this->call('passport:client', ['--personal' => true, '--name' => config('app.name').' Personal Access Client', '--provider' => $provider]);
         $this->call('passport:client', ['--password' => true, '--name' => config('app.name').' Password Grant Client', '--provider' => $provider]);
     }
 

src/HasApiTokens.php

@@ -30,7 +30,11 @@ public function clients()
      */
     public function tokens()
     {
-        return $this->hasMany(Passport::tokenModel(), 'user_id')->orderBy('created_at', 'desc');
+        return $this->hasMany(Passport::tokenModel(), 'user_id')
+            ->when($this->getProvider(), function ($query, $provider) {
+                $query->whereRelation('client', 'provider', $provider);
+            })
+            ->latest('created_at');
     }
 
     /**
@@ -64,7 +68,10 @@ public function tokenCan($scope)
     public function createToken($name, array $scopes = [])
     {
         return Container::getInstance()->make(PersonalAccessTokenFactory::class)->make(
-            $this->getKey(), $name, $scopes
+            $this->getKey(),
+            $name,
+            $scopes,
+            $this->getProvider(),
         );
     }
 
@@ -80,4 +87,24 @@ public function withAccessToken($accessToken)
 
         return $this;
     }
+
+    /**
+     * Get the provider name of the model.
+     *
+     * @return string|null
+     */
+    protected function getProvider()
+    {
+        foreach (config('auth.providers', []) as $name => $config) {
+            if ($config['driver'] == 'eloquent' && is_a($this, $config['model'])) {
+                return $name;
+            }
+
+            if ($config['driver'] == 'database' && $this->getTable() == $config['table']) {
+                return $name;
+            }
+        }
+
+        return null;
+    }
 }

src/PersonalAccessTokenFactory.php

@@ -47,11 +47,12 @@ class PersonalAccessTokenFactory
      * @param  \Lcobucci\JWT\Parser  $jwt
      * @return void
      */
-    public function __construct(AuthorizationServer $server,
-                                ClientRepository $clients,
-                                TokenRepository $tokens,
-                                JwtParser $jwt)
-    {
+    public function __construct(
+        AuthorizationServer $server,
+        ClientRepository $clients,
+        TokenRepository $tokens,
+        JwtParser $jwt,
+    ) {
         $this->jwt = $jwt;
         $this->tokens = $tokens;
         $this->server = $server;
@@ -64,12 +65,13 @@ public function __construct(AuthorizationServer $server,
      * @param  mixed  $userId
      * @param  string  $name
      * @param  array  $scopes
+     * @param  string|null  $provider
      * @return \Laravel\Passport\PersonalAccessTokenResult
      */
-    public function make($userId, $name, array $scopes = [])
+    public function make($userId, $name, array $scopes = [], $provider = null)
     {
         $response = $this->dispatchRequestToAuthorizationServer(
-            $this->createRequest($this->clients->personalAccessClient(), $userId, $scopes)
+            $this->createRequest($this->clients->personalAccessClient($provider), $userId, $scopes)
         );
 
         $token = tap($this->findAccessToken($response), function ($token) use ($userId, $name) {