Elgato_dark/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite synced 2026-05-23 17:08:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge pull request #7638 from appwrite/fix-update-topics-permissions

Browse source 
Fix update topics permissions
This commit is contained in:
Jake Barnby 2024-02-24 13:35:23 +13:00 committed by GitHub
commit 4ce6eabf40
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/controllers/api/messaging.php
View file

@ -2133,21 +2133,26 @@ App::patch('/v1/messaging/topics/:topicId')
->label('sdk.response.type', Response::CONTENT_TYPE_JSON) ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
->label('sdk.response.model', Response::MODEL_TOPIC) ->label('sdk.response.model', Response::MODEL_TOPIC)
->param('topicId', '', new UID(), 'Topic ID.') ->param('topicId', '', new UID(), 'Topic ID.')
->param('name', '', new Text(128), 'Topic Name.', true) ->param('name', null, new Text(128), 'Topic Name.', true)
->param('subscribe', null, new Roles(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of role strings with subscribe permission. By default all users are granted with any subscribe permission. [learn more about roles](https://appwrite.io/docs/permissions#permission-roles). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 64 characters long.', true)
->inject('queueForEvents') ->inject('queueForEvents')
->inject('dbForProject') ->inject('dbForProject')
->inject('response') ->inject('response')
->action(function (string $topicId, string $name, Event $queueForEvents, Database $dbForProject, Response $response) { ->action(function (string $topicId, ?string $name, ?array $subscribe, Event $queueForEvents, Database $dbForProject, Response $response) {
$topic = $dbForProject->getDocument('topics', $topicId); $topic = $dbForProject->getDocument('topics', $topicId);
if ($topic->isEmpty()) { if ($topic->isEmpty()) {
throw new Exception(Exception::TOPIC_NOT_FOUND); throw new Exception(Exception::TOPIC_NOT_FOUND);
} }
if (!empty($name)) { if (!\is_null($name)) {
$topic->setAttribute('name', $name); $topic->setAttribute('name', $name);
} }
if (!\is_null($subscribe)) {
$topic->setAttribute('subscribe', $subscribe);
}
$topic = $dbForProject->updateDocument('topics', $topicId, $topic); $topic = $dbForProject->updateDocument('topics', $topicId, $topic);
$queueForEvents $queueForEvents

11
tests/e2e/Services/Messaging/MessagingBase.php
View file

@ -341,6 +341,17 @@ trait MessagingBase
$this->assertEquals(200, $response['headers']['status-code']); $this->assertEquals(200, $response['headers']['status-code']);
$this->assertEquals('android-app', $response['body']['name']); $this->assertEquals('android-app', $response['body']['name']);
$response2 = $this->client->call(Client::METHOD_PATCH, '/messaging/topics/' . $topics['private']['$id'], [
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey'],
], [
'name' => 'ios-app',
'subscribe' => [Role::user('some-user')->toString()],
]);
$this->assertEquals(200, $response2['headers']['status-code']);
$this->assertEquals('ios-app', $response2['body']['name']);
return $response['body']['$id']; return $response['body']['$id'];
} }