From 184b7358462cb8c587c4d4912435f1de07cec8c6 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Thu, 28 Aug 2025 16:39:12 +0530 Subject: [PATCH] chore: remove enabled check --- config/initializers/omniauth.rb | 2 +- enterprise/app/builders/saml_user_builder.rb | 2 +- .../devise_overrides/omniauth_callbacks_controller.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 6ed8279d6..de811f839 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -22,7 +22,7 @@ Rails.application.config.middleware.use OmniAuth::Builder do env['omniauth.params']['account_id'] = account_id # Find SAML settings for this account - settings = AccountSamlSettings.find_by(account_id: account_id, enabled: true) + settings = AccountSamlSettings.find_by(account_id: account_id) if settings # Configure the strategy options dynamically diff --git a/enterprise/app/builders/saml_user_builder.rb b/enterprise/app/builders/saml_user_builder.rb index 9fc790b70..4bccc6ff2 100644 --- a/enterprise/app/builders/saml_user_builder.rb +++ b/enterprise/app/builders/saml_user_builder.rb @@ -73,7 +73,7 @@ class SamlUserBuilder def apply_role_mappings(account_user, account) return if saml_groups.blank? - saml_settings = AccountSamlSettings.find_by(account_id: account.id, enabled: true) + saml_settings = AccountSamlSettings.find_by(account_id: account.id) return if saml_settings&.role_mappings.blank? saml_settings.role_mappings.each do |group_name, mapping| diff --git a/enterprise/app/controllers/enterprise/devise_overrides/omniauth_callbacks_controller.rb b/enterprise/app/controllers/enterprise/devise_overrides/omniauth_callbacks_controller.rb index 438a516fa..bb4edfbfa 100644 --- a/enterprise/app/controllers/enterprise/devise_overrides/omniauth_callbacks_controller.rb +++ b/enterprise/app/controllers/enterprise/devise_overrides/omniauth_callbacks_controller.rb @@ -61,6 +61,6 @@ module Enterprise::DeviseOverrides::OmniauthCallbacksController account = Account.find_by(id: account_id) return false unless account.feature_enabled?('saml') - AccountSamlSettings.find_by(account_id: account_id, enabled: true).present? + AccountSamlSettings.find_by(account_id: account_id).present? end end