diff options
| author | Starfall <us@starfall.systems> | 2022-04-26 10:41:24 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2022-04-26 10:41:24 -0500 |
| commit | fd98fd86128a5cea302b8496b6c7d5464ec1958a (patch) | |
| tree | f3e304a32bed75cb8ab6b1f38652192bff71c5f1 /config/initializers | |
| parent | 8da73d2e57284c765b232bfc6842a7ac0f0a702b (diff) | |
| parent | a481af15a9b2a7829c2a849906aa4b475ccdbd98 (diff) | |
Merge remote-tracking branch 'glitch/main'
Diffstat (limited to 'config/initializers')
| -rw-r--r-- | config/initializers/devise.rb | 4 | ||||
| -rw-r--r-- | config/initializers/session_store.rb | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index b434c68fa..c55bea7a7 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -8,7 +8,6 @@ Warden::Manager.after_set_user except: :fetch do |user, warden| value: session_id, expires: 1.year.from_now, httponly: true, - secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'), same_site: :lax, } end @@ -23,7 +22,6 @@ Warden::Manager.after_fetch do |user, warden| value: session_id, expires: 1.year.from_now, httponly: true, - secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'), same_site: :lax, } else @@ -265,7 +263,7 @@ Devise.setup do |config| # Options to be passed to the created cookie. For instance, you can set # secure: true in order to force SSL only cookies. - config.rememberable_options = { secure: true } + config.rememberable_options = {} # ==> Configuration for :validatable # Range for password length. diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 3d9bf96fd..210964b1f 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -2,5 +2,5 @@ Rails.application.config.session_store :cookie_store, key: '_mastodon_session', - secure: (Rails.env.production? || ENV['LOCAL_HTTPS'] == 'true'), + secure: false, # All cookies have their secure flag set by the force_ssl option in production same_site: :lax |