feat(profilepicker): check fields visibility in reference provider

Signed-off-by: Julien Veyssier <[email protected]>

Author: julien-nc

lib/Reference/ProfilePickerReferenceProvider.php

@@ -18,6 +18,7 @@
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\IUserManager;
+use OCP\Profile\IProfileManager;
 
 class ProfilePickerReferenceProvider extends ADiscoverableReferenceProvider {
 	public const RICH_OBJECT_TYPE = 'users_picker_profile';
@@ -27,6 +28,7 @@ public function __construct(
 		private IURLGenerator $urlGenerator,
 		private IUserManager $userManager,
 		private IAccountManager $accountManager,
+		private IProfileManager $profileManager,
 		private ?string $userId,
 	) {
 	}
@@ -74,6 +76,8 @@ public function resolveReference(string $referenceText): ?IReference {
 			return null;
 		}
 
+		$currentUser = $this->userManager->get($this->userId);
+
 		$userId = $this->getObjectId($referenceText);
 		$user = $this->userManager->get($userId);
 		if ($user === null) {
@@ -91,8 +95,17 @@ public function resolveReference(string $referenceText): ?IReference {
 		$userEmail = $user->getEMailAddress();
 		$userAvatarUrl = $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $userId, 'size' => '64']);
 
-		$bio = $account->getProperty(IAccountManager::PROPERTY_BIOGRAPHY);
-		$bio = $bio->getScope() !== IAccountManager::SCOPE_PRIVATE ? $bio->getValue() : null;
+		$bioProperty = $account->getProperty(IAccountManager::PROPERTY_BIOGRAPHY);
+		$bio = null;
+		$fullBio = null;
+		if ($this->profileManager->isProfileFieldVisible(IAccountManager::PROPERTY_BIOGRAPHY, $user, $currentUser)) {
+			$fullBio = $bioProperty->getValue();
+			$bio = $fullBio !== ''
+				? (mb_strlen($fullBio) > 80
+					? (mb_substr($fullBio, 0, 80) . '...')
+					: $fullBio)
+				: null;
+		}
 		$headline = $account->getProperty(IAccountManager::PROPERTY_HEADLINE);
 		$location = $account->getProperty(IAccountManager::PROPERTY_ADDRESS);
 		$website = $account->getProperty(IAccountManager::PROPERTY_WEBSITE);
@@ -104,6 +117,8 @@ public function resolveReference(string $referenceText): ?IReference {
 		$reference->setDescription($userEmail ?? $userDisplayName);
 		$reference->setImageUrl($userAvatarUrl);
 
+		$isLocationVisible = $this->profileManager->isProfileFieldVisible(IAccountManager::PROPERTY_ADDRESS, $user, $currentUser);
+
 		// for the Vue reference widget
 		$reference->setRichObject(
 			self::RICH_OBJECT_TYPE,
@@ -112,18 +127,14 @@ public function resolveReference(string $referenceText): ?IReference {
 				'title' => $userDisplayName,
 				'subline' => $userEmail ?? $userDisplayName,
 				'email' => $userEmail,
-				'bio' => isset($bio) && $bio !== ''
-					? (mb_strlen($bio) > 80
-						? (mb_substr($bio, 0, 80) . '...')
-						: $bio)
-					: null,
-				'full_bio' => $bio,
-				'headline' => $headline->getScope() !== IAccountManager::SCOPE_PRIVATE ? $headline->getValue() : null,
-				'location' => $location->getScope() !== IAccountManager::SCOPE_PRIVATE ? $location->getValue() : null,
-				'location_url' => $location->getScope() !== IAccountManager::SCOPE_PRIVATE ? $this->getOpenStreetLocationUrl($location->getValue()) : null,
-				'website' => $website->getScope() !== IAccountManager::SCOPE_PRIVATE ? $website->getValue() : null,
-				'organisation' => $organisation->getScope() !== IAccountManager::SCOPE_PRIVATE ? $organisation->getValue() : null,
-				'role' => $role->getScope() !== IAccountManager::SCOPE_PRIVATE ? $role->getValue() : null,
+				'bio' => $bio,
+				'full_bio' => $fullBio,
+				'headline' => $this->profileManager->isProfileFieldVisible(IAccountManager::PROPERTY_HEADLINE, $user, $currentUser) ? $headline->getValue() : null,
+				'location' => $isLocationVisible ? $location->getValue() : null,
+				'location_url' => $isLocationVisible ? $this->getOpenStreetLocationUrl($location->getValue()) : null,
+				'website' => $this->profileManager->isProfileFieldVisible(IAccountManager::PROPERTY_WEBSITE, $user, $currentUser) ? $website->getValue() : null,
+				'organisation' => $this->profileManager->isProfileFieldVisible(IAccountManager::PROPERTY_ORGANISATION, $user, $currentUser) ? $organisation->getValue() : null,
+				'role' => $this->profileManager->isProfileFieldVisible(IAccountManager::PROPERTY_ROLE, $user, $currentUser) ? $role->getValue() : null,
 				'url' => $referenceText,
 			]
 		);

tests/unit/Reference/ProfilePickerReferenceProviderTest.php

@@ -17,6 +17,7 @@
 use OCP\IURLGenerator;
 use OCP\IUser;
 use OCP\IUserManager;
+use OCP\Profile\IProfileManager;
 use PHPUnit\Framework\MockObject\MockObject;
 
 class ProfilePickerReferenceProviderTest extends TestCase {
@@ -25,6 +26,7 @@ class ProfilePickerReferenceProviderTest extends TestCase {
 	private IURLGenerator|MockObject $urlGenerator;
 	private IUserManager|MockObject $userManager;
 	private IAccountManager|MockObject $accountManager;
+	private IProfileManager|MockObject $profileManager;
 	private ProfilePickerReferenceProvider $referenceProvider;
 
 	private array $testUsersData = [
@@ -120,12 +122,14 @@ public function setUp(): void {
 		$this->urlGenerator = $this->createMock(IURLGenerator::class);
 		$this->userManager = $this->createMock(IUserManager::class);
 		$this->accountManager = $this->createMock(IAccountManager::class);
+		$this->profileManager = $this->createMock(IProfileManager::class);
 
 		$this->referenceProvider = new ProfilePickerReferenceProvider(
 			$this->l10n,
 			$this->urlGenerator,
 			$this->userManager,
 			$this->accountManager,
+			$this->profileManager,
 			$this->userId
 		);