diff options
| author | Patrick Cloke <clokep@users.noreply.github.com> | 2021-02-19 07:48:46 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-19 07:48:46 -0500 |
| commit | b114a45f5ff515dd4887e33e808bb02cb109dfff (patch) | |
| tree | f3ceb13ef2ae40d2291d58a58c3fb9286275bab4 | |
| parent | Be smarter about which hosts to send presence to when processing room joins (... (diff) | |
| download | synapse-b114a45f5ff515dd4887e33e808bb02cb109dfff.tar.xz | |
Support not providing an IdP icon when choosing a username. (#9440)
| -rw-r--r-- | changelog.d/9440.bugfix | 1 | ||||
| -rw-r--r-- | synapse/res/templates/sso_auth_account_details.html | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.d/9440.bugfix b/changelog.d/9440.bugfix new file mode 100644 index 0000000000..47b9842b37 --- /dev/null +++ b/changelog.d/9440.bugfix @@ -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. diff --git a/synapse/res/templates/sso_auth_account_details.html b/synapse/res/templates/sso_auth_account_details.html index f4fdc40b22..00e1dcdbb8 100644 --- a/synapse/res/templates/sso_auth_account_details.html +++ b/synapse/res/templates/sso_auth_account_details.html @@ -145,7 +145,7 @@ <input type="submit" value="Continue" class="primary-button"> {% if user_attributes.avatar_url or user_attributes.display_name or user_attributes.emails %} <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 %} <label class="idp-detail idp-avatar" for="idp-avatar"> <div class="check-row"> |