Clear token after email activation#1177
Merged
steinkel merged 4 commits into16.next-cake5from Apr 12, 2026
Merged
Conversation
There was a problem hiding this comment.
Pull request overview
This PR fixes an email-activation security/logic gap by clearing the stored activation token when a user is activated (previously only token_expires was cleared). This prevents old activation links from becoming usable again if token_expires is later reset, and aligns behavior with the password reset token clearing approach.
Changes:
- Clear both
tokenandtoken_expiresduringRegisterBehavior::activateUser(). - Extend the existing registration behavior test to assert the token itself is cleared after activation.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated no comments.
| File | Description |
|---|---|
src/Model/Behavior/RegisterBehavior.php |
Clears both token fields during activation so old validation URLs can’t be reused. |
tests/TestCase/Model/Behavior/RegisterBehaviorTest.php |
Adds an assertion ensuring the activation token is nulled on activation. |
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
added 3 commits
April 12, 2026 20:07
activateUser() was setting token_expires to null but leaving the token value in the database. Old activation links remained usable if token_expires was ever reset. Now both fields are cleared on activation, consistent with how PasswordBehavior handles password reset tokens.
Since activation now sets token=null, re-using the old token URL results in UserNotFoundException instead of TokenExpiredException.
a115c12 to
b1e01ee
Compare
This file contains hidden or 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
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.
activateUser() was setting token_expires to null but leaving the token value in the database. Old activation links remained usable if token_expires was ever reset. Now both fields are cleared on activation, consistent with how PasswordBehavior handles password reset tokens.