mirror of
https://github.com/GSA/notifications-admin.git
synced 2026-08-23 07:46:23 -04:00
Merge branch 'main' of https://github.com/GSA/notifications-admin into 686-remove-uk-styles
# Conflicts: # app/assets/stylesheets/main.scss # app/templates/views/find-users/user-information.html # app/templates/views/two-factor-webauthn.html # app/templates/views/user-profile/manage-security-key.html # app/templates/views/user-profile/security-keys.html # gulpfile.js
This commit is contained in:
@@ -1,7 +0,0 @@
|
||||
{% macro webauthn_api_check() %}
|
||||
<script>
|
||||
if ('credentials' in window.navigator) {
|
||||
document.body.className = ((document.body.className) ? document.body.className + ' webauthn-api-enabled' : 'webauthn-api-enabled');
|
||||
}
|
||||
</script>
|
||||
{% endmacro %}
|
||||
@@ -11,11 +11,7 @@
|
||||
{% endif %}
|
||||
|
||||
{% if service_has_email_auth %}
|
||||
{% if user.webauthn_auth %}
|
||||
<p class="bottom-gutter govuk-body">
|
||||
This user will login with a security key.
|
||||
</p>
|
||||
{% elif not mobile_number %}
|
||||
{% if not mobile_number %}
|
||||
{{ radios(
|
||||
form.login_authentication,
|
||||
disable=['sms_auth'],
|
||||
|
||||
@@ -65,22 +65,6 @@
|
||||
}}
|
||||
{% endcall %}
|
||||
|
||||
{% if current_user.can_use_webauthn %}
|
||||
{% call row(id='security-keys') %}
|
||||
{{ text_field('Security keys') }}
|
||||
{{ optional_text_field(
|
||||
('{} registered'.format(current_user.webauthn_credentials|length)) if current_user.webauthn_credentials else None,
|
||||
default='None registered'
|
||||
) }}
|
||||
{{ edit_field(
|
||||
'Change',
|
||||
url_for('.user_profile_security_keys'),
|
||||
suffix='security keys'
|
||||
)
|
||||
}}
|
||||
{% endcall %}
|
||||
{% endif %}
|
||||
|
||||
{% if current_user.platform_admin or session.get('disable_platform_admin_view') %}
|
||||
{% call row(id='disable-platform-admin') %}
|
||||
{{ text_field('Use platform admin view') }}
|
||||
|
||||
Reference in New Issue
Block a user