Skip to content

Commit

Permalink
Merge branch 'anusha/APPEALS-22205' into feature/APPEALS-26037
Browse files Browse the repository at this point in the history
  • Loading branch information
mikefinneran authored Jul 18, 2023
2 parents 558ef48 + cc02c52 commit b340937
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
3 changes: 1 addition & 2 deletions app/controllers/sessions_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ class MissingSAMLRequest < StandardError; end
# GET form to allow user to assert a username/station_id
def login
return redirect_to "/" if current_user.present?

respond_to do |format|
format.html { render("login") }
format.text { render plain: "Text not supported" }
Expand Down Expand Up @@ -78,7 +77,7 @@ def url_for_sso_host(path)
end

def allow_assert_username?
!Rails.deploy_env?(:prod)
!(Rails.deploy_env?(:prod) || Rails.deploy_env?(:prodtest))
end
helper_method :allow_assert_username?

Expand Down
1 change: 1 addition & 0 deletions config/initializers/deploy_env.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ def self.deploy_env?(environment)
deploy_env = {
"uat" => :uat,
"preprod" => :preprod,
"prodtest" => :prodtest,
"prod" => :prod
}[ENV["DEPLOY_ENV"]] || :development

Expand Down

0 comments on commit b340937

Please sign in to comment.