2 files changed, 23 insertions, 2 deletions
diff --git a/synapse/rest/client/rendezvous.py b/synapse/rest/client/rendezvous.py
index ed06a29987..143f057651 100644
--- a/synapse/rest/client/rendezvous.py
+++ b/synapse/rest/client/rendezvous.py
@@ -97,9 +97,25 @@ class MSC4108DelegationRendezvousServlet(RestServlet):
)
+class MSC4108RendezvousServlet(RestServlet):
+ PATTERNS = client_patterns(
+ "/org.matrix.msc4108/rendezvous$", releases=[], v1=False, unstable=True
+ )
+
+ def __init__(self, hs: "HomeServer") -> None:
+ super().__init__()
+ self._handler = hs.get_rendezvous_handler()
+
+ def on_POST(self, request: SynapseRequest) -> None:
+ self._handler.handle_post(request)
+
+
def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None:
if hs.config.experimental.msc3886_endpoint is not None:
MSC3886RendezvousServlet(hs).register(http_server)
+ if hs.config.experimental.msc4108_enabled:
+ MSC4108RendezvousServlet(hs).register(http_server)
+
if hs.config.experimental.msc4108_delegation_endpoint is not None:
MSC4108DelegationRendezvousServlet(hs).register(http_server)
diff --git a/synapse/rest/client/versions.py b/synapse/rest/client/versions.py
index 638d4c45ae..fa453a3b02 100644
--- a/synapse/rest/client/versions.py
+++ b/synapse/rest/client/versions.py
@@ -141,8 +141,13 @@ class VersionsRestServlet(RestServlet):
# Allows clients to handle push for encrypted events.
"org.matrix.msc4028": self.config.experimental.msc4028_push_encrypted_events,
# MSC4108: Mechanism to allow OIDC sign in and E2EE set up via QR code
- "org.matrix.msc4108": self.config.experimental.msc4108_delegation_endpoint
- is not None,
+ "org.matrix.msc4108": (
+ self.config.experimental.msc4108_enabled
+ or (
+ self.config.experimental.msc4108_delegation_endpoint
+ is not None
+ )
+ ),
},
},
)
|
