diff options
author | Richard van der Hoff <richard@matrix.org> | 2021-01-28 22:08:11 +0000 |
---|---|---|
committer | Richard van der Hoff <richard@matrix.org> | 2021-01-28 22:08:11 +0000 |
commit | 0d81a6fa3e1dc832f56ed09805229b9089758ba5 (patch) | |
tree | 08a29e6210ef63c506f8a50944163cdabd400a8b /synapse/rest | |
parent | Ratelimit 3PID /requestToken API (#9238) (diff) | |
parent | Add 'brand' field to MSC2858 response (#9242) (diff) | |
download | synapse-0d81a6fa3e1dc832f56ed09805229b9089758ba5.tar.xz |
Merge branch 'social_login' into develop
Diffstat (limited to 'synapse/rest')
-rw-r--r-- | synapse/rest/client/v1/login.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/synapse/rest/client/v1/login.py b/synapse/rest/client/v1/login.py index 0a561eea60..0fb9419e58 100644 --- a/synapse/rest/client/v1/login.py +++ b/synapse/rest/client/v1/login.py @@ -333,6 +333,8 @@ def _get_auth_flow_dict_for_idp(idp: SsoIdentityProvider) -> JsonDict: e = {"id": idp.idp_id, "name": idp.idp_name} # type: JsonDict if idp.idp_icon: e["icon"] = idp.idp_icon + if idp.idp_brand: + e["brand"] = idp.idp_brand return e |