Skip to content

fix: bring the merged WordPress login link and billing re-enable fixes into main - #44

Merged
YvesCesar merged 7 commits into
mainfrom
fix/refuse-adopting-foreign-accounts
Nov 18, 2026
Merged

YvesCesar merged 7 commits into
mainfrom
fix/refuse-adopting-foreign-accounts

Conversation

@YvesCesar

@YvesCesar YvesCesar commented Nov 18, 2026 •

Copy link
Copy Markdown
Member

#35 → #36 → #37 → #38 were opened as a stack. #36 was merged into fix/restrict-subadmin-group-additions and reached main with #35, but #37 was merged into fix/refuse-adopting-foreign-accounts a minute after #36 had already been merged, so #37 and #38 never reached main. This PR takes fix/refuse-adopting-foreign-accounts into main. It carries both, plus the follow-ups below.

What reaches main

Follow-ups on top of #37 and #38

  • The group owner is enabled again when billing is restored: members disabled before fix: only enable again the users disabled for billing #38 have no billing mark, and neither does the account that owns the group. Without this, a customer who paid stayed locked out with nobody able to log in and enable the members. The owner is the account whose uid is the group id and that is sub-admin of that group; Nextcloud does not let a user disable themselves, so the owner is never disabled on purpose by the group admin.
  • Enabling a user by any means drops the billing mark: a listener on UserChangedEvent removes disabled_by_billing when a user is enabled. Before, if an administrator enabled a member by hand during non-payment and the group admin later disabled that member on purpose, the next billing enable brought the member back.
  • Changelog: entry for the WordPress login link with the deploy order and the link-users step; the existing entry now says that the owner is enabled again.

Deploy order

Deploy this before LibreSign/wordpress_login_backend#32, then run occ wordpress-login-backend:link-users --dry-run, check the output and run it without --dry-run for the accounts created before.

Verification

  • The heads merged in fix: record the WordPress login link when creating the group admin account #37 and fix: only enable again the users disabled for billing #38 are ancestors of this branch.
  • The branch merges into main without conflicts.
  • Psalm, PHP CS Fixer, PHP lint and composer run openapi pass locally.
  • Checked against a local Nextcloud through the OCS API:
    • a group whose owner and member were disabled without the billing mark: enabling the group enables the owner, the member stays disabled;
    • a member disabled by billing, enabled by hand and then disabled on purpose stays disabled after the billing enable;
    • a group disabled and provisioned again enables the owner and the members disabled by billing, removes the mark, and keeps disabled the member that was already disabled.

YvesCesar and others added 7 commits November 14, 2026 11:19
Signed-off-by: YvesCesar <yvesamorim73@gmail.com>
…count

Signed-off-by: YvesCesar <yvesamorim73@gmail.com>
…led-users

fix: only enable again the users disabled for billing
fix: record the WordPress login link when creating the group admin account
Signed-off-by: YvesCesar <yvesamorim73@gmail.com>
…tored

Signed-off-by: YvesCesar <yvesamorim73@gmail.com>
…hangelog

Signed-off-by: YvesCesar <yvesamorim73@gmail.com>
@YvesCesar
YvesCesar merged commit 7df06ec into main Nov 18, 2026
15 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants