diff options
author | Richard van der Hoff <1389908+richvdh@users.noreply.github.com> | 2018-05-16 07:19:18 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-05-16 07:19:18 +0100 |
commit | 8030a825c8ea375652a856929d29d7ae28096cc1 (patch) | |
tree | fd1a3c6d59b793fb5ceca6d08187e12753bcaac1 /synapse/app | |
parent | Merge pull request #3201 from matrix-org/dbkr/leave_rooms_on_deactivate (diff) | |
parent | ConsentResource to gather policy consent from users (diff) | |
download | synapse-8030a825c8ea375652a856929d29d7ae28096cc1.tar.xz |
Merge pull request #3213 from matrix-org/rav/consent_handler
ConsentResource to gather policy consent from users
Diffstat (limited to 'synapse/app')
-rwxr-xr-x | synapse/app/homeserver.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/synapse/app/homeserver.py b/synapse/app/homeserver.py index 75f40fd5a4..48594724c1 100755 --- a/synapse/app/homeserver.py +++ b/synapse/app/homeserver.py @@ -41,6 +41,7 @@ from synapse.python_dependencies import CONDITIONAL_REQUIREMENTS, \ from synapse.replication.http import ReplicationRestResource, REPLICATION_PREFIX from synapse.replication.tcp.resource import ReplicationStreamProtocolFactory from synapse.rest import ClientRestResource +from synapse.rest.consent.consent_resource import ConsentResource 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 @@ -184,6 +185,14 @@ class SynapseHomeServer(HomeServer): "/_matrix/client/versions": client_resource, }) + if name == "consent": + consent_resource = ConsentResource(self) + if compress: + consent_resource = gz_wrap(consent_resource) + resources.update({ + "/_matrix/consent": consent_resource, + }) + if name == "federation": resources.update({ FEDERATION_PREFIX: TransportLayerServer(self), |