3g0st
/
mastodon-docker-playground
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt 2FA changes to glitch-soc's theming system

signup-info-prompt
Thibaut Girka 2020-08-30 17:26:18 +02:00
parent a340e653df
commit a68ec50e4e
6 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb
View File

@ -85,6 +85,10 @@ module Settings
private private
def set_pack
use_pack 'auth'
end
def require_otp_enabled def require_otp_enabled
unless current_user.otp_enabled? unless current_user.otp_enabled?
flash[:error] = t('webauthn_credentials.otp_required') flash[:error] = t('webauthn_credentials.otp_required')

2
app/javascript/core/auth.js Normal file
View File

@ -0,0 +1,2 @@
import './settings';
import './two_factor_authentication';

2
app/javascript/core/theme.yml
View File

@ -3,7 +3,7 @@
pack: pack:
about: about:
admin: admin.js admin: admin.js
auth: settings.js auth: auth.js
common: common:
filename: common.js filename: common.js
stylesheet: true stylesheet: true

0
app/javascript/packs/two_factor_authentication.js → app/javascript/core/two_factor_authentication.js
View File

2
app/views/auth/sessions/two_factor.html.haml
View File

@ -1,8 +1,6 @@
- content_for :page_title do - content_for :page_title do
= t('auth.login') = t('auth.login')
=javascript_pack_tag 'two_factor_authentication', integrity: true, crossorigin: 'anonymous'
- if @webauthn_enabled - if @webauthn_enabled
= render partial: 'auth/sessions/two_factor/webauthn_form', locals: { hidden: @scheme_type != 'webauthn' } = render partial: 'auth/sessions/two_factor/webauthn_form', locals: { hidden: @scheme_type != 'webauthn' }

2
app/views/settings/two_factor_authentication/webauthn_credentials/new.html.haml
View File

@ -12,5 +12,3 @@
.actions .actions
= f.button :button, t('webauthn_credentials.add'), class: 'js-webauthn', type: :submit = f.button :button, t('webauthn_credentials.add'), class: 'js-webauthn', type: :submit
= javascript_pack_tag 'two_factor_authentication', integrity: true, crossorigin: 'anonymous'