raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-11 18:26:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove legacy config for secret key

Browse Source
This commit is contained in:
Maikel Linke
2025-12-19 14:22:25 +11:00
parent e09853af0c
commit e91fab5702
4 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/admin/stripe_accounts_controller.rb
View File

@@ -6,7 +6,7 @@ module Admin
class StripeAccountsController < Spree::Admin::BaseController class StripeAccountsController < Spree::Admin::BaseController
def connect def connect
payload = params.permit(:enterprise_id).to_h payload = params.permit(:enterprise_id).to_h
key = Openfoodnetwork::Application.credentials.secret_token key = Rails.application.secret_key_base
url_params = { state: JWT.encode(payload, key, 'HS256'), scope: "read_write" } url_params = { state: JWT.encode(payload, key, 'HS256'), scope: "read_write" }
redirect_to Stripe::OAuth.authorize_url(url_params) redirect_to Stripe::OAuth.authorize_url(url_params)
end end

3
config/initializers/secret_token.rb
View File

@@ -7,6 +7,3 @@
# Rails 4+ key for signing and encrypting cookies. # Rails 4+ key for signing and encrypting cookies.
Openfoodnetwork::Application.credentials.secret_key_base = ENV["SECRET_TOKEN"] Openfoodnetwork::Application.credentials.secret_key_base = ENV["SECRET_TOKEN"]
# Legacy secret_token variable. This is still used directly for encryption.
Openfoodnetwork::Application.credentials.secret_token = ENV["SECRET_TOKEN"]

2
lib/stripe/account_connector.rb
View File

@@ -41,7 +41,7 @@ module Stripe
def state def state
# Returns the original payload # Returns the original payload
key = Openfoodnetwork::Application.credentials.secret_token key = Rails.application.secret_key_base
JWT.decode(params["state"], key, true, algorithm: 'HS256')[0] JWT.decode(params["state"], key, true, algorithm: 'HS256')[0]
end end

2
spec/lib/stripe/account_connector_spec.rb
View File

@@ -10,7 +10,7 @@ module Stripe
let(:user) { create(:user) } let(:user) { create(:user) }
let(:enterprise) { create(:enterprise) } let(:enterprise) { create(:enterprise) }
let(:payload) { { "junk" => "Ssfs" } } let(:payload) { { "junk" => "Ssfs" } }
let(:state) { JWT.encode(payload, Openfoodnetwork::Application.credentials.secret_token) } let(:state) { JWT.encode(payload, Rails.application.secret_key_base) }
let(:params) { { "state" => state } } let(:params) { { "state" => state } }
let(:connector) { AccountConnector.new(user, params) } let(:connector) { AccountConnector.new(user, params) }