Skip to content

[stable29] fix: Avoid throwing errors for teams are unavailable #46163

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
kesselb merged 1 commit into from
Jul 6, 2024
Merged

[stable29] fix: Avoid throwing errors for teams are unavailable #46163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
fix: Avoid throwing errors for teams are unavailable 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr
juliusknorr committed Jun 28, 2024
commit a3cec03f3a057dd88d51dbe50fa9ae943e9db4ea
16 changes: 16 additions & 0 deletions lib/private/Teams/TeamManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ public function hasTeamSupport(): bool {
}

public function getProviders(): array {
if (!$this->hasTeamSupport()) {
return [];
}

if ($this->providers !== null) {
return $this->providers;
}
Expand All @@ -78,6 +82,10 @@ public function getProvider(string $providerId): ITeamResourceProvider {
}

public function getSharedWith(string $teamId, string $userId): array {
if (!$this->hasTeamSupport()) {
return [];
}

if ($this->getTeam($teamId, $userId) === null) {
return [];
}
Expand All @@ -92,6 +100,10 @@ public function getSharedWith(string $teamId, string $userId): array {
}

public function getTeamsForResource(string $providerId, string $resourceId, string $userId): array {
if (!$this->hasTeamSupport()) {
return [];
}

$provider = $this->getProvider($providerId);
return array_values(array_filter(array_map(function ($teamId) use ($userId) {
$team = $this->getTeam($teamId, $userId);
Expand All @@ -108,6 +120,10 @@ public function getTeamsForResource(string $providerId, string $resourceId, stri
}

private function getTeam(string $teamId, string $userId): ?Circle {
if (!$this->hasTeamSupport()) {
return null;
}

try {
$federatedUser = $this->circlesManager->getFederatedUser($userId, Member::TYPE_USER);
$this->circlesManager->startSession($federatedUser);
Expand Down