Skip to content

Commit d955b8f

Browse files
committed
support rails 3 secret_token
1 parent db82a31 commit d955b8f

File tree

2 files changed

+14
-3
lines changed

2 files changed

+14
-3
lines changed

Diff for: lib/rails/secrets/railtie.rb

+5-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@ class Railtie < ::Rails::Railtie
2929
if app.secrets.secret_key_base.blank?
3030
raise "Missing `secret_key_base` for '#{Rails.env}' environment, set this value in `config/secrets.yml`"
3131
else
32-
app.config.secret_key_base = app.secrets.secret_key_base
32+
if Rails::VERSION::MAJOR < 4
33+
app.config.secret_token = app.secrets.secret_key_base
34+
else
35+
app.config.secret_key_base = app.secrets.secret_key_base
36+
end
3337
end
3438
end
3539
end

Diff for: test/rails_secrets_test.rb

+9-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ class RailsSecretsTest < ActiveSupport::TestCase
1313
end
1414

1515
test "config.secret_key_base is copied from secrets.secret_key_base" do
16-
assert_equal app.secrets.secret_key_base, app.config.secret_key_base
16+
assert_equal app.secrets.secret_key_base, secret_key_base
1717
end
1818

1919
private
@@ -22,4 +22,11 @@ def app
2222
Rails.application
2323
end
2424

25-
end
25+
def secret_key_base
26+
if Rails::VERSION::MAJOR < 4
27+
app.config.secret_token
28+
else
29+
app.config.secret_key_base
30+
end
31+
end
32+
end

0 commit comments

Comments
 (0)