diff --git a/app/models/user.rb b/app/models/user.rb index d63d0646..f2e4b5ae 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -2,5 +2,5 @@ class User < ApplicationRecord include GDS::SSO::User - serialize :permissions, Array + serialize :permissions, type: Array end diff --git a/config/application.rb b/config/application.rb index b9924762..fd024832 100644 --- a/config/application.rb +++ b/config/application.rb @@ -23,22 +23,5 @@ class Application < Rails::Application # # config.time_zone = "Central Time (US & Canada)" # config.eager_load_paths << Rails.root.join("extras") - - # Rotate SHA1 cookies to SHA256 (the new Rails 7 default) - # TODO: Remove this after existing user sessions have been rotated - # https://guides.rubyonrails.org/v7.0/upgrading_ruby_on_rails.html#key-generator-digest-class-changing-to-use-sha256 - Rails.application.config.action_dispatch.cookies_rotations.tap do |cookies| - salt = Rails.application.config.action_dispatch.authenticated_encrypted_cookie_salt - secret_key_base = Rails.application.secrets.secret_key_base - next if secret_key_base.blank? - - key_generator = ActiveSupport::KeyGenerator.new( - secret_key_base, iterations: 1000, hash_digest_class: OpenSSL::Digest::SHA1 - ) - key_len = ActiveSupport::MessageEncryptor.key_len - secret = key_generator.generate_key(salt, key_len) - - cookies.rotate :encrypted, secret - end end end