refactor(teams): store folder quotas in team settings

Co-authored-by: Copilot <copilot@github.com>
Signed-off-by: Stefan Lender <Stefan.Lender@dataport.de>

Author: hefftich

appinfo/routes.php

@@ -59,6 +59,7 @@
 		['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#updateTeamFolderDefaultQuota', 'url' => '/admin/teamfolders/{circleId}/default-quota', 'verb' => 'PUT'],
 		['name' => 'Admin#create', 'url' => '/admin/{emulated}/circles', 'verb' => 'POST'],
 		['name' => 'Admin#destroy', 'url' => '/admin/{emulated}/circles/{circleId}', 'verb' => 'DELETE'],
 		[

lib/ConfigLexicon.php

@@ -26,7 +26,6 @@ class ConfigLexicon implements ILexicon {
 	public const REMOVE_SHARE_TOKENS_DONE = 'remove_share_tokens_done';
 	public const TEAM_FOLDER_AUTO_CREATE = 'team_folder_auto_create';
 	public const TEAM_FOLDER_DEFAULT_QUOTA = 'team_folder_default_quota';
-	public const TEAM_FOLDER_QUOTAS = 'team_folder_quotas';
 
 	// OIDC
 	public const OIDC_ENABLED = 'oidc_enabled';
@@ -60,7 +59,6 @@ public function getAppConfigs(): array {
 			new Entry(key: self::REMOVE_SHARE_TOKENS_DONE, type: ValueType::BOOL, defaultRaw: false, definition: 'whether the remove share tokens repair step has already been executed', lazy: true),
 			new Entry(key: self::TEAM_FOLDER_AUTO_CREATE, type: ValueType::BOOL, defaultRaw: true, definition: 'whether Circles auto-creates team folders and allows UI/API upgrade (not exposed in admin UI)', lazy: true),
 			new Entry(key: self::TEAM_FOLDER_DEFAULT_QUOTA, type: ValueType::INT, defaultRaw: 104857600, definition: 'default quota in bytes for all team folders (0 means unlimited)', lazy: true),
-			new Entry(key: self::TEAM_FOLDER_QUOTAS, type: ValueType::ARRAY, defaultRaw: [], definition: 'team folder quota overrides in bytes by team ID (0 means unlimited)', lazy: true),
 			// OIDC
 			new Entry(key: self::OIDC_ENABLED, type: ValueType::BOOL, defaultRaw: false, definition: 'disable/enable OIDC integration', lazy: true),
 			new Entry(key: self::OIDC_ISSUER, type: ValueType::STRING, defaultRaw: '', definition: 'provider issuer URL', lazy: true),

lib/Controller/AdminController.php

@@ -28,10 +28,13 @@
 use OCA\Circles\Service\MemberService;
 use OCA\Circles\Service\MembershipService;
 use OCA\Circles\Service\SearchService;
+use OCA\Circles\Service\TeamFolderPolicy;
 use OCA\Circles\Tools\Traits\TDeserialize;
 use OCA\Circles\Tools\Traits\TNCLogger;
+use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\OCS\OCSException;
+use OCP\AppFramework\OCS\OCSNotFoundException;
 use OCP\AppFramework\OCSController;
 use OCP\IRequest;
 use OCP\IUserSession;
@@ -72,6 +75,7 @@ public function __construct(
 		private MembershipService $membershipService,
 		private SearchService $searchService,
 		private ITeamManager $teamManager,
+		private TeamFolderPolicy $teamFolderPolicy,
 		ConfigService $configService,
 	) {
 		parent::__construct($appName, $request);
@@ -293,6 +297,7 @@ public function teamFolders(): DataResponse {
 				$teamFolders[] = [
 					'teamId' => $circle->getSingleId(),
 					'teamName' => $circle->getDisplayName(),
+					'defaultQuota' => $this->teamFolderPolicy->getTeamFolderQuota($circle),
 					'folder' => $folder?->jsonSerialize(),
 				];
 			}
@@ -304,6 +309,32 @@ public function teamFolders(): DataResponse {
 		}
 	}
 
+	public function updateTeamFolderDefaultQuota(string $circleId, ?int $quota): DataResponse {
+		try {
+			$user = $this->userSession->getUser();
+			if ($user === null) {
+				throw new OCSException('Authentication required', Http::STATUS_UNAUTHORIZED);
+			}
+
+			$this->setLocalFederatedUser($user->getUID());
+			$circle = $this->circleService->getCircle($circleId);
+			if ($quota === null) {
+				$this->teamFolderPolicy->removeTeamFolderQuota($circle);
+			} else {
+				$this->teamFolderPolicy->setTeamFolderQuota($circle, $quota);
+			}
+
+			return new DataResponse([
+				'teamId' => $circleId,
+				'defaultQuota' => $this->teamFolderPolicy->getTeamFolderQuota($circle),
+			]);
+		} catch (\InvalidArgumentException $e) {
+			throw new OCSException($e->getMessage(), Http::STATUS_BAD_REQUEST);
+		} catch (\OCA\Circles\Exceptions\CircleNotFoundException) {
+			throw new OCSNotFoundException('Team not found');
+		}
+	}
+
 	/**
 	 * @param string $emulated
 	 * @param string $circleId

lib/Controller/SettingsController.php

@@ -42,20 +42,6 @@ public function setValue(string $key, string $value): DataResponse {
 			return $this->getValues();
 		}
 
-		if ($key === ConfigLexicon::TEAM_FOLDER_QUOTAS) {
-			try {
-				$quotas = json_decode($value, true, flags: JSON_THROW_ON_ERROR);
-				if (!is_array($quotas) || array_is_list($quotas)) {
-					throw new \InvalidArgumentException('quotas must be an object');
-				}
-				$this->teamFolderPolicy->setQuotas($quotas);
-			} catch (\JsonException|\InvalidArgumentException $e) {
-				return new DataResponse(['data' => ['message' => $e->getMessage()]], Http::STATUS_BAD_REQUEST);
-			}
-
-			return $this->getValues();
-		}
-
 		if ($key === ConfigLexicon::TEAM_FOLDER_DEFAULT_QUOTA) {
 			if (!preg_match('/^\d+$/', $value)) {
 				return new DataResponse(['data' => ['message' => 'default quota must be a non-negative integer']], Http::STATUS_BAD_REQUEST);
@@ -78,7 +64,6 @@ public function getValues(): DataResponse {
 			ConfigLexicon::FEDERATED_TEAMS_FRONTAL => $this->getFrontalValue() ?? '',
 			ConfigLexicon::FEDERATED_TEAMS_ENABLED => $this->appConfig->getAppValueBool(ConfigLexicon::FEDERATED_TEAMS_ENABLED),
 			ConfigLexicon::TEAM_FOLDER_DEFAULT_QUOTA => $this->teamFolderPolicy->getDefaultQuota(),
-			ConfigLexicon::TEAM_FOLDER_QUOTAS => $this->teamFolderPolicy->getQuotas(),
 		]);
 	}
 
@@ -98,7 +83,7 @@ private function setFrontalValue(string $url): bool {
 
 	private function getFrontalValue(): ?string {
 		if ($this->appConfig->hasAppKey(ConfigLexicon::FEDERATED_TEAMS_FRONTAL)) {
-			return $this->appConfig->getAppValueString(ConfigLExicon::FEDERATED_TEAMS_FRONTAL);
+			return $this->appConfig->getAppValueString(ConfigLexicon::FEDERATED_TEAMS_FRONTAL);
 		}
 
 		if (!$this->appConfig->hasAppKey(ConfigService::FRONTAL_CLOUD_SCHEME)

lib/Listeners/TeamFolderLifecycleListener.php

@@ -33,7 +33,6 @@ public function __construct(
 	public function handle(Event $event): void {
 		if ($event instanceof DestroyingCircleEvent) {
 			$circle = $event->getCircle();
-			$this->policy->removeTeam($circle->getSingleId());
 
 			$provider = $this->teamManager->getTeamFolderProvider();
 			if ($provider === null) {

lib/Model/Circle.php

@@ -95,6 +95,7 @@ class Circle extends ManagedModel implements IEntity, IDeserializable, IQueryRow
 
 	// settings array keys
 	public const SETTING_EXTERNAL_ID = 'external_id';
+	public const SETTING_TEAM_FOLDER_QUOTA = 'team_folder_quota';
 
 	/**
 	 * Note: When editing those values, update lib/Application/Capabilities.php

lib/Service/TeamFolderPolicy.php

@@ -10,17 +10,18 @@
 namespace OCA\Circles\Service;
 
 use OCA\Circles\ConfigLexicon;
+use OCA\Circles\Db\CircleRequest;
 use OCA\Circles\Db\MembershipRequest;
+use OCA\Circles\Exceptions\CircleNotFoundException;
 use OCA\Circles\Model\Circle;
-use OCA\Circles\Model\Membership;
 use OCP\AppFramework\Services\IAppConfig;
 
 /**
  * Policy for team folders owned by teams (circles).
  *
  * This class owns the *policy* for team-folder creation:
  *  - the `team_folder_auto_create` app config toggle (occ only, not admin UI),
- *  - the `team_folder_quotas` app config mapping,
+ *  - the default quota and per-team quota settings,
  *  - the circle-type eligibility rules (personal/hidden/system/backend circles
  *    are excluded).
  *
@@ -37,6 +38,7 @@ class TeamFolderPolicy {
 	public function __construct(
 		private IAppConfig $appConfig,
 		private MembershipRequest $membershipRequest,
+		private CircleRequest $circleRequest,
 	) {
 	}
 
@@ -102,36 +104,27 @@ public function setDefaultQuota(int $quota): void {
 		$this->appConfig->setAppValueInt(ConfigLexicon::TEAM_FOLDER_DEFAULT_QUOTA, $quota);
 	}
 
-	/**
-	 * @return array<string, int>
-	 */
-	public function getQuotas(): array {
-		$quotas = $this->appConfig->getAppValueArray(ConfigLexicon::TEAM_FOLDER_QUOTAS, []);
-		return array_filter(
-			$quotas,
-			static fn (mixed $quota, mixed $teamId): bool => is_string($teamId) && $teamId !== '' && is_int($quota) && $quota >= 0,
-			ARRAY_FILTER_USE_BOTH,
-		);
+	public function getTeamFolderQuota(Circle $circle): ?int {
+		$quota = $circle->getSettings()[Circle::SETTING_TEAM_FOLDER_QUOTA] ?? null;
+
+		return is_int($quota) && $quota >= 0 ? $quota : null;
 	}
 
-	/**
-	 * @param array<string, mixed> $quotas
-	 */
-	public function setQuotas(array $quotas): void {
-		foreach ($quotas as $teamId => $quota) {
-			if (!is_string($teamId) || trim($teamId) === '' || !is_int($quota) || $quota < 0) {
-				throw new \InvalidArgumentException('quotas must map non-empty team IDs to non-negative integers');
-			}
+	public function setTeamFolderQuota(Circle $circle, int $quota): void {
+		if ($quota < 0) {
+			throw new \InvalidArgumentException('team folder quota must be a non-negative integer');
 		}
 
-		$this->appConfig->setAppValueArray(ConfigLexicon::TEAM_FOLDER_QUOTAS, $quotas);
+		$settings = $circle->getSettings();
+		$settings[Circle::SETTING_TEAM_FOLDER_QUOTA] = $quota;
+		$this->circleRequest->updateSettings($circle->setSettings($settings));
 	}
 
-	public function removeTeam(string $teamId): void {
-		$quotas = $this->getQuotas();
-		if (array_key_exists($teamId, $quotas)) {
-			unset($quotas[$teamId]);
-			$this->setQuotas($quotas);
+	public function removeTeamFolderQuota(Circle $circle): void {
+		$settings = $circle->getSettings();
+		if (array_key_exists(Circle::SETTING_TEAM_FOLDER_QUOTA, $settings)) {
+			unset($settings[Circle::SETTING_TEAM_FOLDER_QUOTA]);
+			$this->circleRequest->updateSettings($circle->setSettings($settings));
 		}
 	}
 
@@ -140,18 +133,26 @@ public function removeTeam(string $teamId): void {
 	 * Unlimited (0) takes precedence over every finite quota.
 	 */
 	public function getQuotaForCircle(Circle $circle): int {
-		$quotas = $this->getQuotas();
 		$fallback = $this->getDefaultQuota();
 		$owner = $circle->getOwner();
 		if (!$owner->isLocal()) {
 			return $fallback;
 		}
 
-		$teamIds = array_map(
-			static fn (Membership $membership): string => $membership->getCircleId(),
-			$this->membershipRequest->getMemberships($owner->getSingleId()),
-		);
-		$matches = array_intersect_key($quotas, array_flip($teamIds));
+		$matches = [];
+		foreach ($this->membershipRequest->getMemberships($owner->getSingleId()) as $membership) {
+			try {
+				$membershipCircle = $this->circleRequest->getCircle($membership->getCircleId());
+			} catch (CircleNotFoundException) {
+				continue;
+			}
+
+			$quota = $this->getTeamFolderQuota($membershipCircle);
+			if ($quota !== null) {
+				$matches[] = $quota;
+			}
+		}
+
 		if ($matches === []) {
 			return $fallback;
 		}

lib/Settings/AdminTeamFolders.php

@@ -34,7 +34,6 @@ public function __construct(
 	 */
 	public function getForm(): TemplateResponse {
 		$this->initialState->provideInitialState('teamFolderDefaultQuota', $this->teamFolderPolicy->getDefaultQuota());
-		$this->initialState->provideInitialState('teamFolderQuotas', $this->teamFolderPolicy->getQuotas());
 		$this->initialState->provideInitialState('teamFolderAutoCreateEnabled', $this->teamFolderPolicy->isTeamFolderProvisioningEnabled());
 
 		Util::addStyle(Application::APP_ID, 'teams-settings-team-folders');
@@ -69,7 +68,6 @@ public function getAuthorizedAppConfig(): array {
 		return [
 			Application::APP_ID => [
 				ConfigLexicon::TEAM_FOLDER_DEFAULT_QUOTA,
-				ConfigLexicon::TEAM_FOLDER_QUOTAS,
 			],
 		];
 	}

src/components/AdminTeamFolders.vue

@@ -24,7 +24,7 @@ import NcSelect from '@nextcloud/vue/components/NcSelect'
 import NcTextField from '@nextcloud/vue/components/NcTextField'
 import IconDeleteOutline from 'vue-material-design-icons/TrashCanOutline.vue'
 import { logger } from '../logger.ts'
-import { deleteTeam, getAdminTeamFolders, getLinkableTeamFolders, linkTeamFolder, updateTeamFolderQuota, upgradeTeamFolder } from '../teams/api.ts'
+import { deleteTeam, getAdminTeamFolders, getLinkableTeamFolders, linkTeamFolder, updateTeamFolderDefaultQuota, updateTeamFolderQuota, upgradeTeamFolder } from '../teams/api.ts'
 
 interface QuotaOption {
 	id: string
@@ -52,12 +52,10 @@ const quotaPreset: QuotaOption[] = [
 ]
 
 const initialDefaultQuota = loadState<number>('circles', 'teamFolderDefaultQuota', 104857600)
-const initialQuotas = loadState<Record<string, number>>('circles', 'teamFolderQuotas', {})
 const teamFolderAutoCreateEnabled = loadState<boolean>('circles', 'teamFolderAutoCreateEnabled', true)
 const defaultQuota = ref<QuotaOption>(quotaOption(initialDefaultQuota))
-const rows = ref<QuotaRow[]>(Object.entries(initialQuotas)
-	.map(([teamId, quota]) => ({ id: teamId, label: teamId, quota: quotaOption(quota) }))
-	.sort((left, right) => left.label.localeCompare(right.label)))
+const rows = ref<QuotaRow[]>([])
+const loadedQuotas = ref<Record<string, number>>({})
 const teams = ref<TeamOption[]>([])
 const selectedQuotaTeam = ref<TeamOption | null>(null)
 const loadingTeams = ref(false)
@@ -174,8 +172,13 @@ async function loadTeamFolders() {
 		teams.value = teamFolders.value
 			.map((team) => ({ id: team.teamId, label: team.teamName }))
 			.sort((left, right) => left.label.localeCompare(right.label))
-		const labels = new Map(teams.value.map((team) => [team.id, team.label]))
-		rows.value = rows.value.map((row) => ({ ...row, label: labels.get(row.id) ?? row.label }))
+		loadedQuotas.value = Object.fromEntries(teamFolders.value
+			.filter((team) => team.defaultQuota !== null)
+			.map((team) => [team.teamId, team.defaultQuota as number]))
+		rows.value = teamFolders.value
+			.filter((team) => team.defaultQuota !== null)
+			.map((team) => ({ id: team.teamId, label: team.teamName, quota: quotaOption(team.defaultQuota as number) }))
+			.sort((left, right) => left.label.localeCompare(right.label))
 		teamFolderQuotas.value = Object.fromEntries(teamFolders.value.map((teamFolder) => [
 			teamFolder.teamId,
 			quotaOptionFromBytes(teamFolder.folder?.quota ?? 104857600),
@@ -408,8 +411,32 @@ async function onSaveQuotas() {
 
 	saving.value = true
 	const defaultSaved = await updateAppConfig('team_folder_default_quota', String(Math.round(defaultBytes)))
-	if (defaultSaved && await updateAppConfig('team_folder_quotas', JSON.stringify(quotas))) {
+	if (!defaultSaved) {
+		saving.value = false
+		return
+	}
+
+	let quotasSaved = true
+	const changedTeamIds = new Set([...Object.keys(loadedQuotas.value), ...Object.keys(quotas)])
+	for (const teamId of changedTeamIds) {
+		const quota = quotas[teamId] ?? null
+		if ((loadedQuotas.value[teamId] ?? null) === quota) {
+			continue
+		}
+
+		try {
+			await updateTeamFolderDefaultQuota(teamId, quota)
+		} catch (error) {
+			quotasSaved = false
+			logger.error('Unable to update default team folder quota', { error, teamId })
+		}
+	}
+
+	if (quotasSaved) {
 		showSuccess(t('circles', 'Changed default team folder quotas'))
+		await loadTeamFolders()
+	} else {
+		showError(t('circles', 'Unable to update team folder config'))
 	}
 	saving.value = false
 }
@@ -504,7 +531,7 @@ onMounted(() => {
 					:aria-label="t('circles', 'Default quota for all groups')"
 					:clearable="false"
 					:createOption="validateQuota"
-					:input-label="t('circles', 'Default quota')"
+					:inputLabel="t('circles', 'Default quota')"
 					:options="quotaOptions"
 					:placeholder="t('circles', 'Select default quota')"
 					taggable />

src/teams/api.ts

@@ -242,6 +242,7 @@ export interface TeamFolder {
 export interface AdminTeamFolder {
 	teamId: string
 	teamName: string
+	defaultQuota: number | null
 	folder: TeamFolder | null
 }
 
@@ -253,6 +254,20 @@ export async function getAdminTeamFolders(): Promise<AdminTeamFolder[]> {
 	return data.ocs.data
 }
 
+/**
+ * Update the default folder quota associated with a team.
+ *
+ * @param teamId - The team single id
+ * @param quota - Quota in bytes, zero for unlimited, or null to remove the override
+ */
+export async function updateTeamFolderDefaultQuota(teamId: string, quota: number | null): Promise<{ teamId: string, defaultQuota: number | null }> {
+	const { data } = await axios.put<OcsResponse<{ teamId: string, defaultQuota: number | null }>>(
+		generateOcsUrl('/apps/circles/admin/teamfolders/{circleId}/default-quota', { circleId: teamId }),
+		{ quota },
+	)
+	return data.ocs.data
+}
+
 /**
  * Fetch the team folder linked to a team.
  *