email login_hint support when login_with_email_allowed is activated #4568
+82
−11
Conversation
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
MatMaul
reviewed
May 15, 2025
mcalinghee
force-pushed
the
feat/login_hint_with_email
branch
from
86e806c to
34762a6
Compare
|
Might be re-adapted if this PR goes through : #4571 |
mcalinghee
force-pushed
the
feat/login_hint_with_email
branch
from
34762a6 to
9c9cc3d
Compare
sandhose
requested changes
Jun 3, 2025
| @@ -142,6 +144,7 @@ impl AuthorizationGrantStage { | |||
|
|
|||
| pub enum LoginHint<'a> { | |||
| MXID(&'a UserId), | |||
| EMAIL(lettre::Address), | |||
There was a problem hiding this comment.
In the case before, MXID is an ~acronym, hence the caps, but for emails it should follow the regular naming convention
Suggested change
| EMAIL(lettre::Address), | |
| Email(lettre::Address), |
| @@ -197,6 +200,16 @@ impl AuthorizationGrant { | |||
|
|
|||
| LoginHint::MXID(mxid) | |||
| } | |||
| "email" => { | |||
There was a problem hiding this comment.
I'm not convinced "email" should be a prefix. We've defined that in the MSC specifically for mxid:, but more generally, having emails as-is for login_hint is somewhat supported?
crates/data-model/Cargo.toml
Outdated
Comment on lines
31
to
32
| # Emails | ||
| lettre.workspace = true |
There was a problem hiding this comment.
Can you put that in the list of external crates up there without the comment for consistency?
mcalinghee
force-pushed
the
feat/login_hint_with_email
branch
3 times, most recently
from
0a1c9a2 to
52bb16b
Compare
mcalinghee
force-pushed
the
feat/login_hint_with_email
branch
from
52bb16b to
07ac7ca
Compare
mcalinghee
force-pushed
the
feat/login_hint_with_email
branch
4 times, most recently
from
aecb1c9 to
7feb894
Compare
mcalinghee
force-pushed
the
feat/login_hint_with_email
branch
from
7feb894 to
704acfd
Compare
mcalinghee
force-pushed
the
feat/login_hint_with_email
branch
from
704acfd to
2e23003
Compare
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.
It is now possible to forward the login_hint with a mxid to the upstream providers thanks to #4512
This PR allows us to support the login_hint with an email when
login_with_email_allowedis activated.In particular this PR will display the login_hint ie. email on the MAS login page.