Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Ask consent on SSO registration with default mxid #10733

Merged
merged 6 commits into from
Sep 10, 2021
+63 −23
Merged

Ask consent on SSO registration with default mxid #10733

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
311ccf5
Ask consent on SSO registration with default mxid
AndrewFerr Sep 1, 2021
bd3a84e
Add changelog for #10733
AndrewFerr Sep 1, 2021
a847494
Commonize checks for missing new user attributes
AndrewFerr Sep 8, 2021
0083018
Update changelog.d/10733.bugfix
AndrewFerr Sep 8, 2021
7d0d77c
Fix return types
AndrewFerr Sep 8, 2021
7a52696
Explicitly check for null localparts
AndrewFerr Sep 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Explicitly check for null localparts 
Signed-off-by: Andrew Ferrazzutti <[email protected]>
  • Loading branch information
@AndrewFerr
AndrewFerr committed Sep 9, 2021
commit 7a52696d37ea7f72a10ed3deb5bba17e2a71d394
4 changes: 2 additions & 2 deletions synapse/handlers/sso.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -560,8 +560,8 @@ def _get_url_for_next_new_user_step(
# Must provide either attributes or session, not both
assert (attributes is not None) != (session is not None)

if (attributes and not attributes.localpart) or (
session and not session.chosen_localpart
if (attributes and attributes.localpart is None) or (
session and session.chosen_localpart is None
):
return b"/_synapse/client/pick_username/account_details"
elif self._consent_at_registration and not (
Expand Down