Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions appinfo/routes.php
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,17 @@
['name' => 'TeamFolder#getTeamFolder', 'url' => '/teams/{circleId}/folder', 'verb' => 'GET'],
['name' => 'TeamFolder#unlinkTeamFolder', 'url' => '/teams/{circleId}/folder', 'verb' => 'DELETE'],
['name' => 'TeamFolder#upgradeTeamFolder', 'url' => '/teams/{circleId}/folder', 'verb' => 'POST'],
['name' => 'TeamFolder#getLinkableTeamFolders', 'url' => '/teams/{circleId}/folder/linkable', 'verb' => 'GET'],
['name' => 'TeamFolder#linkTeamFolder', 'url' => '/teams/{circleId}/folder/link', 'verb' => 'POST'],
['name' => 'TeamFolder#updateTeamFolderQuota', 'url' => '/teams/{circleId}/folder/quota', 'verb' => 'PUT'],

// Teams Dashboard widget endpoint
['name' => 'TeamsDashboard#getCompleteTeamsData', 'url' => '/teams/dashboard/widget', 'verb' => 'GET'],

// AdminController
['name' => 'Admin#circles', 'url' => '/admin/{emulated}/circles', 'verb' => 'GET'],
['name' => 'Admin#circlesAll', 'url' => '/admin/circlesall', 'verb' => 'GET'],
['name' => 'Admin#teamFolders', 'url' => '/admin/teamfolders', 'verb' => 'GET'],
['name' => 'Admin#create', 'url' => '/admin/{emulated}/circles', 'verb' => 'POST'],
['name' => 'Admin#destroy', 'url' => '/admin/{emulated}/circles/{circleId}', 'verb' => 'DELETE'],
[
Expand Down
2 changes: 1 addition & 1 deletion js/teams-settings-team-folders.mjs.map

Large diffs are not rendered by default.

41 changes: 41 additions & 0 deletions lib/Controller/AdminController.php
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
use OCP\AppFramework\OCSController;
use OCP\IRequest;
use OCP\IUserSession;
use OCP\Teams\ITeamManager;

/**
* Class AdminController
Expand Down Expand Up @@ -70,6 +71,7 @@ public function __construct(
private MemberService $memberService,
private MembershipService $membershipService,
private SearchService $searchService,
private ITeamManager $teamManager,
ConfigService $configService,
) {
parent::__construct($appName, $request);
Expand Down Expand Up @@ -263,6 +265,45 @@ public function circlesAll(
}
}

/**
* Return teams and their optionally linked team folders.
*
* @return DataResponse
* @throws OCSException
*/
public function teamFolders(): DataResponse {
try {
$this->setLocalFederatedUser($this->userSession->getUser()->getUID());
$provider = $this->teamManager->getTeamFolderProvider();
if ($provider === null) {
return new DataResponse([]);
}

$probe = new CircleProbe();
$probe->filterPersonalCircles()
->filterSingleCircles()
->filterSystemCircles()
->filterHiddenCircles()
->filterBackendCircles();

$teamFolders = [];
foreach ($this->circleService->getAllCircles($probe) as $circle) {
$folder = $provider->getTeamFolder($circle->getSingleId());

$teamFolders[] = [
'teamId' => $circle->getSingleId(),
'teamName' => $circle->getDisplayName(),
'folder' => $folder?->jsonSerialize(),
];
}

return new DataResponse($teamFolders);
} catch (Exception $e) {
$this->e($e);
throw new OCSException($e->getMessage(), (int)$e->getCode());
}
}

/**
* @param string $emulated
* @param string $circleId
Expand Down
42 changes: 40 additions & 2 deletions lib/Controller/TeamFolderController.php
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
}

#[NoAdminRequired]
public function upgradeTeamFolder(string $circleId): DataResponse {
public function upgradeTeamFolder(string $circleId, string $name = ''): DataResponse {
if (!$this->policy->isTeamFolderProvisioningEnabled()) {
throw new OCSException('Team space provisioning is disabled', Http::STATUS_FORBIDDEN);
}
Expand All @@ -66,7 +66,7 @@
$folder = $this->getProvider()->createTeamFolder(
new Team(
teamId: $circle->getSingleId(),
displayName: $circle->getDisplayName(),
displayName: trim($name) ?: $circle->getDisplayName(),
link: null,
),
$this->policy->getDefaultQuota(),
Expand All @@ -79,6 +79,44 @@
]);
}

#[NoAdminRequired]
public function getLinkableTeamFolders(string $circleId): DataResponse {
$this->assertAuthenticatedUserIsTeamOwnerOrServerAdmin($circleId);

return new DataResponse(array_map(
static fn (\OCP\Teams\TeamFolder $folder): array => $folder->jsonSerialize(),
$this->getProvider()->getLinkableTeamFolders($circleId),

Check failure on line 88 in lib/Controller/TeamFolderController.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

UndefinedInterfaceMethod

lib/Controller/TeamFolderController.php:88:26: UndefinedInterfaceMethod: Method OCP\Teams\ITeamFolderProvider::getLinkableTeamFolders does not exist (see https://psalm.dev/181)
));
}

#[NoAdminRequired]
public function linkTeamFolder(string $circleId, int $folderId): DataResponse {
$this->assertAuthenticatedUserIsTeamOwnerOrServerAdmin($circleId);
$folder = $this->getProvider()->linkTeamFolder($circleId, $folderId);

Check failure on line 95 in lib/Controller/TeamFolderController.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

UndefinedInterfaceMethod

lib/Controller/TeamFolderController.php:95:35: UndefinedInterfaceMethod: Method OCP\Teams\ITeamFolderProvider::linkTeamFolder does not exist (see https://psalm.dev/181)

return new DataResponse([
'success' => true,
'folderId' => $folder->getId(),
'folder' => $folder->jsonSerialize(),
]);
}

#[NoAdminRequired]
public function updateTeamFolderQuota(string $circleId, int $quota): DataResponse {
$this->assertAuthenticatedUserIsTeamOwnerOrServerAdmin($circleId);
if ($quota < 0) {
throw new OCSException('Quota must be a non-negative number', Http::STATUS_BAD_REQUEST);
}

$folder = $this->getProvider()->updateTeamFolderQuota($circleId, $quota);

Check failure on line 111 in lib/Controller/TeamFolderController.php

View workflow job for this annotation

GitHub Actions / static-psalm-analysis

UndefinedInterfaceMethod

lib/Controller/TeamFolderController.php:111:35: UndefinedInterfaceMethod: Method OCP\Teams\ITeamFolderProvider::updateTeamFolderQuota does not exist (see https://psalm.dev/181)

return new DataResponse([
'success' => true,
'folderId' => $folder->getId(),
'folder' => $folder->jsonSerialize(),
]);
}

#[NoAdminRequired]
public function unlinkTeamFolder(string $circleId, bool $deleteFolder = false): DataResponse {
$this->assertAuthenticatedUserIsTeamOwnerOrServerAdmin($circleId);
Expand Down
Loading
Loading