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

Remove deprecated v1 key exchange endpoint #4119

Merged
merged 2 commits into from Oct 31, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/4119.removal
@@ -0,0 +1 @@
The deprecated v1 key exchange endpoints have been removed.
1 change: 0 additions & 1 deletion synapse/api/urls.py
Expand Up @@ -28,7 +28,6 @@
STATIC_PREFIX = "/_matrix/static"
WEB_CLIENT_PREFIX = "/_matrix/client"
CONTENT_REPO_PREFIX = "/_matrix/content"
SERVER_KEY_PREFIX = "/_matrix/key/v1"
SERVER_KEY_V2_PREFIX = "/_matrix/key/v2"
MEDIA_PREFIX = "/_matrix/media/r0"
LEGACY_MEDIA_PREFIX = "/_matrix/media/v1"
Expand Down
7 changes: 1 addition & 6 deletions synapse/app/homeserver.py
Expand Up @@ -37,7 +37,6 @@
FEDERATION_PREFIX,
LEGACY_MEDIA_PREFIX,
MEDIA_PREFIX,
SERVER_KEY_PREFIX,
SERVER_KEY_V2_PREFIX,
STATIC_PREFIX,
WEB_CLIENT_PREFIX,
Expand All @@ -59,7 +58,6 @@
from synapse.replication.http import REPLICATION_PREFIX, ReplicationRestResource
from synapse.replication.tcp.resource import ReplicationStreamProtocolFactory
from synapse.rest import ClientRestResource
from synapse.rest.key.v1.server_key_resource import LocalKey
from synapse.rest.key.v2 import KeyApiV2Resource
from synapse.rest.media.v0.content_repository import ContentRepoResource
from synapse.server import HomeServer
Expand Down Expand Up @@ -236,10 +234,7 @@ def _configure_named_resource(self, name, compress=False):
)

if name in ["keys", "federation"]:
resources.update({
SERVER_KEY_PREFIX: LocalKey(self),
SERVER_KEY_V2_PREFIX: KeyApiV2Resource(self),
})
resources[SERVER_KEY_V2_PREFIX] = KeyApiV2Resource(self)

if name == "webclient":
resources[WEB_CLIENT_PREFIX] = build_resource_for_web_client(self)
Expand Down
14 changes: 0 additions & 14 deletions synapse/rest/key/v1/__init__.py

This file was deleted.

92 changes: 0 additions & 92 deletions synapse/rest/key/v1/server_key_resource.py

This file was deleted.