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

4 years ago · a68ec50e4e
parent a340e653df
commit a68ec50e4e
6 changed files with 7 additions and 5 deletions
--- a/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb
+++ b/app/controllers/settings/two_factor_authentication/webauthn_credentials_controller.rb
@ -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')
--- a/app/javascript/core/auth.js
+++ b/app/javascript/core/auth.js
@ -0,0 +1,2 @@
+import './settings';
+import './two_factor_authentication';
--- a/app/javascript/core/theme.yml
+++ b/app/javascript/core/theme.yml
@ -3,7 +3,7 @@
 pack:
  about:
  admin: admin.js
-  auth: settings.js
+  auth: auth.js
  common:
    filename: common.js
    stylesheet: true
--- a/app/javascript/packs/two_factor_authentication.js
+++ b/app/javascript/packs/two_factor_authentication.js
--- a/app/views/auth/sessions/two_factor.html.haml
+++ b/app/views/auth/sessions/two_factor.html.haml
@ -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' }

--- a/app/views/settings/two_factor_authentication/webauthn_credentials/new.html.haml
+++ b/app/views/settings/two_factor_authentication/webauthn_credentials/new.html.haml
@ -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'