2018-12-05 23:21:45 +05:30
|
|
|
# frozen_string_literal: true
|
|
|
|
|
2015-04-26 12:48:37 +05:30
|
|
|
class ConfirmationsController < Devise::ConfirmationsController
|
2018-11-08 19:23:39 +05:30
|
|
|
include AcceptsPendingInvitations
|
|
|
|
|
2016-06-02 11:05:42 +05:30
|
|
|
def almost_there
|
|
|
|
flash[:notice] = nil
|
|
|
|
render layout: "devise_empty"
|
|
|
|
end
|
|
|
|
|
2015-04-26 12:48:37 +05:30
|
|
|
protected
|
|
|
|
|
2016-06-02 11:05:42 +05:30
|
|
|
def after_resending_confirmation_instructions_path_for(resource)
|
2020-03-13 15:44:24 +05:30
|
|
|
return users_almost_there_path unless Feature.enabled?(:soft_email_confirmation)
|
|
|
|
|
|
|
|
stored_location_for(resource) || dashboard_projects_path
|
2016-06-02 11:05:42 +05:30
|
|
|
end
|
|
|
|
|
2015-04-26 12:48:37 +05:30
|
|
|
def after_confirmation_path_for(resource_name, resource)
|
2018-11-08 19:23:39 +05:30
|
|
|
accept_pending_invitations
|
|
|
|
|
2018-03-17 18:26:18 +05:30
|
|
|
# incoming resource can either be a :user or an :email
|
|
|
|
if signed_in?(:user)
|
|
|
|
after_sign_in(resource)
|
2015-04-26 12:48:37 +05:30
|
|
|
else
|
2018-03-17 18:26:18 +05:30
|
|
|
Gitlab::AppLogger.info("Email Confirmed: username=#{resource.username} email=#{resource.email} ip=#{request.remote_ip}")
|
2019-07-31 22:56:46 +05:30
|
|
|
flash[:notice] = flash[:notice] + _(" Please sign in.")
|
2018-03-17 18:26:18 +05:30
|
|
|
new_session_path(:user, anchor: 'login-pane')
|
2015-04-26 12:48:37 +05:30
|
|
|
end
|
|
|
|
end
|
2018-03-17 18:26:18 +05:30
|
|
|
|
|
|
|
def after_sign_in(resource)
|
|
|
|
after_sign_in_path_for(resource)
|
|
|
|
end
|
2015-04-26 12:48:37 +05:30
|
|
|
end
|
2019-12-04 20:38:33 +05:30
|
|
|
|
|
|
|
ConfirmationsController.prepend_if_ee('EE::ConfirmationsController')
|