Skip to content

Fix disabled user list for SAML group subadmin - #51108

Merged
come-nc merged 3 commits into
masterfrom
fix/fix-disabled-user-list-for-saml-subadmin
Mar 10, 2025
Merged

Fix disabled user list for SAML group subadmin#51108
come-nc merged 3 commits into
masterfrom
fix/fix-disabled-user-list-for-saml-subadmin

Conversation

@come-nc

@come-nccome-nc commented Feb 27, 2025

Copy link
Copy Markdown
Contributor
  • Resolves: #

Summary

When a subadmin of a group opens user list, if the group is not backed in database or LDAP (SAML for instance), disabled user list is not accessible.
This fixes it by counting enabled and disabled users independently of the backend for subadmin, and limits the user count to 999 for performance reasons.

Checklist

@come-nccome-nc added the 3. to review Waiting for reviews label Feb 27, 2025
@come-nccome-nc added this to the Nextcloud 32 milestone Feb 27, 2025
@come-nccome-nc self-assigned this Feb 27, 2025
@come-nccome-nc changed the title Fix/fix disabled user list for saml subadminFix disabled user list for SAML group subadminFeb 27, 2025
@come-nc
come-nc requested review from a team, blizzz, skjnldsv, sorbaugh and yemkareems and removed request for a teamFebruary 27, 2025 15:40
Comment threadapps/settings/lib/Controller/UsersController.php Outdated
Comment threadlib/private/User/Manager.php
@come-nc
come-nc requested a review from blizzzMarch 3, 2025 17:17
@come-nc
come-ncforce-pushed the fix/fix-disabled-user-list-for-saml-subadmin branch from 0de1e1f to 52872aeCompareMarch 4, 2025 17:05
@come-nc
come-nc requested a review from a team as a code ownerMarch 4, 2025 17:05
Comment threadapps/settings/lib/Controller/UsersController.php Outdated

@AndyScherzingerAndyScherzinger left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

🐘

@come-nc

Copy link
Copy Markdown
ContributorAuthor

/backport to stable31

@come-nc

Copy link
Copy Markdown
ContributorAuthor

/backport to stable30

@come-nc

Copy link
Copy Markdown
ContributorAuthor

/backport to stable29

If too many users return -1 as for LDAP so that link is shown
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
@come-nc
come-ncforce-pushed the fix/fix-disabled-user-list-for-saml-subadmin branch from c157af2 to c59400dCompareMarch 10, 2025 10:30
@come-nc
come-nc merged commit e8b90c8 into masterMar 10, 2025
@come-nc
come-nc deleted the fix/fix-disabled-user-list-for-saml-subadmin branch March 10, 2025 13:21
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

3. to reviewWaiting for reviews

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@come-nc@AndyScherzinger@blizzz@skjnldsv