[5.3] Add user argument to perform the cli command with a specific user

cli/joomla.php

@@ -74,4 +74,9 @@
 
 $app                              = \Joomla\CMS\Factory::getContainer()->get(\Joomla\Console\Application::class);
 \Joomla\CMS\Factory::$application = $app;
+
+if ($app instanceof \Joomla\CMS\User\UserFactoryAwareInterface) {
+    $app->setUserFactory($container->get(\Joomla\CMS\User\UserFactoryInterface::class));
+}
+
 $app->execute();

libraries/src/Application/ConsoleApplication.php

@@ -16,6 +16,8 @@
 use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\Router\Router;
 use Joomla\CMS\Uri\Uri;
+use Joomla\CMS\User\UserFactoryAwareInterface;
+use Joomla\CMS\User\UserFactoryAwareTrait;
 use Joomla\CMS\Version;
 use Joomla\Console\Application;
 use Joomla\Database\DatabaseAwareTrait;
@@ -40,14 +42,15 @@
  *
  * @since  4.0.0
  */
-class ConsoleApplication extends Application implements CMSApplicationInterface
+class ConsoleApplication extends Application implements CMSApplicationInterface, UserFactoryAwareInterface
 {
     use EventAware;
     use IdentityAware;
     use ContainerAwareTrait;
     use ExtensionManagerTrait;
     use ExtensionNamespaceMapper;
     use DatabaseAwareTrait;
+    use UserFactoryAwareTrait;
 
     /**
      * The input.
@@ -247,6 +250,20 @@ public function execute()
          */
         $this->populateHttpHost();
 
+        // Load the user when specified
+        $user = $this->getConsoleInput()->getParameterOption(['--user'], null);
+
+        try {
+            if ($user !== null && is_numeric($user)) {
+                $this->loadIdentity($this->getUserFactory()->loadUserById((int) $user));
+            }
+
+            if ($user !== null && !is_numeric($user)) {
+                $this->loadIdentity($this->getUserFactory()->loadUserByUsername($user));
+            }
+        } catch (\UnexpectedValueException $e) {
+        }
+
         // Import CMS plugin groups to be able to subscribe to events
         PluginHelper::importPlugin('behaviour', null, true, $this->getDispatcher());
         PluginHelper::importPlugin('system', null, true, $this->getDispatcher());
@@ -549,6 +566,7 @@ protected function populateHttpHost()
     protected function getDefaultInputDefinition(): InputDefinition
     {
         $inputDefinition = parent::getDefaultInputDefinition();
+
         $inputDefinition->addOption(
             new InputOption(
                 '--live-site',
@@ -558,6 +576,15 @@ protected function getDefaultInputDefinition(): InputDefinition
             )
         );
 
+        $inputDefinition->addOption(
+            new InputOption(
+                '--user',
+                null,
+                InputOption::VALUE_OPTIONAL,
+                'The user to use, can be the user id or username'
+            )
+        );
+
         return $inputDefinition;
     }
 

libraries/src/Console/AddUserCommand.php

@@ -9,6 +9,8 @@
 
 namespace Joomla\CMS\Console;
 
+use Joomla\CMS\Application\CMSApplicationInterface;
+use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\User\User;
 use Joomla\Console\Command\AbstractCommand;
 use Joomla\Database\DatabaseAwareTrait;
@@ -142,6 +144,13 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
             return Command::FAILURE;
         }
 
+        // Load the action log plugins when an identity is set
+        $app = $this->getApplication();
+        if ($app instanceof CMSApplicationInterface && $app->getIdentity() instanceof User) {
+            PluginHelper::importPlugin('actionlog');
+            $app->getInput()->set('option', 'com_users');
+        }
+
         // Get filter to remove invalid characters
         $filter = new InputFilter();
 

libraries/src/Console/ChangeUserPasswordCommand.php

@@ -9,6 +9,8 @@
 
 namespace Joomla\CMS\Console;
 
+use Joomla\CMS\Application\CMSApplicationInterface;
+use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\User\User;
 use Joomla\CMS\User\UserHelper;
 use Joomla\Console\Command\AbstractCommand;
@@ -93,6 +95,13 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
             return Command::FAILURE;
         }
 
+        // Load the action log plugins when an identity is set
+        $app = $this->getApplication();
+        if ($app instanceof CMSApplicationInterface && $app->getIdentity() instanceof User) {
+            PluginHelper::importPlugin('actionlog');
+            $app->getInput()->set('option', 'com_users');
+        }
+
         $user           = User::getInstance($userId);
         $this->password = $this->getStringFromOption('password', 'Please enter a new password');
 

libraries/src/Console/DeleteUserCommand.php

@@ -10,6 +10,8 @@
 namespace Joomla\CMS\Console;
 
 use Joomla\CMS\Access\Access;
+use Joomla\CMS\Application\CMSApplicationInterface;
+use Joomla\CMS\Plugin\PluginHelper;
 use Joomla\CMS\User\User;
 use Joomla\CMS\User\UserHelper;
 use Joomla\Console\Command\AbstractCommand;
@@ -142,6 +144,13 @@ protected function doExecute(InputInterface $input, OutputInterface $output): in
             }
         }
 
+        // Load the action log plugins when an identity is set
+        $app = $this->getApplication();
+        if ($app instanceof CMSApplicationInterface && $app->getIdentity() instanceof User) {
+            PluginHelper::importPlugin('actionlog');
+            $app->getInput()->set('option', 'com_users');
+        }
+
         // Trigger delete of user
         $result = $user->delete();
 

libraries/src/User/User.php

@@ -718,7 +718,7 @@ public function save($updateOnly = false)
 
             // @todo ACL - this needs to be acl checked
 
-            $my = Factory::getUser();
+            $my = Factory::getApplication()->getIdentity() ?: Factory::getUser();
 
             // Are we creating a new user
             $isNew = empty($this->id);
@@ -748,7 +748,7 @@ public function save($updateOnly = false)
             // Check if we are using a CLI application
             $isCli = false;
 
-            if (Factory::getApplication()->isCli()) {
+            if ($my->id === 0 && Factory::getApplication()->isCli()) {
                 $isCli = true;
             }