Merge pull request #5645 from BroiSatse/main

Removed now obsolete SecretKeyFinder
heartcombo · Oct 22, 2024 · 5b15bbe · 5b15bbe
2 parents 7288464 + b6d64ba
commit 5b15bbe
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 150 deletions.
diff --git a/lib/devise.rb b/lib/devise.rb
@@ -19,7 +19,6 @@ module Devise
   autoload :TestHelpers,        'devise/test_helpers'
   autoload :TimeInflector,      'devise/time_inflector'
   autoload :TokenGenerator,     'devise/token_generator'
-  autoload :SecretKeyFinder,    'devise/secret_key_finder'
 
   module Controllers
     autoload :Helpers,        'devise/controllers/helpers'

diff --git a/lib/devise/rails.rb b/lib/devise/rails.rb
@@ -38,7 +38,7 @@ class Engine < ::Rails::Engine
     end
 
     initializer "devise.secret_key" do |app|
-      Devise.secret_key ||= Devise::SecretKeyFinder.new(app).find
+      Devise.secret_key ||= app.secret_key_base
 
       Devise.token_generator ||=
         if secret_key = Devise.secret_key

diff --git a/lib/devise/secret_key_finder.rb b/lib/devise/secret_key_finder.rb
diff --git a/test/secret_key_finder_test.rb b/test/secret_key_finder_test.rb