Allow enabling MSC4108 when the stable MAS integration is enabled (#18832)

This commit is contained in:
Quentin Gliech
2025-08-18 11:00:51 +02:00
committed by GitHub
parent c0878ac9e6
commit 3212526673
2 changed files with 7 additions and 2 deletions

1
changelog.d/18832.bugfix Normal file
View File

@@ -0,0 +1 @@
Allow enabling MSC4108 when the stable Matrix Authentication Service integration is enabled.

View File

@@ -535,11 +535,15 @@ class ExperimentalConfig(Config):
"msc4108_delegation_endpoint", None
)
auth_delegated = self.msc3861.enabled or (
config.get("matrix_authentication_service") or {}
).get("enabled", False)
if (
self.msc4108_enabled or self.msc4108_delegation_endpoint is not None
) and not self.msc3861.enabled:
) and not auth_delegated:
raise ConfigError(
"MSC4108 requires MSC3861 to be enabled",
"MSC4108 requires MSC3861 or matrix_authentication_service to be enabled",
("experimental", "msc4108_delegation_endpoint"),
)