diff options
| author | James Edwards-Jones <jedwardsjones@gitlab.com> | 2019-02-06 17:28:35 +0000 |
|---|---|---|
| committer | James Edwards-Jones <jedwardsjones@gitlab.com> | 2019-02-06 17:28:35 +0000 |
| commit | 24f3f9600484efcf088c73509a4f3c72fc30fff0 (patch) | |
| tree | f3bb407a91cfc991a9f3d18b3cd68bd41b56d3ee | |
| parent | 0ef68a58e02319440cecb2ca60812b22e249bf4e (diff) | |
| download | gitlab-ce-ce-jej/group-saml-sso-when-signed-out.tar.gz | |
Backport build_auth_user for GroupSAML callbackce-jej/group-saml-sso-when-signed-out
| -rw-r--r-- | app/controllers/omniauth_callbacks_controller.rb | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/omniauth_callbacks_controller.rb b/app/controllers/omniauth_callbacks_controller.rb index 97120273d6b..cc2bb99f55b 100644 --- a/app/controllers/omniauth_callbacks_controller.rb +++ b/app/controllers/omniauth_callbacks_controller.rb @@ -116,8 +116,12 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController session[:service_tickets][provider] = ticket end + def build_auth_user(auth_user_class) + auth_user_class.new(oauth) + end + def sign_in_user_flow(auth_user_class) - auth_user = auth_user_class.new(oauth) + auth_user = build_auth_user(auth_user_class) user = auth_user.find_and_update! if auth_user.valid_sign_in? |