Fixes for develop

Fixes for compatibility with #15582.
matrix-org · May 30, 2023 · b9ab999 · b9ab999
1 parent 6f26ca4
commit b9ab999
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/synapse/config/experimental.py b/synapse/config/experimental.py
@@ -192,10 +192,10 @@ def check_config_conflicts(self, root: RootConfig) -> None:
                 ("captcha", "enable_registration_captcha"),
             )
 
-        if root.experimental.msc3882_enabled:
+        if root.auth.login_via_existing_enabled:
             raise ConfigError(
-                "MSC3882 cannot be enabled when OAuth delegation is enabled",
-                ("experimental_features", "msc3882_enabled"),
+                "Login via existing session cannot be enabled when OAuth delegation is enabled",
+                ("login_via_existing_session", "enabled"),
             )
 
         if root.registration.refresh_token_lifetime: