Skip to content

LDAP: announce display name changes so that addressbook picks it up #12054

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 2 commits into from
Oct 30, 2018
Merged

LDAP: announce display name changes so that addressbook picks it up #12054

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bbe4410
only write when the displayname differs, but then announce it
blizzz Oct 25, 2018
49456e4
do not run into UniqueConstraintViolationException
blizzz Oct 26, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions apps/user_ldap/lib/User/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,14 +414,21 @@ private function store($key, $value) {
*
* @param string $displayName
* @param string $displayName2
* @returns string the effective display name
* @return string the effective display name
*/
public function composeAndStoreDisplayName($displayName, $displayName2 = '') {
$displayName2 = (string)$displayName2;
if($displayName2 !== '') {
$displayName .= ' (' . $displayName2 . ')';
}
$this->store('displayName', $displayName);
$oldName = $this->config->getUserValue($this->uid, 'user_ldap', 'displayName', '');
if ($oldName !== $displayName) {
$this->store('displayName', $displayName);
$user = $this->userManager->get($this->getUsername());
if ($user instanceof \OC\User\User) {
$user->triggerChange('displayName', $displayName);
}
}
return $displayName;
}

Expand Down
25 changes: 25 additions & 0 deletions apps/user_ldap/tests/User/UserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,11 +1010,36 @@ public function displayNameProvider() {
public function testComposeAndStoreDisplayName($part1, $part2, $expected) {
$this->config->expects($this->once())
->method('setUserValue');
$this->config->expects($this->once())
->method('getUserValue');

$ncUserObj = $this->createMock(\OC\User\User::class);
$ncUserObj->expects($this->once())
->method('triggerChange')
->with('displayName', $expected);
$this->userManager->expects($this->once())
->method('get')
->willReturn($ncUserObj);

$displayName = $this->user->composeAndStoreDisplayName($part1, $part2);
$this->assertSame($expected, $displayName);
}

public function testComposeAndStoreDisplayNameNoOverwrite() {
$displayName = 'Randall Flagg';
$this->config->expects($this->never())
->method('setUserValue');
$this->config->expects($this->once())
->method('getUserValue')
->willReturn($displayName);

$this->userManager->expects($this->never())
->method('get'); // Implicit: no triggerChange can be called

$composedDisplayName = $this->user->composeAndStoreDisplayName($displayName);
$this->assertSame($composedDisplayName, $displayName);
}

public function testHandlePasswordExpiryWarningDefaultPolicy() {
$this->connection->expects($this->any())
->method('__get')
Expand Down