Merge remote-tracking branch 'origin/0.16.x' into fix-storage-audit-resources

2024-06-29 19:50:26 +12:00 · 2022-09-08 17:24:00 +12:00 · 2022-09-08 17:24:00 +12:00 · 15939bb155
parent 6ac2493445 83f238867f
commit 15939bb155
18 changed files with 180 additions and 143 deletions
--- a/.github/workflows/linter.yml
+++ b/.github/workflows/linter.yml
@ -2,33 +2,19 @@ name: "Linter"

 on: [pull_request]
 jobs:
-  tests:
+  lint:
    name: Linter
    runs-on: ubuntu-latest

    steps:
    - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
      with:
-        # We must fetch at least the immediate parents so that if this is
-        # a pull request then we can checkout the head.
        fetch-depth: 2

-    # If this run was triggered by a pull request event, then checkout
-    # the head of the pull request instead of the merge commit.
    - run: git checkout HEAD^2
-      if: ${{ github.event_name == 'pull_request' }}
-
-    - name: Setup PHP
-      uses: shivammathur/setup-php@v2
-      with:
-        php-version: '8.0'
-
-    - name: Install dependencies
-      uses: php-actions/composer@v6
-      with:
-        php_version: '8.0'
-        args: --profile --ignore-platform-reqs

    - name: Run Linter
-      run: ./vendor/bin/phpcs -p
+      run: |
+        docker run --rm -v $PWD:/app composer sh -c \
+        "composer install --profile --ignore-platform-reqs && composer lint"
--- a/CHANGES.md
+++ b/CHANGES.md
@ -9,6 +9,7 @@
 - Resources that are computed asynchronously, such as function deployments, will now return a `202 Accepted` status code instead of `200 OK` [#3547](https://github.com/appwrite/appwrite/pull/3547)
 - Queries have been improved to allow even more flexibility, and introduced to new endpoints. See the Queries V2 section in the document for more information [#3702](https://github.com/appwrite/appwrite/pull/3702)
 - Compound indexes are now more flexible [#151](https://github.com/utopia-php/database/pull/151)
+- `createExecution` parameter `async` default value was changed from `true` to `false` [#3781](https://github.com/appwrite/appwrite/pull/3781)

 ## Features
 - Added the UI to see the Parent ID of all resources within the UI. [#3653](https://github.com/appwrite/appwrite/pull/3653)
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@ -134,8 +134,9 @@ App::post('/v1/account')

        $events->setParam('userId', $user->getId());

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($user, Response::MODEL_ACCOUNT);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($user, Response::MODEL_ACCOUNT);
    });

 App::post('/v1/account/sessions/email')
@ -1250,8 +1251,9 @@ App::post('/v1/account/jwt')

        $jwt = new JWT(App::getEnv('_APP_OPENSSL_KEY_V1'), 'HS256', 900, 10); // Instantiate with key, algo, maxAge and leeway.

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic(new Document(['jwt' => $jwt->encode([
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic(new Document(['jwt' => $jwt->encode([
            // 'uid'    => 1,
            // 'aud'    => 'http://site.com',
            // 'scopes' => ['user'],
@ -1979,8 +1981,9 @@ App::post('/v1/account/recovery')
        // Hide secret for clients
        $recovery->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? $secret : '');

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($recovery, Response::MODEL_TOKEN);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($recovery, Response::MODEL_TOKEN);
    });

 App::put('/v1/account/recovery')
@ -2135,8 +2138,9 @@ App::post('/v1/account/verification')
        // Hide secret for clients
        $verification->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? $verificationSecret : '');

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($verification, Response::MODEL_TOKEN);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($verification, Response::MODEL_TOKEN);
    });

 App::put('/v1/account/verification')
@ -2276,8 +2280,9 @@ App::post('/v1/account/verification/phone')
        // Hide secret for clients
        $verification->setAttribute('secret', ($isPrivilegedUser || $isAppUser) ? $verificationSecret : '');

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($verification, Response::MODEL_TOKEN);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($verification, Response::MODEL_TOKEN);
    });

 App::put('/v1/account/verification/phone')
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@ -217,8 +217,9 @@ App::post('/v1/databases')

        $events->setParam('databaseId', $database->getId());

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($database, Response::MODEL_DATABASE);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($database, Response::MODEL_DATABASE);
    });

 App::get('/v1/databases')
@ -529,8 +530,9 @@ App::post('/v1/databases/:databaseId/collections')
            ->setParam('databaseId', $databaseId)
            ->setParam('collectionId', $collection->getId());

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($collection, Response::MODEL_COLLECTION);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($collection, Response::MODEL_COLLECTION);
    });

 App::get('/v1/databases/:databaseId/collections')
@ -887,8 +889,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/string
            'array' => $array,
        ]), $response, $dbForProject, $database, $events);

-        $response->setStatusCode(Response::STATUS_CODE_ACCEPTED);
-        $response->dynamic($attribute, Response::MODEL_ATTRIBUTE_STRING);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
+            ->dynamic($attribute, Response::MODEL_ATTRIBUTE_STRING);
    });

 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/email')
@ -929,8 +932,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/email'
            'format' => APP_DATABASE_ATTRIBUTE_EMAIL,
        ]), $response, $dbForProject, $database, $events);

-        $response->setStatusCode(Response::STATUS_CODE_ACCEPTED);
-        $response->dynamic($attribute, Response::MODEL_ATTRIBUTE_EMAIL);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
+            ->dynamic($attribute, Response::MODEL_ATTRIBUTE_EMAIL);
    });

 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/enum')
@ -987,8 +991,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/enum')
            'formatOptions' => ['elements' => $elements],
        ]), $response, $dbForProject, $database, $events);

-        $response->setStatusCode(Response::STATUS_CODE_ACCEPTED);
-        $response->dynamic($attribute, Response::MODEL_ATTRIBUTE_ENUM);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
+            ->dynamic($attribute, Response::MODEL_ATTRIBUTE_ENUM);
    });

 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/ip')
@ -1029,8 +1034,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/ip')
            'format' => APP_DATABASE_ATTRIBUTE_IP,
        ]), $response, $dbForProject, $database, $events);

-        $response->setStatusCode(Response::STATUS_CODE_ACCEPTED);
-        $response->dynamic($attribute, Response::MODEL_ATTRIBUTE_IP);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
+            ->dynamic($attribute, Response::MODEL_ATTRIBUTE_IP);
    });

 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/url')
@ -1071,8 +1077,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/url')
            'format' => APP_DATABASE_ATTRIBUTE_URL,
        ]), $response, $dbForProject, $database, $events);

-        $response->setStatusCode(Response::STATUS_CODE_ACCEPTED);
-        $response->dynamic($attribute, Response::MODEL_ATTRIBUTE_URL);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
+            ->dynamic($attribute, Response::MODEL_ATTRIBUTE_URL);
    });

 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/integer')
@ -1142,8 +1149,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/intege
            $attribute->setAttribute('max', \intval($formatOptions['max']));
        }

-        $response->setStatusCode(Response::STATUS_CODE_ACCEPTED);
-        $response->dynamic($attribute, Response::MODEL_ATTRIBUTE_INTEGER);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
+            ->dynamic($attribute, Response::MODEL_ATTRIBUTE_INTEGER);
    });

 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/float')
@ -1216,8 +1224,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/float'
            $attribute->setAttribute('max', \floatval($formatOptions['max']));
        }

-        $response->setStatusCode(Response::STATUS_CODE_ACCEPTED);
-        $response->dynamic($attribute, Response::MODEL_ATTRIBUTE_FLOAT);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
+            ->dynamic($attribute, Response::MODEL_ATTRIBUTE_FLOAT);
    });

 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/boolean')
@ -1257,8 +1266,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/boolea
            'array' => $array,
        ]), $response, $dbForProject, $database, $events);

-        $response->setStatusCode(Response::STATUS_CODE_ACCEPTED);
-        $response->dynamic($attribute, Response::MODEL_ATTRIBUTE_BOOLEAN);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
+            ->dynamic($attribute, Response::MODEL_ATTRIBUTE_BOOLEAN);
    });


@ -1300,8 +1310,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/dateti
            'filters' => ['datetime']
        ]), $response, $dbForProject, $database, $events);

-        $response->setStatusCode(Response::STATUS_CODE_ACCEPTED);
-        $response->dynamic($attribute, Response::MODEL_ATTRIBUTE_DATETIME);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
+            ->dynamic($attribute, Response::MODEL_ATTRIBUTE_DATETIME);
    });


@ -1642,12 +1653,13 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/indexes')
            ->setParam('databaseId', $databaseId)
            ->setParam('collectionId', $collection->getId())
            ->setParam('indexId', $index->getId())
-           ->setContext('collection', $collection)
-        ->setContext('database', $db)
+            ->setContext('collection', $collection)
+            ->setContext('database', $db)
        ;

-        $response->setStatusCode(Response::STATUS_CODE_ACCEPTED);
-        $response->dynamic($index, Response::MODEL_INDEX);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
+            ->dynamic($index, Response::MODEL_INDEX);
    });

 App::get('/v1/databases/:databaseId/collections/:collectionId/indexes')
@ -1925,8 +1937,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/documents')
            ->setContext('database', $database)
        ;

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($document, Response::MODEL_DOCUMENT);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($document, Response::MODEL_DOCUMENT);
    });

 App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@ -90,8 +90,9 @@ App::post('/v1/functions')

        $eventsInstance->setParam('functionId', $function->getId());

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($function, Response::MODEL_FUNCTION);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($function, Response::MODEL_FUNCTION);
    });

 App::get('/v1/functions')
@ -754,8 +755,9 @@ App::post('/v1/functions/:functionId/deployments')
            ->setParam('functionId', $function->getId())
            ->setParam('deploymentId', $deployment->getId());

-        $response->setStatusCode(Response::STATUS_CODE_ACCEPTED);
-        $response->dynamic($deployment, Response::MODEL_DEPLOYMENT);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
+            ->dynamic($deployment, Response::MODEL_DEPLOYMENT);
    });

 App::get('/v1/functions/:functionId/deployments')
@ -936,7 +938,7 @@ App::post('/v1/functions/:functionId/executions')
    ->label('abuse-time', APP_LIMIT_WRITE_RATE_PERIOD_DEFAULT)
    ->param('functionId', '', new UID(), 'Function ID.')
    ->param('data', '', new Text(8192), 'String of custom data to send to function.', true)
-    ->param('async', true, new Boolean(), 'Execute code asynchronously. Default value is true.', true)
+    ->param('async', false, new Boolean(), 'Execute code in the background. Default value is false.', true)
    ->inject('response')
    ->inject('project')
    ->inject('dbForProject')
@ -1041,9 +1043,9 @@ App::post('/v1/functions/:functionId/executions')

            $event->trigger();

-            $response->setStatusCode(Response::STATUS_CODE_ACCEPTED);
-
-            return $response->dynamic($execution, Response::MODEL_EXECUTION);
+            return $response
+                ->setStatusCode(Response::STATUS_CODE_ACCEPTED)
+                ->dynamic($execution, Response::MODEL_EXECUTION);
        }

        $vars = array_reduce($function['vars'] ?? [], function (array $carry, Document $var) {
@ -1340,8 +1342,9 @@ App::post('/v1/functions/:functionId/variables')

        $dbForProject->deleteCachedDocument('functions', $function->getId());

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($variable, Response::MODEL_VARIABLE);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($variable, Response::MODEL_VARIABLE);
    });

 App::get('/v1/functions/:functionId/variables')
--- a/app/controllers/api/projects.php
+++ b/app/controllers/api/projects.php
@ -167,8 +167,9 @@ App::post('/v1/projects')
            $dbForProject->createCollection($key, $attributes, $indexes);
        }

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($project, Response::MODEL_PROJECT);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($project, Response::MODEL_PROJECT);
    });

 App::get('/v1/projects')
@ -624,8 +625,9 @@ App::post('/v1/projects/:projectId/webhooks')

        $dbForConsole->deleteCachedDocument('projects', $project->getId());

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($webhook, Response::MODEL_WEBHOOK);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($webhook, Response::MODEL_WEBHOOK);
    });

 App::get('/v1/projects/:projectId/webhooks')
@ -871,8 +873,9 @@ App::post('/v1/projects/:projectId/keys')

        $dbForConsole->deleteCachedDocument('projects', $project->getId());

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($key, Response::MODEL_KEY);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($key, Response::MODEL_KEY);
    });

 App::get('/v1/projects/:projectId/keys')
@ -1072,8 +1075,9 @@ App::post('/v1/projects/:projectId/platforms')

        $dbForConsole->deleteCachedDocument('projects', $project->getId());

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($platform, Response::MODEL_PLATFORM);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($platform, Response::MODEL_PLATFORM);
    });

 App::get('/v1/projects/:projectId/platforms')
@ -1289,8 +1293,9 @@ App::post('/v1/projects/:projectId/domains')

        $dbForConsole->deleteCachedDocument('projects', $project->getId());

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($domain, Response::MODEL_DOMAIN);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($domain, Response::MODEL_DOMAIN);
    });

 App::get('/v1/projects/:projectId/domains')
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@ -136,8 +136,9 @@ App::post('/v1/storage/buckets')
            ->setParam('bucketId', $bucket->getId())
        ;

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($bucket, Response::MODEL_BUCKET);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($bucket, Response::MODEL_BUCKET);
    });

 App::get('/v1/storage/buckets')
@ -643,8 +644,9 @@ App::post('/v1/storage/buckets/:bucketId/files')

        $metadata = null; // was causing leaks as it was passed by reference

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($file, Response::MODEL_FILE);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($file, Response::MODEL_FILE);
    });

 App::get('/v1/storage/buckets/:bucketId/files')
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@ -116,8 +116,9 @@ App::post('/v1/teams')
            $events->setParam('userId', $user->getId());
        }

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($team, Response::MODEL_TEAM);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($team, Response::MODEL_TEAM);
    });

 App::get('/v1/teams')
@ -446,14 +447,15 @@ App::post('/v1/teams/:teamId/memberships')
            ->setParam('membershipId', $membership->getId())
        ;

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic(
-            $membership
-            ->setAttribute('teamName', $team->getAttribute('name'))
-            ->setAttribute('userName', $invitee->getAttribute('name'))
-            ->setAttribute('userEmail', $invitee->getAttribute('email')),
-            Response::MODEL_MEMBERSHIP
-        );
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic(
+                $membership
+                    ->setAttribute('teamName', $team->getAttribute('name'))
+                    ->setAttribute('userName', $invitee->getAttribute('name'))
+                    ->setAttribute('userEmail', $invitee->getAttribute('email')),
+                Response::MODEL_MEMBERSHIP
+            );
    });

 App::get('/v1/teams/:teamId/memberships')
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@ -108,8 +108,9 @@ App::post('/v1/users')
    ->action(function (string $userId, ?string $email, ?string $phone, ?string $password, string $name, Response $response, Database $dbForProject, Event $events) {
        $user = createUser('plaintext', '{}', $userId, $email, $password, $phone, $name, $dbForProject, $events);

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($user, Response::MODEL_USER);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($user, Response::MODEL_USER);
    });

 App::post('/v1/users/bcrypt')
@ -136,8 +137,9 @@ App::post('/v1/users/bcrypt')
    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Database $dbForProject, Event $events) {
        $user = createUser('bcrypt', '{}', $userId, $email, $password, null, $name, $dbForProject, $events);

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($user, Response::MODEL_USER);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($user, Response::MODEL_USER);
    });

 App::post('/v1/users/md5')
@ -164,8 +166,9 @@ App::post('/v1/users/md5')
    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Database $dbForProject, Event $events) {
        $user = createUser('md5', '{}', $userId, $email, $password, null, $name, $dbForProject, $events);

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($user, Response::MODEL_USER);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($user, Response::MODEL_USER);
    });

 App::post('/v1/users/argon2')
@ -192,8 +195,9 @@ App::post('/v1/users/argon2')
    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Database $dbForProject, Event $events) {
        $user = createUser('argon2', '{}', $userId, $email, $password, null, $name, $dbForProject, $events);

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($user, Response::MODEL_USER);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($user, Response::MODEL_USER);
    });

 App::post('/v1/users/sha')
@ -227,8 +231,9 @@ App::post('/v1/users/sha')

        $user = createUser('sha', $options, $userId, $email, $password, null, $name, $dbForProject, $events);

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($user, Response::MODEL_USER);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($user, Response::MODEL_USER);
    });

 App::post('/v1/users/phpass')
@ -255,8 +260,9 @@ App::post('/v1/users/phpass')
    ->action(function (string $userId, string $email, string $password, string $name, Response $response, Database $dbForProject, Event $events) {
        $user = createUser('phpass', '{}', $userId, $email, $password, null, $name, $dbForProject, $events);

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($user, Response::MODEL_USER);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($user, Response::MODEL_USER);
    });

 App::post('/v1/users/scrypt')
@ -296,8 +302,9 @@ App::post('/v1/users/scrypt')

        $user = createUser('scrypt', \json_encode($options), $userId, $email, $password, null, $name, $dbForProject, $events);

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($user, Response::MODEL_USER);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($user, Response::MODEL_USER);
    });

 App::post('/v1/users/scrypt-modified')
@ -327,8 +334,9 @@ App::post('/v1/users/scrypt-modified')
    ->action(function (string $userId, string $email, string $password, string $passwordSalt, string $passwordSaltSeparator, string $passwordSignerKey, string $name, Response $response, Database $dbForProject, Event $events) {
        $user = createUser('scryptMod', '{"signerKey":"' . $passwordSignerKey . '","saltSeparator":"' . $passwordSaltSeparator . '","salt":"' . $passwordSalt . '"}', $userId, $email, $password, null, $name, $dbForProject, $events);

-        $response->setStatusCode(Response::STATUS_CODE_CREATED);
-        $response->dynamic($user, Response::MODEL_USER);
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($user, Response::MODEL_USER);
    });

 App::get('/v1/users')
--- a/composer.lock
+++ b/composer.lock
@ -1741,23 +1741,23 @@
        },
        {
            "name": "utopia-php/abuse",
-            "version": "0.13.0",
+            "version": "0.13.1",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/abuse.git",
-                "reference": "3157bee5eee631b549fa4e9cca0aaf982649f931"
+                "reference": "4c1b8fe742f17158c59550cdfd9074a94bf474ac"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/abuse/zipball/3157bee5eee631b549fa4e9cca0aaf982649f931",
-                "reference": "3157bee5eee631b549fa4e9cca0aaf982649f931",
+                "url": "https://api.github.com/repos/utopia-php/abuse/zipball/4c1b8fe742f17158c59550cdfd9074a94bf474ac",
+                "reference": "4c1b8fe742f17158c59550cdfd9074a94bf474ac",
                "shasum": ""
            },
            "require": {
                "ext-curl": "*",
                "ext-pdo": "*",
                "php": ">=8.0",
-                "utopia-php/database": "0.25.0"
+                "utopia-php/database": "0.25.*"
            },
            "require-dev": {
                "phpunit/phpunit": "^9.4",
@ -1789,9 +1789,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/abuse/issues",
-                "source": "https://github.com/utopia-php/abuse/tree/0.13.0"
+                "source": "https://github.com/utopia-php/abuse/tree/0.13.1"
            },
-            "time": "2022-09-06T08:33:02+00:00"
+            "time": "2022-09-07T16:02:58+00:00"
        },
        {
            "name": "utopia-php/analytics",
@ -1850,22 +1850,22 @@
        },
        {
            "name": "utopia-php/audit",
-            "version": "0.14.0",
+            "version": "0.14.1",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/audit.git",
-                "reference": "fe5d59076512dd63db92d38035d3039170730e5e"
+                "reference": "b011224ed9bfef7e5c849938e65619af28f7cf41"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/audit/zipball/fe5d59076512dd63db92d38035d3039170730e5e",
-                "reference": "fe5d59076512dd63db92d38035d3039170730e5e",
+                "url": "https://api.github.com/repos/utopia-php/audit/zipball/b011224ed9bfef7e5c849938e65619af28f7cf41",
+                "reference": "b011224ed9bfef7e5c849938e65619af28f7cf41",
                "shasum": ""
            },
            "require": {
                "ext-pdo": "*",
                "php": ">=8.0",
-                "utopia-php/database": "0.25.0"
+                "utopia-php/database": "0.25.*"
            },
            "require-dev": {
                "phpunit/phpunit": "^9.3",
@ -1897,9 +1897,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/audit/issues",
-                "source": "https://github.com/utopia-php/audit/tree/0.14.0"
+                "source": "https://github.com/utopia-php/audit/tree/0.14.1"
            },
-            "time": "2022-09-06T08:38:04+00:00"
+            "time": "2022-09-07T16:03:16+00:00"
        },
        {
            "name": "utopia-php/cache",
@ -2060,16 +2060,16 @@
        },
        {
            "name": "utopia-php/database",
-            "version": "0.25.0",
+            "version": "0.25.1",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/database.git",
-                "reference": "167fb53a6c199d4b9ce5fc513c78774ee92199e7"
+                "reference": "9d013ce3c111d1477d7986483f1003dcab2b9d14"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/database/zipball/167fb53a6c199d4b9ce5fc513c78774ee92199e7",
-                "reference": "167fb53a6c199d4b9ce5fc513c78774ee92199e7",
+                "url": "https://api.github.com/repos/utopia-php/database/zipball/9d013ce3c111d1477d7986483f1003dcab2b9d14",
+                "reference": "9d013ce3c111d1477d7986483f1003dcab2b9d14",
                "shasum": ""
            },
            "require": {
@ -2118,9 +2118,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/database/issues",
-                "source": "https://github.com/utopia-php/database/tree/0.25.0"
+                "source": "https://github.com/utopia-php/database/tree/0.25.1"
            },
-            "time": "2022-09-06T07:53:26+00:00"
+            "time": "2022-09-07T14:47:52+00:00"
        },
        {
            "name": "utopia-php/domains",
@ -2178,16 +2178,16 @@
        },
        {
            "name": "utopia-php/framework",
-            "version": "0.21.0",
+            "version": "0.21.1",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/framework.git",
-                "reference": "5aa5431788460a782065e42b0e8a35e7f139af2f"
+                "reference": "c81789b87a917da2daf336738170ebe01f50ea18"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/framework/zipball/5aa5431788460a782065e42b0e8a35e7f139af2f",
-                "reference": "5aa5431788460a782065e42b0e8a35e7f139af2f",
+                "url": "https://api.github.com/repos/utopia-php/framework/zipball/c81789b87a917da2daf336738170ebe01f50ea18",
+                "reference": "c81789b87a917da2daf336738170ebe01f50ea18",
                "shasum": ""
            },
            "require": {
@ -2221,9 +2221,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/framework/issues",
-                "source": "https://github.com/utopia-php/framework/tree/0.21.0"
+                "source": "https://github.com/utopia-php/framework/tree/0.21.1"
            },
-            "time": "2022-08-12T11:37:21+00:00"
+            "time": "2022-09-07T09:56:28+00:00"
        },
        {
            "name": "utopia-php/image",
@ -5384,5 +5384,5 @@
    "platform-overrides": {
        "php": "8.0"
    },
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }
--- a/public/dist/styles/default-ltr.css
+++ b/public/dist/styles/default-ltr.css
--- a/public/dist/styles/default-rtl.css
+++ b/public/dist/styles/default-rtl.css
--- a/public/styles/forms.less
+++ b/public/styles/forms.less
@ -424,7 +424,7 @@ fieldset {
  width: ~"calc(100% - 2px)";
  max-height: 180px;
  visibility: visible !important;
-  object-fit: contain;
+  object-fit: cover;
 }

 .video-preview {
--- a/src/Appwrite/Utopia/Response/Model/Bucket.php
+++ b/src/Appwrite/Utopia/Response/Model/Bucket.php
@ -36,9 +36,9 @@ class Bucket extends Model
                'array' => true,
            ])
            ->addRule('fileSecurity', [
-                'type' => self::TYPE_STRING,
+                'type' => self::TYPE_BOOLEAN,
                'description' => 'Whether file-level security is enabled. [Learn more about permissions](/docs/permissions).',
-                'default' => '',
+                'default' => false,
                'example' => true,
            ])
            ->addRule('name', [
--- a/tests/e2e/Services/Functions/FunctionsCustomClientTest.php
+++ b/tests/e2e/Services/Functions/FunctionsCustomClientTest.php
@ -245,6 +245,7 @@ class FunctionsCustomClientTest extends Scope
            'x-appwrite-project' => $projectId,
        ], $this->getHeaders()), [
            'data' => 'foobar',
+            'async' => true
        ]);

        $this->assertEquals(202, $execution['headers']['status-code']);
@ -343,6 +344,7 @@ class FunctionsCustomClientTest extends Scope
            'x-appwrite-project' => $projectId,
        ], [
            'data' => 'foobar',
+            'async' => true,
        ]);

        $this->assertEquals(202, $execution['headers']['status-code']);
@ -388,6 +390,7 @@ class FunctionsCustomClientTest extends Scope
            'x-appwrite-project' => $projectId,
        ], $this->getHeaders()), [
            'data' => 'foobar',
+            'async' => true
        ]);

        $this->assertEquals(202, $execution['headers']['status-code']);
@ -568,7 +571,7 @@ class FunctionsCustomClientTest extends Scope
            'x-appwrite-project' => $projectId,
        ], $this->getHeaders()), [
            'data' => 'foobar',
-            'async' => false
+            // Testing default value, should be 'async' => false
        ]);

        $output = json_decode($execution['body']['response'], true);
--- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
+++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
@ -738,7 +738,7 @@ class FunctionsCustomServerTest extends Scope
            'content-type' => 'application/json',
            'x-appwrite-project' => $this->getProject()['$id'],
        ], $this->getHeaders()), [
-            'async' => false,
+            // Testing default value, should be 'async' => false
        ]);

        $this->assertEquals(201, $execution['headers']['status-code']);
@ -979,6 +979,7 @@ class FunctionsCustomServerTest extends Scope
            'x-appwrite-project' => $this->getProject()['$id'],
        ], $this->getHeaders()), [
            'data' => 'foobar',
+            'async' => true
        ]);

        $executionId = $execution['body']['$id'] ?? '';
@ -1093,6 +1094,7 @@ class FunctionsCustomServerTest extends Scope
            'x-appwrite-project' => $this->getProject()['$id'],
        ], $this->getHeaders()), [
            'data' => 'foobar',
+            'async' => true
        ]);

        $executionId = $execution['body']['$id'] ?? '';
@ -1205,6 +1207,7 @@ class FunctionsCustomServerTest extends Scope
            'x-appwrite-project' => $this->getProject()['$id'],
        ], $this->getHeaders()), [
            'data' => 'foobar',
+            'async' => true
        ]);

        $executionId = $execution['body']['$id'] ?? '';
@ -1318,6 +1321,7 @@ class FunctionsCustomServerTest extends Scope
            'x-appwrite-project' => $this->getProject()['$id'],
        ], $this->getHeaders()), [
            'data' => 'foobar',
+            'async' => true
        ]);

        $executionId = $execution['body']['$id'] ?? '';
@ -1431,6 +1435,7 @@ class FunctionsCustomServerTest extends Scope
            'x-appwrite-project' => $this->getProject()['$id'],
        ], $this->getHeaders()), [
            'data' => 'foobar',
+            'async' => true
        ]);

        $executionId = $execution['body']['$id'] ?? '';
--- a/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php
+++ b/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php
@ -1262,7 +1262,9 @@ class RealtimeCustomClientTest extends Scope
        $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
            'content-type' => 'application/json',
            'x-appwrite-project' => $this->getProject()['$id']
-        ], $this->getHeaders()), []);
+        ], $this->getHeaders()), [
+            'async' => true
+        ]);

        $this->assertEquals($execution['headers']['status-code'], 202);
        $this->assertNotEmpty($execution['body']['$id']);
--- a/tests/e2e/Services/Webhooks/WebhooksCustomServerTest.php
+++ b/tests/e2e/Services/Webhooks/WebhooksCustomServerTest.php
@ -605,7 +605,9 @@ class WebhooksCustomServerTest extends Scope
        $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $id . '/executions', array_merge([
            'content-type' => 'application/json',
            'x-appwrite-project' => $this->getProject()['$id'],
-        ], $this->getHeaders()), []);
+        ], $this->getHeaders()), [
+            'async' => true
+        ]);

        $executionId = $execution['body']['$id'] ?? '';