From 4428d49d292822eb52345e59b8be49e8a9bbd3b0 Mon Sep 17 00:00:00 2001 From: Abigail McPhillips Date: Tue, 21 May 2024 10:58:46 +0100 Subject: [PATCH] Check that environment_name starts with review rather than == review --- config/initializers/dfe_analytics.rb | 2 +- config/initializers/omniauth.rb | 4 ++-- config/initializers/session_store.rb | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/initializers/dfe_analytics.rb b/config/initializers/dfe_analytics.rb index f16c50259b..8f4a1f704e 100644 --- a/config/initializers/dfe_analytics.rb +++ b/config/initializers/dfe_analytics.rb @@ -2,7 +2,7 @@ # Whether to log events instead of sending them to BigQuery. # # config.log_only = true - config.log_only = (%w[development test].include?(ENV["RAILS_ENV"]) || ENV["ENVIRONMENT_NAME"] == "review") + config.log_only = (%w[development test].include?(ENV["RAILS_ENV"]) || ENV["ENVIRONMENT_NAME"].start_with?("review")) # Whether to use ActiveJob or dispatch events immediately. # diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 4728ac7ea5..d030c53486 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -21,14 +21,14 @@ tid_sign_in_redirect_uri = URI.parse(ENV["TID_BASE_URL"]) tid_sign_in_redirect_uri.path = "/claim/auth/tid/callback" - if ENV["ENVIRONMENT_NAME"] == "review" + if ENV["ENVIRONMENT_NAME"].start_with?("review") tid_sign_in_redirect_uri.host = ENV["CANONICAL_HOSTNAME"] end end module ::DfESignIn def self.bypass? - (Rails.env.development? || ENV["ENVIRONMENT_NAME"] == "review") && ENV["BYPASS_DFE_SIGN_IN"] == "true" + (Rails.env.development? || ENV["ENVIRONMENT_NAME"].start_with?("review")) && ENV["BYPASS_DFE_SIGN_IN"] == "true" end end diff --git a/config/initializers/session_store.rb b/config/initializers/session_store.rb index 59e9f62499..ba3542392a 100644 --- a/config/initializers/session_store.rb +++ b/config/initializers/session_store.rb @@ -1,4 +1,4 @@ -domain = if ENV["ENVIRONMENT_NAME"] == "review" +domain = if ENV["ENVIRONMENT_NAME"].start_with?("review") ENV["CANONICAL_HOSTNAME"] elsif !ENV["TID_BASE_URL"].nil? URI.parse(ENV["TID_BASE_URL"]).host