Fixes for develop

clokep · web-flow · commit b9ab999750cf · 2023-05-30T13:06:49.000-04:00
Fixes for compatibility with #15582.
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:

Original file line number	Diff line number	Diff line change
`@@ -192,10 +192,10 @@ def check_config_conflicts(self, root: RootConfig) -> None:`
`192`	`192`	`("captcha", "enable_registration_captcha"),`
`193`	`193`	`)`
`194`	`194`
`195`		`- if root.experimental.msc3882_enabled:`
	`195`	`+ if root.auth.login_via_existing_enabled:`
`196`	`196`	`raise ConfigError(`
`197`		`- "MSC3882 cannot be enabled when OAuth delegation is enabled",`
`198`		`- ("experimental_features", "msc3882_enabled"),`
	`197`	`+ "Login via existing session cannot be enabled when OAuth delegation is enabled",`
	`198`	`+ ("login_via_existing_session", "enabled"),`
`199`	`199`	`)`
`200`	`200`
`201`	`201`	`if root.registration.refresh_token_lifetime:`