nextcloud / server

lib/private/Teams/TeamManager.php

Indentation +153 added lines, -153 removed lines

@@ -22,157 +22,157 @@
 
 class TeamManager implements ITeamManager {
 
-	/** @var ?ITeamResourceProvider[] */
-	private ?array $providers = null;
-
-	public function __construct(
-		private Coordinator $bootContext,
-		private IURLGenerator $urlGenerator,
-		private ?CirclesManager $circlesManager,
-	) {
-	}
-
-	public function hasTeamSupport(): bool {
-		return $this->circlesManager !== null;
-	}
-
-	public function getProviders(): array {
-		if (!$this->hasTeamSupport()) {
-			return [];
-		}
-
-		if ($this->providers !== null) {
-			return $this->providers;
-		}
-
-		$this->providers = [];
-		foreach ($this->bootContext->getRegistrationContext()->getTeamResourceProviders() as $providerRegistration) {
-			try {
-				/** @var ITeamResourceProvider $provider */
-				$provider = Server::get($providerRegistration->getService());
-				$this->providers[$provider->getId()] = $provider;
-			} catch (NotFoundExceptionInterface|ContainerExceptionInterface $e) {
-			}
-		}
-		return $this->providers;
-	}
-
-	public function getProvider(string $providerId): ITeamResourceProvider {
-		$providers = $this->getProviders();
-		if (isset($providers[$providerId])) {
-			return $providers[$providerId];
-		}
-
-		throw new \RuntimeException('No provider found for id ' . $providerId);
-	}
-
-	public function getSharedWith(string $teamId, string $userId): array {
-		if (!$this->hasTeamSupport()) {
-			return [];
-		}
-
-		if ($this->getTeam($teamId, $userId) === null) {
-			return [];
-		}
-
-		$resources = [];
-
-		foreach ($this->getProviders() as $provider) {
-			array_push($resources, ...$provider->getSharedWith($teamId));
-		}
-
-		return array_values($resources);
-	}
-
-	public function getSharedWithList(array $teams, string $userId): array {
-		if (!$this->hasTeamSupport()) {
-			return [];
-		}
-
-		$resources = [];
-		foreach ($this->getProviders() as $provider) {
-			if (method_exists($provider, 'getSharedWithList')) {
-				$resources[] = $provider->getSharedWithList($teams, $userId);
-			} else {
-				foreach ($teams as $team) {
-					$resources[] = [$team => $provider->getSharedWith($team)];
-				}
-			}
-		}
-
-		return array_merge_recursive(...$resources);
-	}
-
-	public function getTeamsForResource(string $providerId, string $resourceId, string $userId): array {
-		if (!$this->hasTeamSupport()) {
-			return [];
-		}
-
-		$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));
-	}
-
-	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);
-			return $this->circlesManager->getCircle($teamId);
-		} catch (CircleNotFoundException) {
-			return null;
-		}
-	}
-
-	/**
-	 * @return string[]
-	 */
-	public function getMembersOfTeam(string $teamId, string $userId): array {
-		$team = $this->getTeam($teamId, $userId);
-		if ($team === null) {
-			return [];
-		}
-		$members = $team->getInheritedMembers();
-		return array_map(fn ($member) => $member->getUserId(), $members);
-	}
-
-	/**
-	 * @return Circle[]
-	 */
-	private function getTeams(array $teams, string $userId): array {
-		if (!$this->hasTeamSupport()) {
-			return [];
-		}
-
-		$federatedUser = $this->circlesManager->getFederatedUser($userId, Member::TYPE_USER);
-		$this->circlesManager->startSession($federatedUser);
-		return $this->circlesManager->getCirclesByIds($teams);
-	}
-
-	public function getTeamsForUser(string $userId): array {
-		if (!$this->hasTeamSupport()) {
-			return [];
-		}
-
-		$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 $teams;
-	}
+    /** @var ?ITeamResourceProvider[] */
+    private ?array $providers = null;
+
+    public function __construct(
+        private Coordinator $bootContext,
+        private IURLGenerator $urlGenerator,
+        private ?CirclesManager $circlesManager,
+    ) {
+    }
+
+    public function hasTeamSupport(): bool {
+        return $this->circlesManager !== null;
+    }
+
+    public function getProviders(): array {
+        if (!$this->hasTeamSupport()) {
+            return [];
+        }
+
+        if ($this->providers !== null) {
+            return $this->providers;
+        }
+
+        $this->providers = [];
+        foreach ($this->bootContext->getRegistrationContext()->getTeamResourceProviders() as $providerRegistration) {
+            try {
+                /** @var ITeamResourceProvider $provider */
+                $provider = Server::get($providerRegistration->getService());
+                $this->providers[$provider->getId()] = $provider;
+            } catch (NotFoundExceptionInterface|ContainerExceptionInterface $e) {
+            }
+        }
+        return $this->providers;
+    }
+
+    public function getProvider(string $providerId): ITeamResourceProvider {
+        $providers = $this->getProviders();
+        if (isset($providers[$providerId])) {
+            return $providers[$providerId];
+        }
+
+        throw new \RuntimeException('No provider found for id ' . $providerId);
+    }
+
+    public function getSharedWith(string $teamId, string $userId): array {
+        if (!$this->hasTeamSupport()) {
+            return [];
+        }
+
+        if ($this->getTeam($teamId, $userId) === null) {
+            return [];
+        }
+
+        $resources = [];
+
+        foreach ($this->getProviders() as $provider) {
+            array_push($resources, ...$provider->getSharedWith($teamId));
+        }
+
+        return array_values($resources);
+    }
+
+    public function getSharedWithList(array $teams, string $userId): array {
+        if (!$this->hasTeamSupport()) {
+            return [];
+        }
+
+        $resources = [];
+        foreach ($this->getProviders() as $provider) {
+            if (method_exists($provider, 'getSharedWithList')) {
+                $resources[] = $provider->getSharedWithList($teams, $userId);
+            } else {
+                foreach ($teams as $team) {
+                    $resources[] = [$team => $provider->getSharedWith($team)];
+                }
+            }
+        }
+
+        return array_merge_recursive(...$resources);
+    }
+
+    public function getTeamsForResource(string $providerId, string $resourceId, string $userId): array {
+        if (!$this->hasTeamSupport()) {
+            return [];
+        }
+
+        $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));
+    }
+
+    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);
+            return $this->circlesManager->getCircle($teamId);
+        } catch (CircleNotFoundException) {
+            return null;
+        }
+    }
+
+    /**
+     * @return string[]
+     */
+    public function getMembersOfTeam(string $teamId, string $userId): array {
+        $team = $this->getTeam($teamId, $userId);
+        if ($team === null) {
+            return [];
+        }
+        $members = $team->getInheritedMembers();
+        return array_map(fn ($member) => $member->getUserId(), $members);
+    }
+
+    /**
+     * @return Circle[]
+     */
+    private function getTeams(array $teams, string $userId): array {
+        if (!$this->hasTeamSupport()) {
+            return [];
+        }
+
+        $federatedUser = $this->circlesManager->getFederatedUser($userId, Member::TYPE_USER);
+        $this->circlesManager->startSession($federatedUser);
+        return $this->circlesManager->getCirclesByIds($teams);
+    }
+
+    public function getTeamsForUser(string $userId): array {
+        if (!$this->hasTeamSupport()) {
+            return [];
+        }
+
+        $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 $teams;
+    }
 }

tests/Core/Controller/ContactsMenuControllerTest.php

Indentation +106 added lines, -106 removed lines

@@ -18,110 +18,110 @@
 use Test\TestCase;
 
 class ContactsMenuControllerTest extends TestCase {
-	private IUserSession&MockObject $userSession;
-	private Manager&MockObject $contactsManager;
-	private TeamManager&MockObject $teamManager;
-
-	private ContactsMenuController $controller;
-
-	protected function setUp(): void {
-		parent::setUp();
-
-		$request = $this->createMock(IRequest::class);
-		$this->userSession = $this->createMock(IUserSession::class);
-		$this->contactsManager = $this->createMock(Manager::class);
-		$this->teamManager = $this->createMock(TeamManager::class);
-
-		$this->controller = new ContactsMenuController(
-			$request,
-			$this->userSession,
-			$this->contactsManager,
-			$this->teamManager,
-		);
-	}
-
-	public function testIndex(): void {
-		$user = $this->createMock(IUser::class);
-		$entries = [
-			$this->createMock(IEntry::class),
-			$this->createMock(IEntry::class),
-		];
-		$this->userSession->expects($this->once())
-			->method('getUser')
-			->willReturn($user);
-		$this->contactsManager->expects($this->once())
-			->method('getEntries')
-			->with($this->equalTo($user), $this->equalTo(null))
-			->willReturn($entries);
-
-		$response = $this->controller->index();
-
-		$this->assertEquals($entries, $response);
-	}
-
-	public function testIndex_withTeam(): void {
-		$user = $this->createMock(IUser::class);
-		$user->method('getUID')
-			->willReturn('current-user');
-
-		$entries = [
-			$this->createMock(IEntry::class),
-			$this->createMock(IEntry::class),
-		];
-		$entries[0]->method('getProperty')
-			->with('UID')
-			->willReturn('member1');
-		$entries[0]->method('getProperty')
-			->with('UID')
-			->willReturn('member2');
-
-		$this->userSession->expects($this->atLeastOnce())
-			->method('getUser')
-			->willReturn($user);
-		$this->contactsManager->expects($this->once())
-			->method('getEntries')
-			->with($this->equalTo($user), $this->equalTo(null))
-			->willReturn(['contacts' => $entries]);
-
-		$this->teamManager->expects($this->once())
-			->method('getMembersOfTeam')
-			->with('team-id', 'current-user')
-			->willReturn(['member1', 'member3']);
-
-		$response = $this->controller->index(teamId: 'team-id');
-
-		$this->assertEquals([$entries[0]], $response['contacts']);
-	}
-
-	public function testFindOne(): void {
-		$user = $this->createMock(IUser::class);
-		$entry = $this->createMock(IEntry::class);
-		$this->userSession->expects($this->once())
-			->method('getUser')
-			->willReturn($user);
-		$this->contactsManager->expects($this->once())
-			->method('findOne')
-			->with($this->equalTo($user), $this->equalTo(42), $this->equalTo('test-search-phrase'))
-			->willReturn($entry);
-
-		$response = $this->controller->findOne(42, 'test-search-phrase');
-
-		$this->assertEquals($entry, $response);
-	}
-
-	public function testFindOne404(): void {
-		$user = $this->createMock(IUser::class);
-		$this->userSession->expects($this->once())
-			->method('getUser')
-			->willReturn($user);
-		$this->contactsManager->expects($this->once())
-			->method('findOne')
-			->with($this->equalTo($user), $this->equalTo(42), $this->equalTo('test-search-phrase'))
-			->willReturn(null);
-
-		$response = $this->controller->findOne(42, 'test-search-phrase');
-
-		$this->assertEquals([], $response->getData());
-		$this->assertEquals(404, $response->getStatus());
-	}
+    private IUserSession&MockObject $userSession;
+    private Manager&MockObject $contactsManager;
+    private TeamManager&MockObject $teamManager;
+
+    private ContactsMenuController $controller;
+
+    protected function setUp(): void {
+        parent::setUp();
+
+        $request = $this->createMock(IRequest::class);
+        $this->userSession = $this->createMock(IUserSession::class);
+        $this->contactsManager = $this->createMock(Manager::class);
+        $this->teamManager = $this->createMock(TeamManager::class);
+
+        $this->controller = new ContactsMenuController(
+            $request,
+            $this->userSession,
+            $this->contactsManager,
+            $this->teamManager,
+        );
+    }
+
+    public function testIndex(): void {
+        $user = $this->createMock(IUser::class);
+        $entries = [
+            $this->createMock(IEntry::class),
+            $this->createMock(IEntry::class),
+        ];
+        $this->userSession->expects($this->once())
+            ->method('getUser')
+            ->willReturn($user);
+        $this->contactsManager->expects($this->once())
+            ->method('getEntries')
+            ->with($this->equalTo($user), $this->equalTo(null))
+            ->willReturn($entries);
+
+        $response = $this->controller->index();
+
+        $this->assertEquals($entries, $response);
+    }
+
+    public function testIndex_withTeam(): void {
+        $user = $this->createMock(IUser::class);
+        $user->method('getUID')
+            ->willReturn('current-user');
+
+        $entries = [
+            $this->createMock(IEntry::class),
+            $this->createMock(IEntry::class),
+        ];
+        $entries[0]->method('getProperty')
+            ->with('UID')
+            ->willReturn('member1');
+        $entries[0]->method('getProperty')
+            ->with('UID')
+            ->willReturn('member2');
+
+        $this->userSession->expects($this->atLeastOnce())
+            ->method('getUser')
+            ->willReturn($user);
+        $this->contactsManager->expects($this->once())
+            ->method('getEntries')
+            ->with($this->equalTo($user), $this->equalTo(null))
+            ->willReturn(['contacts' => $entries]);
+
+        $this->teamManager->expects($this->once())
+            ->method('getMembersOfTeam')
+            ->with('team-id', 'current-user')
+            ->willReturn(['member1', 'member3']);
+
+        $response = $this->controller->index(teamId: 'team-id');
+
+        $this->assertEquals([$entries[0]], $response['contacts']);
+    }
+
+    public function testFindOne(): void {
+        $user = $this->createMock(IUser::class);
+        $entry = $this->createMock(IEntry::class);
+        $this->userSession->expects($this->once())
+            ->method('getUser')
+            ->willReturn($user);
+        $this->contactsManager->expects($this->once())
+            ->method('findOne')
+            ->with($this->equalTo($user), $this->equalTo(42), $this->equalTo('test-search-phrase'))
+            ->willReturn($entry);
+
+        $response = $this->controller->findOne(42, 'test-search-phrase');
+
+        $this->assertEquals($entry, $response);
+    }
+
+    public function testFindOne404(): void {
+        $user = $this->createMock(IUser::class);
+        $this->userSession->expects($this->once())
+            ->method('getUser')
+            ->willReturn($user);
+        $this->contactsManager->expects($this->once())
+            ->method('findOne')
+            ->with($this->equalTo($user), $this->equalTo(42), $this->equalTo('test-search-phrase'))
+            ->willReturn(null);
+
+        $response = $this->controller->findOne(42, 'test-search-phrase');
+
+        $this->assertEquals([], $response->getData());
+        $this->assertEquals(404, $response->getStatus());
+    }
 }

core/Controller/ContactsMenuController.php

Indentation +48 added lines, -48 removed lines

@@ -19,56 +19,56 @@
 use OCP\Teams\ITeamManager;
 
 class ContactsMenuController extends Controller {
-	public function __construct(
-		IRequest $request,
-		private IUserSession $userSession,
-		private Manager $manager,
-		private ITeamManager $teamManager,
-	) {
-		parent::__construct('core', $request);
-	}
+    public function __construct(
+        IRequest $request,
+        private IUserSession $userSession,
+        private Manager $manager,
+        private ITeamManager $teamManager,
+    ) {
+        parent::__construct('core', $request);
+    }
 
-	/**
-	 * @return \JsonSerializable[]
-	 * @throws Exception
-	 */
-	#[NoAdminRequired]
-	#[FrontpageRoute(verb: 'POST', url: '/contactsmenu/contacts')]
-	public function index(?string $filter = null, ?string $teamId = null): array {
-		$entries = $this->manager->getEntries($this->userSession->getUser(), $filter);
-		if ($teamId !== null) {
-			/** @var \OC\Teams\TeamManager */
-			$teamManager = $this->teamManager;
-			$memberIds = $teamManager->getMembersOfTeam($teamId, $this->userSession->getUser()->getUID());
-			$entries['contacts'] = array_filter(
-				$entries['contacts'],
-				fn (IEntry $entry) => in_array($entry->getProperty('UID'), $memberIds, true)
-			);
-		}
-		return $entries;
-	}
+    /**
+     * @return \JsonSerializable[]
+     * @throws Exception
+     */
+    #[NoAdminRequired]
+    #[FrontpageRoute(verb: 'POST', url: '/contactsmenu/contacts')]
+    public function index(?string $filter = null, ?string $teamId = null): array {
+        $entries = $this->manager->getEntries($this->userSession->getUser(), $filter);
+        if ($teamId !== null) {
+            /** @var \OC\Teams\TeamManager */
+            $teamManager = $this->teamManager;
+            $memberIds = $teamManager->getMembersOfTeam($teamId, $this->userSession->getUser()->getUID());
+            $entries['contacts'] = array_filter(
+                $entries['contacts'],
+                fn (IEntry $entry) => in_array($entry->getProperty('UID'), $memberIds, true)
+            );
+        }
+        return $entries;
+    }
 
-	/**
-	 * @return JSONResponse|\JsonSerializable
-	 * @throws Exception
-	 */
-	#[NoAdminRequired]
-	#[FrontpageRoute(verb: 'POST', url: '/contactsmenu/findOne')]
-	public function findOne(int $shareType, string $shareWith) {
-		$contact = $this->manager->findOne($this->userSession->getUser(), $shareType, $shareWith);
+    /**
+     * @return JSONResponse|\JsonSerializable
+     * @throws Exception
+     */
+    #[NoAdminRequired]
+    #[FrontpageRoute(verb: 'POST', url: '/contactsmenu/findOne')]
+    public function findOne(int $shareType, string $shareWith) {
+        $contact = $this->manager->findOne($this->userSession->getUser(), $shareType, $shareWith);
 
-		if ($contact) {
-			return $contact;
-		}
-		return new JSONResponse([], Http::STATUS_NOT_FOUND);
-	}
+        if ($contact) {
+            return $contact;
+        }
+        return new JSONResponse([], Http::STATUS_NOT_FOUND);
+    }
 
-	/**
-	 * @return \JsonSerializable[]
-	 */
-	#[NoAdminRequired]
-	#[FrontpageRoute(verb: 'GET', url: '/contactsmenu/teams')]
-	public function getTeams(): array {
-		return $this->teamManager->getTeamsForUser($this->userSession->getUser()->getUID());
-	}
+    /**
+     * @return \JsonSerializable[]
+     */
+    #[NoAdminRequired]
+    #[FrontpageRoute(verb: 'GET', url: '/contactsmenu/teams')]
+    public function getTeams(): array {
+        return $this->teamManager->getTeamsForUser($this->userSession->getUser()->getUID());
+    }
 }