diff --git a/config/config.yml.example b/config/config.yml.example index b8ecd2a8ec..691cd71933 100644 --- a/config/config.yml.example +++ b/config/config.yml.example @@ -273,9 +273,6 @@ development: &default devise_unlock_accounts_after: 1 login_rate_limit: 10 api_rate_limit: 100 - - session_store_key: '_checkdesk_session_dev' - session_store_domain: 'localhost' test: <<: *default checkdesk_base_url_private: http://api:3000 diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 06c2b3fb15..f8f9ad672c 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,8 +1,3 @@ # Be sure to restart your server when you modify this file. -# Retrieve the session key and domain based on the environment using CheckConfig. -cookie_key = CheckConfig.get('session_store_key', '_checkdesk_session') -domain_setting = CheckConfig.get('session_store_domain', Rails.env.development? ? 'localhost' : '.checkmedia.org') - -# Configure the session store with the dynamically obtained session key and domain. -Rails.application.config.session_store :cookie_store, key: cookie_key, domain: domain_setting +Rails.application.config.session_store :cookie_store, key: '_checkdesk_session' diff --git a/test/lib/check_session_store_test.rb b/test/lib/check_session_store_test.rb deleted file mode 100644 index f379290398..0000000000 --- a/test/lib/check_session_store_test.rb +++ /dev/null @@ -1,37 +0,0 @@ -require 'test_helper' - -class SessionStoreTest < ActiveSupport::TestCase - def with_environment(env) - original_env = Rails.env - Rails.singleton_class.class_eval do - define_method(:env) { ActiveSupport::StringInquirer.new(env) } - end - yield - ensure - Rails.singleton_class.class_eval do - define_method(:env) { original_env } - end - end - - test "session store configuration with default key and domain when config values are not set" do - with_environment('production') do - stub_configs({ 'session_store_key' => nil, 'session_store_domain' => nil }) do - load Rails.root.join('config/initializers/session_store.rb') - assert_equal ActionDispatch::Session::CookieStore, Rails.application.config.session_store - assert_equal '_checkdesk_session', Rails.application.config.session_options[:key] - assert_equal '.checkmedia.org', Rails.application.config.session_options[:domain] - end - end - end - - test "session store configuration with overriding key and domain in config" do - with_environment('production') do - stub_configs({ 'session_store_key' => '_checkdesk_session_qa', 'session_store_domain' => 'qa.checkmedia.org' }) do - load Rails.root.join('config/initializers/session_store.rb') - assert_equal ActionDispatch::Session::CookieStore, Rails.application.config.session_store - assert_equal '_checkdesk_session_qa', Rails.application.config.session_options[:key] - assert_equal 'qa.checkmedia.org', Rails.application.config.session_options[:domain] - end - end - end -end