Fix account activation being triggered before email confirmation #23245
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ClearlyClaire
force-pushed
the
fixes/approved-hook
branch
from
20ae6bd
to
ee38502
Compare
Gargron
approved these changes
Jan 24, 2023
btrd
pushed a commit
to btrd/mastodon
that referenced
this pull request
Feb 22, 2023
…todon#23245) * Add tests * Fix account activation being triggered before email confirmation Fixes mastodon#23098
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #23098
When registrations are open and not subject to approval, accounts are activated (
User#prepare_new_user!is called, the welcome email is sent, the staff is notified, theaccount.approvedWeb Hook is triggered, and if the user was invited, the inviting user is followed) the moment the user confirms their email.However, when approvals are required, this happens when a moderator approves the user, even if they have not confirmed their email, and should they confirm their email after being approved, their account will be activated twice.
Therefore, this PR changes it so the account is only activated when both confirmed and approved.