File size: 6,258 Bytes
4d2a9bf | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 | diff --git a/framework/core/src/Discussion/Command/StartDiscussionHandler.php b/framework/core/src/Discussion/Command/StartDiscussionHandler.php
index bda8cb43955..25f7b09bdff 100644
--- a/framework/core/src/Discussion/Command/StartDiscussionHandler.php
+++ b/framework/core/src/Discussion/Command/StartDiscussionHandler.php
@@ -79,7 +79,7 @@ public function handle(StartDiscussion $command)
// We will do this by running the PostReply command.
try {
$post = $this->bus->dispatch(
- new PostReply($discussion->id, $actor, $data, $ipAddress)
+ new PostReply($discussion->id, $actor, $data, $ipAddress, true)
);
} catch (Exception $e) {
$discussion->delete();
diff --git a/framework/core/src/Post/Command/PostReply.php b/framework/core/src/Post/Command/PostReply.php
index ae1d4c03c74..226464926ed 100644
--- a/framework/core/src/Post/Command/PostReply.php
+++ b/framework/core/src/Post/Command/PostReply.php
@@ -41,17 +41,23 @@ class PostReply
*/
public $ipAddress;
+ /**
+ * @var bool
+ */
+ public $isFirstPost;
+
/**
* @param int $discussionId The ID of the discussion to post the reply to.
* @param User $actor The user who is performing the action.
* @param array $data The attributes to assign to the new post.
* @param string $ipAddress The IP address of the actor.
*/
- public function __construct($discussionId, User $actor, array $data, $ipAddress = null)
+ public function __construct($discussionId, User $actor, array $data, $ipAddress = null, bool $isFirstPost = false)
{
$this->discussionId = $discussionId;
$this->actor = $actor;
$this->data = $data;
$this->ipAddress = $ipAddress;
+ $this->isFirstPost = $isFirstPost;
}
}
diff --git a/framework/core/src/Post/Command/PostReplyHandler.php b/framework/core/src/Post/Command/PostReplyHandler.php
index b0bfb887733..f634a2dac5c 100644
--- a/framework/core/src/Post/Command/PostReplyHandler.php
+++ b/framework/core/src/Post/Command/PostReplyHandler.php
@@ -74,7 +74,7 @@ public function handle(PostReply $command)
// If this is the first post in the discussion, it's technically not a
// "reply", so we won't check for that permission.
- if ($discussion->first_post_id !== null) {
+ if (! $command->isFirstPost) {
$actor->assertCan('reply', $discussion);
}
diff --git a/framework/core/tests/integration/api/posts/CreateTest.php b/framework/core/tests/integration/api/posts/CreateTest.php
index a69d4278370..41b61276db0 100644
--- a/framework/core/tests/integration/api/posts/CreateTest.php
+++ b/framework/core/tests/integration/api/posts/CreateTest.php
@@ -10,6 +10,7 @@
namespace Flarum\Tests\integration\api\posts;
use Carbon\Carbon;
+use Flarum\Group\Group;
use Flarum\Testing\integration\RetrievesAuthorizedUsers;
use Flarum\Testing\integration\TestCase;
@@ -26,36 +27,70 @@ protected function setUp(): void
$this->prepareDatabase([
'discussions' => [
- ['id' => 1, 'title' => __CLASS__, 'created_at' => Carbon::now()->toDateTimeString(), 'user_id' => 2],
+ ['id' => 1, 'title' => __CLASS__, 'created_at' => Carbon::now()->toDateTimeString(), 'user_id' => 2, 'first_post_id' => 1],
+ // Discussion with deleted first post.
+ ['id' => 2, 'title' => __CLASS__, 'created_at' => Carbon::now()->toDateTimeString(), 'user_id' => 2, 'first_post_id' => null],
+ ],
+ 'posts' => [
+ ['id' => 1, 'discussion_id' => 1, 'number' => 1, 'created_at' => Carbon::now()->subDay()->toDateTimeString(), 'user_id' => 2, 'type' => 'comment', 'content' => '<t></t>'],
],
'users' => [
$this->normalUser(),
- ]
+ ['id' => 3, 'username' => 'restricted', 'email' => 'restricted@machine.local', 'is_email_confirmed' => 1],
+ ],
+ 'groups' => [
+ ['id' => 40, 'name_singular' => 'tess', 'name_plural' => 'tess'],
+ ],
+ 'group_user' => [
+ ['group_id' => 40, 'user_id' => 3],
+ ],
+ 'group_permission' => [
+ ['group_id' => 40, 'permission' => 'discussion.reply'],
+ ],
]);
}
/**
+ * @dataProvider discussionRepliesPrvider
* @test
*/
- public function can_create_reply()
+ public function can_create_reply_if_allowed(int $actorId, int $discussionId, int $responseStatus)
{
+ // Reset permissions for normal users group.
+ $this->database()
+ ->table('group_permission')
+ ->where('permission', 'discussion.reply')
+ ->where('group_id', Group::MEMBER_ID)
+ ->delete();
+
$response = $this->send(
$this->request('POST', '/api/posts', [
- 'authenticatedAs' => 2,
+ 'authenticatedAs' => $actorId,
'json' => [
'data' => [
'attributes' => [
'content' => 'reply with predetermined content for automated testing - too-obscure',
],
'relationships' => [
- 'discussion' => ['data' => ['id' => 1]],
+ 'discussion' => ['data' => ['id' => $discussionId]],
],
],
],
])
);
- $this->assertEquals(201, $response->getStatusCode());
+ $this->assertEquals($responseStatus, $response->getStatusCode());
+ }
+
+ public function discussionRepliesPrvider(): array
+ {
+ return [
+ // [$actorId, $discussionId, $responseStatus]
+ 'can_create_reply_with_ability' => [3, 1, 201],
+ 'cannot_create_reply_without_ability' => [2, 1, 403],
+ 'can_create_reply_with_ability_when_first_post_is_deleted' => [3, 2, 201],
+ 'cannot_create_reply_without_ability_when_first_post_is_deleted' => [2, 2, 403],
+ ];
}
/**
|