hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-23 18:03:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

change activate_password to password_oauth2_gt

Browse Source
This commit is contained in:
aynsix
2020-02-28 16:06:58 +03:00
parent d2a899ab4f
commit d3b4d78b72
1 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/Alchemy/Phrasea/Command/User/UserApplicationsCommand.php
View File

@@ -25,7 +25,6 @@ use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface; use Symfony\Component\Console\Output\OutputInterface;
use Symfony\Component\Console\Input\InputOption; use Symfony\Component\Console\Input\InputOption;
class UserApplicationsCommand extends Command class UserApplicationsCommand extends Command
{ {
@@ -51,7 +50,7 @@ class UserApplicationsCommand extends Command
->addOption('webhook_url', null, InputOption::VALUE_REQUIRED, 'The webhook url') ->addOption('webhook_url', null, InputOption::VALUE_REQUIRED, 'The webhook url')
->addOption('active', null, InputOption::VALUE_OPTIONAL, 'Activate or unactive the app, values true or false', 'true') ->addOption('active', null, InputOption::VALUE_OPTIONAL, 'Activate or unactive the app, values true or false', 'true')
->addOption('generate_token', null, InputOption::VALUE_NONE, 'Generate or regenerate an access token') ->addOption('generate_token', null, InputOption::VALUE_NONE, 'Generate or regenerate an access token')
->addOption('activate_password', null, InputOption::VALUE_OPTIONAL, 'Activate or deactivate password OAuth2 grant type , values true or false', 'false') ->addOption('password_oauth2_gt', null, InputOption::VALUE_OPTIONAL, 'Activate or deactivate password OAuth2 grant type , values true or false', 'false')
->addOption('jsonformat', null, InputOption::VALUE_NONE, 'Output in json format') ->addOption('jsonformat', null, InputOption::VALUE_NONE, 'Output in json format')
->setHelp(''); ->setHelp('');
@@ -71,7 +70,7 @@ class UserApplicationsCommand extends Command
$webhookUrl = $input->getOption('webhook_url'); $webhookUrl = $input->getOption('webhook_url');
$active = $input->getOption('active'); $active = $input->getOption('active');
$generateToken = $input->getOption('generate_token'); $generateToken = $input->getOption('generate_token');
$activatePassword = $input->getOption('activate_password'); $passwordOauth2Gt = $input->getOption('password_oauth2_gt');
$create = $input->getOption('create'); $create = $input->getOption('create');
$edit = $input->getOption('edit'); $edit = $input->getOption('edit');
$delete = $input->getOption('delete'); $delete = $input->getOption('delete');
@@ -122,12 +121,12 @@ class UserApplicationsCommand extends Command
$apiOauthTokenManipulator->create($account); $apiOauthTokenManipulator->create($account);
} }
if ($activatePassword) { if ($passwordOauth2Gt) {
if (in_array($activatePassword, ['true', 'false'])) { if (in_array($passwordOauth2Gt, ['true', 'false'])) {
$application->setGrantPassword(($activatePassword == 'true') ? true : false); $application->setGrantPassword(($passwordOauth2Gt == 'true') ? true : false);
$applicationManipulator->update($application); $applicationManipulator->update($application);
} else { } else {
$output->writeln('<error> Value of option --activate_password should be "true" or "false"</error>'); $output->writeln('<error> Value of option --password_oauth2_gt should be "true" or "false"</error>');
return 0; return 0;
} }
@@ -197,11 +196,11 @@ class UserApplicationsCommand extends Command
$apiOauthTokenManipulator->create($account); $apiOauthTokenManipulator->create($account);
} }
} }
if ($activatePassword) { if ($passwordOauth2Gt) {
if (in_array($activatePassword, ['true', 'false'])) { if (in_array($passwordOauth2Gt, ['true', 'false'])) {
$application->setGrantPassword(($activatePassword == 'true') ? true : false); $application->setGrantPassword(($passwordOauth2Gt == 'true') ? true : false);
} else { } else {
$output->writeln('<error> Value of option --activate_password should be "true" or "false"</error>'); $output->writeln('<error> Value of option --password_oauth2_gt should be "true" or "false"</error>');
return 0; return 0;
} }
@@ -254,7 +253,7 @@ class UserApplicationsCommand extends Command
} }
$applicationTable = $this->getHelperSet()->get('table'); $applicationTable = $this->getHelperSet()->get('table');
$headers = ['app_id', 'user_id', 'name', 'client_id', 'callback_url', 'generated token', 'activate_password status']; $headers = ['app_id', 'user_id', 'name', 'client_id', 'callback_url', 'generated token', 'grant_password status'];
if ($jsonformat ) { if ($jsonformat ) {
foreach ($applicationList as $appList) { foreach ($applicationList as $appList) {
@@ -313,7 +312,7 @@ class UserApplicationsCommand extends Command
$application->isPasswordGranted() ? "true": "false" $application->isPasswordGranted() ? "true": "false"
]; ];
$headers = ['client secret', 'client ID', 'Authorize endpoint url', 'Access endpoint', 'generated token', 'activate_password status']; $headers = ['client secret', 'client ID', 'Authorize endpoint url', 'Access endpoint', 'generated token', 'grant_password status'];
if ($jsonformat ) { if ($jsonformat ) {
$createdAppInfo = array_combine($headers, $applicationCreated); $createdAppInfo = array_combine($headers, $applicationCreated);
echo json_encode($createdAppInfo); echo json_encode($createdAppInfo);