diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2021-02-11 11:16:54 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-11 11:16:54 -0500 |
| commit | e40d88cff3cca3d5186d5f623ad1107bc403d69b (patch) | |
| tree | 1bb8e1daa3f43099f535eb56dacd472edb78795e /synapse/config/oidc_config.py | |
| parent | Clarify documentation about escaping URLs in templates. (#9310) (diff) | |
| download | synapse-e40d88cff3cca3d5186d5f623ad1107bc403d69b.tar.xz | |
Backout changes for automatically calculating the public baseurl. (#9313)
This breaks some people's configurations (if their Client-Server API is not accessed via port 443).
Diffstat (limited to 'synapse/config/oidc_config.py')
| -rw-r--r-- | synapse/config/oidc_config.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/synapse/config/oidc_config.py b/synapse/config/oidc_config.py index 4c24c50629..4d0f24a9d5 100644 --- a/synapse/config/oidc_config.py +++ b/synapse/config/oidc_config.py @@ -53,7 +53,10 @@ class OIDCConfig(Config): "Multiple OIDC providers have the idp_id %r." % idp_id ) - self.oidc_callback_url = self.public_baseurl + "_synapse/client/oidc/callback" + public_baseurl = self.public_baseurl + if public_baseurl is None: + raise ConfigError("oidc_config requires a public_baseurl to be set") + self.oidc_callback_url = public_baseurl + "_synapse/client/oidc/callback" @property def oidc_enabled(self) -> bool: |