Merge branch 'master' into auth-token-commands

2 files changed, 106 insertions, 1 deletions

diff --git a/core/Command/Base.php b/core/Command/Base.php
index abf9f95773a..2581e273cb9 100644
--- a/core/Command/Base.php
+++ b/core/Command/Base.php
@@ -161,7 +161,7 @@ class Base extends Command implements CompletionAwareInterface {
 	 *
 	 * Gives a chance to the command to properly terminate what it's doing
 	 */
-	protected function cancelOperation() {
+	public function cancelOperation(): void {
 		$this->interrupted = true;
 	}
 
diff --git a/core/Command/User/SyncAccountDataCommand.php b/core/Command/User/SyncAccountDataCommand.php
new file mode 100644
index 00000000000..6a4a600ea03
--- /dev/null
+++ b/core/Command/User/SyncAccountDataCommand.php
@@ -0,0 +1,105 @@
+<?php
+/**
+ * @copyright Copyright (c) 2023 Julius Härrtl <jus@bitgrid.net>
+ *
+ * @author Julius Härrtl <jus@bitgrid.net>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OC\Core\Command\User;
+
+use OC\Core\Command\Base;
+use OCP\Accounts\IAccountManager;
+use OCP\Accounts\PropertyDoesNotExistException;
+use OCP\IUser;
+use OCP\IUserManager;
+use OCP\User\Backend\IGetDisplayNameBackend;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class SyncAccountDataCommand extends Base {
+	protected IUserManager $userManager;
+	protected IAccountManager $accountManager;
+
+	public function __construct(
+		IUserManager $userManager,
+		IAccountManager $accountManager
+	) {
+		$this->userManager = $userManager;
+		$this->accountManager = $accountManager;
+		parent::__construct();
+	}
+
+	protected function configure() {
+		$this
+			->setName('user:sync-account-data')
+			->setDescription('sync user backend data to accounts table for configured users')
+			->addOption(
+				'limit',
+				'l',
+				InputOption::VALUE_OPTIONAL,
+				'Number of users to retrieve',
+				'500'
+			)->addOption(
+				'offset',
+				'o',
+				InputOption::VALUE_OPTIONAL,
+				'Offset for retrieving users',
+				'0'
+			);
+	}
+
+	protected function execute(InputInterface $input, OutputInterface $output): int {
+		$users = $this->userManager->searchDisplayName('', (int) $input->getOption('limit'), (int) $input->getOption('offset'));
+
+		foreach ($users as $user) {
+			$this->updateUserAccount($user, $output);
+		}
+		return 0;
+	}
+
+	private function updateUserAccount(IUser $user, OutputInterface $output): void {
+		$changed = false;
+		$account = $this->accountManager->getAccount($user);
+		if ($user->getBackend() instanceof IGetDisplayNameBackend) {
+			try {
+				$displayNameProperty = $account->getProperty(IAccountManager::PROPERTY_DISPLAYNAME);
+			} catch (PropertyDoesNotExistException) {
+				$displayNameProperty = null;
+			}
+			if (!$displayNameProperty || $displayNameProperty->getValue() !== $user->getDisplayName()) {
+				$output->writeln($user->getUID() . ' - updating changed display name');
+				$account->setProperty(
+					IAccountManager::PROPERTY_DISPLAYNAME,
+					$user->getDisplayName(),
+					$displayNameProperty ? $displayNameProperty->getScope() : IAccountManager::SCOPE_PRIVATE,
+					$displayNameProperty ? $displayNameProperty->getVerified() : IAccountManager::NOT_VERIFIED,
+					$displayNameProperty ? $displayNameProperty->getVerificationData() : ''
+				);
+				$changed = true;
+			}
+		}
+
+		if ($changed) {
+			$this->accountManager->updateAccount($account);
+			$output->writeln($user->getUID() . ' - account data updated');
+		} else {
+			$output->writeln($user->getUID() . ' - nothing to update');
+		}
+	}
+}