mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
Adapt 2FA changes to glitch-soc's theming system
This commit is contained in:
parent
a340e653df
commit
a68ec50e4e
@ -85,6 +85,10 @@ module Settings
|
||||
|
||||
private
|
||||
|
||||
def set_pack
|
||||
use_pack 'auth'
|
||||
end
|
||||
|
||||
def require_otp_enabled
|
||||
unless current_user.otp_enabled?
|
||||
flash[:error] = t('webauthn_credentials.otp_required')
|
||||
|
2
app/javascript/core/auth.js
Normal file
2
app/javascript/core/auth.js
Normal file
@ -0,0 +1,2 @@
|
||||
import './settings';
|
||||
import './two_factor_authentication';
|
@ -3,7 +3,7 @@
|
||||
pack:
|
||||
about:
|
||||
admin: admin.js
|
||||
auth: settings.js
|
||||
auth: auth.js
|
||||
common:
|
||||
filename: common.js
|
||||
stylesheet: true
|
||||
|
@ -1,8 +1,6 @@
|
||||
- content_for :page_title do
|
||||
= t('auth.login')
|
||||
|
||||
=javascript_pack_tag 'two_factor_authentication', integrity: true, crossorigin: 'anonymous'
|
||||
|
||||
- if @webauthn_enabled
|
||||
= render partial: 'auth/sessions/two_factor/webauthn_form', locals: { hidden: @scheme_type != 'webauthn' }
|
||||
|
||||
|
@ -12,5 +12,3 @@
|
||||
|
||||
.actions
|
||||
= f.button :button, t('webauthn_credentials.add'), class: 'js-webauthn', type: :submit
|
||||
|
||||
= javascript_pack_tag 'two_factor_authentication', integrity: true, crossorigin: 'anonymous'
|
||||
|
Loading…
Reference in New Issue
Block a user