Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Commit

Permalink
Fix endpoint improperly declaring support for MSC3814 (#16068)
Browse files Browse the repository at this point in the history
  • Loading branch information
H-Shay committed Aug 7, 2023
1 parent 81a6f8c commit 8af3f33
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
1 change: 1 addition & 0 deletions changelog.d/16068.misc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix endpoint improperly declaring support for MSC3814.
18 changes: 8 additions & 10 deletions synapse/rest/client/devices.py
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ class Config:
class DehydratedDeviceServlet(RestServlet):
"""Retrieve or store a dehydrated device.
Implements either MSC2697 or MSC3814.
Implements MSC2697.
GET /org.matrix.msc2697.v2/dehydrated_device
Expand Down Expand Up @@ -266,21 +266,19 @@ class DehydratedDeviceServlet(RestServlet):
"""

def __init__(self, hs: "HomeServer", msc2697: bool = True):
PATTERNS = client_patterns(
"/org.matrix.msc2697.v2/dehydrated_device$",
releases=(),
)

def __init__(self, hs: "HomeServer"):
super().__init__()
self.hs = hs
self.auth = hs.get_auth()
handler = hs.get_device_handler()
assert isinstance(handler, DeviceHandler)
self.device_handler = handler

self.PATTERNS = client_patterns(
"/org.matrix.msc2697.v2/dehydrated_device$"
if msc2697
else "/org.matrix.msc3814.v1/dehydrated_device$",
releases=(),
)

async def on_GET(self, request: SynapseRequest) -> Tuple[int, JsonDict]:
requester = await self.auth.get_user_by_req(request)
dehydrated_device = await self.device_handler.get_dehydrated_device(
Expand Down Expand Up @@ -579,7 +577,7 @@ def register_servlets(hs: "HomeServer", http_server: HttpServer) -> None:
if hs.config.worker.worker_app is None:
DeviceRestServlet(hs).register(http_server)
if hs.config.experimental.msc2697_enabled:
DehydratedDeviceServlet(hs, msc2697=True).register(http_server)
DehydratedDeviceServlet(hs).register(http_server)
ClaimDehydratedDeviceServlet(hs).register(http_server)
if hs.config.experimental.msc3814_enabled:
DehydratedDeviceV2Servlet(hs).register(http_server)
Expand Down

0 comments on commit 8af3f33

Please sign in to comment.