AtHeartEngineer/devise
1
1
Fork 0
mirror of https://github.com/heartcombo/devise.git synced 2026-01-09 15:47:59 -05:00
Code Issues Packages Projects Releases Wiki Activity

Removed now obsolete SecretKeyFinder

Browse Source
This commit is contained in:
Stanislaw Klajn
2023-10-20 11:05:16 +01:00
parent e2242a95f3
commit b6d64ba525
4 changed files with 1 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/devise.rb
View File

@@ -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'

2
lib/devise/rails.rb
View File

@@ -38,7 +38,7 @@ module Devise
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

27
lib/devise/secret_key_finder.rb
View File

@@ -1,27 +0,0 @@
# frozen_string_literal: true
module Devise
class SecretKeyFinder
def initialize(application)
@application = application
end
def find
if @application.respond_to?(:credentials) && key_exists?(@application.credentials)
@application.credentials.secret_key_base
elsif @application.respond_to?(:secrets) && key_exists?(@application.secrets)
@application.secrets.secret_key_base
elsif @application.config.respond_to?(:secret_key_base) && key_exists?(@application.config)
@application.config.secret_key_base
elsif @application.respond_to?(:secret_key_base) && key_exists?(@application)
@application.secret_key_base
end
end
private
def key_exists?(object)
object.secret_key_base.present?
end
end
end

121
test/secret_key_finder_test.rb
View File

@@ -1,121 +0,0 @@
# frozen_string_literal: true
require 'test_helper'
class Rails52Credentials
def credentials
OpenStruct.new(secret_key_base: 'credentials')
end
end
class Rails52Secrets
def credentials
OpenStruct.new(secret_key_base: nil)
end
def secrets
OpenStruct.new(secret_key_base: 'secrets')
end
end
class Rails52Config
def credentials
OpenStruct.new(secret_key_base: nil)
end
def secrets
OpenStruct.new(secret_key_base: nil)
end
def config
OpenStruct.new(secret_key_base: 'config')
end
end
class Rails52SecretKeyBase
def credentials
OpenStruct.new(secret_key_base: nil)
end
def secrets
OpenStruct.new(secret_key_base: nil)
end
def config
OpenStruct.new(secret_key_base: nil)
end
def secret_key_base
'secret_key_base'
end
end
class Rails41Secrets
def secrets
OpenStruct.new(secret_key_base: 'secrets')
end
def config
OpenStruct.new(secret_key_base: nil)
end
end
class Rails41Config
def secrets
OpenStruct.new(secret_key_base: nil)
end
def config
OpenStruct.new(secret_key_base: 'config')
end
end
class Rails40Config
def config
OpenStruct.new(secret_key_base: 'config')
end
end
class SecretKeyFinderTest < ActiveSupport::TestCase
test "rails 5.2 uses credentials when they're available" do
secret_key_finder = Devise::SecretKeyFinder.new(Rails52Credentials.new)
assert_equal 'credentials', secret_key_finder.find
end
test "rails 5.2 uses secrets when credentials are empty" do
secret_key_finder = Devise::SecretKeyFinder.new(Rails52Secrets.new)
assert_equal 'secrets', secret_key_finder.find
end
test "rails 5.2 uses config when secrets are empty" do
secret_key_finder = Devise::SecretKeyFinder.new(Rails52Config.new)
assert_equal 'config', secret_key_finder.find
end
test "rails 5.2 uses secret_key_base when config is empty" do
secret_key_finder = Devise::SecretKeyFinder.new(Rails52SecretKeyBase.new)
assert_equal 'secret_key_base', secret_key_finder.find
end
test "rails 4.1 uses secrets" do
secret_key_finder = Devise::SecretKeyFinder.new(Rails41Secrets.new)
assert_equal 'secrets', secret_key_finder.find
end
test "rails 4.1 uses config when secrets are empty" do
secret_key_finder = Devise::SecretKeyFinder.new(Rails41Config.new)
assert_equal 'config', secret_key_finder.find
end
test "rails 4.0 uses config" do
secret_key_finder = Devise::SecretKeyFinder.new(Rails40Config.new)
assert_equal 'config', secret_key_finder.find
end
end