Skip to content

Commit 7edf6d8

Browse files
FIX: Use Guardian.basic_user instead of new (anon) (#270)
c.f. de983796e1b66aa2ab039a4fb6e32cec8a65a098 There will soon be additional login_required checks for Guardian, and the intent of many checks by automated systems is better fulfilled by using BasicUser, which simulates a logged in TL0 forum user, rather than an anon user.
1 parent ad1b7c9 commit 7edf6d8

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

.discourse-compatibility

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
< 3.2.0.beta4-dev: ad1b7c9608bf32c3a991580347302a071d5902d9
12
< 3.2.0.beta2-dev: 9fbf43e2f077e86f0a1ff769af6036d4e78bfff1
23
3.1.999: b5d487d6a5bfe2571d936eec5911d02a5f3fcc32
34
3.1.0.beta1: 62fe282c756ac7de43a22a09b0d675882a507743

plugin.rb

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -703,8 +703,10 @@ class ::ListableTopicSerializer
703703
category_id_changes = topic_changes.diff["category_id"].to_a
704704
tag_changes = topic_changes.diff["tags"].to_a
705705

706-
old_allowed = Guardian.new.allow_accepted_answers?(category_id_changes[0], tag_changes[0])
707-
new_allowed = Guardian.new.allow_accepted_answers?(category_id_changes[1], tag_changes[1])
706+
old_allowed =
707+
Guardian.basic_user.allow_accepted_answers?(category_id_changes[0], tag_changes[0])
708+
new_allowed =
709+
Guardian.basic_user.allow_accepted_answers?(category_id_changes[1], tag_changes[1])
708710

709711
options[:refresh_stream] = true if old_allowed != new_allowed
710712
end

spec/models/site_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
describe Site do
77
let(:category) { Fabricate(:category) }
8-
let(:guardian) { Guardian.new }
8+
let(:guardian) { Guardian.basic_user }
99

1010
before { SiteSetting.show_filter_by_solved_status = true }
1111

spec/serializers/topic_answer_mixin_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
describe TopicAnswerMixin do
66
let(:topic) { Fabricate(:topic) }
77
let(:post) { Fabricate(:post, topic: topic) }
8-
let(:guardian) { Guardian.new }
8+
let(:guardian) { Guardian.basic_user }
99

1010
before do
1111
topic.custom_fields["accepted_answer_post_id"] = post.id

spec/serializers/user_card_serializer_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
describe UserCardSerializer do
66
let(:user) { Fabricate(:user) }
7-
let(:serializer) { described_class.new(user, scope: Guardian.new, root: false) }
7+
let(:serializer) { described_class.new(user, scope: Guardian.basic_user, root: false) }
88
let(:json) { serializer.as_json }
99

1010
it "accepted_answers serializes number of accepted answers" do

0 commit comments

Comments
 (0)