darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-08-03 13:18:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/GSA/notifications-admin into 686-remove-uk-styles

Browse Source 
# 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:
Jonathan Bobel
2023-08-15 13:29:39 -04:00
parent 6b22c347da 01c18c9624
commit d66ff27bae
41 changed files with 337 additions and 2340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/main/forms.py
View File

@@ -1058,10 +1058,6 @@ class BasePermissionsForm(StripWhitespaceForm):
login_authentication=user.auth_type
)
# If a user logs in with a security key, we generally don't want a service admin to be able to change this.
# As well as enforcing this in the backend, we need to delete the auth radios to prevent validation errors.
if user.webauthn_auth:
del form.login_authentication
return form