Matrix-Mirrors/anonymousland-synapse
1
0
Fork 0
mirror of https://git.anonymousland.org/anonymousland/synapse.git synced 2025-05-06 12:45:03 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into rav/saml_mapping_work

Browse source
This commit is contained in:
Richard van der Hoff 2019-09-19 18:13:31 +01:00
commit b65327ff66
363 changed files with 10632 additions and 5352 deletions
Download patch file Download diff file Expand all files Collapse all files

6
synapse/rest/client/v1/login.py
View file

@ -122,10 +122,10 @@ class LoginRestServlet(RestServlet):
({"type": t} for t in self.auth_handler.get_supported_login_types())
)
return (200, {"flows": flows})
return 200, {"flows": flows}
def on_OPTIONS(self, request):
return (200, {})
return 200, {}
@defer.inlineCallbacks
def on_POST(self, request):
@ -153,7 +153,7 @@ class LoginRestServlet(RestServlet):
well_known_data = self._well_known_builder.get_well_known()
if well_known_data:
result["well_known"] = well_known_data
return (200, result)
return 200, result
@defer.inlineCallbacks
def _do_other_login(self, login_submission):