mirror of
https://git.anonymousland.org/anonymousland/synapse.git
synced 2024-09-08 01:02:09 +00:00
Fix fallback value for account_threepid_delegates.email (#7316)
This commit is contained in:
parent
c58ae367d8
commit
eeef9633af
1
changelog.d/7316.bugfix
Normal file
1
changelog.d/7316.bugfix
Normal file
@ -0,0 +1 @@
|
||||
Fixed backwards compatibility logic of the first value of `trusted_third_party_id_servers` being used for `account_threepid_delegates.email`, which occurs when the former, deprecated option is set and the latter is not.
|
@ -108,9 +108,14 @@ class EmailConfig(Config):
|
||||
if self.trusted_third_party_id_servers:
|
||||
# XXX: It's a little confusing that account_threepid_delegate_email is modified
|
||||
# both in RegistrationConfig and here. We should factor this bit out
|
||||
self.account_threepid_delegate_email = self.trusted_third_party_id_servers[
|
||||
0
|
||||
] # type: Optional[str]
|
||||
|
||||
first_trusted_identity_server = self.trusted_third_party_id_servers[0]
|
||||
|
||||
# trusted_third_party_id_servers does not contain a scheme whereas
|
||||
# account_threepid_delegate_email is expected to. Presume https
|
||||
self.account_threepid_delegate_email = (
|
||||
"https://" + first_trusted_identity_server
|
||||
) # type: Optional[str]
|
||||
self.using_identity_server_from_trusted_list = True
|
||||
else:
|
||||
raise ConfigError(
|
||||
|
Loading…
Reference in New Issue
Block a user