Skip to content

feat(ITeamManager): Add getTeam method #62038

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

Open
provokateurin wants to merge 2 commits into
base: master
Choose a base branch
from
+43 −19
Open

feat(ITeamManager): Add getTeam method #62038

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8651c3
refactor(TeamManager): Deduplicate mapping circle to team
provokateurin Jul 13, 2026
a974f0b
feat(ITeamManager): Add getTeam method
provokateurin Jul 13, 2026
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
8 changes: 7 additions & 1 deletion build/psalm-baseline.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4184,8 +4184,14 @@
</MoreSpecificImplementedParamType>
</file>
<file src="lib/private/Teams/TeamManager.php">
<LessSpecificReturnStatement>
<code><![CDATA[array_map($this->circleToTeam(...), $this->circlesManager->probeCircles())]]></code>
</LessSpecificReturnStatement>
<MoreSpecificReturnType>
<code><![CDATA[array]]></code>
</MoreSpecificReturnType>
<UndefinedDocblockClass>
<code><![CDATA[Circle]]></code>
<code><![CDATA[Circle[]]]></code>
</UndefinedDocblockClass>
</file>
<file src="lib/private/Template/Base.php">
Expand Down
49 changes: 31 additions & 18 deletions lib/private/Teams/TeamManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ public function getSharedWith(string $teamId, string $userId): array {
$probe = new CircleProbe();
$probe->mustBeMember();

if ($this->getTeam($teamId, $userId, $probe) === null) {
if ($this->getTeamInternal($teamId, $userId, $probe) === null) {
return [];
}

Expand Down Expand Up @@ -119,16 +119,10 @@ public function getTeamsForResource(string $providerId, string $resourceId, stri
}

$provider = $this->getProvider($providerId);
return array_map(function (Circle $team) {
return new Team(
$team->getSingleId(),
$team->getDisplayName(),
$this->urlGenerator->linkToRouteAbsolute('contacts.contacts.directcircle', ['singleId' => $team->getSingleId()]),
);
}, $this->getTeams($provider->getTeamsForResource($resourceId), $userId));
return array_map($this->circleToTeam(...), $this->getTeams($provider->getTeamsForResource($resourceId), $userId));
}

private function getTeam(string $teamId, string $userId, ?CircleProbe $probe = null): ?Circle {
private function getTeamInternal(string $teamId, string $userId, ?CircleProbe $probe = null): ?Circle {
if (!$this->hasTeamSupport()) {
return null;
}
Expand All @@ -149,7 +143,7 @@ private function getTeam(string $teamId, string $userId, ?CircleProbe $probe = n
*/
#[\Override]
public function getMembersOfTeam(string $teamId, string $userId): array {
$team = $this->getTeam($teamId, $userId);
$team = $this->getTeamInternal($teamId, $userId);
if ($team === null) {
return [];
}
Expand Down Expand Up @@ -182,15 +176,34 @@ public function getTeamsForUser(string $userId): array {

$federatedUser = $this->circlesManager->getFederatedUser($userId, Member::TYPE_USER);
$this->circlesManager->startSession($federatedUser);
$teams = [];
foreach ($this->circlesManager->probeCircles() as $team) {
$teams[] = new Team(
$team->getSingleId(),
$team->getDisplayName(),
$this->urlGenerator->linkToRouteAbsolute('contacts.contacts.directcircle', ['singleId' => $team->getSingleId()]),
);

return array_map($this->circleToTeam(...), $this->circlesManager->probeCircles());
}

#[\Override]
public function getTeam(string $teamId, ?string $userId = null): ?Team {
if (!$this->hasTeamSupport()) {
return null;
}

if ($userId !== null) {
$this->circlesManager->startSession($this->circlesManager->getLocalFederatedUser($userId));

@cristianscheid cristianscheid Jul 13, 2026

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.

other places on this class use $this->circlesManager->getFederatedUser() to start session for a user, shouldn't we use the same here?

@provokateurin provokateurin Jul 13, 2026

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

Not entirely sure, but those methods could potentially use a remote user, right? From my perspective the userid parameters in this class are only meant to be used with local users. But again, I'm not really sure.

@cristianscheid cristianscheid Jul 13, 2026 •
edited
Loading

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.

looking at lib/CirclesManager, what getLocalFederatedUser() does is call getFederatedUser($userId, Member::TYPE_USER), so basically you are achieving the same as other places in this class who call getFederatedUser() directly

for reference:
lib/CirclesManager::getFederatedUser()
lib/CirclesManager::getLocalFederatedUser()

} else {
$this->circlesManager->startSuperSession();
}

return $teams;
try {
return $this->circleToTeam($this->circlesManager->getCircle($teamId));
} catch (CircleNotFoundException) {
return null;
}
}

private function circleToTeam(Circle $circle): Team {
return new Team(
$circle->getSingleId(),
$circle->getDisplayName(),
$this->urlGenerator->linkToRouteAbsolute('contacts.contacts.directcircle', ['singleId' => $circle->getSingleId()]),
);
}
}
5 changes: 5 additions & 0 deletions lib/public/Teams/ITeamManager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,4 +76,9 @@ public function getMembersOfTeam(string $teamId, string $userId): array;
* @since 34.0.0
*/
public function hasTeamSupport(): bool;

/**
* @since 35.0.0
*/
public function getTeam(string $teamId, ?string $userId = null): ?Team;
}
Loading