From bb9b166eb1be73226d2cf978a05a70ed83faec1e Mon Sep 17 00:00:00 2001 From: Alexandre Alapetite Date: Thu, 17 Sep 2020 09:43:39 +0200 Subject: Fix CLI api_password (#3179) * Fix CLI api_password #fix https://github.com/FreshRSS/FreshRSS/issues/3177 Fix regression from https://github.com/FreshRSS/FreshRSS/pull/2675 * Update cli/_update-or-create-user.php Co-authored-by: oupala Co-authored-by: oupala --- cli/_update-or-create-user.php | 5 +++-- cli/create-user.php | 8 ++++++++ cli/update-user.php | 7 +++++++ 3 files changed, 18 insertions(+), 2 deletions(-) (limited to 'cli') diff --git a/cli/_update-or-create-user.php b/cli/_update-or-create-user.php index 0da9963f0..2b01fd011 100644 --- a/cli/_update-or-create-user.php +++ b/cli/_update-or-create-user.php @@ -4,6 +4,7 @@ require(__DIR__ . '/_cli.php'); $params = array( 'user:', 'password:', + 'api_password:', 'language:', 'email:', 'token:', @@ -22,9 +23,9 @@ $options = getopt('', $params); if (!validateOptions($argv, $params) || empty($options['user'])) { fail('Usage: ' . basename($_SERVER['SCRIPT_FILENAME']) . - " --user username ( --password 'password'" . + " --user username ( --password 'password' --api_password 'api_password'" . " --language en --email user@example.net --token 'longRandomString'" . - ($isUpdate ? '' : '--no_default_feeds') . + ($isUpdate ? '' : ' --no_default_feeds') . " --purge_after_months 3 --feed_min_articles_default 50 --feed_ttl_default 3600" . " --since_hours_posts_per_rss 168 --max_posts_per_rss 400 )"); } diff --git a/cli/create-user.php b/cli/create-user.php index f98168cf6..dd0c23175 100755 --- a/cli/create-user.php +++ b/cli/create-user.php @@ -28,6 +28,14 @@ if (!$ok) { fail('FreshRSS could not create user!'); } +if (!empty($options['api_password'])) { + $username = cliInitUser($username); + $error = FreshRSS_api_Controller::updatePassword($options['api_password']); + if ($error) { + fail($error); + } +} + invalidateHttpCache(FreshRSS_Context::$system_conf->default_user); echo '• Remember to refresh the feeds of the user: ', $username , "\n", diff --git a/cli/update-user.php b/cli/update-user.php index 75c778fe5..953a9d2c0 100755 --- a/cli/update-user.php +++ b/cli/update-user.php @@ -17,6 +17,13 @@ if (!$ok) { fail('FreshRSS could not update user!'); } +if (!empty($options['api_password'])) { + $error = FreshRSS_api_Controller::updatePassword($options['api_password']); + if ($error) { + fail($error); + } +} + invalidateHttpCache($username); accessRights(); -- cgit v1.2.3