diff --git a/config/initializers/omniauth.rb b/config/initializers/omniauth.rb index 77031b8e8..6ed8279d6 100644 --- a/config/initializers/omniauth.rb +++ b/config/initializers/omniauth.rb @@ -1,60 +1,43 @@ -# Enable OmniAuth debug logging -OmniAuth.config.logger = Rails.logger -OmniAuth.config.logger.level = Logger::DEBUG OmniAuth.config.full_host = ENV.fetch('FRONTEND_URL', 'http://localhost:3000') Rails.application.config.middleware.use OmniAuth::Builder do provider :google_oauth2, ENV.fetch('GOOGLE_OAUTH_CLIENT_ID', nil), ENV.fetch('GOOGLE_OAUTH_CLIENT_SECRET', nil), { provider_ignores_state: true } - + # SAML provider with setup phase for multi-tenant configuration provider :saml, - setup: lambda { |env| - request = ActionDispatch::Request.new(env) - - Rails.logger.debug "[SAML Setup] Request path: #{request.path}" - Rails.logger.debug "[SAML Setup] Request params: #{request.params.inspect}" - Rails.logger.debug "[SAML Setup] Session ID: #{request.session.id}" - - # Extract account_id from various sources - account_id = request.params['account_id'] || - request.session[:saml_account_id] || - env['omniauth.params']&.dig('account_id') - - Rails.logger.debug "[SAML Setup] Account ID: #{account_id}" - - if account_id - # Store in session and omniauth params for callback - request.session[:saml_account_id] = account_id - env['omniauth.params'] ||= {} - env['omniauth.params']['account_id'] = account_id - - # Find SAML settings for this account - settings = AccountSamlSettings.find_by(account_id: account_id, enabled: true) - - if settings - Rails.logger.debug "[SAML Setup] Found settings for account #{account_id}" - Rails.logger.debug "[SAML Setup] SSO URL: #{settings.sso_url}" - Rails.logger.debug "[SAML Setup] SP Entity ID: #{settings.sp_entity_id_or_default}" - - # Configure the strategy options dynamically - env['omniauth.strategy'].options[:assertion_consumer_service_url] = "#{ENV.fetch('FRONTEND_URL', 'http://localhost:3000')}/omniauth/saml/callback?account_id=#{account_id}" - env['omniauth.strategy'].options[:sp_entity_id] = settings.sp_entity_id_or_default - env['omniauth.strategy'].options[:idp_sso_service_url] = settings.sso_url - env['omniauth.strategy'].options[:idp_cert] = settings.certificate - env['omniauth.strategy'].options[:name_identifier_format] = 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress' - - Rails.logger.debug "[SAML Setup] Strategy configured successfully" - else - Rails.logger.warn "[SAML Setup] No SAML settings found for account #{account_id}" - # Set a dummy certificate to avoid the error - env['omniauth.strategy'].options[:idp_cert] = "DUMMY" - end - else - Rails.logger.warn "[SAML Setup] No account_id found in params or session" - # Set a dummy certificate to avoid the error - env['omniauth.strategy'].options[:idp_cert] = "DUMMY" - end - } + setup: lambda { |env| + request = ActionDispatch::Request.new(env) + + # Extract account_id from various sources + account_id = request.params['account_id'] || + request.session[:saml_account_id] || + env['omniauth.params']&.dig('account_id') + + if account_id + # Store in session and omniauth params for callback + request.session[:saml_account_id] = account_id + env['omniauth.params'] ||= {} + env['omniauth.params']['account_id'] = account_id + + # Find SAML settings for this account + settings = AccountSamlSettings.find_by(account_id: account_id, enabled: true) + + if settings + # Configure the strategy options dynamically + env['omniauth.strategy'].options[:assertion_consumer_service_url] = "#{ENV.fetch('FRONTEND_URL', 'http://localhost:3000')}/omniauth/saml/callback?account_id=#{account_id}" + env['omniauth.strategy'].options[:sp_entity_id] = settings.sp_entity_id_or_default + env['omniauth.strategy'].options[:idp_sso_service_url] = settings.sso_url + env['omniauth.strategy'].options[:idp_cert] = settings.certificate + env['omniauth.strategy'].options[:name_identifier_format] = 'urn:oasis:names:tc:SAML:1.1:nameid-format:emailAddress' + else + # Set a dummy certificate to avoid the error + env['omniauth.strategy'].options[:idp_cert] = 'DUMMY' + end + else + # Set a dummy certificate to avoid the error + env['omniauth.strategy'].options[:idp_cert] = 'DUMMY' + end + } end