Mirrors
/
synapse
mirror of https://github.com/element-hq/synapse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix buglet in DirectRenderJsonResource (#8897) 

this was using `canonical_json` without setting it, so when you used it as a
standalone class, you would get exceptions.
This commit is contained in:
Richard van der Hoff 2020-12-10 12:42:55 +00:00 committed by GitHub
parent a5f7aff5e5
commit 1821f7cc26
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
changelog.d/8897.feature Normal file
View File

@ -0,0 +1 @@
Add support for allowing users to pick their own user ID during a single-sign-on login.

8
synapse/http/server.py
View File

@ -275,6 +275,10 @@ class DirectServeJsonResource(_AsyncResource):
formatting responses and errors as JSON. formatting responses and errors as JSON.
""" """
def __init__(self, canonical_json=False, extract_context=False):
super().__init__(extract_context)
self.canonical_json = canonical_json
def _send_response( def _send_response(
self, request: Request, code: int, response_object: Any, self, request: Request, code: int, response_object: Any,
): ):
@ -318,9 +322,7 @@ class JsonResource(DirectServeJsonResource):
) )
def __init__(self, hs, canonical_json=True, extract_context=False): def __init__(self, hs, canonical_json=True, extract_context=False):
super().__init__(extract_context) super().__init__(canonical_json, extract_context)
self.canonical_json = canonical_json
self.clock = hs.get_clock() self.clock = hs.get_clock()
self.path_regexs = {} self.path_regexs = {}
self.hs = hs self.hs = hs