diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py
index 74a372e2ff..da18933b63 100644
--- a/synapse/rest/__init__.py
+++ b/synapse/rest/__init__.py
@@ -15,8 +15,7 @@
from . import (
- room, events, register, login, profile, public, presence, im, directory,
- webclient
+ room, events, register, login, profile, public, presence, im, directory
)
@@ -32,19 +31,15 @@ class RestServletFactory(object):
"""
def __init__(self, hs):
- http_server = hs.get_http_server()
+ client_resource = hs.get_resource_for_client()
# TODO(erikj): There *must* be a better way of doing this.
- room.register_servlets(hs, http_server)
- events.register_servlets(hs, http_server)
- register.register_servlets(hs, http_server)
- login.register_servlets(hs, http_server)
- profile.register_servlets(hs, http_server)
- public.register_servlets(hs, http_server)
- presence.register_servlets(hs, http_server)
- im.register_servlets(hs, http_server)
- directory.register_servlets(hs, http_server)
-
- def register_web_client(self, hs):
- http_server = hs.get_http_server()
- webclient.register_servlets(hs, http_server)
+ room.register_servlets(hs, client_resource)
+ events.register_servlets(hs, client_resource)
+ register.register_servlets(hs, client_resource)
+ login.register_servlets(hs, client_resource)
+ profile.register_servlets(hs, client_resource)
+ public.register_servlets(hs, client_resource)
+ presence.register_servlets(hs, client_resource)
+ im.register_servlets(hs, client_resource)
+ directory.register_servlets(hs, client_resource)
diff --git a/synapse/rest/base.py b/synapse/rest/base.py
index 65d417f757..124b3a2e0c 100644
--- a/synapse/rest/base.py
+++ b/synapse/rest/base.py
@@ -16,6 +16,8 @@
""" This module contains base REST classes for constructing REST servlets. """
import re
+CLIENT_PREFIX = "/matrix/client/api/v1"
+
def client_path_pattern(path_regex):
"""Creates a regex compiled client path with the correct client path
@@ -27,7 +29,7 @@ def client_path_pattern(path_regex):
Returns:
SRE_Pattern
"""
- return re.compile("^/matrix/client/api/v1" + path_regex)
+ return re.compile("^" + CLIENT_PREFIX + path_regex)
class RestServlet(object):
diff --git a/synapse/rest/webclient.py b/synapse/rest/webclient.py
deleted file mode 100644
index 75a425c14c..0000000000
--- a/synapse/rest/webclient.py
+++ /dev/null
@@ -1,45 +0,0 @@
-# -*- coding: utf-8 -*-
-# Copyright 2014 matrix.org
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-from synapse.rest.base import RestServlet
-
-import logging
-import re
-
-logger = logging.getLogger(__name__)
-
-
-class WebClientRestServlet(RestServlet):
- # No PATTERN; we have custom dispatch rules here
-
- def register(self, http_server):
- http_server.register_path("GET",
- re.compile("^/$"),
- self.on_GET_redirect)
- http_server.register_path("GET",
- re.compile("^/matrix/client$"),
- self.on_GET)
-
- def on_GET(self, request):
- return (200, "not implemented")
-
- def on_GET_redirect(self, request):
- request.setHeader("Location", request.uri + "matrix/client")
- return (302, None)
-
-
-def register_servlets(hs, http_server):
- logger.info("Registering web client.")
- WebClientRestServlet(hs).register(http_server)
\ No newline at end of file
|
