mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-12-25 20:45:03 +01:00
Code Issues Projects Releases Wiki Activity

Remove monkey patch in favor of supported Devise config value (#28760)

Browse Source
This commit is contained in:
Matt Jankowski 2024-01-17 04:08:17 -05:00 committed by GitHub
parent 8cc322a0e1
commit 0ce081fe49
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
config/initializers/devise.rb
View File

@ -2,15 +2,6 @@
require 'devise/strategies/authenticatable' require 'devise/strategies/authenticatable'
# TODO: Remove this patch when this PR or similar is merged into Devise:
# https://github.com/heartcombo/devise/pull/5645
# We rely on ENV vars and not secrets/credentials, so the deprecation is just noise.
class Devise::SecretKeyFinder
def find
@application.secret_key_base
end
end
Warden::Manager.after_set_user except: :fetch do |user, warden| Warden::Manager.after_set_user except: :fetch do |user, warden|
session_id = warden.cookies.signed['_session_id'] || warden.raw_session['auth_id'] session_id = warden.cookies.signed['_session_id'] || warden.raw_session['auth_id']
session_id = user.activate_session(warden.request) unless user.session_activations.active?(session_id) session_id = user.activate_session(warden.request) unless user.session_activations.active?(session_id)
@ -133,9 +124,11 @@ Devise.setup do |config|
# The secret key used by Devise. Devise uses this key to generate # The secret key used by Devise. Devise uses this key to generate
# random tokens. Changing this key will render invalid all existing # random tokens. Changing this key will render invalid all existing
# confirmation, reset password and unlock tokens in the database. # confirmation, reset password and unlock tokens in the database.
# Devise will use the `secret_key_base` on Rails 4+ applications as its `secret_key` #
# by default. You can change it below and use your own secret key. # Set explicitly to Rails default to avoid deprecation warnings.
# config.secret_key = '2f86974c4dd7735170fd70fbf399f7a477ffd635ef240d07a22cf4bd7cd13dbae17c4383a2996d0c1e79a991ec18a91a17424c53e4771adb75a8b21904bd1403' # https://github.com/heartcombo/devise/pull/5645#issuecomment-1871849856
# Remove when Devise changes `SecretKeyFinder` to not emit deprecations.
config.secret_key = Rails.application.secret_key_base
# ==> Mailer Configuration # ==> Mailer Configuration
# Configure the e-mail address which will be shown in Devise::Mailer, # Configure the e-mail address which will be shown in Devise::Mailer,