fix: always use display name from correct backend by max-nextcloud · Pull Request #39770 · nextcloud/server

max-nextcloud · 2023-08-09T07:36:15Z

Overwrite the display name after the account is initialized when using an instacne of IGetDisplayNameBackend.

Before when using a variation of user_oidc and registering a Backend.php implementing IGetDisplayNameBackend
the personal setting page shows 'uid'.

The UserManager/AccountManager seems not to use consistently the correct backend.

The correct backend is used in this sequence:

server/lib/private/TemplateLayout.php

 $userDisplayName = \OC_User::getDisplayName();
$this->assign(user_displayname, $userDisplayName);

In the settings page, it definitely not calls the registered backend, but seems to fall back to default Backend and shows (usually) uid or a value from the standard account property table.

Resolves: #

Summary

TODO

...

Checklist

Code is properly formatted
Sign-off message is added to all commits
Tests (unit, integration, api and/or acceptance) are included
Screenshots before/after for front-end changes
Documentation (manuals or wiki) has been updated or is not required
Backports requested where applicable (ex: critical bugfixes)

juliusknorr · 2023-08-09T08:29:28Z

Looks sane, one thing I'll still want to double check is if this properly propagates to the system addressbook

max-nextcloud · 2023-08-11T10:13:15Z

 }
 $account = $this->parseAccountData($user, $this->getUser($user));
+ if ($user->getBackend() instanceof IGetDisplayNameBackend) {
+ $account->setProperty(self::PROPERTY_DISPLAYNAME, $user->getDisplayName());


okay... so this would need a scope and verified parameter.

We can just take the existing scope/verified parameter from the account object obtained earlier i think

I now reuse the ones that were set on the original property from the account data as that mimics what the previous patch did.
I'm not sure that's what we want though. Given that we are getting the display name from the backend it's probably verified even if the display name in the original account data was not.

I think we do not make any use of the verified parameter anyways for the displayname, the scope is user configured so it should be fine with this approach.

Overwrite the display name after the account is initialized when using an instacne of IGetDisplayNameBackend. Before when using a variation of user_oidc and registering a Backend.php implementing IGetDisplayNameBackend the personal setting page shows 'uid'. The UserManager/AccountManager seems not to use consistently the correct backend. The correct backend is used in this sequence: server/lib/private/TemplateLayout.php $userDisplayName = \OC_User::getDisplayName(); $this->assign(user_displayname, $userDisplayName); In the settings page, it definitely not calls the registered backend, but seems to fall back to default Backend and shows (usually) uid or a value from the standard account property table. Signed-off-by: Max <max@nextcloud.com>

juliusknorr

Looks good to me 👍

juliusknorr · 2023-08-16T16:43:01Z

Asking @Pytal and @ChristophWurst for review as I think both worked with that accounts code in the past

ChristophWurst

Makes sense

max-nextcloud · 2023-08-17T21:08:29Z

/backport to stable27

max-nextcloud · 2023-08-17T21:08:46Z

/backport to stable26

max-nextcloud · 2023-08-17T21:10:31Z

/backport to stable25

backportbot-nextcloud · 2023-08-17T22:33:29Z

The backport to stable26 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable26
git pull origin stable26
# Create the new backport branch
git checkout -b fix/foo-stable26
# Cherry pick the change from the commit sha1 of the change against the default branch# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable26

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

backportbot-nextcloud · 2023-08-17T22:48:04Z

The backport to stable25 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable25
git pull origin stable25
# Create the new backport branch
git checkout -b fix/foo-stable25
# Cherry pick the change from the commit sha1 of the change against the default branch# This might cause conflicts. Resolve them.
git cherry-pick abc123
# Push the cherry pick commit to the remote repository and open a pull request
git push origin fix/foo-stable25

More info at https://docs.nextcloud.com/server/latest/developer_manual/getting_started/development_process.html#manual-backport

tsdicloud · 2023-08-18T07:00:49Z

Perfect. You helped me to save some nerves for the next release!

juliusknorr · 2023-08-22T06:57:19Z

@max-nextcloud Can you take care of the manual backports?

max-nextcloud requested review from blizzz and juliusknorr August 9, 2023 07:36

max-nextcloud force-pushed the fix/always-use-displayname-from-correct-backend branch from c3058b0 to cbc436eCompare August 9, 2023 07:36

github-advanced-securityAI found potential problems Aug 9, 2023
View reviewed changes

Comment threadlib/private/Accounts/AccountManager.php Fixed
Comment threadlib/private/Accounts/AccountManager.php Fixed
Comment threadlib/private/Accounts/AccountManager.php Fixed

max-nextcloud force-pushed the fix/always-use-displayname-from-correct-backend branch from cbc436e to 136c804Compare August 9, 2023 14:36

max-nextcloud commented Aug 11, 2023
View reviewed changes

max-nextcloud force-pushed the fix/always-use-displayname-from-correct-backend branch from 136c804 to b78d2fcCompare August 14, 2023 06:38

github-advanced-securityAI found potential problems Aug 14, 2023
View reviewed changes

Comment threadlib/private/Accounts/AccountManager.php Fixed
Comment threadlib/private/Accounts/AccountManager.php Fixed

max-nextcloud force-pushed the fix/always-use-displayname-from-correct-backend branch from b78d2fc to b72e979Compare August 14, 2023 06:45

szaimen added the 3. to review Waiting for reviews label Aug 14, 2023

szaimen added this to the Nextcloud 28 milestone Aug 14, 2023

max-nextcloud force-pushed the fix/always-use-displayname-from-correct-backend branch from b72e979 to d3ce30cCompare August 14, 2023 07:35

max-nextcloud force-pushed the fix/always-use-displayname-from-correct-backend branch from d3ce30c to 99a4a9cCompare August 15, 2023 12:55

juliusknorr approved these changes Aug 16, 2023
View reviewed changes

juliusknorr requested review from ChristophWurst and Pytal August 16, 2023 16:42

ChristophWurst approved these changes Aug 17, 2023
View reviewed changes

backportbot-nextcloudBot added the backport-request label Aug 17, 2023

max-nextcloud merged commit 4b7aa65 into masterAug 17, 2023

max-nextcloud deleted the fix/always-use-displayname-from-correct-backend branch August 17, 2023 21:10

backportbot-nextcloudBot mentioned this pull request Aug 17, 2023
[stable27] fix: always use display name from correct backend #39949
Merged

This was referenced Aug 22, 2023
[stable26] fix: always use display name from correct backend #39991
Merged
[stable25] fix: always use display name from correct backend #39992
Merged

skjnldsv removed the backport-request label Jun 28, 2025

This was referenced Jan 9, 2026
fix: Make User_Proxy IGetDisplayNameBackend complient #57452
Merged
occ user:sync-account-data without function #57482
Open

Uh oh!

Uh oh!

Conversation

max-nextcloud commented Aug 9, 2023

Summary

TODO

Checklist

Uh oh!

Uh oh!

Uh oh!

Uh oh!

juliusknorr commented Aug 9, 2023

Uh oh!

max-nextcloudAug 11, 2023

Choose a reason for hiding this comment

Uh oh!

juliusknorrAug 11, 2023

Choose a reason for hiding this comment

Uh oh!

max-nextcloudAug 14, 2023

Choose a reason for hiding this comment

Uh oh!

juliusknorrAug 16, 2023

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

juliusknorr left a comment

Choose a reason for hiding this comment

Uh oh!

juliusknorr commented Aug 16, 2023

Uh oh!

ChristophWurst left a comment

Choose a reason for hiding this comment

Uh oh!

max-nextcloud commented Aug 17, 2023

Uh oh!

max-nextcloud commented Aug 17, 2023

Uh oh!

max-nextcloud commented Aug 17, 2023

Uh oh!

backportbot-nextcloudBot commented Aug 17, 2023

Uh oh!

backportbot-nextcloudBot commented Aug 17, 2023

Uh oh!

tsdicloud commented Aug 18, 2023

Uh oh!

juliusknorr commented Aug 22, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants