feat: control team space provisioning via app config by lennart441 · Pull Request #2743 · nextcloud/circles

lennart441 · 2026-08-11T14:12:50Z

feat: kill switch for user team-folder provisioning (app config, no admin UI)

Assisted by: Cursor

Supersedes / follows up on feat: add Teams admin settings and group-based creation limits #2698
Issue from that PR: Allow restricting team-creation to certain groups #2717
Review direction: keep teams creatable; restriction via CLI / app config, not admin UI

Summary

Kill switch for user team-folder provisioning so admins keep quota control. Teams stay creatable.

When disabled:

no auto-create on team creation
no Circles UI/API self-upgrade

occ config:app:set circles team_folder_auto_create --value="false" --type=boolean

Default remains on. Not exposed in admin settings. Not group-based team-creation limits (#2698). Not per-team wizard skip (#2744).

Checklist

Code is properly formatted
Sign-off message is added to all commits
Tests (unit, integration, api and/or acceptance) are included
Screenshots before/after for front-end changes
Admin toggle removed; no new UI surfaces
Documentation (manuals or wiki) has been updated or is not required
Documented in PR description (occ config:app:set)
Backports requested where applicable (ex: critical bugfixes)
no
Labels added where applicable (ex: bug/enhancement, 3. to review, feature component)
Milestone added for target branch/version (ex: 32.x for stable32)

AI (if applicable)

The content of this PR was partly or fully generated using AI

codecov · 2026-08-11T14:14:57Z

Codecov Report

✅ All modified and coverable lines are covered by tests.

📢 Thoughts on this report? Let us know!

artonge · 2026-08-19T14:36:07Z

+	 * Defaults to true when unset. OCC upgrade commands bypass this gate.
+	 */
+	public function isTeamFolderProvisioningEnabled(): bool {
+		$value = $this->config->getSystemValue(self::SYSTEM_TEAM_FOLDER_AUTO_CREATE, null);


Can't this be an app config instead?

I would try to avoid 'poluting' the system config for such specific configs

It can be app config technically, but we put it in config.php on purpose.

This PR follows the direction from @jospoortvliet on #2698: keep the strong default (teams + team spaces), and if a restriction is needed, only allow it in config.php so it is not the first thing admins reach for in the UI (and so we do not treat Nextcloud Teams like a feature to turn off). #2698 had this as an admin/app setting; we closed that PR in favor of this one for that reason.

App config would still be changeable via occ config:app:set and is easy to surface again in admin settings later. System config keeps this as an explicit ops-level opt-out, which matches that discussion.

Happy to revisit if you still prefer app config with the UI kept out.

Yes, let's keep it in the app config :)

artonge

This is still a system config and not an app config

artonge · 2026-08-25T08:50:20Z

+	public function isTeamFolderProvisioningEnabled(): bool {
+		$value = $this->config->getSystemValue(self::SYSTEM_TEAM_FOLDER_AUTO_CREATE, null);


To make sure that it is not miss-used.

Suggested change

public function isTeamFolderProvisioningEnabled(): bool {

$value = $this->config->getSystemValue(self::SYSTEM_TEAM_FOLDER_AUTO_CREATE, null);

public function isTeamFolderAutoProvisioningEnabled(): bool {

$value = $this->config->getSystemValue(self::SYSTEM_TEAM_FOLDER_AUTO_CREATE, null);

Agreed the name is easy to misread, but …AutoProvisioning… would be the wrong contract.

This flag is meant to stop user provisioning (create + UI/API self-upgrade), not only auto-create, so quota stays under admin control. OCC is not gated.

Happy to rename to something like isUserTeamFolderProvisioningEnabled instead.

If this is not about auto-provisioning, let's rename the name of the config

artonge · 2026-08-25T08:51:30Z

+/**
+ * Admin escape hatch to provision team spaces for existing teams.
+ *
+ * This bypasses the config.php gate (`circles.team_folder_auto_create`) that


This is not a bypass if the config is only about blocking auto-provisioning.

Fair on the wording. OCC is the admin path and must keep working when user provisioning is off. I will drop “bypass” in comments/docs and say: user paths honour the flag, OCC does not.

see above - do what is quickest.

lennart441 · 2026-08-25T09:12:01Z

This PR is the original plan after #2698 / Jos: teams stay creatable, but user team-folder provisioning can be switched off so quota stays under admin control (OCC still works).

That is not really #2744 (optional skip per team in the wizard). Happy to open a dedicated issue and retarget if that helps.

github-actions · 2026-08-26T02:49:15Z

Hello there,
Thank you so much for taking the time and effort to create a pull request to our Nextcloud project.

We hope that the review process is going smooth and is helpful for you. We want to ensure your pull request is reviewed to your satisfaction. If you have a moment, our community management team would very much appreciate your feedback on your experience with this PR review process.

Your feedback is valuable to us as we continuously strive to improve our community developer experience. Please take a moment to complete our short survey by clicking on the following link: https://cloud.nextcloud.com/apps/forms/s/i9Ago4EQRZ7TWxjfmeEpPkf6

Thank you for contributing to Nextcloud and we hope to hear from you soon!

(If you believe you should not receive this message, you can add yourself to the blocklist.)

jospoortvliet · 2026-08-26T09:37:28Z

This PR is the original plan after #2698 / Jos: teams stay creatable, but user team-folder provisioning can be switched off so quota stays under admin control (OCC still works).

That is not really #2744 (optional skip per team in the wizard). Happy to open a dedicated issue and retarget if that helps.

yeah, two different things. just discussed - so this doesn't have to be in config.php, just not visible in the admin UI - if it can be switched via the command line (occ or editing a config file), it's fine. So to be configured with something like occ app:config:system:set app_id --value "new_value".

But we agreed it is not a big deal either way, so @lennart441 do what is quickest for you:

merge this as it is (so other PR's can continue and build on it) and do a separate PR to move this config to the app config
change the PR to move this (back?) to app config and then merge.

So whatever works ;-)

lennart441 · 2026-08-26T10:01:12Z

Moved the flag from system/config.php to app config as discussed (@artonge / @jospoortvliet):

occ config:app:set circles team_folder_auto_create --value="false" --type=boolean

Still not in admin UI. User paths (auto-create + UI/API upgrade) honour it; occ circles:team-folder:upgrade does not.

lennart441 · 2026-08-26T10:22:59Z

/backport to stable35

artonge · 2026-08-26T10:10:49Z

I don't think we need that command.

Just to clarify: do you mean only circles:team-folder:upgrade, or the whole PR (app-config kill switch for user provisioning)?

If it’s only the OCC command, I can drop it and keep the app-config flag. Note that with the flag off there would then be no admin path to provision spaces unless we leave UI/API upgrade open.

If you mean the whole approach isn’t needed anymore, I’ll close the PR — happy to confirm before I do that. (Context: this would be the second PR on this topic after #2698 that we implemented based on earlier feedback and then walked back.)

I only mean the command.

I don't see use cases to allow bypassing the app-config flag.

@artonge done

lennart441 · 2026-08-26T14:56:50Z

Dropped circles:team-folder:upgrade as requested — no bypass of the app-config flag.

artonge

Good besides nitpick.

artonge · 2026-08-26T15:13:47Z

Probably not needed anymore.

artonge · 2026-08-26T15:41:11Z

And please cleanup your git history

lennart441 · 2026-08-27T08:43:14Z

And please cleanup your git history

Squashed to a single commit on current master

Keep the flag off the admin UI; set it with occ config:app:set. When disabled, auto-create and Circles UI/API upgrade are blocked. Signed-off-by: Lennart Joswig <mail@ljoswig.de> Co-authored-by: Cursor <cursoragent@cursor.com>

artonge · 2026-08-27T10:18:36Z


 import 'cropperjs/dist/cropper.css'

+const teamFolderProvisioningEnabled = Boolean(loadState('circles', 'teamFolderProvisioningEnabled', true))


Not needed too.

Thanks for the extra look.

The initial state / canCreateTeamFolder check is intentional, not leftover from the OCC command.

The goal is that admins can keep quota fully under their control. If team_folder_auto_create is off, users should not be able to consume team-space quota — whether the folder is created with the team or attached afterwards via the UI. Those two paths are the same from a quota perspective.

So we hide the upgrade action in the UI (and the API already returns 403) when the flag is off. Auto-create-only would still let someone create a team first and add the space later.

At least, that was my intention.

artonge · 2026-09-02T14:25:55Z

/backport to stable35

backportbot · 2026-09-02T14:26:03Z

The backport to stable35 failed. Please do this backport manually.

# Switch to the target branch and update it
git checkout stable35
git pull origin stable35

# Create the new backport branch
git checkout -b backport/2743/stable35

# Cherry pick the change from the commit sha1 of the change against the default branch
# This might cause conflicts, resolve them
git cherry-pick 00a5cd1a

# Push the cherry pick commit to the remote repository and open a pull request
git push origin backport/2743/stable35

Error: Failed to check for changes with origin/stable35: No changes found in backport branch

Learn more about backports at https://docs.nextcloud.com/server/stable/go.php?to=developer-backports.

lennart441 added design enhancement labels Aug 11, 2026

lennart441 force-pushed the feat/config-team-folder-auto-create branch 2 times, most recently from af1f1eb to d31ced6 Compare August 11, 2026 14:57

lennart441 mentioned this pull request Aug 11, 2026

feat: add Teams admin settings and group-based creation limits #2698

Closed

7 tasks

lennart441 force-pushed the feat/config-team-folder-auto-create branch from d31ced6 to adf249b Compare August 18, 2026 14:37

lennart441 marked this pull request as ready for review August 18, 2026 20:44

lennart441 requested review from ArtificialOwl and provokateurin as code owners August 18, 2026 20:44

lennart441 added the 3. to review label Aug 18, 2026

alimmroth added this to 👥 Teams Aug 19, 2026

github-project-automation Bot moved this to Backlog in 👥 Teams Aug 19, 2026

alimmroth moved this from Backlog to In review in 👥 Teams Aug 19, 2026

artonge reviewed Aug 19, 2026

View reviewed changes

artonge reviewed Aug 25, 2026

View reviewed changes

artonge mentioned this pull request Aug 25, 2026

feat: implement team upgrade banner and remove legacy folder share #2741

Merged

7 tasks

github-actions Bot added the feedback-requested label Aug 26, 2026

lennart441 changed the title ~~feat: control team space auto-create via config.php~~ feat: control team space provisioning via app config Aug 26, 2026

lennart441 force-pushed the feat/config-team-folder-auto-create branch from 87522db to 45dd509 Compare August 26, 2026 10:02

lennart441 enabled auto-merge August 26, 2026 10:21

backportbot Bot added the backport-request label Aug 26, 2026

artonge reviewed Aug 26, 2026

View reviewed changes

artonge disabled auto-merge August 26, 2026 15:14

artonge approved these changes Aug 26, 2026

View reviewed changes

Comment thread lib/Controller/PageController.php

artonge Aug 26, 2026

Copy link
Copy Markdown

Contributor

Choose a reason for hiding this comment

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

Probably not needed anymore.

lennart441 enabled auto-merge August 26, 2026 15:28

lennart441 disabled auto-merge August 26, 2026 15:28

lennart441 enabled auto-merge August 26, 2026 15:34

alimmroth mentioned this pull request Aug 27, 2026

Implement a default quota per group. nextcloud/groupfolders#5029

Open

lennart441 force-pushed the feat/config-team-folder-auto-create branch from 84fb222 to b32e5ef Compare August 27, 2026 08:41

feat: control team space provisioning via app config

00a5cd1

Keep the flag off the admin UI; set it with occ config:app:set. When disabled, auto-create and Circles UI/API upgrade are blocked. Signed-off-by: Lennart Joswig <mail@ljoswig.de> Co-authored-by: Cursor <cursoragent@cursor.com>

lennart441 force-pushed the feat/config-team-folder-auto-create branch from 4110db4 to 00a5cd1 Compare August 27, 2026 09:43

artonge reviewed Aug 27, 2026

View reviewed changes

lennart441 merged commit d924d8d into nextcloud:master Aug 27, 2026
44 of 45 checks passed

github-project-automation Bot moved this from In review to Done in 👥 Teams Aug 27, 2026

lennart441 added 4. to release and removed 3. to review labels Aug 28, 2026

lennart441 deleted the feat/config-team-folder-auto-create branch August 28, 2026 11:38

artonge mentioned this pull request Sep 2, 2026

[stable35] feat: control team space provisioning via app config #2865

Merged

tomek2k1 mentioned this pull request Sep 2, 2026

feat: control team space provisioning via app config #2866

Closed

		public function isTeamFolderProvisioningEnabled(): bool {
		$value = $this->config->getSystemValue(self::SYSTEM_TEAM_FOLDER_AUTO_CREATE, null);


		import 'cropperjs/dist/cropper.css'

		const teamFolderProvisioningEnabled = Boolean(loadState('circles', 'teamFolderProvisioningEnabled', true))

Uh oh!

Conversation

lennart441 commented Aug 11, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Summary

Checklist

AI (if applicable)

Uh oh!

codecov Bot commented Aug 11, 2026

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

artonge left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lennart441 commented Aug 25, 2026

Uh oh!

github-actions Bot commented Aug 26, 2026

Uh oh!

jospoortvliet commented Aug 26, 2026

Uh oh!

lennart441 commented Aug 26, 2026

Uh oh!

lennart441 commented Aug 26, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

lennart441 commented Aug 26, 2026

Uh oh!

artonge left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

artonge commented Aug 26, 2026

Uh oh!

lennart441 commented Aug 27, 2026

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

artonge commented Sep 2, 2026

Uh oh!

backportbot Bot commented Sep 2, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

lennart441 commented Aug 11, 2026 •

edited

Loading