summary refs log tree commit diff
path: root/synapse/rest/__init__.py
diff options
context:
space:
mode:
authorMark Haines <mjark@negativecurvature.net>2016-05-05 19:26:30 +0100
committerMark Haines <mjark@negativecurvature.net>2016-05-05 19:26:30 +0100
commit1f590f3e9abf25c70078055ba68a99cd5970a4d2 (patch)
treefe56d6d34f0d57a707e65a7327b587e81265a951 /synapse/rest/__init__.py
parentMerge pull request #762 from matrix-org/erikj/report_event (diff)
parentRename openid/token to openid/request_token (diff)
downloadsynapse-1f590f3e9abf25c70078055ba68a99cd5970a4d2.tar.xz
Merge pull request #765 from matrix-org/markjh/open_id
Add an openidish mechanism for proving that you own a given user_id
Diffstat (limited to 'synapse/rest/__init__.py')
-rw-r--r--synapse/rest/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/rest/__init__.py b/synapse/rest/__init__.py
index e805cb9111..8b223e032b 100644
--- a/synapse/rest/__init__.py
+++ b/synapse/rest/__init__.py
@@ -45,6 +45,7 @@ from synapse.rest.client.v2_alpha import (
     tags,
     account_data,
     report_event,
+    openid,
 )
 
 from synapse.http.server import JsonResource
@@ -88,3 +89,4 @@ class ClientRestResource(JsonResource):
         tags.register_servlets(hs, client_resource)
         account_data.register_servlets(hs, client_resource)
         report_event.register_servlets(hs, client_resource)
+        openid.register_servlets(hs, client_resource)