tileradotorg/synapse
1
0
Fork 0
forked from MirrorHub/synapse
Code Pull requests Activity

Support not providing an IdP icon when choosing a username. (#9440)

Browse source
This commit is contained in:
Patrick Cloke 2021-02-19 07:48:46 -05:00 committed by GitHub
parent 8bcfc2eaad
commit b114a45f5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changelog.d/9440.bugfix Normal file
View file

@ -0,0 +1 @@
Fix bug introduced in v1.27.0 where allowing a user to choose their own username when logging in via single sign-on did not work unless an `idp_icon` was defined.

2
synapse/res/templates/sso_auth_account_details.html
View file

@ -145,7 +145,7 @@
<input type="submit" value="Continue" class="primary-button"> <input type="submit" value="Continue" class="primary-button">
{% if user_attributes.avatar_url or user_attributes.display_name or user_attributes.emails %} {% if user_attributes.avatar_url or user_attributes.display_name or user_attributes.emails %}
<section class="idp-pick-details"> <section class="idp-pick-details">
<h2><img src="{{ idp.idp_icon | mxc_to_http(24, 24) }}"/>Information from {{ idp.idp_name }}</h2> <h2>{% if idp.idp_icon %}<img src="{{ idp.idp_icon | mxc_to_http(24, 24) }}"/>{% endif %}Information from {{ idp.idp_name }}</h2>
{% if user_attributes.avatar_url %} {% if user_attributes.avatar_url %}
<label class="idp-detail idp-avatar" for="idp-avatar"> <label class="idp-detail idp-avatar" for="idp-avatar">
<div class="check-row"> <div class="check-row">