[11.x] Add Provider Guard to ClientRepository for Personal Access Clients (#1655)

* Added provider guard to Password Grant Client.

* Add argument provider in `InstallCommand`

* formatting

---------

Co-authored-by: Taylor Otwell <[email protected]>

Author: michaelnabil230

src/ClientRepository.php

@@ -161,11 +161,12 @@ public function create($userId, $name, $redirect, $provider = null, $personalAcc
      * @param  int|null  $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->getKey();
             $accessClient->save();

src/Console/ClientCommand.php

@@ -63,8 +63,10 @@ protected function createPersonalClient(ClientRepository $clients)
             config('app.name').' Personal Access Client'
         );
 
+        $provider = $this->promptForProvider();
+
         $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->promptForProvider();
 
         $client = $clients->createPasswordGrantClient(
             null, $name, 'http://localhost', $provider
@@ -154,6 +150,22 @@ protected function createAuthCodeClient(ClientRepository $clients)
         $this->outputClientDetails($client);
     }
 
+    /**
+     * Ask the user what user provider should be used.
+     *
+     * @return string
+     */
+    protected function promptForProvider()
+    {
+        $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
+        );
+    }
+
     /**
      * Output the client's ID and secret key.
      *

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]);
     }