Add missing console commands for client management

Command/CreateClientCommand.php

@@ -34,23 +34,23 @@ protected function configure()
             ->addOption(
                 'redirect-uri',
                 null,
-                InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
+                InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
                 'Sets redirect uri for client. Use this option multiple times to set multiple redirect URIs.',
-                null
+                []
             )
             ->addOption(
                 'grant-type',
                 null,
-                InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
+                InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
                 'Sets allowed grant type for client. Use this option multiple times to set multiple grant types.',
-                null
+                []
             )
             ->addOption(
                 'scope',
                 null,
-                InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
+                InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
                 'Sets allowed scope for client. Use this option multiple times to set multiple scopes.',
-                null
+                []
             )
             ->addArgument(
                 'identifier',
@@ -81,7 +81,7 @@ protected function execute(InputInterface $input, OutputInterface $output)
         return 0;
     }
 
-    private function buildClientFromInput(InputInterface $input)
+    private function buildClientFromInput(InputInterface $input): Client
     {
         $identifier = $input->getArgument('identifier') ?? hash('md5', random_bytes(16));
         $secret = $input->getArgument('secret') ?? hash('sha512', random_bytes(32));
@@ -90,19 +90,19 @@ private function buildClientFromInput(InputInterface $input)
         $client->setActive(true);
 
         $redirectUris = array_map(
-            function (string $redirectUri) { return new RedirectUri($redirectUri); },
+            function (string $redirectUri): RedirectUri { return new RedirectUri($redirectUri); },
             $input->getOption('redirect-uri')
         );
         $client->setRedirectUris(...$redirectUris);
 
         $grants = array_map(
-            function (string $grant) { return new Grant($grant); },
+            function (string $grant): Grant { return new Grant($grant); },
             $input->getOption('grant-type')
         );
         $client->setGrants(...$grants);
 
         $scopes = array_map(
-            function (string $scope) { return new Scope($scope); },
+            function (string $scope): Scope { return new Scope($scope); },
             $input->getOption('scope')
         );
         $client->setScopes(...$scopes);

Command/DeleteClientCommand.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Trikoder\Bundle\OAuth2Bundle\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Trikoder\Bundle\OAuth2Bundle\Manager\ClientManagerInterface;
+
+final class DeleteClientCommand extends Command
+{
+    protected static $defaultName = 'trikoder:oauth2:delete-client';
+    private $clientManager;
+
+    public function __construct(ClientManagerInterface $clientManager)
+    {
+        parent::__construct();
+        $this->clientManager = $clientManager;
+    }
+
+    protected function configure(): void
+    {
+        $this
+            ->setDescription('Deletes an oAuth2 client')
+            ->addArgument(
+                'identifier',
+                InputArgument::REQUIRED,
+                'The client ID'
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $io = new SymfonyStyle($input, $output);
+        $identifier = $input->getArgument('identifier');
+        $client = $this->clientManager->find($identifier);
+        if (null === $client) {
+            $io->error(sprintf('oAuth2 client identified as "%s" does not exist', $identifier));
+
+            return 1;
+        }
+        $this->clientManager->remove($client);
+        $io->success('Given oAuth2 client deleted successfully.');
+
+        return 0;
+    }
+}

Command/ListClientsCommand.php

@@ -0,0 +1,127 @@
+<?php
+
+namespace Trikoder\Bundle\OAuth2Bundle\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Style\SymfonyStyle;
+use Trikoder\Bundle\OAuth2Bundle\Manager\ClientFilter;
+use Trikoder\Bundle\OAuth2Bundle\Manager\ClientManagerInterface;
+use Trikoder\Bundle\OAuth2Bundle\Model\Client;
+use Trikoder\Bundle\OAuth2Bundle\Model\Grant;
+use Trikoder\Bundle\OAuth2Bundle\Model\RedirectUri;
+use Trikoder\Bundle\OAuth2Bundle\Model\Scope;
+
+final class ListClientsCommand extends Command
+{
+    public const ALLOWED_COLUMNS = ['identifier', 'secret', 'scope', 'redirect uri', 'grant type'];
+
+    protected static $defaultName = 'trikoder:oauth2:list-clients';
+    private $clientManager;
+
+    public function __construct(ClientManagerInterface $clientManager)
+    {
+        parent::__construct();
+        $this->clientManager = $clientManager;
+    }
+
+    protected function configure(): void
+    {
+        $this
+            ->setDescription('Lists existing oAuth2 clients')
+            ->addOption(
+                'columns',
+                null,
+                InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
+                'Determine which columns are shown. Can be used multiple times to specify multiple columns.',
+                self::ALLOWED_COLUMNS
+            )
+            ->addOption(
+                'redirect-uri',
+                null,
+                InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
+                'Finds by redirect uri for client. Use this option multiple times to filter by multiple redirect URIs.',
+                []
+            )
+            ->addOption(
+                'grant-type',
+                null,
+                InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
+                'Finds by allowed grant type for client. Use this option multiple times to filter by multiple grant types.',
+                []
+            )
+            ->addOption(
+                'scope',
+                null,
+                InputOption::VALUE_IS_ARRAY | InputOption::VALUE_REQUIRED,
+                'Finds by allowed scope for client. Use this option multiple times to find by multiple scopes.',
+                []
+            )
+        ;
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $criteria = $this->getFindByCriteria($input);
+        $clients = $this->clientManager->list($criteria);
+        $this->drawTable($input, $output, $clients);
+
+        return 0;
+    }
+
+    private function getFindByCriteria(InputInterface $input): ClientFilter
+    {
+        return
+            ClientFilter
+                ::create()
+                ->addGrantCriteria(...array_map(function (string $grant): Grant {
+                    return new Grant($grant);
+                }, $input->getOption('grant-type')))
+                ->addRedirectUriCriteria(...array_map(function (string $redirectUri): RedirectUri {
+                    return new RedirectUri($redirectUri);
+                }, $input->getOption('redirect-uri')))
+                ->addScopeCriteria(...array_map(function (string $scope): Scope {
+                    return new Scope($scope);
+                }, $input->getOption('scope')))
+            ;
+    }
+
+    private function drawTable(InputInterface $input, OutputInterface $output, array $clients): void
+    {
+        $io = new SymfonyStyle($input, $output);
+        $columns = $this->getColumns($input);
+        $rows = $this->getRows($clients, $columns);
+        $io->table($columns, $rows);
+    }
+
+    private function getRows(array $clients, array $columns): array
+    {
+        return array_map(function (Client $client) use ($columns): array {
+            $values = [
+                'identifier' => $client->getIdentifier(),
+                'secret' => $client->getSecret(),
+                'scope' => implode(', ', $client->getScopes()),
+                'redirect uri' => implode(', ', $client->getRedirectUris()),
+                'grant type' => implode(', ', $client->getGrants()),
+            ];
+
+            return array_map(function (string $column) use ($values): string {
+                return $values[$column];
+            }, $columns);
+        }, $clients);
+    }
+
+    private function getColumns(InputInterface $input): array
+    {
+        $allowedColumns = self::ALLOWED_COLUMNS;
+
+        $requestedColumns = $input->getOption('columns');
+        $requestedColumns = array_map(function (string $column): string {
+            return strtolower(trim($column));
+        }, $requestedColumns);
+
+        return array_intersect($requestedColumns, $allowedColumns);
+    }
+}

Command/UpdateClientCommand.php

@@ -27,30 +27,30 @@ public function __construct(ClientManagerInterface $clientManager)
         $this->clientManager = $clientManager;
     }
 
-    protected function configure()
+    protected function configure(): void
     {
         $this
             ->setDescription('Updates an oAuth2 client')
             ->addOption(
                 'redirect-uri',
                 null,
-                InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
+                InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
                 'Sets redirect uri for client. Use this option multiple times to set multiple redirect URIs.',
-                null
+                []
             )
             ->addOption(
                 'grant-type',
                 null,
-                InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
+                InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
                 'Sets allowed grant type for client. Use this option multiple times to set multiple grant types.',
-                null
+                []
             )
             ->addOption(
                 'scope',
                 null,
-                InputOption::VALUE_OPTIONAL | InputOption::VALUE_IS_ARRAY,
+                InputOption::VALUE_REQUIRED | InputOption::VALUE_IS_ARRAY,
                 'Sets allowed scope for client. Use this option multiple times to set multiple scopes.',
-                null
+                []
             )
             ->addOption(
                 'deactivated',
@@ -66,7 +66,7 @@ protected function configure()
         ;
     }
 
-    protected function execute(InputInterface $input, OutputInterface $output)
+    protected function execute(InputInterface $input, OutputInterface $output): int
     {
         $io = new SymfonyStyle($input, $output);
 
@@ -88,19 +88,19 @@ private function updateClientFromInput(Client $client, InputInterface $input): C
         $client->setActive(!$input->getOption('deactivated'));
 
         $redirectUris = array_map(
-            function (string $redirectUri) { return new RedirectUri($redirectUri); },
+            function (string $redirectUri): RedirectUri { return new RedirectUri($redirectUri); },
             $input->getOption('redirect-uri')
         );
         $client->setRedirectUris(...$redirectUris);
 
         $grants = array_map(
-            function (string $grant) { return new Grant($grant); },
+            function (string $grant): Grant { return new Grant($grant); },
             $input->getOption('grant-type')
         );
         $client->setGrants(...$grants);
 
         $scopes = array_map(
-            function (string $scope) { return new Scope($scope); },
+            function (string $scope): Scope { return new Scope($scope); },
             $input->getOption('scope')
         );
         $client->setScopes(...$scopes);

Manager/ClientFilter.php

@@ -0,0 +1,86 @@
+<?php
+
+namespace Trikoder\Bundle\OAuth2Bundle\Manager;
+
+use Trikoder\Bundle\OAuth2Bundle\Model\Grant;
+use Trikoder\Bundle\OAuth2Bundle\Model\RedirectUri;
+use Trikoder\Bundle\OAuth2Bundle\Model\Scope;
+
+final class ClientFilter
+{
+    /**
+     * @var array
+     */
+    private $grants = [];
+    /**
+     * @var array
+     */
+    private $redirectUris = [];
+    /**
+     * @var array
+     */
+    private $scopes = [];
+
+    public static function create(): self
+    {
+        return new static();
+    }
+
+    public function addGrantCriteria(Grant ...$grants): self
+    {
+        return $this->addCriteria($this->grants, ...$grants);
+    }
+
+    public function addRedirectUriCriteria(RedirectUri ...$redirectUris): self
+    {
+        return $this->addCriteria($this->redirectUris, ...$redirectUris);
+    }
+
+    public function addScopeCriteria(Scope ...$scopes): self
+    {
+        return $this->addCriteria($this->scopes, ...$scopes);
+    }
+
+    private function addCriteria(&$field, ...$values): self
+    {
+        if (0 === \count($values)) {
+            return $this;
+        }
+
+        $field = array_merge($field, $values);
+
+        return $this;
+    }
+
+    /**
+     * @return Grant[]
+     */
+    public function getGrants(): array
+    {
+        return $this->grants;
+    }
+
+    /**
+     * @return RedirectUri[]
+     */
+    public function getRedirectUris(): array
+    {
+        return $this->redirectUris;
+    }
+
+    /**
+     * @return Scope[]
+     */
+    public function getScopes(): array
+    {
+        return $this->scopes;
+    }
+
+    public function hasFilters(): bool
+    {
+        return
+            !empty($this->grants)
+            || !empty($this->redirectUris)
+            || !empty($this->scopes);
+    }
+}