Skip to content
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.

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

[stable30] fix: Return correct list of managers for a user #48622

Merged
merged 4 commits into from
Oct 30, 2024

Conversation

backportbot[bot]
Copy link

@backportbot backportbot bot commented Oct 9, 2024

Backport of #48538

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

Todo

  • Review and resolve any conflicts
  • Amend HEAD commit to remove the line stating to skip CI

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

@backportbot backportbot bot requested review from artonge, come-nc and Pytal October 9, 2024 00:49
@backportbot backportbot bot added this to the Nextcloud 30.0.1 milestone Oct 9, 2024
Pytal added 4 commits October 9, 2024 14:52
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Signed-off-by: Christopher Ng <chrng8@gmail.com>
@Pytal Pytal force-pushed the backport/48538/stable30 branch from 9d43f66 to 221f7a3 Compare October 9, 2024 21:53
@Pytal Pytal marked this pull request as ready for review October 9, 2024 21:54
$currentLoggedInUser = $this->userSession->getUser();

$managerUids = $user->getManagerUids();
if ($this->groupManager->isAdmin($currentLoggedInUser->getUID()) || $this->groupManager->isDelegatedAdmin($currentLoggedInUser->getUID())) {

Check notice

Code scanning / Psalm

PossiblyNullReference Note

Cannot call method getUID on possibly null value
return $managerUids;
}

if ($this->subAdminManager->isSubAdmin($currentLoggedInUser)) {

Check notice

Code scanning / Psalm

PossiblyNullArgument Note

Argument 1 of OCP\Group\ISubAdmin::isSubAdmin cannot be null, possibly null value provided
This was referenced Oct 10, 2024
@Altahrim Altahrim mentioned this pull request Oct 30, 2024
2 tasks
@Altahrim Altahrim enabled auto-merge October 30, 2024 08:28
@Altahrim Altahrim merged commit 22d9f90 into stable30 Oct 30, 2024
173 of 175 checks passed
@Altahrim Altahrim deleted the backport/48538/stable30 branch October 30, 2024 08:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants