Skip to content
Snippets Groups Projects

Enable SSO and ensure trial registrations perform onboarding steps

Merged Doug Stull requested to merge 404926-add-sso-onboarding-specs into master
5 files
+ 46
43
Compare changes
  • Side-by-side
  • Inline
Files
5
@@ -19,10 +19,7 @@ def handle_omniauth
end
AuthHelper.providers_for_base_controller.each do |provider|
define_method(provider) do
set_registration_tasks if intent_to_register?
handle_omniauth
end
alias_method provider, :handle_omniauth
end
# overridden in EE
@@ -170,7 +167,7 @@ def sign_in_user_flow(auth_user_class)
accept_pending_invitations(user: user) if new_user
persist_accepted_terms_if_required(user) if new_user
perform_registration_tasks(user) if intent_to_register?
perform_registration_tasks(user, oauth['provider']) if intent_to_register?
sign_in_and_redirect_or_verify_identity(user, auth_user, new_user)
end
else
@@ -298,14 +295,10 @@ def persist_accepted_terms_if_required(user)
Users::RespondToTermsService.new(user, terms).execute(accepted: true)
end
def perform_registration_tasks(_user)
def perform_registration_tasks(_user, _provider)
store_location_for(:user, after_sign_up_path)
end
def set_registration_tasks
# no-op override in ee
end
def after_sign_up_path
users_sign_up_welcome_path
end
Loading