summary refs log tree commit diff
path: root/synapse/rest
diff options
context:
space:
mode:
authorAndrewFerr <AndrewFerr@users.noreply.github.com>2021-09-10 05:36:45 -0400
committerGitHub <noreply@github.com>2021-09-10 10:36:45 +0100
commit0c0da36a68ab5eebd883937986fa1ef5275e6423 (patch)
tree4fdd9b1e8b4ce4c2b9a5d55d42f8dd2faf7f4ebd /synapse/rest
parentDon't needlessly batch in `add_event_to_cache` (#10784) (diff)
downloadsynapse-0c0da36a68ab5eebd883937986fa1ef5275e6423.tar.xz
Ask consent on SSO registration with default mxid (#10733)
Fixes #10732: consent flow skipped during SSO user registration if username is left at default

Signed-off-by: Andrew Ferrazzutti fair@miscworks.net
Diffstat (limited to 'synapse/rest')
-rw-r--r--synapse/rest/synapse/client/new_user_consent.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/synapse/rest/synapse/client/new_user_consent.py b/synapse/rest/synapse/client/new_user_consent.py
index fc62a09b7f..3869d18003 100644
--- a/synapse/rest/synapse/client/new_user_consent.py
+++ b/synapse/rest/synapse/client/new_user_consent.py
@@ -63,8 +63,8 @@ class NewUserConsentResource(DirectServeHtmlResource):
             self._sso_handler.render_error(request, "bad_session", e.msg, code=e.code)
             return
 
-        # It should be impossible to get here without having first been through
-        # the pick-a-username step, which ensures chosen_localpart gets set.
+        # It should be impossible to get here without either the user or the mapping provider
+        # having chosen a username, which ensures chosen_localpart gets set.
         if not session.chosen_localpart:
             logger.warning("Session has no user name selected")
             self._sso_handler.render_error(