summary refs log tree commit diff
path: root/synapse/config/oidc_config.py
diff options
context:
space:
mode:
authorRichard van der Hoff <richard@matrix.org>2021-01-20 12:33:05 +0000
committerRichard van der Hoff <richard@matrix.org>2021-01-20 12:33:05 +0000
commit6c0dfd2e8e89d841587f3b601e2eaf8a358eb98e (patch)
treec0e82ece8dd47bdd3d0d142953d8b494c0b40023 /synapse/config/oidc_config.py
parentReword confusing sentence in CHANGES. (diff)
parentGive `public_baseurl` a default value (#9159) (diff)
downloadsynapse-6c0dfd2e8e89d841587f3b601e2eaf8a358eb98e.tar.xz
Merge remote-tracking branch 'origin/develop' into release-v1.26.0
Diffstat (limited to 'synapse/config/oidc_config.py')
-rw-r--r--synapse/config/oidc_config.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/synapse/config/oidc_config.py b/synapse/config/oidc_config.py
index 80a24cfbc9..df55367434 100644
--- a/synapse/config/oidc_config.py
+++ b/synapse/config/oidc_config.py
@@ -43,8 +43,6 @@ class OIDCConfig(Config):
             raise ConfigError(e.message) from e
 
         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/oidc/callback"
 
     @property