Skip to content

Commit a7cc035

Browse files
julien-ncjulien-nc
committed
feat(profilepicker): check fields visibility in reference provider
Signed-off-by: Julien Veyssier <[email protected]>
1 parent 4fb561f commit a7cc035

File tree

2 files changed

+75
-20
lines changed

2 files changed

+75
-20
lines changed

‎lib/Reference/ProfilePickerReferenceProvider.php

+27-17
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
use OCP\IL10N;
1919
use OCP\IURLGenerator;
2020
use OCP\IUserManager;
21+
use OCP\Profile\IProfileManager;
2122

2223
class ProfilePickerReferenceProvider extends ADiscoverableReferenceProvider {
2324
public const RICH_OBJECT_TYPE = 'users_picker_profile';
@@ -27,6 +28,7 @@ public function __construct(
2728
private IURLGenerator $urlGenerator,
2829
private IUserManager $userManager,
2930
private IAccountManager $accountManager,
31+
private IProfileManager $profileManager,
3032
private ?string $userId,
3133
) {
3234
}
@@ -79,20 +81,30 @@ public function resolveReference(string $referenceText): ?IReference {
7981
if ($user === null) {
8082
return null;
8183
}
82-
$account = $this->accountManager->getAccount($user);
83-
$profileEnabled = $account->getProperty(IAccountManager::PROPERTY_PROFILE_ENABLED)->getValue() === '1';
84-
if (!$profileEnabled) {
84+
if (!$this->profileManager->isProfileEnabled($user)) {
8585
return null;
8686
}
87+
$account = $this->accountManager->getAccount($user);
88+
89+
$currentUser = $this->userManager->get($this->userId);
8790

8891
$reference = new Reference($referenceText);
8992

9093
$userDisplayName = $user->getDisplayName();
9194
$userEmail = $user->getEMailAddress();
9295
$userAvatarUrl = $this->urlGenerator->linkToRouteAbsolute('core.avatar.getAvatar', ['userId' => $userId, 'size' => '64']);
9396

94-
$bio = $account->getProperty(IAccountManager::PROPERTY_BIOGRAPHY);
95-
$bio = $bio->getScope() !== IAccountManager::SCOPE_PRIVATE ? $bio->getValue() : null;
97+
$bioProperty = $account->getProperty(IAccountManager::PROPERTY_BIOGRAPHY);
98+
$bio = null;
99+
$fullBio = null;
100+
if ($this->profileManager->isProfileFieldVisible(IAccountManager::PROPERTY_BIOGRAPHY, $user, $currentUser)) {
101+
$fullBio = $bioProperty->getValue();
102+
$bio = $fullBio !== ''
103+
? (mb_strlen($fullBio) > 80
104+
? (mb_substr($fullBio, 0, 80) . '...')
105+
: $fullBio)
106+
: null;
107+
}
96108
$headline = $account->getProperty(IAccountManager::PROPERTY_HEADLINE);
97109
$location = $account->getProperty(IAccountManager::PROPERTY_ADDRESS);
98110
$website = $account->getProperty(IAccountManager::PROPERTY_WEBSITE);
@@ -104,6 +116,8 @@ public function resolveReference(string $referenceText): ?IReference {
104116
$reference->setDescription($userEmail ?? $userDisplayName);
105117
$reference->setImageUrl($userAvatarUrl);
106118

119+
$isLocationVisible = $this->profileManager->isProfileFieldVisible(IAccountManager::PROPERTY_ADDRESS, $user, $currentUser);
120+
107121
// for the Vue reference widget
108122
$reference->setRichObject(
109123
self::RICH_OBJECT_TYPE,
@@ -112,18 +126,14 @@ public function resolveReference(string $referenceText): ?IReference {
112126
'title' => $userDisplayName,
113127
'subline' => $userEmail ?? $userDisplayName,
114128
'email' => $userEmail,
115-
'bio' => isset($bio) && $bio !== ''
116-
? (mb_strlen($bio) > 80
117-
? (mb_substr($bio, 0, 80) . '...')
118-
: $bio)
119-
: null,
120-
'full_bio' => $bio,
121-
'headline' => $headline->getScope() !== IAccountManager::SCOPE_PRIVATE ? $headline->getValue() : null,
122-
'location' => $location->getScope() !== IAccountManager::SCOPE_PRIVATE ? $location->getValue() : null,
123-
'location_url' => $location->getScope() !== IAccountManager::SCOPE_PRIVATE ? $this->getOpenStreetLocationUrl($location->getValue()) : null,
124-
'website' => $website->getScope() !== IAccountManager::SCOPE_PRIVATE ? $website->getValue() : null,
125-
'organisation' => $organisation->getScope() !== IAccountManager::SCOPE_PRIVATE ? $organisation->getValue() : null,
126-
'role' => $role->getScope() !== IAccountManager::SCOPE_PRIVATE ? $role->getValue() : null,
129+
'bio' => $bio,
130+
'full_bio' => $fullBio,
131+
'headline' => $this->profileManager->isProfileFieldVisible(IAccountManager::PROPERTY_HEADLINE, $user, $currentUser) ? $headline->getValue() : null,
132+
'location' => $isLocationVisible ? $location->getValue() : null,
133+
'location_url' => $isLocationVisible ? $this->getOpenStreetLocationUrl($location->getValue()) : null,
134+
'website' => $this->profileManager->isProfileFieldVisible(IAccountManager::PROPERTY_WEBSITE, $user, $currentUser) ? $website->getValue() : null,
135+
'organisation' => $this->profileManager->isProfileFieldVisible(IAccountManager::PROPERTY_ORGANISATION, $user, $currentUser) ? $organisation->getValue() : null,
136+
'role' => $this->profileManager->isProfileFieldVisible(IAccountManager::PROPERTY_ROLE, $user, $currentUser) ? $role->getValue() : null,
127137
'url' => $referenceText,
128138
]
129139
);

‎tests/unit/Reference/ProfilePickerReferenceProviderTest.php

+48-3
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,17 @@
1717
use OCP\IURLGenerator;
1818
use OCP\IUser;
1919
use OCP\IUserManager;
20+
use OCP\Profile\IProfileManager;
2021
use PHPUnit\Framework\MockObject\MockObject;
2122

2223
class ProfilePickerReferenceProviderTest extends TestCase {
2324
private string $userId = 'admin';
25+
private IUser|MockObject $adminUser;
2426
private IL10N|MockObject $l10n;
2527
private IURLGenerator|MockObject $urlGenerator;
2628
private IUserManager|MockObject $userManager;
2729
private IAccountManager|MockObject $accountManager;
30+
private IProfileManager|MockObject $profileManager;
2831
private ProfilePickerReferenceProvider $referenceProvider;
2932

3033
private array $testUsersData = [
@@ -46,60 +49,74 @@ class ProfilePickerReferenceProviderTest extends TestCase {
4649
'user1' => [
4750
IAccountManager::PROPERTY_BIOGRAPHY => [
4851
'scope' => IAccountManager::SCOPE_PRIVATE,
52+
'visible' => true,
4953
'value' => 'This is a first test user',
5054
],
5155
IAccountManager::PROPERTY_HEADLINE => [
5256
'scope' => IAccountManager::SCOPE_LOCAL,
57+
'visible' => false,
5358
'value' => 'I\'m a first test user',
5459
],
5560
IAccountManager::PROPERTY_ADDRESS => [
5661
'scope' => IAccountManager::SCOPE_LOCAL,
62+
'visible' => true,
5763
'value' => 'Odessa',
5864
],
5965
IAccountManager::PROPERTY_WEBSITE => [
6066
'scope' => IAccountManager::SCOPE_LOCAL,
67+
'visible' => true,
6168
'value' => 'https://domain.co/testuser1',
6269
],
6370
IAccountManager::PROPERTY_ORGANISATION => [
6471
'scope' => IAccountManager::SCOPE_PRIVATE,
72+
'visible' => true,
6573
'value' => 'Nextcloud GmbH',
6674
],
6775
IAccountManager::PROPERTY_ROLE => [
6876
'scope' => IAccountManager::SCOPE_LOCAL,
77+
'visible' => true,
6978
'value' => 'Non-existing user',
7079
],
7180
IAccountManager::PROPERTY_PROFILE_ENABLED => [
7281
'scope' => IAccountManager::SCOPE_LOCAL,
82+
'visible' => true,
7383
'value' => '1',
7484
],
7585
],
7686
'user2' => [
7787
IAccountManager::PROPERTY_BIOGRAPHY => [
7888
'scope' => IAccountManager::SCOPE_LOCAL,
89+
'visible' => true,
7990
'value' => 'This is a test user',
8091
],
8192
IAccountManager::PROPERTY_HEADLINE => [
8293
'scope' => IAccountManager::SCOPE_LOCAL,
94+
'visible' => true,
8395
'value' => 'Second test user',
8496
],
8597
IAccountManager::PROPERTY_ADDRESS => [
8698
'scope' => IAccountManager::SCOPE_LOCAL,
99+
'visible' => true,
87100
'value' => 'Berlin',
88101
],
89102
IAccountManager::PROPERTY_WEBSITE => [
90103
'scope' => IAccountManager::SCOPE_LOCAL,
104+
'visible' => true,
91105
'value' => 'https://domain.co/testuser2',
92106
],
93107
IAccountManager::PROPERTY_ORGANISATION => [
94108
'scope' => IAccountManager::SCOPE_PRIVATE,
109+
'visible' => true,
95110
'value' => 'Nextcloud GmbH',
96111
],
97112
IAccountManager::PROPERTY_ROLE => [
98113
'scope' => IAccountManager::SCOPE_LOCAL,
114+
'visible' => true,
99115
'value' => 'Non-existing user',
100116
],
101117
IAccountManager::PROPERTY_PROFILE_ENABLED => [
102118
'scope' => IAccountManager::SCOPE_LOCAL,
119+
'visible' => true,
103120
'value' => '1',
104121
],
105122
],
@@ -120,22 +137,44 @@ public function setUp(): void {
120137
$this->urlGenerator = $this->createMock(IURLGenerator::class);
121138
$this->userManager = $this->createMock(IUserManager::class);
122139
$this->accountManager = $this->createMock(IAccountManager::class);
140+
$this->profileManager = $this->createMock(IProfileManager::class);
123141

124142
$this->referenceProvider = new ProfilePickerReferenceProvider(
125143
$this->l10n,
126144
$this->urlGenerator,
127145
$this->userManager,
128146
$this->accountManager,
147+
$this->profileManager,
129148
$this->userId
130149
);
131150

132151
$this->urlGenerator->expects($this->any())
133152
->method('getBaseUrl')
134153
->willReturn($this->baseUrl);
154+
155+
$this->profileManager->expects($this->any())
156+
->method('isProfileEnabled')
157+
->willReturn(true);
158+
159+
$this->profileManager->expects($this->any())
160+
->method('isProfileFieldVisible')
161+
->willReturnCallback(function (string $profileField, IUser $targetUser, ?IUser $visitingUser) {
162+
return $this->testAccountsData[$targetUser->getUID()][$profileField]['visible']
163+
&& $this->testAccountsData[$targetUser->getUID()][$profileField]['scope'] !== IAccountManager::SCOPE_PRIVATE;
164+
});
165+
166+
$this->adminUser = $this->createMock(IUser::class);
167+
$this->adminUser->expects($this->any())
168+
->method('getUID')
169+
->willReturn('admin');
170+
$this->adminUser->expects($this->any())
171+
->method('getDisplayName')
172+
->willReturn('admin');
135173
}
136174

137175
private function getTestAccountPropertyValue(string $testUserId, string $property): mixed {
138-
if ($this->testAccountsData[$testUserId][$property]['scope'] === IAccountManager::SCOPE_PRIVATE) {
176+
if (!$this->testAccountsData[$testUserId][$property]['visible']
177+
|| $this->testAccountsData[$testUserId][$property]['scope'] === IAccountManager::SCOPE_PRIVATE) {
139178
return null;
140179
}
141180
return $this->testAccountsData[$testUserId][$property]['value'];
@@ -163,8 +202,14 @@ private function setupUserAccountReferenceExpectation(string $userId): ?IReferen
163202

164203
$this->userManager->expects($this->any())
165204
->method('get')
166-
->with($userId)
167-
->willReturn($user);
205+
->willReturnCallback(function (string $uid) use ($user, $userId) {
206+
if ($uid === $userId) {
207+
return $user;
208+
} elseif ($uid === 'admin') {
209+
return $this->adminUser;
210+
}
211+
return null;
212+
});
168213

169214
// setup account expectations
170215
$account = $this->createMock(IAccount::class);

0 commit comments

Comments
 (0)