fix: require login actions for magic links#1329
Open
memleakd wants to merge 3 commits into
Open
Conversation
michalsn
previously approved these changes
May 31, 2026
Member
michalsn
left a comment
michalsn
left a comment
There was a problem hiding this comment.
The fix makes sense. I only wonder... if we add another passwordless login method later, it may need the same handling. A generic pending login-method marker would keep this reusable... but maybe we should keep things simple and refactor it later if it will be needed.
michalsn
dismissed
their stale review
I thought only PHPStan is failing, but PHPUnit fails too.
Member
|
@memleakd Please rebase and fix PHPUnit issues. |
- Start configured login actions during magic-link verification - Preserve magicLogin notification until pending actions complete - Cover normal and conditional login-action magic-link flows - Document that magic-link login finishes after required login actions Signed-off-by: memleakd <121398829+memleakd@users.noreply.github.com>
Signed-off-by: memleakd <121398829+memleakd@users.noreply.github.com>
memleakd
force-pushed
the
fix/magic-link-login-actions
branch
from
9263659 to
5d0b89d
Compare
Contributor
Author
Done |
Signed-off-by: memleakd <121398829+memleakd@users.noreply.github.com>
Contributor
Author
Good point, thanks for calling that out. I refactored it to use a generic marker instead of magic-link-specific. |
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
2 participants
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.
Description
This fixes a gap in the magic-link login flow.
Password login already respects configured login auth actions, such as Email-based 2FA. Magic-link login, however, could finish immediately after the token was verified. So an app could have 2FA enabled for normal login, but magic-link login would not go through that same action flow.
With this PR, magic-link login now starts the configured login action when one applies to the user. If an action is required, the user is sent to the normal auth-action screen first, and the magic-link login is only treated as complete after that action passes.
The existing
magicLoginsession value andmagicLoginevent still work. They are just delayed until the login action is completed, so they continue to mean "the user has finished logging in with a magic link".I also added a short note to the docs, plus tests for normal and conditional login actions.
Checklist: