Merge branch 'MDL-63725_master' of git://github.com/markn86/moodle

diff --git a/message/externallib.php b/message/externallib.php
index 000eaba..c0c55f0 100644 (file)
--- a/message/externallib.php
+++ b/message/externallib.php
@@ -713,6 +713,11 @@ class core_message_external extends external_api {
             throw new required_capability_exception($context, $capability, 'nopermissions', '');
         }
 
+        // The user needs to be a part of the conversation before querying who the members are.
+        if (!\core_message\api::is_user_in_conversation($userid, $conversationid)) {
+            throw new moodle_exception('You are not a member of this conversation.');
+        }
+
         $params = [
             'userid' => $userid,
             'conversationid' => $conversationid,

diff --git a/message/tests/externallib_test.php b/message/tests/externallib_test.php
index 6ea79a4..1d2667d 100644 (file)
--- a/message/tests/externallib_test.php
+++ b/message/tests/externallib_test.php
@@ -4889,4 +4889,31 @@ class core_message_externallib_testcase extends externallib_advanced_testcase {
         $this->assertEquals($user2->id, $request2->userid);
         $this->assertEquals($user3->id, $request2->requesteduserid);
     }
+
+    /**
+     * Test returning members in a conversation when you are not a member.
+     */
+    public function test_get_conversation_members_not_a_member() {
+        $this->resetAfterTest();
+
+        $user1 = self::getDataGenerator()->create_user();
+        $user2 = self::getDataGenerator()->create_user();
+
+        // This user will not be in the conversation.
+        $user3 = self::getDataGenerator()->create_user();
+
+        $conversation = \core_message\api::create_conversation(
+            \core_message\api::MESSAGE_CONVERSATION_TYPE_GROUP,
+            [
+                $user1->id,
+                $user2->id,
+            ]
+        );
+        $conversationid = $conversation->id;
+
+        $this->setUser($user3);
+
+        $this->expectException('moodle_exception');
+        core_message_external::get_conversation_members($user3->id, $conversationid);
+    }
 }