This repository has been archived by the owner on Apr 26, 2024. It is now read-only.
Allow password providers to bind emails #4947
Merged
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
Codecov Report
@@ Coverage Diff @@
## develop #4947 +/- ##
===========================================
- Coverage 60.43% 60.43% -0.01%
===========================================
Files 328 328
Lines 34093 34097 +4
Branches 5627 5628 +1
===========================================
+ Hits 20605 20606 +1
- Misses 12017 12019 +2
- Partials 1471 1472 +1 |
richvdh
previously requested changes
Mar 27, 2019
synapse/handlers/register.py
Outdated
| threepid_dict = { | ||
| "medium": "email", | ||
| "address": email, | ||
| "validated_at": self.hs.get_clock().time_msec(), |
There was a problem hiding this comment.
you are ignoring the validated_at param
synapse/handlers/register.py
Outdated
| } | ||
|
|
||
| # Bind email to new account | ||
| yield self._register_email_threepid( |
There was a problem hiding this comment.
for the record: where you have a function which just does some synchronous things and ends up calling an asynchronous function, you can skip @inlineCallbacks and just return the deferred from the other function:
def bind_email_to_account():
do_synchronous_stuff()
return self._register_email_threepid(...)
There was a problem hiding this comment.
Good to know, thanks!
synapse/handlers/register.py
Outdated
| @@ -406,6 +412,32 @@ def register_email(self, threepidCreds): | |||
| 403, "Third party identifier is not allowed" | |||
| ) | |||
|
|
|||
| @defer.inlineCallbacks | |||
| def bind_email_to_account(self, user_id, email, validated_at=None): | |||
There was a problem hiding this comment.
unless you have a reason for factoring this out, i feel like it may as well be inlined.
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
This PR allows password provider modules to bind email addresses when a user is registering and is motivated by matrix-org/matrix-synapse-ldap3#58