Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX: Allow half-merged user to be accessed #22105

Merged
merged 1 commit into from Jun 14, 2023
Merged

FIX: Allow half-merged user to be accessed #22105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/guardian/user_guardian.rb
View file
Open in desktop
Expand Up @@ -74,7 +74,7 @@ def can_delete_user?(user)
end

def can_anonymize_user?(user)
is_staff? && !user.nil? && !user.staff? && !user.email.ends_with?(UserAnonymizer::EMAIL_SUFFIX)
is_staff? && !user.nil? && !user.staff? && !user.email&.ends_with?(UserAnonymizer::EMAIL_SUFFIX)
end

def can_merge_user?(user)
Expand Down
8 changes: 7 additions & 1 deletion spec/lib/guardian_spec.rb
View file
Open in desktop
Expand Up @@ -2777,10 +2777,16 @@
expect(Guardian.new(user).can_anonymize_user?(user)).to be_falsey
end

it "it false for an anonymized user" do
it "is false for an anonymized user" do
expect(Guardian.new(user).can_anonymize_user?(anonymous_user)).to be_falsey
end

it "is true for a user with no email" do
bad_state_user = Fabricate.build(:user, email: nil)
bad_state_user.skip_email_validation = true
expect(Guardian.new(moderator).can_anonymize_user?(bad_state_user)).to eq(true)
end

it "is true for admin anonymizing a regular user" do
expect(Guardian.new(admin).can_anonymize_user?(user)).to eq(true)
end
Expand Down