Skip to content

[stable30] fix(settings): Handle email change restriction separately from display name change restriction#51900

Merged
Altahrim merged 3 commits intostable30from
backport/51745/stable30
Apr 3, 2025
Merged

[stable30] fix(settings): Handle email change restriction separately from display name change restriction#51900
Altahrim merged 3 commits intostable30from
backport/51745/stable30

Conversation

@backportbot
Copy link

@backportbot backportbot bot commented Apr 3, 2025 •
edited by susnux
Loading

Backport of #51745

Warning, This backport's changes differ from the original and might be incomplete ⚠️

Todo

  • Review and resolve any conflicts
  • Remove all the empty commits

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

@backportbot backportbot bot added bug 3. to review Waiting for reviews labels Apr 3, 2025
@backportbot backportbot bot added this to the Nextcloud 30.0.9 milestone Apr 3, 2025
github-advanced-security[bot]
github-advanced-security bot found potential problems Apr 3, 2025
View reviewed changes
apps/provisioning_api/lib/Controller/UsersController.php
$allowDisplayNameChange = $this->config->getSystemValue('allow_user_to_change_display_name', true);
if ($allowDisplayNameChange === true && (
$targetUser->getBackend() instanceof ISetDisplayNameBackend
|| $targetUser->getBackend()->implementsActions(Backend::SET_DISPLAYNAME)

Check notice

Code scanning / Psalm

PossiblyNullReference Note

Cannot call method implementsActions on possibly null value
apps/provisioning_api/lib/Controller/UsersController.php
$allowDisplayNameChange = $this->config->getSystemValue('allow_user_to_change_display_name', true);
if ($allowDisplayNameChange === true && (
$targetUser->getBackend() instanceof ISetDisplayNameBackend
|| $targetUser->getBackend()->implementsActions(Backend::SET_DISPLAYNAME)

Check notice

Code scanning / Psalm

DeprecatedMethod Note

The method OCP\UserInterface::implementsActions has been marked as deprecated
apps/provisioning_api/lib/Controller/UsersController.php
$allowDisplayNameChange = $this->config->getSystemValue('allow_user_to_change_display_name', true);
if ($allowDisplayNameChange !== false && (
$targetUser->getBackend() instanceof ISetDisplayNameBackend
|| $targetUser->getBackend()->implementsActions(Backend::SET_DISPLAYNAME)

Check notice

Code scanning / Psalm

PossiblyNullReference Note

Cannot call method implementsActions on possibly null value
apps/provisioning_api/lib/Controller/UsersController.php
$allowDisplayNameChange = $this->config->getSystemValue('allow_user_to_change_display_name', true);
if ($allowDisplayNameChange !== false && (
$targetUser->getBackend() instanceof ISetDisplayNameBackend
|| $targetUser->getBackend()->implementsActions(Backend::SET_DISPLAYNAME)

Check notice

Code scanning / Psalm

DeprecatedMethod Note

The method OCP\UserInterface::implementsActions has been marked as deprecated
@susnux susnux force-pushed the backport/51745/stable30 branch from 747c3b9 to 9d1bace Compare April 3, 2025 06:42
@susnux susnux marked this pull request as ready for review April 3, 2025 06:42
@susnux susnux force-pushed the backport/51745/stable30 branch from 9d1bace to b8203dd Compare April 3, 2025 06:45
@susnux
Copy link
Contributor

susnux commented Apr 3, 2025

/compile

github-advanced-security[bot]
github-advanced-security bot found potential problems Apr 3, 2025
View reviewed changes
apps/settings/lib/Settings/Personal/PersonalInfo.php
$accountParameters = [
'avatarChangeSupported' => $user->canChangeAvatar(),
'displayNameChangeSupported' => $user->canChangeDisplayName(),
'emailChangeSupported' => $user->canChangeEmail(),

Check notice

Code scanning / Psalm

UndefinedInterfaceMethod Note

Method OCP\IUser::canChangeEmail does not exist
Copy link
Member

@AndyScherzinger AndyScherzinger Apr 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems legit @susnux ?

Copy link
Contributor

@susnux susnux Apr 3, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes but intentional.
Its not on the public interface (no backport of public interface changes), but on the private implementation.

github-advanced-security[bot]
github-advanced-security bot found potential problems Apr 3, 2025
View reviewed changes
apps/provisioning_api/lib/Controller/UsersController.php
$permittedFields[] = IAccountManager::PROPERTY_DISPLAYNAME;
}
$allowDisplayNameChange = $this->config->getSystemValue('allow_user_to_change_display_name', true);
if ($allowDisplayNameChange !== false && (

Check notice

Code scanning / Psalm

PossiblyNullReference Note

Cannot call method getUID on possibly null value
@Altahrim Altahrim mentioned this pull request Apr 3, 2025
Merged
5 tasks
provokateurin and others added 3 commits April 3, 2025 16:12
@provokateurin @susnux
@artonge @Altahrim
fix(settings): Handle email change restriction separately from displa…
8a8d6ad 
…y name change restriction

Co-authored-by: provokateurin <kate@provokateurin.de>
Co-authored-by: Ferdinand Thiessen <opensource@fthiessen.de>
Co-authored-by: Louis <louis@chmn.me>
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@susnux @Altahrim
refactor: add migration for email setting
8ab2835 
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
@nextcloud-command @Altahrim
chore(assets): Recompile assets
185e97b 
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
@Altahrim Altahrim force-pushed the backport/51745/stable30 branch from 1af09b0 to 185e97b Compare April 3, 2025 14:12
@Altahrim
Copy link
Collaborator

Altahrim commented Apr 3, 2025

Rebased

@Altahrim Altahrim enabled auto-merge April 3, 2025 14:32
@Altahrim Altahrim merged commit 2f22c0d into stable30 Apr 3, 2025
182 of 190 checks passed
@Altahrim Altahrim deleted the backport/51745/stable30 branch April 3, 2025 15:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AndyScherzinger AndyScherzinger AndyScherzinger approved these changes

@susnux susnux susnux approved these changes

@skjnldsv skjnldsv Awaiting requested review from skjnldsv

@provokateurin provokateurin Awaiting requested review from provokateurin

Assignees

@provokateurin provokateurin

Labels

3. to review Waiting for reviews bug

Projects

None yet

Milestone

Nextcloud 30.0.9

Development

Successfully merging this pull request may close these issues.

5 participants

@susnux @Altahrim @AndyScherzinger @provokateurin @nextcloud-command