diff options
| author | Andrew Morgan <1342360+anoadragon453@users.noreply.github.com> | 2022-01-18 16:03:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-18 16:03:56 +0000 |
| commit | d93ec0a0ba5f6d2fbf2bc321086d4ad4c03136e0 (patch) | |
| tree | fe4b11e13bc74d6621140524ebd86584a8dab35a | |
| parent | Move python/postgres deprecation notice to the top of 1.50 changelog (diff) | |
| download | synapse-d93ec0a0ba5f6d2fbf2bc321086d4ad4c03136e0.tar.xz | |
Partially revert #11602 to prevent webclient overriding client resource (#11764)
| -rw-r--r-- | changelog.d/11764.bugfix | 1 | ||||
| -rw-r--r-- | synapse/app/homeserver.py | 9 |
2 files changed, 8 insertions, 2 deletions
diff --git a/changelog.d/11764.bugfix b/changelog.d/11764.bugfix new file mode 100644 index 0000000000..1de5b9c609 --- /dev/null +++ b/changelog.d/11764.bugfix @@ -0,0 +1 @@ +Fixes a bug introduced in Synapse 1.50.0rc1 that could cause Matrix clients to be unable to connect to Synapse instances with the 'webclient' resource enabled. \ No newline at end of file diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 177ce040e8..dd76e07321 100644 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -27,7 +27,6 @@ import synapse import synapse.config.logger from synapse import events from synapse.api.urls import ( - CLIENT_API_PREFIX, FEDERATION_PREFIX, LEGACY_MEDIA_PREFIX, MEDIA_R0_PREFIX, @@ -193,7 +192,13 @@ class SynapseHomeServer(HomeServer): resources.update( { - CLIENT_API_PREFIX: client_resource, + "/_matrix/client/api/v1": client_resource, + "/_matrix/client/r0": client_resource, + "/_matrix/client/v1": client_resource, + "/_matrix/client/v3": client_resource, + "/_matrix/client/unstable": client_resource, + "/_matrix/client/v2_alpha": client_resource, + "/_matrix/client/versions": client_resource, "/.well-known": well_known_resource(self), "/_synapse/admin": AdminRestResource(self), **build_synapse_client_resource_tree(self), |