nextcloud / server

lib/public/Teams/TeamResource.php

Indentation +106 added lines, -106 removed lines

@@ -11,118 +11,118 @@
  * @since 29.0.0
  */
 class TeamResource implements \JsonSerializable {
-	/**
-	 * @since 29.0.0
-	 */
-	public function __construct(
-		private ITeamResourceProvider $teamResourceProvider,
-		private string $resourceId,
-		private string $label,
-		private string $url,
-		private ?string $iconSvg = null,
-		private ?string $iconURL = null,
-		private ?string $iconEmoji = null,
-	) {
-	}
+    /**
+     * @since 29.0.0
+     */
+    public function __construct(
+        private ITeamResourceProvider $teamResourceProvider,
+        private string $resourceId,
+        private string $label,
+        private string $url,
+        private ?string $iconSvg = null,
+        private ?string $iconURL = null,
+        private ?string $iconEmoji = null,
+    ) {
+    }
 
-	/**
-	 * Returns the provider details for the current resource
-	 *
-	 * @since 29.0.0
-	 */
-	public function getProvider(): ITeamResourceProvider {
-		return $this->teamResourceProvider;
-	}
+    /**
+     * Returns the provider details for the current resource
+     *
+     * @since 29.0.0
+     */
+    public function getProvider(): ITeamResourceProvider {
+        return $this->teamResourceProvider;
+    }
 
-	/**
-	 * Unique id of the resource (e.g. primary key id)
-	 * @since 29.0.0
-	 */
-	public function getId(): string {
-		return $this->resourceId;
-	}
+    /**
+     * Unique id of the resource (e.g. primary key id)
+     * @since 29.0.0
+     */
+    public function getId(): string {
+        return $this->resourceId;
+    }
 
-	/**
-	 * User visible label when listing resources
-	 *
-	 * @since 29.0.0
-	 */
-	public function getLabel(): string {
-		return $this->label;
-	}
+    /**
+     * User visible label when listing resources
+     *
+     * @since 29.0.0
+     */
+    public function getLabel(): string {
+        return $this->label;
+    }
 
-	/**
-	 * Absolute url to navigate the user to the resource
-	 *
-	 * @since 29.0.0
-	 */
-	public function getUrl(): string {
-		return $this->url;
-	}
+    /**
+     * Absolute url to navigate the user to the resource
+     *
+     * @since 29.0.0
+     */
+    public function getUrl(): string {
+        return $this->url;
+    }
 
-	/**
-	 * Svg icon to show next to the name for the resource
-	 *
-	 * From all icons the first one returning not null will be picked in order: iconEmoji, iconSvg, iconUrl
-	 *
-	 * @since 29.0.0
-	 */
-	public function getIconSvg(): ?string {
-		return $this->iconSvg;
-	}
+    /**
+     * Svg icon to show next to the name for the resource
+     *
+     * From all icons the first one returning not null will be picked in order: iconEmoji, iconSvg, iconUrl
+     *
+     * @since 29.0.0
+     */
+    public function getIconSvg(): ?string {
+        return $this->iconSvg;
+    }
 
-	/**
-	 * Image url of the icon to show next to the name for the resource
-	 *
-	 * From all icons the first one returning not null will be picked in order: iconEmoji, iconSvg, iconUrl
-	 *
-	 * @since 29.0.0
-	 */
-	public function getIconURL(): ?string {
-		return $this->iconURL;
-	}
+    /**
+     * Image url of the icon to show next to the name for the resource
+     *
+     * From all icons the first one returning not null will be picked in order: iconEmoji, iconSvg, iconUrl
+     *
+     * @since 29.0.0
+     */
+    public function getIconURL(): ?string {
+        return $this->iconURL;
+    }
 
-	/**
-	 * Emoji show next to the name for the resource
-	 *
-	 * From all icons the first one returning not null will be picked in order: iconEmoji, iconSvg, iconUrl
-	 *
-	 * @since 29.0.0
-	 */
-	public function getIconEmoji(): ?string {
-		return $this->iconEmoji;
-	}
+    /**
+     * Emoji show next to the name for the resource
+     *
+     * From all icons the first one returning not null will be picked in order: iconEmoji, iconSvg, iconUrl
+     *
+     * @since 29.0.0
+     */
+    public function getIconEmoji(): ?string {
+        return $this->iconEmoji;
+    }
 
-	/**
-	 * @return array{
-	 *     id: string,
-	 *     label: string,
-	 *     url: string,
-	 *     iconSvg: ?string,
-	 *     iconURL: ?string,
-	 *     iconEmoji: ?string,
-	 *     provider: array{
-	 *         id: string,
-	 *         name: string,
-	 *         icon: string,
-	 *     },
-	 * }
-	 *
-	 * @since 29.0.0
-	 */
-	public function jsonSerialize(): array {
-		return [
-			'id' => $this->resourceId,
-			'label' => $this->label,
-			'url' => $this->url,
-			'iconSvg' => $this->iconSvg,
-			'iconURL' => $this->iconURL,
-			'iconEmoji' => $this->iconEmoji,
-			'provider' => [
-				'id' => $this->teamResourceProvider->getId(),
-				'name' => $this->teamResourceProvider->getName(),
-				'icon' => $this->teamResourceProvider->getIconSvg(),
-			]
-		];
-	}
+    /**
+     * @return array{
+     *     id: string,
+     *     label: string,
+     *     url: string,
+     *     iconSvg: ?string,
+     *     iconURL: ?string,
+     *     iconEmoji: ?string,
+     *     provider: array{
+     *         id: string,
+     *         name: string,
+     *         icon: string,
+     *     },
+     * }
+     *
+     * @since 29.0.0
+     */
+    public function jsonSerialize(): array {
+        return [
+            'id' => $this->resourceId,
+            'label' => $this->label,
+            'url' => $this->url,
+            'iconSvg' => $this->iconSvg,
+            'iconURL' => $this->iconURL,
+            'iconEmoji' => $this->iconEmoji,
+            'provider' => [
+                'id' => $this->teamResourceProvider->getId(),
+                'name' => $this->teamResourceProvider->getName(),
+                'icon' => $this->teamResourceProvider->getIconSvg(),
+            ]
+        ];
+    }
 }

lib/public/Teams/Team.php

Indentation +45 added lines, -45 removed lines

@@ -16,53 +16,53 @@
  */
 class Team implements \JsonSerializable {
 
-	/**
-	 * @since 29.0.0
-	 */
-	public function __construct(
-		private string $teamId,
-		private string $displayName,
-		private ?string $link,
-	) {
-	}
+    /**
+     * @since 29.0.0
+     */
+    public function __construct(
+        private string $teamId,
+        private string $displayName,
+        private ?string $link,
+    ) {
+    }
 
-	/**
-	 * Unique identifier of the team (singleId of the circle)
-	 *
-	 * @since 29.0.0
-	 */
-	public function getId(): string {
-		return $this->teamId;
-	}
+    /**
+     * Unique identifier of the team (singleId of the circle)
+     *
+     * @since 29.0.0
+     */
+    public function getId(): string {
+        return $this->teamId;
+    }
 
-	/**
-	 * @since 29.0.0
-	 */
-	public function getDisplayName(): string {
-		return $this->displayName;
-	}
+    /**
+     * @since 29.0.0
+     */
+    public function getDisplayName(): string {
+        return $this->displayName;
+    }
 
-	/**
-	 * @since 29.0.0
-	 */
-	public function getLink(): ?string {
-		return $this->link;
-	}
+    /**
+     * @since 29.0.0
+     */
+    public function getLink(): ?string {
+        return $this->link;
+    }
 
-	/**
-	 * @return array{
-	 *     teamId: string,
-	 *     displayName: string,
-	 *     link: ?string,
-	 * }
-	 *
-	 * @since 29.0.0
-	 */
-	public function jsonSerialize(): array {
-		return [
-			'teamId' => $this->teamId,
-			'displayName' => $this->displayName,
-			'link' => $this->link,
-		];
-	}
+    /**
+     * @return array{
+     *     teamId: string,
+     *     displayName: string,
+     *     link: ?string,
+     * }
+     *
+     * @since 29.0.0
+     */
+    public function jsonSerialize(): array {
+        return [
+            'teamId' => $this->teamId,
+            'displayName' => $this->displayName,
+            'link' => $this->link,
+        ];
+    }
 }

lib/public/Teams/ITeamManager.php

Indentation +33 added lines, -33 removed lines

@@ -11,41 +11,41 @@
  * @since 29.0.0
  */
 interface ITeamManager {
-	/**
-	 * Get all providers that have registered as a team resource provider
-	 *
-	 * @return ITeamResourceProvider[]
-	 * @since 29.0.0
-	 */
-	public function getProviders(): array;
+    /**
+     * Get all providers that have registered as a team resource provider
+     *
+     * @return ITeamResourceProvider[]
+     * @since 29.0.0
+     */
+    public function getProviders(): array;
 
-	/**
-	 * Get a specific team resource provider by its id
-	 *
-	 * @since 29.0.0
-	 */
-	public function getProvider(string $providerId): ITeamResourceProvider;
+    /**
+     * Get a specific team resource provider by its id
+     *
+     * @since 29.0.0
+     */
+    public function getProvider(string $providerId): ITeamResourceProvider;
 
-	/**
-	 * Returns all team resources for a given team and user
-	 *
-	 * @return list<TeamResource>
-	 * @since 29.0.0
-	 */
-	public function getSharedWith(string $teamId, string $userId): array;
+    /**
+     * Returns all team resources for a given team and user
+     *
+     * @return list<TeamResource>
+     * @since 29.0.0
+     */
+    public function getSharedWith(string $teamId, string $userId): array;
 
-	/**
-	 * Returns all teams for a given resource and user
-	 *
-	 * @since 29.0.0
-	 */
-	public function getTeamsForResource(string $providerId, string $resourceId, string $userId): array;
+    /**
+     * Returns all teams for a given resource and user
+     *
+     * @since 29.0.0
+     */
+    public function getTeamsForResource(string $providerId, string $resourceId, string $userId): array;
 
-	/**
-	 * @param list<Team> $teams
-	 * @return array<string, list<TeamResource>>
-	 *
-	 * @since 33.0.0
-	 */
-	public function getSharedWithList(array $teams, string $userId): array;
+    /**
+     * @param list<Team> $teams
+     * @return array<string, list<TeamResource>>
+     *
+     * @since 33.0.0
+     */
+    public function getSharedWithList(array $teams, string $userId): array;
 }

lib/private/Teams/TeamManager.php

Indentation +122 added lines, -122 removed lines

@@ -22,126 +22,126 @@
 
 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->getId() => $provider->getSharedWith($team->getId())];
-				}
-			}
-		}
-
-		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 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);
-	}
+    /** @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->getId() => $provider->getSharedWith($team->getId())];
+                }
+            }
+        }
+
+        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 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);
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -51,7 +51,7 @@ 
 				/** @var ITeamResourceProvider $provider */
 				$provider = Server::get($providerRegistration->getService());
 				$this->providers[$provider->getId()] = $provider;
-			} catch (NotFoundExceptionInterface|ContainerExceptionInterface $e) {
+			} catch (NotFoundExceptionInterface | ContainerExceptionInterface $e) {
 			}
 		}
 		return $this->providers;
@@ -63,7 +63,7 @@ 
 			return $providers[$providerId];
 		}
 
-		throw new \RuntimeException('No provider found for id ' . $providerId);
+		throw new \RuntimeException('No provider found for id '.$providerId);
 	}
 
 	public function getSharedWith(string $teamId, string $userId): array {
@@ -109,7 +109,7 @@ 
 		}
 
 		$provider = $this->getProvider($providerId);
-		return array_map(function (Circle $team) {
+		return array_map(function(Circle $team) {
 			return new Team(
 				$team->getSingleId(),
 				$team->getDisplayName(),

core/Controller/TeamsApiController.php

Indentation +47 added lines, -47 removed lines

@@ -26,55 +26,55 @@
  * @property $userId string
  */
 class TeamsApiController extends OCSController {
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		private ITeamManager $teamManager,
-		private ?string $userId,
-	) {
-		parent::__construct($appName, $request);
-	}
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        private ITeamManager $teamManager,
+        private ?string $userId,
+    ) {
+        parent::__construct($appName, $request);
+    }
 
-	/**
-	 * Get all resources of a team
-	 *
-	 * @param string $teamId Unique id of the team
-	 * @return DataResponse<Http::STATUS_OK, array{resources: list<CoreTeamResource>}, array{}>
-	 *
-	 * 200: Resources returned
-	 */
-	#[NoAdminRequired]
-	#[ApiRoute(verb: 'GET', url: '/{teamId}/resources', root: '/teams')]
-	public function resolveOne(string $teamId): DataResponse {
-		/** @psalm-suppress PossiblyNullArgument The route is limited to logged-in users */
-		$resolvedResources = $this->teamManager->getSharedWith($teamId, $this->userId);
+    /**
+     * Get all resources of a team
+     *
+     * @param string $teamId Unique id of the team
+     * @return DataResponse<Http::STATUS_OK, array{resources: list<CoreTeamResource>}, array{}>
+     *
+     * 200: Resources returned
+     */
+    #[NoAdminRequired]
+    #[ApiRoute(verb: 'GET', url: '/{teamId}/resources', root: '/teams')]
+    public function resolveOne(string $teamId): DataResponse {
+        /** @psalm-suppress PossiblyNullArgument The route is limited to logged-in users */
+        $resolvedResources = $this->teamManager->getSharedWith($teamId, $this->userId);
 
-		return new DataResponse(['resources' => array_map(static fn (TeamResource $resource) => $resource->jsonSerialize(), $resolvedResources)]);
-	}
+        return new DataResponse(['resources' => array_map(static fn (TeamResource $resource) => $resource->jsonSerialize(), $resolvedResources)]);
+    }
 
-	/**
-	 * Get all teams of a resource
-	 *
-	 * @param string $providerId Identifier of the provider (e.g. deck, talk, collectives)
-	 * @param string $resourceId Unique id of the resource to list teams for (e.g. deck board id)
-	 * @return DataResponse<Http::STATUS_OK, array{teams: list<CoreTeamWithResources>}, array{}>
-	 *
-	 * 200: Teams returned
-	 */
-	#[NoAdminRequired]
-	#[ApiRoute(verb: 'GET', url: '/resources/{providerId}/{resourceId}', root: '/teams')]
-	public function listTeams(string $providerId, string $resourceId): DataResponse {
-		/** @psalm-suppress PossiblyNullArgument The route is limited to logged-in users */
-		$teams = $this->teamManager->getTeamsForResource($providerId, $resourceId, $this->userId);
-		$sharesPerTeams = $this->teamManager->getSharedWithList(array_map(fn (Team $team): string => $team->getId(), $teams), $this->userId);
-		$listTeams = array_values(array_map(function (Team $team) use ($sharesPerTeams) {
-			$response = $team->jsonSerialize();
-			$response['resources'] = array_map(static fn (TeamResource $resource) => $resource->jsonSerialize(), $sharesPerTeams[$team->getId()] ?? []);
-			return $response;
-		}, $teams));
+    /**
+     * Get all teams of a resource
+     *
+     * @param string $providerId Identifier of the provider (e.g. deck, talk, collectives)
+     * @param string $resourceId Unique id of the resource to list teams for (e.g. deck board id)
+     * @return DataResponse<Http::STATUS_OK, array{teams: list<CoreTeamWithResources>}, array{}>
+     *
+     * 200: Teams returned
+     */
+    #[NoAdminRequired]
+    #[ApiRoute(verb: 'GET', url: '/resources/{providerId}/{resourceId}', root: '/teams')]
+    public function listTeams(string $providerId, string $resourceId): DataResponse {
+        /** @psalm-suppress PossiblyNullArgument The route is limited to logged-in users */
+        $teams = $this->teamManager->getTeamsForResource($providerId, $resourceId, $this->userId);
+        $sharesPerTeams = $this->teamManager->getSharedWithList(array_map(fn (Team $team): string => $team->getId(), $teams), $this->userId);
+        $listTeams = array_values(array_map(function (Team $team) use ($sharesPerTeams) {
+            $response = $team->jsonSerialize();
+            $response['resources'] = array_map(static fn (TeamResource $resource) => $resource->jsonSerialize(), $sharesPerTeams[$team->getId()] ?? []);
+            return $response;
+        }, $teams));
 
-		return new DataResponse([
-			'teams' => $listTeams,
-		]);
-	}
+        return new DataResponse([
+            'teams' => $listTeams,
+        ]);
+    }
 }

Spacing +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
 		/** @psalm-suppress PossiblyNullArgument The route is limited to logged-in users */
 		$teams = $this->teamManager->getTeamsForResource($providerId, $resourceId, $this->userId);
 		$sharesPerTeams = $this->teamManager->getSharedWithList(array_map(fn (Team $team): string => $team->getId(), $teams), $this->userId);
-		$listTeams = array_values(array_map(function (Team $team) use ($sharesPerTeams) {
+		$listTeams = array_values(array_map(function(Team $team) use ($sharesPerTeams) {
 			$response = $team->jsonSerialize();
 			$response['resources'] = array_map(static fn (TeamResource $resource) => $resource->jsonSerialize(), $sharesPerTeams[$team->getId()] ?? []);
 			return $response;