mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-18 04:43:24 +00:00
6c99479ef4
Conflicts: - `app/views/settings/profiles/show.html.haml`: Upstream redesigned the settings page, where glitch-soc had changes because of the ability to set some custom limits. Went with upstream's design while keeping our custom limits. - `yarn.lock`: Upstream updated dependencies textually close to a glitch-soc-only dependency. Updated the dependnencies as well.
98 lines
2.3 KiB
Ruby
98 lines
2.3 KiB
Ruby
# frozen_string_literal: true
|
|
|
|
class Auth::ConfirmationsController < Devise::ConfirmationsController
|
|
include CaptchaConcern
|
|
|
|
layout 'auth'
|
|
|
|
before_action :set_body_classes
|
|
before_action :set_pack
|
|
before_action :set_confirmation_user!, only: [:show, :confirm_captcha]
|
|
before_action :require_unconfirmed!
|
|
|
|
before_action :extend_csp_for_captcha!, only: [:show, :confirm_captcha]
|
|
before_action :require_captcha_if_needed!, only: [:show]
|
|
|
|
skip_before_action :require_functional!
|
|
|
|
def show
|
|
old_session_values = session.to_hash
|
|
reset_session
|
|
session.update old_session_values.except('session_id')
|
|
|
|
super
|
|
end
|
|
|
|
def new
|
|
super
|
|
|
|
resource.email = current_user.unconfirmed_email || current_user.email if user_signed_in?
|
|
end
|
|
|
|
def confirm_captcha
|
|
check_captcha! do |message|
|
|
flash.now[:alert] = message
|
|
render :captcha
|
|
return
|
|
end
|
|
|
|
show
|
|
end
|
|
|
|
private
|
|
|
|
def require_captcha_if_needed!
|
|
render :captcha if captcha_required?
|
|
end
|
|
|
|
def set_confirmation_user!
|
|
# We need to reimplement looking up the user because
|
|
# Devise::ConfirmationsController#show looks up and confirms in one
|
|
# step.
|
|
confirmation_token = params[:confirmation_token]
|
|
return if confirmation_token.nil?
|
|
|
|
@confirmation_user = User.find_first_by_auth_conditions(confirmation_token: confirmation_token)
|
|
end
|
|
|
|
def captcha_user_bypass?
|
|
return true if @confirmation_user.nil? || @confirmation_user.confirmed?
|
|
end
|
|
|
|
def set_pack
|
|
use_pack 'auth'
|
|
end
|
|
|
|
def require_unconfirmed!
|
|
if user_signed_in? && current_user.confirmed? && current_user.unconfirmed_email.blank?
|
|
redirect_to(current_user.approved? ? root_path : edit_user_registration_path)
|
|
end
|
|
end
|
|
|
|
def set_body_classes
|
|
@body_classes = 'lighter'
|
|
end
|
|
|
|
def after_resending_confirmation_instructions_path_for(_resource_name)
|
|
if user_signed_in?
|
|
if current_user.confirmed? && current_user.approved?
|
|
edit_user_registration_path
|
|
else
|
|
auth_setup_path
|
|
end
|
|
else
|
|
new_user_session_path
|
|
end
|
|
end
|
|
|
|
def after_confirmation_path_for(_resource_name, user)
|
|
if user.created_by_application && truthy_param?(:redirect_to_app)
|
|
user.created_by_application.confirmation_redirect_uri
|
|
elsif user_signed_in?
|
|
web_url('start')
|
|
else
|
|
new_user_session_path
|
|
end
|
|
end
|
|
end
|