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

ID updates

Browse Source
This commit is contained in:
Jake Barnby
2022-08-14 22:33:36 +12:00
parent a8698b6065
commit b007acfa95
61 changed files with 1010 additions and 928 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/controllers/api/functions.php
+11 -10
View File
@@ -9,6 +9,7 @@ use Appwrite\Event\Func;
use Appwrite\Event\Validator\Event as ValidatorEvent;
use Appwrite\Extend\Exception;
use Appwrite\Utopia\Database\Validator\CustomId;
use Utopia\Database\ID;
use Utopia\Database\Permission;
use Utopia\Database\Role;
use Utopia\Database\Validator\UID;
@@ -67,7 +68,7 @@ App::post('/v1/functions')
$functionId = ($functionId == 'unique()') ? $dbForProject->getId() : $functionId;
$function = $dbForProject->createDocument('functions', new Document([
'$id' => $functionId,
'$id' => ID::custom($functionId),
'execute' => $execute,
'status' => 'disabled',
'name' => $name,
@@ -570,13 +571,13 @@ App::post('/v1/functions/:functionId/deployments')
if ($deployment->isEmpty()) {
$deployment = $dbForProject->createDocument('deployments', new Document([
'$id' => $deploymentId,
'$id' => ID::custom($deploymentId),
'$permissions' => [
Permission::read(Role::any()),
Permission::update(Role::any()),
Permission::delete(Role::any()),
],
'resourceId' => $function->getId(),
'resourceId' => ID::custom($function->getId()),
'resourceType' => 'functions',
'entrypoint' => $entrypoint,
'path' => $path,
@@ -602,7 +603,7 @@ App::post('/v1/functions/:functionId/deployments')
} else {
if ($deployment->isEmpty()) {
$deployment = $dbForProject->createDocument('deployments', new Document([
'$id' => $deploymentId,
'$id' => ID::custom($deploymentId),
'$permissions' => [
Permission::read(Role::any()),
Permission::update(Role::any()),
@@ -861,10 +862,10 @@ App::post('/v1/functions/:functionId/executions')
/** @var Document $execution */
$execution = Authorization::skip(fn () => $dbForProject->createDocument('executions', new Document([
'$id' => $executionId,
'$permissions' => !$user->isEmpty() ? [Permission::read(Role::user($user->getId()))] : [],
'functionId' => $function->getId(),
'deploymentId' => $deployment->getId(),
'$id' => ID::custom($executionId),
'$permissions' => !$user->isEmpty() ? [Permission::read(Role::user(ID::custom($user->getId())))] : [],
'functionId' => ID::custom($function->getId()),
'deploymentId' => ID::custom($deployment->getId()),
'trigger' => 'http', // http / schedule / event
'status' => 'waiting', // waiting / processing / completed / failed
'statusCode' => 0,
@@ -889,8 +890,8 @@ App::post('/v1/functions/:functionId/executions')
if (!$current->isEmpty()) {
$jwtObj = new JWT(App::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 900, 10); // Instantiate with key, algo, maxAge and leeway.
$jwt = $jwtObj->encode([
'userId' => $user->getId(),
'sessionId' => $current->getId(),
'userId' => ID::custom($user->getId()),
'sessionId' => ID::custom($current->getId()),
]);
}
}