Merge pull request #58518 from nextcloud/enh/58508/move-user-picker-to-profile

Move the profile picker to the profile app

Author: susnux

.gitignore

@@ -44,7 +44,6 @@ node_modules/
 !/apps/updatenotification
 !/apps/theming
 !/apps/twofactor_backupcodes
-!/apps/user_picker
 !/apps/user_status
 !/apps/weather_status
 !/apps/webhook_listeners

.tx/config

@@ -170,12 +170,6 @@ source_file = translationfiles/templates/user_ldap.pot
 source_lang = en
 type        = PO
 
-[o:nextcloud:p:nextcloud:r:user_picker]
-file_filter = translationfiles/<lang>/user_picker.po
-source_file = translationfiles/templates/user_picker.pot
-source_lang = en
-type        = PO
-
 [o:nextcloud:p:nextcloud:r:user_status]
 file_filter = translationfiles/<lang>/user_status.po
 source_file = translationfiles/templates/user_status.pot

apps/user_picker/REUSE.toml apps/profile/REUSE.tomlapps/user_picker/REUSE.toml renamed to apps/profile/REUSE.toml

@@ -7,5 +7,8 @@
 
 return array(
     'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
+    'OCA\\Profile\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
     'OCA\\Profile\\Controller\\ProfilePageController' => $baseDir . '/../lib/Controller/ProfilePageController.php',
+    'OCA\\Profile\\Listener\\ProfilePickerReferenceListener' => $baseDir . '/../lib/Listener/ProfilePickerReferenceListener.php',
+    'OCA\\Profile\\Reference\\ProfilePickerReferenceProvider' => $baseDir . '/../lib/Reference/ProfilePickerReferenceProvider.php',
 );

apps/profile/composer/composer/autoload_classmap.php

@@ -22,7 +22,10 @@ class ComposerStaticInitProfile
 
     public static $classMap = array (
         'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
+        'OCA\\Profile\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
         'OCA\\Profile\\Controller\\ProfilePageController' => __DIR__ . '/..' . '/../lib/Controller/ProfilePageController.php',
+        'OCA\\Profile\\Listener\\ProfilePickerReferenceListener' => __DIR__ . '/..' . '/../lib/Listener/ProfilePickerReferenceListener.php',
+        'OCA\\Profile\\Reference\\ProfilePickerReferenceProvider' => __DIR__ . '/..' . '/../lib/Reference/ProfilePickerReferenceProvider.php',
     );
 
     public static function getInitializer(ClassLoader $loader)

apps/profile/composer/composer/autoload_static.php

@@ -6,10 +6,10 @@
  * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-namespace OCA\UserPicker\AppInfo;
+namespace OCA\Profile\AppInfo;
 
-use OCA\UserPicker\Listener\UserPickerReferenceListener;
-use OCA\UserPicker\Reference\ProfilePickerReferenceProvider;
+use OCA\Profile\Listener\ProfilePickerReferenceListener;
+use OCA\Profile\Reference\ProfilePickerReferenceProvider;
 use OCP\AppFramework\App;
 use OCP\AppFramework\Bootstrap\IBootContext;
 use OCP\AppFramework\Bootstrap\IBootstrap;
@@ -18,15 +18,15 @@
 use OCP\Collaboration\Reference\RenderReferenceEvent;
 
 class Application extends App implements IBootstrap {
-	public const APP_ID = 'user_picker';
+	public const APP_ID = 'profile';
 
 	public function __construct(array $urlParams = []) {
 		parent::__construct(self::APP_ID, $urlParams);
 	}
 
 	public function register(IRegistrationContext $context): void {
 		$context->registerReferenceProvider(ProfilePickerReferenceProvider::class);
-		$context->registerEventListener(RenderReferenceEvent::class, UserPickerReferenceListener::class);
+		$context->registerEventListener(RenderReferenceEvent::class, ProfilePickerReferenceListener::class);
 	}
 
 	public function boot(IBootContext $context): void {

apps/profile/img/app-dark.svg

@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+namespace OCA\Profile\Listener;
+
+use OCA\Profile\AppInfo\Application;
+use OCP\Collaboration\Reference\RenderReferenceEvent;
+use OCP\EventDispatcher\Event;
+use OCP\EventDispatcher\IEventListener;
+use OCP\IAppConfig;
+use OCP\Profile\IProfileManager;
+use OCP\Util;
+
+/**
+ * @template-implements IEventListener<RenderReferenceEvent>
+ */
+class ProfilePickerReferenceListener implements IEventListener {
+
+	public function __construct(
+		private IAppConfig $appConfig,
+		private IProfileManager $profileManager,
+	) {
+	}
+
+	public function handle(Event $event): void {
+		if (!$event instanceof RenderReferenceEvent) {
+			return;
+		}
+
+		$profileEnabledGlobally = $this->profileManager->isProfileEnabled();
+
+		$profilePickerEnabled = filter_var(
+			$this->appConfig->getValueString('settings', 'profile_picker_enabled', '1'),
+			FILTER_VALIDATE_BOOLEAN,
+			FILTER_NULL_ON_FAILURE,
+		);
+
+		if ($profileEnabledGlobally && $profilePickerEnabled) {
+			Util::addScript(Application::APP_ID, 'reference');
+		}
+	}
+}

apps/profile/img/app.svg

@@ -6,31 +6,41 @@
  * SPDX-FileCopyrightText: 2026 Nextcloud GmbH and Nextcloud contributors
  * SPDX-License-Identifier: AGPL-3.0-or-later
  */
-namespace OCA\UserPicker\Reference;
+namespace OCA\Profile\Reference;
 
-use OCA\UserPicker\AppInfo\Application;
+use OCA\Profile\AppInfo\Application;
 use OCP\Accounts\IAccountManager;
 
 use OCP\Collaboration\Reference\ADiscoverableReferenceProvider;
 use OCP\Collaboration\Reference\IReference;
 use OCP\Collaboration\Reference\Reference;
 
+use OCP\IAppConfig;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\IUserManager;
 use OCP\Profile\IProfileManager;
 
 class ProfilePickerReferenceProvider extends ADiscoverableReferenceProvider {
-	public const RICH_OBJECT_TYPE = 'user_picker_profile';
+	public const RICH_OBJECT_TYPE = 'profile_widget';
+	private bool $enabled;
 
 	public function __construct(
 		private IL10N $l10n,
 		private IURLGenerator $urlGenerator,
 		private IUserManager $userManager,
 		private IAccountManager $accountManager,
 		private IProfileManager $profileManager,
+		private IAppConfig $appConfig,
 		private ?string $userId,
 	) {
+		$profileEnabledGlobally = $this->profileManager->isProfileEnabled();
+		$profilePickerEnabled = filter_var(
+			$this->appConfig->getValueString('settings', 'profile_picker_enabled', '1'),
+			FILTER_VALIDATE_BOOLEAN,
+			FILTER_NULL_ON_FAILURE,
+		);
+		$this->enabled = $profileEnabledGlobally && $profilePickerEnabled;
 	}
 
 	/**
@@ -65,6 +75,9 @@ public function getIconUrl(): string {
 	 * @inheritDoc
 	 */
 	public function matchReference(string $referenceText): bool {
+		if (!$this->enabled) {
+			return false;
+		}
 		return $this->getObjectId($referenceText) !== null;
 	}