akadmin/chatwoot
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor: cleaner saml check

Browse Source
This commit is contained in:
Shivam Mishra
2025-08-28 15:06:15 +05:30
parent 379ef876eb
commit d5b7068394
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/devise_overrides/omniauth_callbacks_controller.rb
+5 -4
View File
@@ -41,10 +41,7 @@ class DeviseOverrides::OmniauthCallbacksController < DeviseTokenAuth::OmniauthCa
return redirect_to login_page_url(error: 'saml-not-available'), allow_other_host: true unless ChatwootApp.enterprise?
account_id = extract_saml_account_id
account = Account.find_by(id: account_id) if account_id
return redirect_to login_page_url(error: 'saml-not-enabled'), allow_other_host: true if account && !account.feature_enabled?('saml')
return redirect_to login_page_url(error: 'saml-not-enabled'), allow_other_host: true if account_id && !saml_enabled_for_account?(account_id)
return redirect_to login_page_url(error: 'saml-not-enabled'), allow_other_host: true unless saml_enabled_for_account?(account_id)
@resource = SamlUserBuilder.new(auth_hash, account_id: account_id).perform
@@ -66,6 +63,10 @@ class DeviseOverrides::OmniauthCallbacksController < DeviseTokenAuth::OmniauthCa
def saml_enabled_for_account?(account_id)
return false unless ChatwootApp.enterprise?
return false if account_id.blank?
account = Account.find_by(id: account_id)
return false unless account.feature_enabled?('saml')
AccountSamlSettings.find_by(account_id: account_id, enabled: true).present?
end