techhub/mastodon
2
0
Fork 0
Code Activity

Remove OTP_SECRET env configuration (#34748)

Browse Source
This commit is contained in:
Matt Jankowski
2025-05-22 05:33:21 -04:00
committed by GitHub
parent 83dd09d4dc
commit 8d4ae81ab4
2 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/models/user.rb
View File

@@ -73,7 +73,6 @@ class User < ApplicationRecord
ACTIVE_DURATION = ENV.fetch('USER_ACTIVE_DAYS', 7).to_i.days.freeze
devise :two_factor_authenticatable,
otp_secret_encryption_key: Rails.configuration.x.otp_secret,
otp_secret_length: 32
devise :two_factor_backupable,

3
config/environments/development.rb
View File

@@ -84,9 +84,6 @@ Rails.application.configure do
# Otherwise, use letter_opener, which launches a browser window to view sent mail.
config.action_mailer.delivery_method = ENV['HEROKU'] || ENV['VAGRANT'] || ENV['REMOTE_DEV'] ? :letter_opener_web : :letter_opener
# TODO: Remove once devise-two-factor data migration complete
config.x.otp_secret = ENV.fetch('OTP_SECRET', '1fc2b87989afa6351912abeebe31ffc5c476ead9bf8b3d74cbc4a302c7b69a45b40b1bbef3506ddad73e942e15ed5ca4b402bf9a66423626051104f4b5f05109')
# Raise error when a before_action's only/except options reference missing actions.
config.action_controller.raise_on_missing_callback_actions = true