Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Backout changes for automatically calculating the public baseurl #9313

Merged
merged 9 commits into from
Feb 11, 2021
Merged

Backout changes for automatically calculating the public baseurl #9313

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
3d48150
Revert fa50e4bf4ddcb8e98d44700513a28c490f80f02b
clokep Feb 3, 2021
0bfc63e
Keep the improved sample config.
clokep Feb 3, 2021
4efab71
Add a config check for the CAS service_url.
clokep Feb 3, 2021
fa4a9cc
Do not load templates that use mxc_to_http unless public baseurl exists.
clokep Feb 3, 2021
12ec864
Newsfragment
clokep Feb 3, 2021
805276d
Remove the CAS fallback to the service_url.
clokep Feb 8, 2021
7a1168d
Raise a runtime error instead of a config error.
clokep Feb 8, 2021
d5554d3
Add a clarifying comment.
clokep Feb 8, 2021
9dbfec0
Fix a typo.
clokep Feb 8, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Add a clarifying comment.
  • Loading branch information
@clokep
clokep committed Feb 8, 2021
commit d5554d38fecf661c2846ab505b3b1d229a6825ed
2 changes: 2 additions & 0 deletions synapse/handlers/identity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,6 +504,8 @@ async def requestMsisdnToken(
except RequestTimedOutError:
raise SynapseError(500, "Timed out contacting identity server")

# It is already checked that public_baseurl is configured since this code
# should only be used if account_threepid_delegate_msisdn is true.
assert self.hs.config.public_baseurl

# we need to tell the client to send the token back to us, since it doesn't
Expand Down