Appwrite/appwrite
1
0
Fork 0
mirror of https://github.com/appwrite/appwrite.git synced 2026-05-26 13:51:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

403 error

Browse Source
This commit is contained in:
fogelito
2023-02-14 13:05:59 +02:00
parent 60c7d19be6
commit 895c546884
4 changed files with 18 additions and 5621 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/config/collections.php
+3 -3
View File
@@ -3548,10 +3548,10 @@ $collections = [
],
],
],
'slow_queries' => [
'slowQueries' => [
'$collection' => Database::METADATA,
'$id' => 'slow_queries',
'name' => 'slow_queries',
'$id' => 'slowQueries',
'name' => 'slowQueries',
'attributes' => [
[
'$id' => 'blocked',
app/controllers/api/databases.php
+13 -13
View File
@@ -160,7 +160,7 @@ App::init()
$request->getParam('queries')
]));
/* @var $document Document */
$document = Authorization::skip(fn() => $dbForProject->getDocument('slow_queries', $key));
$document = Authorization::skip(fn() => $dbForProject->getDocument('slowQueries', $key));
if ($document->getAttribute('blocked') === true) {
throw new Exception(Exception::TIMEOUT_BLOCKED);
}
@@ -201,9 +201,9 @@ App::error()
]));
/* @var $document Document */
$document = Authorization::skip(fn() => $dbForProject->getDocument('slow_queries', $key));
$document = Authorization::skip(fn() => $dbForProject->getDocument('slowQueries', $key));
if ($document->isEmpty()) {
$document = Authorization::skip(fn()=>$dbForProject->createDocument('slow_queries', new Document([
$document = Authorization::skip(fn()=>$dbForProject->createDocument('slowQueries', new Document([
'$id' => $key,
'blocked' => false,
'count' => 1,
@@ -221,7 +221,7 @@ App::error()
if ($document['count'] > $max) {
$document['blocked'] = true;
}
$document = Authorization::skip(fn() => $dbForProject->updateDocument('slow_queries', $document->getId(), $document));
$document = Authorization::skip(fn() => $dbForProject->updateDocument('slowQueries', $document->getId(), $document));
}
if ($document['blocked'] === true) {
throw new Exception(Exception::TIMEOUT_BLOCKED);
@@ -2899,7 +2899,7 @@ App::get('/v1/databases/:databaseId/slow-queries')
$cursor = reset($cursor);
if ($cursor) {
$documentId = $cursor->getValue();
$cursorDocument = Authorization::skip(fn()=>$dbForProject->getDocument('slow_queries', $documentId));
$cursorDocument = Authorization::skip(fn()=>$dbForProject->getDocument('slowQueries', $documentId));
if ($cursorDocument->isEmpty()) {
throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Slow query '{$documentId}' for the 'cursor' value not found.");
}
@@ -2907,8 +2907,8 @@ App::get('/v1/databases/:databaseId/slow-queries')
}
$response->dynamic(new Document([
'documents' => Authorization::skip(fn()=>$dbForProject->find('slow_queries', $queries)),
'total' => Authorization::skip(fn()=>$dbForProject->count('slow_queries', Query::groupByType($queries)['filters'], APP_LIMIT_COUNT)),
'documents' => Authorization::skip(fn()=>$dbForProject->find('slowQueries', $queries)),
'total' => Authorization::skip(fn()=>$dbForProject->count('slowQueries', Query::groupByType($queries)['filters'], APP_LIMIT_COUNT)),
]), Response::MODEL_DOCUMENT_LIST);
});
@@ -2933,7 +2933,7 @@ App::get('/v1/databases/slow-queries/:documentId')
->inject('mode')
->inject('project')
->action(function (string $documentId, Response $response, Database $dbForProject) {
$document = Authorization::skip(fn () => $dbForProject->getDocument('slow_queries', $documentId));
$document = Authorization::skip(fn () => $dbForProject->getDocument('slowQueries', $documentId));
if ($document->isEmpty()) {
throw new Exception(Exception::DOCUMENT_NOT_FOUND);
}
@@ -2952,7 +2952,7 @@ App::delete('/v1/databases/slow-queries/:documentId')
//->label('usage.params', ['databaseId:{request.databaseId}', 'collectionId:{request.collectionId}'])
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
->label('sdk.namespace', 'databases')
->label('event', 'slow_queries.documents.[documentId].delete')
->label('event', 'slowQueries.documents.[documentId].delete')
->label('audits.event', 'document.delete')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}/document/{request.documentId}')
->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
@@ -2963,14 +2963,14 @@ App::delete('/v1/databases/slow-queries/:documentId')
->inject('events')
->inject('deletes')
->action(function (string $documentId, Response $response, Database $dbForProject, Event $events, Delete $deletes) {
$document = Authorization::skip(fn() => $dbForProject->getDocument('slow_queries', $documentId));
$document = Authorization::skip(fn() => $dbForProject->getDocument('slowQueries', $documentId));
if ($document->isEmpty()) {
throw new Exception(Exception::DOCUMENT_NOT_FOUND);
}
Authorization::skip(fn() => $dbForProject->deleteDocument('slow_queries', $documentId));
Authorization::skip(fn() => $dbForProject->deleteDocument('slowQueries', $documentId));
$dbForProject->deleteCachedDocument('slow_queries', $documentId);
$dbForProject->deleteCachedDocument('slowQueries', $documentId);
$deletes
->setType(DELETE_TYPE_AUDIT)
@@ -2980,7 +2980,7 @@ App::delete('/v1/databases/slow-queries/:documentId')
// todo: check slow Queries events
$events
->setParam('collectionId', 'slow_queries')
->setParam('collectionId', 'slowQueries')
->setParam('documentId', $document->getId())
->setPayload($response->output($document, Response::MODEL_DOCUMENT))
;
composer.lock
Generated
-5605
View File
File diff suppressed because it is too large Load Diff
tests/e2e/Services/Databases/DatabasesBase.php
+2
View File
@@ -997,6 +997,8 @@ trait DatabasesBase
]);
$this->assertEquals(408, $documents['headers']['status-code']);
exit();
}