diff --git a/app/init/constants.php b/app/init/constants.php index 3a625980b8..143bba29bd 100644 --- a/app/init/constants.php +++ b/app/init/constants.php @@ -258,3 +258,10 @@ const RESOURCE_TYPE_PROVIDERS = 'providers'; const RESOURCE_TYPE_TOPICS = 'topics'; const RESOURCE_TYPE_SUBSCRIBERS = 'subscribers'; const RESOURCE_TYPE_MESSAGES = 'messages'; + +// Resource types for Tokens + +const TOKENS_RESOURCE_TYPE_FILES = 'files'; +const TOKENS_RESOURCE_TYPE_SITES = 'sites'; +const TOKENS_RESOURCE_TYPE_FUNCTIONS = 'functions'; +const TOKENS_RESOURCE_TYPE_DATABASES = 'databases'; diff --git a/app/init/resources.php b/app/init/resources.php index d756c24499..2b72c8da33 100644 --- a/app/init/resources.php +++ b/app/init/resources.php @@ -922,7 +922,7 @@ App::setResource('resourceToken', function ($project, $dbForProject, $request) { return new Document([]); } - if ($token->getAttribute('resourceType') === 'files') { + if ($token->getAttribute('resourceType') === TOKENS_RESOURCE_TYPE_FILES) { $internalIds = explode(':', $token->getAttribute('resourceInternalId')); $ids = explode(':', $token->getAttribute('resourceId')); diff --git a/src/Appwrite/Platform/Modules/Storage/Http/Tokens/Buckets/Files/Create.php b/src/Appwrite/Platform/Modules/Storage/Http/Tokens/Buckets/Files/Create.php index 76e161e101..c68573f79f 100644 --- a/src/Appwrite/Platform/Modules/Storage/Http/Tokens/Buckets/Files/Create.php +++ b/src/Appwrite/Platform/Modules/Storage/Http/Tokens/Buckets/Files/Create.php @@ -97,7 +97,7 @@ class Create extends Action 'secret' => Auth::tokenGenerator(128), 'resourceId' => $bucketId . ':' . $fileId, 'resourceInternalId' => $bucket->getInternalId() . ':' . $file->getInternalId(), - 'resourceType' => 'files', + 'resourceType' => TOKENS_RESOURCE_TYPE_FILES, 'expire' => $expire, '$permissions' => $permissions ])); diff --git a/src/Appwrite/Platform/Modules/Storage/Http/Tokens/Buckets/Files/XList.php b/src/Appwrite/Platform/Modules/Storage/Http/Tokens/Buckets/Files/XList.php index 562522efad..3b98c063e1 100644 --- a/src/Appwrite/Platform/Modules/Storage/Http/Tokens/Buckets/Files/XList.php +++ b/src/Appwrite/Platform/Modules/Storage/Http/Tokens/Buckets/Files/XList.php @@ -62,7 +62,7 @@ class XList extends Action ['bucket' => $bucket, 'file' => $file] = $this->getFileAndBucket($dbForProject, $bucketId, $fileId); $queries = Query::parseQueries($queries); - $queries[] = Query::equal('resourceType', ["files"]); + $queries[] = Query::equal('resourceType', [TOKENS_RESOURCE_TYPE_FILES]); $queries[] = Query::equal('resourceInternalId', [$bucket->getInternalId() . ':' . $file->getInternalId()]); // Get cursor document if there was a cursor query $cursor = \array_filter($queries, function ($query) {