github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 03:09:00 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: Allow merging users when email domains are restricted

Browse Source
This commit is contained in:
David Taylor 2020-06-09 18:51:59 +01:00
parent a3cf1cf6ff
commit ae6c4cd237
No known key found for this signature in database
GPG Key ID: 46904C18B1D3F434
3 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user.rb
View File

@ -1200,7 +1200,7 @@ class User < ActiveRecord::Base
if primary_email
new_record? ? primary_email.email = new_email : primary_email.update(email: new_email)
else
self.primary_email = UserEmail.new(email: new_email, user: self, primary: true)
self.primary_email = UserEmail.new(email: new_email, user: self, primary: true, skip_validate_email: !should_validate_email_address?)
end
end

2
app/services/user_merger.rb
View File

@ -358,6 +358,8 @@ class UserMerger
def delete_source_user
@source_user.reload
@source_user.skip_email_validation = true
@source_user.update(
admin: false,
email: "#{@source_user.username}_#{SecureRandom.hex}@no-email.invalid"

9
spec/services/user_merger_spec.rb
View File

@ -990,6 +990,15 @@ describe UserMerger do
expect(User.find_by_username(source_user.username)).to be_nil
end
it "works even when email domains are restricted" do
SiteSetting.email_domains_whitelist = "example.com|work.com"
source_user.update_attribute(:admin, true)
expect(User.find_by_username(source_user.username)).to be_present
merge_users!
expect(User.find_by_username(source_user.username)).to be_nil
end
it "deletes external auth infos of source user" do
UserAssociatedAccount.create(user_id: source_user.id, provider_name: "facebook", provider_uid: "1234")
GithubUserInfo.create(user_id: source_user.id, screen_name: "example", github_user_id: "examplel123123")