diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-04-23 18:03:01 +0300 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2018-04-23 18:24:47 +0300 |
| commit | 795cd7f95206db318c58939698f63eee5abedb34 (patch) | |
| tree | f8e244b3ea6b80acb64b724b0aef04af3b5c4fa8 /app/controllers/omniauth_callbacks_controller.rb | |
| parent | d3a8a07423dccf1709b6432e017ae4679143dbce (diff) | |
Replace define_method with alias_method in Omniauth Controllers
Diffstat (limited to 'app/controllers/omniauth_callbacks_controller.rb')
| -rw-r--r-- | app/controllers/omniauth_callbacks_controller.rb | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index f7e7f04384a..9137bc92810 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -4,10 +4,12 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController protect_from_forgery except: [:kerberos, :saml, :cas3] + def handle_omniauth + omniauth_flow(Gitlab::Auth::OAuth) + end + Gitlab.config.omniauth.providers.each do |provider| - define_method provider['name'] do - handle_omniauth - end + alias_method provider['name'], :handle_omniauth end # Extend the standard implementation to also increment @@ -70,10 +72,6 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController private - def handle_omniauth - omniauth_flow(Gitlab::Auth::OAuth) - end - def omniauth_flow(auth_module, identity_linker: nil) if current_user log_audit_event(current_user, with: oauth['provider']) |