Fix email confirmation link not updating email (#6187)

A change introduced in #6125 prevents
`Devise::Models::Confirmable#confirm` from being called for existing
users, which in turn leads to `email` not being set to
`unconfirmed_email`, breaking email updates. This also adds a test
that would've caught this issue.
This commit is contained in:
Patrick Figel 2018-01-05 00:15:35 +01:00 committed by Eugen Rochko
parent 49e296e1b0
commit 5ec25ff3e1
3 changed files with 42 additions and 14 deletions

View File

@ -126,18 +126,18 @@ class User < ApplicationRecord
end end
def confirm def confirm
return if confirmed? new_user = !confirmed?
super super
update_statistics! update_statistics! if new_user
end end
def confirm! def confirm!
return if confirmed? new_user = !confirmed?
skip_confirmation! skip_confirmation!
save! save!
update_statistics! update_statistics! if new_user
end end
def promote! def promote!

View File

@ -12,20 +12,40 @@ describe Auth::ConfirmationsController, type: :controller do
end end
describe 'GET #show' do describe 'GET #show' do
let!(:user) { Fabricate(:user, confirmation_token: 'foobar', confirmed_at: nil) } context 'when user is unconfirmed' do
let!(:user) { Fabricate(:user, confirmation_token: 'foobar', confirmed_at: nil) }
before do before do
allow(BootstrapTimelineWorker).to receive(:perform_async) allow(BootstrapTimelineWorker).to receive(:perform_async)
@request.env['devise.mapping'] = Devise.mappings[:user] @request.env['devise.mapping'] = Devise.mappings[:user]
get :show, params: { confirmation_token: 'foobar' } get :show, params: { confirmation_token: 'foobar' }
end
it 'redirects to login' do
expect(response).to redirect_to(new_user_session_path)
end
it 'queues up bootstrapping of home timeline' do
expect(BootstrapTimelineWorker).to have_received(:perform_async).with(user.account_id)
end
end end
it 'redirects to login' do context 'when user is updating email' do
expect(response).to redirect_to(new_user_session_path) let!(:user) { Fabricate(:user, confirmation_token: 'foobar', unconfirmed_email: 'new-email@example.com') }
end
it 'queues up bootstrapping of home timeline' do before do
expect(BootstrapTimelineWorker).to have_received(:perform_async).with(user.account_id) allow(BootstrapTimelineWorker).to receive(:perform_async)
@request.env['devise.mapping'] = Devise.mappings[:user]
get :show, params: { confirmation_token: 'foobar' }
end
it 'redirects to login' do
expect(response).to redirect_to(new_user_session_path)
end
it 'does not queue up bootstrapping of home timeline' do
expect(BootstrapTimelineWorker).to_not have_received(:perform_async)
end
end end
end end
end end

View File

@ -148,6 +148,14 @@ RSpec.describe User, type: :model do
end end
end end
describe '#confirm' do
it 'sets email to unconfirmed_email' do
user = Fabricate.build(:user, confirmed_at: Time.now.utc, unconfirmed_email: 'new-email@example.com')
user.confirm
expect(user.email).to eq 'new-email@example.com'
end
end
describe '#disable_two_factor!' do describe '#disable_two_factor!' do
it 'saves false for otp_required_for_login' do it 'saves false for otp_required_for_login' do
user = Fabricate.build(:user, otp_required_for_login: true) user = Fabricate.build(:user, otp_required_for_login: true)