summary refs log tree commit diff
diff options
context:
space:
mode:
authorDavid Baker <dbkr@matrix.org>2014-09-24 17:28:47 +0200
committerDavid Baker <dbkr@matrix.org>2014-09-24 17:28:47 +0200
commit7dc7c53029fccbccf291ca4c299fccfdeb8e19fb (patch)
treee72afc8690917c5f1b9b97bdcc8f5a20e178908b
parentHopefully implement turn in the web client (probably wrong for Firefox becaus... (diff)
downloadsynapse-7dc7c53029fccbccf291ca4c299fccfdeb8e19fb.tar.xz
The REST API spec only alows for returning a single server so name the
endpoint appropriately.
-rw-r--r--synapse/rest/voip.py2
-rw-r--r--webclient/components/matrix/matrix-service.js2
2 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/voip.py b/synapse/rest/voip.py
index a3a8842cb6..7260ff0e8e 100644
--- a/synapse/rest/voip.py
+++ b/synapse/rest/voip.py
@@ -24,7 +24,7 @@ import base64
 
 
 class VoipRestServlet(RestServlet):
-    PATTERN = client_path_pattern("/voip/turnServers$")
+    PATTERN = client_path_pattern("/voip/turnServer$")
 
     @defer.inlineCallbacks
     def on_GET(self, request):
diff --git a/webclient/components/matrix/matrix-service.js b/webclient/components/matrix/matrix-service.js
index 69e6caccd3..cb827a0b4d 100644
--- a/webclient/components/matrix/matrix-service.js
+++ b/webclient/components/matrix/matrix-service.js
@@ -765,7 +765,7 @@ angular.module('matrixService', [])
         },
 
         getTurnServer: function() {
-            return doRequest("GET", "/voip/turnServers");
+            return doRequest("GET", "/voip/turnServer");
         }
 
     };