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

renames and fixes

Browse Source
This commit is contained in:
Damodar Lohani
2024-06-30 08:53:21 +00:00
parent 8f667671ad
commit 0dbc37dacf
4 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/config/collections.php
+2 -2
View File
@@ -4139,9 +4139,9 @@ $projectCollections = array_merge([
],
],
'resource_tokens' => [
'resourceTokens' => [
'$collection' => ID::custom(Database::METADATA),
'$id' => ID::custom('resource_tokens'),
'$id' => ID::custom('resourceTokens'),
'name' => 'Resource Tokens',
'attributes' => [
[
app/controllers/api/storage.php
+10 -10
View File
@@ -1706,7 +1706,7 @@ App::post('/v1/storage/buckets/:bucketId/files/:fileId/tokens')
throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
}
$token = $dbForProject->createDocument('resource_tokens', new Document([
$token = $dbForProject->createDocument('resourceTokens', new Document([
'$id' => ID::unique(),
'secret' => Auth::tokenGenerator(128),
'resourceId' => $bucketId . ':' . $fileId,
@@ -1782,7 +1782,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/tokens')
if ($cursor) {
/** @var Query $cursor */
$tokenId = $cursor->getValue();
$cursorDocument = $dbForProject->getDocument('resource_tokens', $tokenId);
$cursorDocument = $dbForProject->getDocument('resourceTokens', $tokenId);
if ($cursorDocument->isEmpty()) {
throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "File token '{$tokenId}' for the 'cursor' value not found.");
@@ -1795,8 +1795,8 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/tokens')
$filterQueries = Query::groupByType($queries)['filters'];
$response->dynamic(new Document([
'tokens' => $dbForProject->find('resource_tokens', $queries),
'total' => $dbForProject->count('resource_tokens', $filterQueries, APP_LIMIT_COUNT),
'tokens' => $dbForProject->find('resourceTokens', $queries),
'total' => $dbForProject->count('resourceTokens', $filterQueries, APP_LIMIT_COUNT),
]), Response::MODEL_RESOURCE_TOKEN_LIST);
});
@@ -1845,7 +1845,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/tokens/:tokenId')
throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
}
$token = $dbForProject->getDocument('resource_tokens', $tokenId);
$token = $dbForProject->getDocument('resourceTokens', $tokenId);
if ($token->isEmpty() || $token->getAttribute('resourceInternalId') != $bucket->getInternalId() . ':' . $file->getInternalId()) {
throw new Exception(Exception::STORAGE_FILE_TOKEN_NOT_FOUND);
@@ -1900,7 +1900,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/tokens/:tokenId/jwt')
throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
}
$token = $dbForProject->getDocument('resource_tokens', $tokenId);
$token = $dbForProject->getDocument('resourceTokens', $tokenId);
if ($token->isEmpty() || $token->getAttribute('resourceInternalId') != $bucket->getInternalId() . ':' . $file->getInternalId()) {
throw new Exception(Exception::STORAGE_FILE_TOKEN_NOT_FOUND);
@@ -1986,7 +1986,7 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId/tokens/:tokenId')
throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
}
$token = $dbForProject->getDocument('resource_tokens', $tokenId);
$token = $dbForProject->getDocument('resourceTokens', $tokenId);
if ($token->isEmpty() || $token->getAttribute('resourceInternalId') != $bucket->getInternalId() . ':' . $file->getInternalId()) {
throw new Exception(Exception::STORAGE_FILE_TOKEN_NOT_FOUND);
@@ -2028,7 +2028,7 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId/tokens/:tokenId')
->setAttribute('expire', $expire)
->setAttribute('$permissions', $permissions);
$token = $dbForProject->updateDocument('resource_tokens', $tokenId, $token);
$token = $dbForProject->updateDocument('resourceTokens', $tokenId, $token);
$queueForEvents
->setParam('bucketId', $bucket->getId())
@@ -2091,12 +2091,12 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId/tokens/:tokenId')
throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
}
$token = $dbForProject->getDocument('resource_tokens', $tokenId);
$token = $dbForProject->getDocument('resourceTokens', $tokenId);
if ($token->isEmpty() || $token->getAttribute('resourceInternalId') != $bucket->getInternalId() . ':' . $file->getInternalId()) {
throw new Exception(Exception::STORAGE_FILE_TOKEN_NOT_FOUND);
}
$dbForProject->deleteDocument('resource_tokens', $tokenId);
$dbForProject->deleteDocument('resourceTokens', $tokenId);
$queueForEvents
->setParam('bucketId', $bucket->getId())
app/init.php
+1 -1
View File
@@ -1141,7 +1141,7 @@ App::setResource('resourceToken', function ($project, $dbForProject, $request) {
return new Document([]);
}
$token = Authorization::skip(fn () => $dbForProject->getDocument('resource_tokens', $tokenId));
$token = Authorization::skip(fn () => $dbForProject->getDocument('resourceTokens', $tokenId));
if ($token->isEmpty() || $token->getAttribute('secret') != $secret) {
return new Document([]);
tests/e2e/Services/Storage/StorageBase.php
+2 -2
View File
@@ -789,10 +789,10 @@ trait StorageBase
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()), [
'expiry' => $expiry,
'expire' => $expiry,
]);
$this->assertEquals($expiry, $res['body']['expiry']);
$this->assertEquals($expiry, $res['body']['expire']);
return $data;
}