Commit b0fa01fc authored by Douwe Maan's avatar Douwe Maan

Merge branch '48677-also-check-auto_sign_in_with_provider' into 'master'

Resolve "Undefined omniauth_authorize_path when omniauth_enabled not enabled"

Closes #48677

See merge request gitlab-org/gitlab-ce!20302
parents afb3caac 772be582
---
title: Load Devise with Omniauth when auto_sign_in_with_provider is configured
merge_request: 20302
author:
type: fixed
......@@ -219,7 +219,7 @@ Devise.setup do |config|
end
end
if Gitlab.config.omniauth.enabled
if Gitlab::OmniauthInitializer.enabled?
Gitlab::OmniauthInitializer.new(config).execute(Gitlab.config.omniauth.providers)
end
end
......@@ -17,7 +17,7 @@ OmniAuth.config.before_request_phase do |env|
Gitlab::RequestForgeryProtection.call(env)
end
if Gitlab.config.omniauth.enabled
if Gitlab::OmniauthInitializer.enabled?
provider_names = Gitlab.config.omniauth.providers.map(&:name)
Gitlab::Auth.omniauth_setup_providers(provider_names)
end
module Gitlab
class OmniauthInitializer
def self.enabled?
Gitlab.config.omniauth.enabled ||
Gitlab.config.omniauth.auto_sign_in_with_provider.present?
end
def initialize(devise_config)
@devise_config = devise_config
end
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment