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
24 files
+ 394
76
Compare changes
  • Side-by-side
  • Inline
Files
24
@@ -399,9 +399,7 @@ def hexdigest(string)
end
def require_email
if current_user && current_user.temp_oauth_email? && session[:impersonator_id].nil?
redirect_to profile_path, notice: _('Please complete your profile with email address')
end
redirect_to profile_path, notice: _('Please complete your profile with email address') if in_user_oath_flow?
end
def enforce_terms!
@@ -574,11 +572,16 @@ def context_user
def required_signup_info
return unless current_user
return unless current_user.role_required?
return if in_user_oath_flow?
store_location_for :user, request.fullpath
redirect_to users_sign_up_welcome_path
end
def in_user_oath_flow?
current_user.present? && current_user.temp_oauth_email? && session[:impersonator_id].nil?
end
end
ApplicationController.prepend_mod
Loading