From 0dbc37dacf230cafceea7013ccbd55ae37aa2b68 Mon Sep 17 00:00:00 2001 From: Damodar Lohani Date: Sun, 30 Jun 2024 08:53:21 +0000 Subject: [PATCH] renames and fixes --- app/config/collections.php | 4 ++-- app/controllers/api/storage.php | 20 ++++++++++---------- app/init.php | 2 +- tests/e2e/Services/Storage/StorageBase.php | 4 ++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/app/config/collections.php b/app/config/collections.php index a297ebb761..3eccf84f1f 100644 --- a/app/config/collections.php +++ b/app/config/collections.php @@ -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' => [ [ diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php index 6a9599b138..a2e947f78c 100644 --- a/app/controllers/api/storage.php +++ b/app/controllers/api/storage.php @@ -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()) diff --git a/app/init.php b/app/init.php index 3efea49e31..e66776cdb0 100644 --- a/app/init.php +++ b/app/init.php @@ -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([]); diff --git a/tests/e2e/Services/Storage/StorageBase.php b/tests/e2e/Services/Storage/StorageBase.php index 723eae0e94..18bd437107 100644 --- a/tests/e2e/Services/Storage/StorageBase.php +++ b/tests/e2e/Services/Storage/StorageBase.php @@ -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; }