diff --git a/.env b/.env
index f6a6a7f642..2470c786b1 100644
--- a/.env
+++ b/.env
@@ -2,6 +2,7 @@ _APP_ENV=development
_APP_EDITION=self-hosted
_APP_LOCALE=en
_APP_WORKER_PER_CORE=6
+_APP_COMPRESSION_MIN_SIZE_BYTES=1024
_APP_CONSOLE_WHITELIST_ROOT=disabled
_APP_CONSOLE_WHITELIST_EMAILS=
_APP_CONSOLE_SESSION_ALERTS=enabled
@@ -22,6 +23,7 @@ _APP_OPENSSL_KEY_V1=your-secret-key
_APP_DOMAIN=traefik
_APP_DOMAIN_FUNCTIONS=functions.localhost
_APP_DOMAIN_TARGET=localhost
+_APP_RULES_FORMAT=md5
_APP_REDIS_HOST=redis
_APP_REDIS_PORT=6379
_APP_REDIS_PASS=
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 633bd46ea4..3ab240c1b9 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -16,15 +16,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
submodules: recursive
- name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v2
+ uses: docker/setup-buildx-action@v3
- name: Build Appwrite
- uses: docker/build-push-action@v3
+ uses: docker/build-push-action@v6
with:
context: .
push: false
@@ -39,7 +39,7 @@ jobs:
VERSION=dev
- name: Cache Docker Image
- uses: actions/cache@v3
+ uses: actions/cache@v4
with:
key: ${{ env.CACHE_KEY }}
path: /tmp/${{ env.IMAGE }}.tar
@@ -51,10 +51,10 @@ jobs:
steps:
- name: checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
- name: Load Cache
- uses: actions/cache@v3
+ uses: actions/cache@v4
with:
key: ${{ env.CACHE_KEY }}
path: /tmp/${{ env.IMAGE }}.tar
@@ -81,10 +81,10 @@ jobs:
needs: setup
steps:
- name: checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Load Cache
- uses: actions/cache@v3
+ uses: actions/cache@v4
with:
key: ${{ env.CACHE_KEY }}
path: /tmp/${{ env.IMAGE }}.tar
@@ -113,6 +113,7 @@ jobs:
Console,
Databases,
Functions,
+ FunctionsSchedule,
GraphQL,
Health,
Locale,
@@ -124,14 +125,20 @@ jobs:
Webhooks,
VCS,
Messaging,
+ Migrations
]
+ tables-mode: [
+ 'Project',
+ 'Shared V1',
+ 'Shared V2',
+ ]
steps:
- name: checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Load Cache
- uses: actions/cache@v3
+ uses: actions/cache@v4
with:
key: ${{ env.CACHE_KEY }}
path: /tmp/${{ env.IMAGE }}.tar
@@ -141,23 +148,38 @@ jobs:
run: |
docker load --input /tmp/${{ env.IMAGE }}.tar
docker compose up -d
- sleep 25
+ sleep 30
- - name: Run ${{matrix.service}} Tests
- run: docker compose exec -T appwrite test /usr/src/code/tests/e2e/Services/${{matrix.service}} --debug
+ - name: Run ${{ matrix.service }} tests with ${{ matrix.tables-mode }} table mode
+ run: |
+ if [ "${{ matrix.tables-mode }}" == "Shared V1" ]; then
+ echo "Using shared tables V1"
+ export _APP_DATABASE_SHARED_TABLES=database_db_main
+ export _APP_DATABASE_SHARED_TABLES_V1=database_db_main
+ elif [ "${{ matrix.tables-mode }}" == "Shared V2" ]; then
+ echo "Using shared tables V2"
+ export _APP_DATABASE_SHARED_TABLES=database_db_main
+ export _APP_DATABASE_SHARED_TABLES_V1=
+ else
+ echo "Using project tables"
+ export _APP_DATABASE_SHARED_TABLES=
+ export _APP_DATABASE_SHARED_TABLES_V1=
+ fi
+
+ docker compose exec -T \
+ -e _APP_DATABASE_SHARED_TABLES \
+ -e _APP_DATABASE_SHARED_TABLES_V1 \
+ appwrite test /usr/src/code/tests/e2e/Services/${{ matrix.service }} --debug
- - name: Run ${{matrix.service}} Shared Tables Tests
- run: _APP_DATABASE_SHARED_TABLES=database_db_main docker compose exec -T appwrite test /usr/src/code/tests/e2e/Services/${{matrix.service}} --debug
-
- benchamrking:
+ benchmarking:
name: Benchmark
runs-on: ubuntu-latest
needs: setup
steps:
- name: Checkout repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
- name: Load Cache
- uses: actions/cache@v3
+ uses: actions/cache@v4
with:
key: ${{ env.CACHE_KEY }}
path: /tmp/${{ env.IMAGE }}.tar
diff --git a/.gitignore b/.gitignore
index 0c19fd215e..a68af84071 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,4 @@ dev/yasd_init.php
.phpunit.result.cache
Makefile
appwrite.json
-/.zed/
\ No newline at end of file
+/.zed/
diff --git a/CHANGES.md b/CHANGES.md
index 9b6172eeab..62db3d525e 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,3 +1,117 @@
+# Version 1.6.1
+
+## What's Changed
+
+### Notable changes
+
+* Remove JPEG fallback for webp by @lohanidamodar in https://github.com/appwrite/appwrite/pull/8746
+* Add heic and avif support by @lohanidamodar in https://github.com/appwrite/appwrite/pull/7718
+* Add new runtimes by @Meldiron in https://github.com/appwrite/appwrite/pull/8771
+* Remove audits deletion by @shimonewman in https://github.com/appwrite/appwrite/pull/8766
+* Bump assistant by @loks0n in https://github.com/appwrite/appwrite/pull/8801
+* Change max queries values to 500 by @fogelito in https://github.com/appwrite/appwrite/pull/8802
+* Allow '.wav' as 'audio/x-wav' as well by @basert in https://github.com/appwrite/appwrite/pull/8846
+* Use 1 instead of 0.5 cpu for default function specification by @loks0n in https://github.com/appwrite/appwrite/pull/8848
+* Update function runtimes by @christyjacob4 in https://github.com/appwrite/appwrite/pull/8781
+* Add a realtime heartbeat by @TorstenDittmann in https://github.com/appwrite/appwrite/pull/8943
+
+### Fixes
+
+* Trigger functions event only if event is not paused by @lohanidamodar in https://github.com/appwrite/appwrite/pull/8526
+* Update docker-compose to restart usage-dump by @feschaffa in https://github.com/appwrite/appwrite/pull/8642
+* Fix typo in scheduler base by @fogelito in https://github.com/appwrite/appwrite/pull/8691
+* Add domain and force HTTPS env vars to mail worker by @stnguyen90 in https://github.com/appwrite/appwrite/pull/8722
+* Fix webp by @lohanidamodar in https://github.com/appwrite/appwrite/pull/8732
+* Ignore junction tables by @fogelito in https://github.com/appwrite/appwrite/pull/8728
+* Fix logger throwing fatal error by @lohanidamodar in https://github.com/appwrite/appwrite/pull/8724
+* Fix missing protocol for testing SMTP by @byawitz in https://github.com/appwrite/appwrite/pull/8749
+* Make create execution async loose by @loks0n in https://github.com/appwrite/appwrite/pull/8707
+* Fix invalid cursor value by @fogelito in https://github.com/appwrite/appwrite/pull/8109
+* Fix target deletes by @abnegate in https://github.com/appwrite/appwrite/pull/8833
+* Fix translation commas by @loks0n in https://github.com/appwrite/appwrite/pull/8892
+* Fix Migrations having source creds being overwritten and add Migration tests by @PineappleIOnic in https://github.com/appwrite/appwrite/pull/8897
+* Fix validator usage for updating string size by @abnegate in https://github.com/appwrite/appwrite/pull/8890
+* Fix create user event not triggering by @loks0n in https://github.com/appwrite/appwrite/pull/8718
+* Improve error handling and logging in the database worker by @fogelito in https://github.com/appwrite/appwrite/pull/8944
+* Remove inaccurate info about leaving the URL parameter empty by @ebenezerdon in https://github.com/appwrite/appwrite/pull/8963
+* Ensure indexes are updated when updating an attribute key by @fogelito in https://github.com/appwrite/appwrite/pull/8971
+* Remove duplicate dart-2.16 runtime template by @stnguyen90 in https://github.com/appwrite/appwrite/pull/8972
+* Fix team invites with existing session by @TorstenDittmann in https://github.com/appwrite/appwrite/pull/9006
+* Improve handling of HTTP requests by dispatching to safe workers by @Meldiron in https://github.com/appwrite/appwrite/pull/9016
+* Fix users create session secret by @stnguyen90 in https://github.com/appwrite/appwrite/pull/9019
+* Fix swoole task warning by @Meldiron in https://github.com/appwrite/appwrite/pull/9025
+
+### Miscellaneous
+
+* Update Init copy by @adityaoberai in https://github.com/appwrite/appwrite/pull/8557
+* Fix security scan permissions and comment by @EVDOG4LIFE in https://github.com/appwrite/appwrite/pull/8525
+* Add Trivy security scans by @btme0011 in https://github.com/appwrite/appwrite/pull/6876
+* Update database stack by @abnegate in https://github.com/appwrite/appwrite/pull/8564
+* Bump database by @abnegate in https://github.com/appwrite/appwrite/pull/8573
+* Sync main with 1.5.x by @PineappleIOnic in https://github.com/appwrite/appwrite/pull/8589
+* Add AWS to one-click installs by @byawitz in https://github.com/appwrite/appwrite/pull/8593
+* Update Init copy in readme by @adityaoberai in https://github.com/appwrite/appwrite/pull/8618
+* Sync main into 1.6.x by @stnguyen90 in https://github.com/appwrite/appwrite/pull/8685
+* Sync 1.6.x into main by @stnguyen90 in https://github.com/appwrite/appwrite/pull/8686
+* Feat coroutines by @Meldiron in https://github.com/appwrite/appwrite/pull/7826
+* Sync main into 1.6.x by @Meldiron in https://github.com/appwrite/appwrite/pull/8719
+* Sentence casing endpoint API reference by @choir241 in https://github.com/appwrite/appwrite/pull/8617
+* DB storage metrics by @PineappleIOnic in https://github.com/appwrite/appwrite/pull/8404
+* Fix exception thrown when optional array attribute does not exist by @lohanidamodar in https://github.com/appwrite/appwrite/pull/8391
+* Add projects channels to realtime by @TorstenDittmann in https://github.com/appwrite/appwrite/pull/8735
+* Base for console roles support by @lohanidamodar in https://github.com/appwrite/appwrite/pull/8565
+* Remove DB disk storage calculation by @christyjacob4 in https://github.com/appwrite/appwrite/pull/8745
+* Messaging adapter default values by @shimonewman in https://github.com/appwrite/appwrite/pull/8742
+* Add payload response type by @loks0n in https://github.com/appwrite/appwrite/pull/8720
+* Fix flaky functions tests by @loks0n in https://github.com/appwrite/appwrite/pull/8682
+* Migrations Backups by @fogelito in https://github.com/appwrite/appwrite/pull/8186
+* Add test for response and request filters by @vermakhushboo in https://github.com/appwrite/appwrite/pull/8697
+* Bump version in SECURITY.md by @EVDOG4LIFE in https://github.com/appwrite/appwrite/pull/8755
+* Add originalId attribute to databases collection by @fogelito in https://github.com/appwrite/appwrite/pull/8764
+* Fix Walter References by @ItzNotABug in https://github.com/appwrite/appwrite/pull/8757
+* Update database by @abnegate in https://github.com/appwrite/appwrite/pull/8769
+* Move new attributes by @abnegate in https://github.com/appwrite/appwrite/pull/8777
+* Add ping endpoint by @loks0n in https://github.com/appwrite/appwrite/pull/8761
+* Fix GitHub action caching by @loks0n in https://github.com/appwrite/appwrite/pull/8772
+* Chore release ruby SDK by @abnegate in https://github.com/appwrite/appwrite/pull/8767
+* Call migration success on success by @abnegate in https://github.com/appwrite/appwrite/pull/8782
+* Update utopia-php/system to 0.9.0 by @basert in https://github.com/appwrite/appwrite/pull/8780
+* Move createDocument from api to worker by @vermakhushboo in https://github.com/appwrite/appwrite/pull/8776
+* Add missing indexes by @christyjacob4 in https://github.com/appwrite/appwrite/pull/8803
+* Update database by @abnegate in https://github.com/appwrite/appwrite/pull/8809
+* Fix typo in BLR region by @stnguyen90 in https://github.com/appwrite/appwrite/pull/8756
+* Add tests for project variables by @vermakhushboo in https://github.com/appwrite/appwrite/pull/8815
+* Replace 'Expires' with 'Cache-Control: private' header to avoid CDN caching by @basert in https://github.com/appwrite/appwrite/pull/8836
+* Allow blocking based on resource attributes by @basert in https://github.com/appwrite/appwrite/pull/8812
+* Check if resource is blocked inside functions worker by @basert in https://github.com/appwrite/appwrite/pull/8855
+* Fix missing allow attribute by @abnegate in https://github.com/appwrite/appwrite/pull/8889
+* Revert function execution order by @basert in https://github.com/appwrite/appwrite/pull/8857
+* Use resource type constants by @basert in https://github.com/appwrite/appwrite/pull/8895
+* Update Database lib by @PineappleIOnic in https://github.com/appwrite/appwrite/pull/8680
+* Update database by @abnegate in https://github.com/appwrite/appwrite/pull/8917
+* Update database by @abnegate in https://github.com/appwrite/appwrite/pull/8923
+* Update database for transaction counter fixes with retries by @abnegate in https://github.com/appwrite/appwrite/pull/8927
+* Validate string permissions by @fogelito in https://github.com/appwrite/appwrite/pull/8929
+* Add PubSub adapter support by @basert in https://github.com/appwrite/appwrite/pull/8905
+* List memberships as client by @loks0n in https://github.com/appwrite/appwrite/pull/8913
+* Fix XDebug Extension not being removed by @PineappleIOnic in https://github.com/appwrite/appwrite/pull/8891
+* Update database by @abnegate in https://github.com/appwrite/appwrite/pull/8946
+* Use utopia compression by @loks0n in https://github.com/appwrite/appwrite/pull/8938
+* Make compression minimum size configurable by @loks0n in https://github.com/appwrite/appwrite/pull/8947
+* Revert "Update database" by @christyjacob4 in https://github.com/appwrite/appwrite/pull/8949
+* Fix setpaused by @loks0n in https://github.com/appwrite/appwrite/pull/8948
+* Use getDocument instead of find() for rules by @christyjacob4 in https://github.com/appwrite/appwrite/pull/8951
+* Remove double fetch from migrations worker by @PineappleIOnic in https://github.com/appwrite/appwrite/pull/8956
+* Fix memberships privacy MFA by @loks0n in https://github.com/appwrite/appwrite/pull/8969
+* Add telemetry by @basert in https://github.com/appwrite/appwrite/pull/8960
+* Send migration errors individually by @PineappleIOnic in https://github.com/appwrite/appwrite/pull/8959
+* Add console sdk previews by @TorstenDittmann in https://github.com/appwrite/appwrite/pull/8990
+* Unset index length by @fogelito in https://github.com/appwrite/appwrite/pull/8978
+* Update base to 0.9.5 by @basert in https://github.com/appwrite/appwrite/pull/9005
+* Sync main into 1.6.x by @TorstenDittmann in https://github.com/appwrite/appwrite/pull/9011
+* Improved shared tables V2 by @abnegate in https://github.com/appwrite/appwrite/pull/9013
+* Ensure backwards compatibility for 1.6.x by @christyjacob4 in https://github.com/appwrite/appwrite/pull/9018
+
# Version 1.6.0
## What's Changed
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d3a7d060b0..e89aa369cf 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -319,10 +319,13 @@ These are the current metrics we collect usage stats for:
| users | Total number of users per project|
| executions | Total number of executions per project |
| databases | Total number of databases per project |
+| databases.storage | Total amount of storage used by all databases per project (in bytes) |
| collections | Total number of collections per project |
| {databaseInternalId}.collections | Total number of collections per database|
+| {databaseInternalId}.storage | Sum of database storage (in bytes) |
| documents | Total number of documents per project |
| {databaseInternalId}.{collectionInternalId}.documents | Total number of documents per collection |
+| {databaseInternalId}.{collectionInternalId}.storage | Sum of database storage used by the collection (in bytes) |
| buckets | Total number of buckets per project |
| files | Total number of files per project |
| {bucketInternalId}.files.storage | Sum of files.storage per bucket (in bytes) |
@@ -610,6 +613,18 @@ If you need to clear the cache, you can do so by running the following command:
docker compose exec redis redis-cli FLUSHALL
```
+## Using preview domains locally
+
+Appwrite Functions are automatically given a domain you can visit to execute the function. This domain has format `[SOMETHING].functions.localhost` unless you changed `_APP_DOMAIN_FUNCTIONS` environment variable. This default value works great when running Appwrite locally, but it can be impossible to use preview domains with Cloud woekspaces such as Gitpod or GitHub Codespaces.
+
+To use preview domains on Cloud workspaces, you can visit hostname provided by them, and supply function's preview domain as URL parameter:
+
+```
+https://8080-appwrite-appwrite-mjeb3ebilwv.ws-eu116.gitpod.io/ping?preview=672b3c7eab1ac523ccf5.functions.localhost
+```
+
+The path was set to `/ping` intentionally. Visiting `/` for preview domains might trigger Console background worker, and trigger redirect to Console without our preview URL param. Visiting different path ensures this doesnt happen.
+
## Tutorials
From time to time, our team will add tutorials that will help contributors find their way in the Appwrite source code. Below is a list of currently available tutorials:
diff --git a/Dockerfile b/Dockerfile
index 22b37982d0..41810f5dc4 100755
--- a/Dockerfile
+++ b/Dockerfile
@@ -12,7 +12,7 @@ RUN composer install --ignore-platform-reqs --optimize-autoloader \
--no-plugins --no-scripts --prefer-dist \
`if [ "$TESTING" != "true" ]; then echo "--no-dev"; fi`
-FROM appwrite/base:0.9.3 AS final
+FROM appwrite/base:0.9.5 AS final
LABEL maintainer="team@appwrite.io"
@@ -28,6 +28,8 @@ RUN \
apk add boost boost-dev; \
fi
+RUN apk add libwebp
+
WORKDIR /usr/src/code
COPY --from=composer /usr/local/src/vendor /usr/src/code/vendor
@@ -90,10 +92,10 @@ RUN chmod +x /usr/local/bin/doctor && \
RUN mkdir -p /etc/letsencrypt/live/ && chmod -Rf 755 /etc/letsencrypt/live/
# Enable Extensions
-RUN if [ "$DEBUG" == "true" ]; then cp /usr/src/code/dev/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini; fi
-RUN if [ "$DEBUG" == "true" ]; then mkdir -p /tmp/xdebug; fi
+RUN if [ "$DEBUG" = "true" ]; then cp /usr/src/code/dev/xdebug.ini /usr/local/etc/php/conf.d/xdebug.ini; fi
+RUN if [ "$DEBUG" = "true" ]; then mkdir -p /tmp/xdebug; fi
RUN if [ "$DEBUG" = "false" ]; then rm -rf /usr/src/code/dev; fi
-RUN if [ "$DEBUG" = "false" ]; then rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20220829/xdebug.so; fi
+RUN if [ "$DEBUG" = "false" ]; then rm -f /usr/local/lib/php/extensions/no-debug-non-zts-20230831/xdebug.so; fi
EXPOSE 80
diff --git a/README-CN.md b/README-CN.md
index a5eac1be03..92a9bf9806 100644
--- a/README-CN.md
+++ b/README-CN.md
@@ -67,7 +67,7 @@ docker run -it --rm \
--volume /var/run/docker.sock:/var/run/docker.sock \
--volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
--entrypoint="install" \
- appwrite/appwrite:1.6.0
+ appwrite/appwrite:1.6.1
```
### Windows
@@ -79,7 +79,7 @@ docker run -it --rm ^
--volume //var/run/docker.sock:/var/run/docker.sock ^
--volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
--entrypoint="install" ^
- appwrite/appwrite:1.6.0
+ appwrite/appwrite:1.6.1
```
#### PowerShell
@@ -89,7 +89,7 @@ docker run -it --rm `
--volume /var/run/docker.sock:/var/run/docker.sock `
--volume ${pwd}/appwrite:/usr/src/code/appwrite:rw `
--entrypoint="install" `
- appwrite/appwrite:1.6.0
+ appwrite/appwrite:1.6.1
```
运行后，可以在浏览器上访问 http://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后，服务器可能需要几分钟才能启动。
diff --git a/README.md b/README.md
index a9856a7310..ab57e65c4c 100644
--- a/README.md
+++ b/README.md
@@ -75,7 +75,7 @@ docker run -it --rm \
--volume /var/run/docker.sock:/var/run/docker.sock \
--volume "$(pwd)"/appwrite:/usr/src/code/appwrite:rw \
--entrypoint="install" \
- appwrite/appwrite:1.6.0
+ appwrite/appwrite:1.6.1
```
### Windows
@@ -87,7 +87,7 @@ docker run -it --rm ^
--volume //var/run/docker.sock:/var/run/docker.sock ^
--volume "%cd%"/appwrite:/usr/src/code/appwrite:rw ^
--entrypoint="install" ^
- appwrite/appwrite:1.6.0
+ appwrite/appwrite:1.6.1
```
#### PowerShell
@@ -97,7 +97,7 @@ docker run -it --rm `
--volume /var/run/docker.sock:/var/run/docker.sock `
--volume ${pwd}/appwrite:/usr/src/code/appwrite:rw `
--entrypoint="install" `
- appwrite/appwrite:1.6.0
+ appwrite/appwrite:1.6.1
```
Once the Docker installation is complete, go to http://localhost to access the Appwrite console from your browser. Please note that on non-Linux native hosts, the server might take a few minutes to start after completing the installation.
diff --git a/app/assets/security/10k-common-passwords b/app/assets/security/10k-common-passwords
index 6902dfb81a..487a4faf54 100644
--- a/app/assets/security/10k-common-passwords
+++ b/app/assets/security/10k-common-passwords
@@ -412,7 +412,6 @@ august
sammy
cool
brian
-brien
platinum
jake
bronco
@@ -1936,7 +1935,6 @@ panama
lucy
buffy
brianna
-brienna
welcome1
vette
blue22
@@ -3055,7 +3053,6 @@ randall
abstr
napster
brian1
-brien1
bogart
high
hitler
@@ -4126,7 +4123,6 @@ truman
cubbies
nitram
briana
-briena
ebony
kings
warner
diff --git a/app/cli.php b/app/cli.php
index ecff5180a2..fd49d2fed4 100644
--- a/app/cli.php
+++ b/app/cli.php
@@ -114,8 +114,9 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
if (isset($databases[$dsn->getHost()])) {
$database = $databases[$dsn->getHost()];
+ $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
- if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
+ if (\in_array($dsn->getHost(), $sharedTables)) {
$database
->setSharedTables(true)
->setTenant($project->getInternalId())
@@ -136,10 +137,10 @@ CLI::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
->getResource();
$database = new Database($dbAdapter, $cache);
-
$databases[$dsn->getHost()] = $database;
+ $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
- if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
+ if (\in_array($dsn->getHost(), $sharedTables)) {
$database
->setSharedTables(true)
->setTenant($project->getInternalId())
@@ -180,7 +181,7 @@ CLI::setResource('logError', function (Registry $register) {
$log = new Log();
$log->setNamespace($namespace);
- $log->setServer(\gethostname());
+ $log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
$log->setVersion($version);
$log->setType(Log::TYPE_ERROR);
$log->setMessage($error->getMessage());
@@ -197,8 +198,12 @@ CLI::setResource('logError', function (Registry $register) {
$isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
$log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
- $responseCode = $logger->addLog($log);
- Console::info('Usage stats log pushed with status code: ' . $responseCode);
+ try {
+ $responseCode = $logger->addLog($log);
+ Console::info('Error log pushed with status code: ' . $responseCode);
+ } catch (Throwable $th) {
+ Console::error('Error pushing log: ' . $th->getMessage());
+ }
}
Console::warning("Failed: {$error->getMessage()}");
diff --git a/app/config/collections.php b/app/config/collections.php
index 56c1761967..a55ab1abd0 100644
--- a/app/config/collections.php
+++ b/app/config/collections.php
@@ -2406,6 +2406,17 @@ $projectCollections = array_merge([
'array' => false,
'filters' => [],
],
+ [
+ '$id' => ID::custom('originalId'),
+ 'type' => Database::VAR_STRING,
+ 'signed' => true,
+ 'size' => Database::LENGTH_KEY,
+ 'format' => '',
+ 'filters' => [],
+ 'required' => false,
+ 'default' => null,
+ 'array' => false,
+ ],
],
'indexes' => [
[
@@ -4109,13 +4120,24 @@ $projectCollections = array_merge([
'$id' => ID::custom('source'),
'type' => Database::VAR_STRING,
'format' => '',
- 'size' => 8192,
+ 'size' => 8192, // reduce size
'signed' => true,
'required' => true,
'default' => null,
'array' => false,
'filters' => [],
],
+ [
+ '$id' => ID::custom('destination'),
+ 'type' => Database::VAR_STRING,
+ 'format' => '',
+ 'size' => Database::LENGTH_KEY,
+ 'signed' => true,
+ 'required' => false, // make true after patch script
+ 'default' => null,
+ 'array' => false,
+ 'filters' => [],
+ ],
[
'$id' => ID::custom('credentials'),
'type' => Database::VAR_STRING,
@@ -4508,6 +4530,28 @@ $consoleCollections = array_merge([
'array' => false,
'filters' => [],
],
+ [
+ '$id' => ID::custom('pingCount'),
+ 'type' => Database::VAR_INTEGER,
+ 'format' => '',
+ 'size' => 0,
+ 'signed' => false,
+ 'required' => false,
+ 'default' => 0,
+ 'array' => false,
+ 'filters' => [],
+ ],
+ [
+ '$id' => ID::custom('pingedAt'),
+ 'type' => Database::VAR_DATETIME,
+ 'format' => '',
+ 'size' => 0,
+ 'signed' => false,
+ 'required' => false,
+ 'default' => null,
+ 'array' => false,
+ 'filters' => ['datetime'],
+ ]
],
'indexes' => [
[
@@ -4531,6 +4575,20 @@ $consoleCollections = array_merge([
'lengths' => [Database::LENGTH_KEY],
'orders' => [Database::ORDER_ASC],
],
+ [
+ '$id' => ID::custom('_key_pingCount'),
+ 'type' => Database::INDEX_KEY,
+ 'attributes' => ['pingCount'],
+ 'lengths' => [],
+ 'orders' => [],
+ ],
+ [
+ '$id' => ID::custom('_key_pingedAt'),
+ 'type' => Database::INDEX_KEY,
+ 'attributes' => ['pingedAt'],
+ 'lengths' => [],
+ 'orders' => [],
+ ]
],
],
diff --git a/app/config/errors.php b/app/config/errors.php
index fc79599b12..f09d1596eb 100644
--- a/app/config/errors.php
+++ b/app/config/errors.php
@@ -24,6 +24,11 @@ return [
'description' => 'Access to this API is forbidden.',
'code' => 401,
],
+ Exception::GENERAL_RESOURCE_BLOCKED => [
+ 'name' => Exception::GENERAL_RESOURCE_BLOCKED,
+ 'description' => 'Access to this resource is blocked.',
+ 'code' => 401,
+ ],
Exception::GENERAL_UNKNOWN_ORIGIN => [
'name' => Exception::GENERAL_UNKNOWN_ORIGIN,
'description' => 'The request originated from an unknown origin. If you trust this domain, please list it as a trusted platform in the Appwrite console.',
@@ -681,7 +686,7 @@ return [
],
Exception::ATTRIBUTE_LIMIT_EXCEEDED => [
'name' => Exception::ATTRIBUTE_LIMIT_EXCEEDED,
- 'description' => 'The maximum number of attributes has been reached.',
+ 'description' => 'The maximum number or size of attributes for this collection has been reached.',
'code' => 400,
],
Exception::ATTRIBUTE_VALUE_INVALID => [
diff --git a/app/config/function-templates.php b/app/config/function-templates.php
index db26ff2c19..fec9d2227f 100644
--- a/app/config/function-templates.php
+++ b/app/config/function-templates.php
@@ -3,7 +3,7 @@
const TEMPLATE_RUNTIMES = [
'NODE' => [
'name' => 'node',
- 'versions' => ['21.0', '20.0', '19.0', '18.0', '16.0', '14.5']
+ 'versions' => ['22', '21.0', '20.0', '19.0', '18.0', '16.0', '14.5']
],
'PYTHON' => [
'name' => 'python',
@@ -11,7 +11,7 @@ const TEMPLATE_RUNTIMES = [
],
'DART' => [
'name' => 'dart',
- 'versions' => ['3.3', '3.1', '3.0', '2.19', '2.18', '2.17', '2.16', '2.16']
+ 'versions' => ['3.5', '3.3', '3.1', '3.0', '2.19', '2.18', '2.17', '2.16']
],
'GO' => [
'name' => 'go',
@@ -21,9 +21,13 @@ const TEMPLATE_RUNTIMES = [
'name' => 'php',
'versions' => ['8.3', '8.2', '8.1', '8.0']
],
+ 'DENO' => [
+ 'name' => 'deno',
+ 'versions' => ['2.0', '1.46', '1.40', '1.35', '1.24', '1.21']
+ ],
'BUN' => [
'name' => 'bun',
- 'versions' => ['1.0']
+ 'versions' => ['1.1', '1.0']
],
'RUBY' => [
'name' => 'ruby',
@@ -51,7 +55,7 @@ return [
'id' => 'starter',
'name' => 'Starter function',
'tagline' =>
- 'A simple function to get started. Edit this function to explore endless possibilities with Appwrite Functions.',
+ 'A simple function to get started. Edit this function to explore endless possibilities with Appwrite Functions.',
'permissions' => ['any'],
'events' => [],
'cron' => '',
@@ -73,6 +77,7 @@ return [
'src/index.php',
'php/starter'
),
+ ...getRuntimes(TEMPLATE_RUNTIMES['DENO'], 'deno cache src/main.ts', 'src/main.ts', 'deno/starter'),
...getRuntimes(TEMPLATE_RUNTIMES['BUN'], 'bun install', 'src/main.ts', 'bun/starter'),
...getRuntimes(TEMPLATE_RUNTIMES['RUBY'], 'bundle install', 'lib/main.rb', 'ruby/starter'),
],
@@ -121,7 +126,7 @@ return [
'description' => 'Authentication token to access your Upstash Vector database. Learn more.',
'value' => '',
'placeholder' =>
- 'oe4wNTbwHVLcDNa6oceZfhBEABsCNYh43ii6Xdq4bKBH7mq7qJkUmc4cs3ABbYyuVKWZTxVQjiNjYgydn2dkhABNes4NAuDpj7qxUAmZYqGJT78',
+ 'oe4wNTbwHVLcDNa6oceZfhBEABsCNYh43ii6Xdq4bKBH7mq7qJkUmc4cs3ABbYyuVKWZTxVQjiNjYgydn2dkhABNes4NAuDpj7qxUAmZYqGJT78',
'required' => true,
'type' => 'password'
]
@@ -227,7 +232,7 @@ return [
'id' => 'query-mongo-atlas',
'name' => 'Query MongoDB Atlas',
'tagline' =>
- 'Realtime NoSQL document database with geospecial, graph, search, and vector suport.',
+ 'Realtime NoSQL document database with geospecial, graph, search, and vector suport.',
'permissions' => ['any'],
'events' => [],
'cron' => '',
@@ -252,7 +257,7 @@ return [
'description' => 'The endpoint to connect to your Mongo database. Learn more.',
'value' => '',
'placeholder' =>
- 'mongodb+srv://appwrite:Yx42hafg7Q4fgkxe@cluster0.7mslfog.mongodb.net/?retryWrites=true&w=majority&appName=Appwrite',
+ 'mongodb+srv://appwrite:Yx42hafg7Q4fgkxe@cluster0.7mslfog.mongodb.net/?retryWrites=true&w=majority&appName=Appwrite',
'required' => true,
'type' => 'password'
]
@@ -264,7 +269,7 @@ return [
'id' => 'query-neon-postgres',
'name' => 'Query Neon Postgres',
'tagline' =>
- 'Reliable SQL database with replication, point-in-time recovery, and pgvector support.',
+ 'Reliable SQL database with replication, point-in-time recovery, and pgvector support.',
'permissions' => ['any'],
'events' => [],
'cron' => '',
@@ -491,7 +496,7 @@ return [
'id' => 'censor-with-redact',
'name' => 'Censor with Redact',
'tagline' =>
- 'Censor sensitive information from a provided text string using Redact API by Pangea.',
+ 'Censor sensitive information from a provided text string using Redact API by Pangea.',
'permissions' => ['any'],
'events' => [],
'cron' => '',
@@ -560,7 +565,7 @@ return [
'id' => 'github-issue-bot',
'name' => 'GitHub issue bot',
'tagline' =>
- 'Automate the process of responding to newly opened issues in a GitHub repository.',
+ 'Automate the process of responding to newly opened issues in a GitHub repository.',
'permissions' => ['any'],
'events' => [],
'cron' => '',
diff --git a/app/config/locale/templates/email-inner-base.tpl b/app/config/locale/templates/email-inner-base.tpl
index 52e1093ffb..8cef391d2f 100644
--- a/app/config/locale/templates/email-inner-base.tpl
+++ b/app/config/locale/templates/email-inner-base.tpl
@@ -1,9 +1,9 @@
-{{hello}},
+{{hello}}
{{body}}
{{redirect}}
{{footer}}
- {{thanks}},
+ {{thanks}}
{{signature}}
\ No newline at end of file
diff --git a/app/config/locale/templates/email-magic-url.tpl b/app/config/locale/templates/email-magic-url.tpl
index def1ea2395..21988c5bc1 100644
--- a/app/config/locale/templates/email-magic-url.tpl
+++ b/app/config/locale/templates/email-magic-url.tpl
@@ -1,4 +1,4 @@
-{{hello}},
+{{hello}}
{{optionButton}}
diff --git a/app/config/locale/templates/email-mfa-challenge.tpl b/app/config/locale/templates/email-mfa-challenge.tpl
index e3cb6b444d..3e55227055 100644
--- a/app/config/locale/templates/email-mfa-challenge.tpl
+++ b/app/config/locale/templates/email-mfa-challenge.tpl
@@ -1,4 +1,4 @@
-{{hello}},
+{{hello}}
{{description}}
diff --git a/app/config/locale/templates/email-otp.tpl b/app/config/locale/templates/email-otp.tpl
index 9552185f84..84802c1603 100644
--- a/app/config/locale/templates/email-otp.tpl
+++ b/app/config/locale/templates/email-otp.tpl
@@ -1,4 +1,4 @@
-{{hello}},
+{{hello}}
{{description}}
diff --git a/app/config/locale/templates/email-session-alert.tpl b/app/config/locale/templates/email-session-alert.tpl
index 20cecf212d..bd2f52af79 100644
--- a/app/config/locale/templates/email-session-alert.tpl
+++ b/app/config/locale/templates/email-session-alert.tpl
@@ -1,4 +1,4 @@
-{{hello}},
+{{hello}}
{{body}}
diff --git a/app/config/locale/translations/af.json b/app/config/locale/translations/af.json
index 238c6777bd..e68fda2c75 100644
--- a/app/config/locale/translations/af.json
+++ b/app/config/locale/translations/af.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s span",
"emails.verification.subject": "Rekening Bevestiging",
- "emails.verification.hello": "Goeie dag {{user}}",
+ "emails.verification.hello": "Goeie dag {{user}},",
"emails.verification.body": "Volg hierdie skakel om u e-pos adres te bevestig.",
"emails.verification.footer": "Ignoreer gerus hierdie boodskap as u nie die versoek gestuur het om u adres te bevestig nie.",
- "emails.verification.thanks": "Baie dankie",
+ "emails.verification.thanks": "Baie dankie,",
"emails.verification.signature": "Die {{project}} span",
"emails.magicSession.subject": "Teken aan",
- "emails.magicSession.hello": "Goeie dag",
+ "emails.magicSession.hello": "Goeie dag,",
"emails.magicSession.body": "Volg hierdie skakel om in te teken.",
"emails.magicSession.footer": "Ignoreer gerus hierdie boodskap as u nie die versoek gestuur het om met die' adres in te teken nie.",
- "emails.magicSession.thanks": "Baie dankie",
+ "emails.magicSession.thanks": "Baie dankie,",
"emails.magicSession.signature": "Die {{project}} span",
"emails.recovery.subject": "Herstel Wagwoord",
- "emails.recovery.hello": "Goeie dag {{user}}",
+ "emails.recovery.hello": "Goeie dag {{user}},",
"emails.recovery.body": "Volg hierdie skakel om u {{project}} wagwoord te herstel.",
"emails.recovery.footer": "Ignoreer gerus hierdie boodskap as u nie die versoek gestuur het om u wagwoord te herstel nie.",
- "emails.recovery.thanks": "Baie dankie",
+ "emails.recovery.thanks": "Baie dankie,",
"emails.recovery.signature": "Die {{project}} span",
"emails.invitation.subject": "Uitnodiging om by die %s span aan te sluit by %s",
"emails.invitation.hello": "Goeie dag,",
"emails.invitation.body": "Hierdie boodskap is aan u gestuur omdat {{owner}} u uitnooi om 'n lid van die {{team}} groep by die {{project}} projek te wees.",
"emails.invitation.footer": "As u nie belang stel nie, kan u gerus hierdie boodskap ignoreer.",
- "emails.invitation.thanks": "Baie dankie",
+ "emails.invitation.thanks": "Baie dankie,",
"emails.invitation.signature": "Die {{project}} span",
"locale.country.unknown": "Onbekend",
"countries.af": "Afghanistan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Die veiligheidsfrase vir hierdie e-pos is {{phrase}}. Jy kan hierdie e-pos vertrou as hierdie frase ooreenstem met die frase wat gewys is tydens aanmelding.",
"emails.otpSession.thanks": "Dankie,",
"emails.otpSession.signature": "{{project}} span"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/ar-ma.json b/app/config/locale/translations/ar-ma.json
index 453de25c80..efd2e95c31 100644
--- a/app/config/locale/translations/ar-ma.json
+++ b/app/config/locale/translations/ar-ma.json
@@ -4,34 +4,34 @@
"settings.direction": "rtl",
"emails.sender": "فرقة %s",
"emails.verification.subject": "التيْقان ديال الحساب",
- "emails.verification.hello": "السلام {{user}}",
+ "emails.verification.hello": "السلام {{user}}،",
"emails.verification.body": "تبّع هاد الوصلة باش تيقّن لادريسة تاع ليميل ديالك.",
"emails.verification.footer": "إلا ماشي نتا اللي طلبتي تيقّن هاد لادريسة تاع ليميل، ممكن تنخّل هاد البرية.",
- "emails.verification.thanks": "شكرا",
+ "emails.verification.thanks": "شكرا،",
"emails.verification.signature": "فرقة {{project}}",
"emails.magicSession.subject": "تكونيكطا",
- "emails.magicSession.hello": "السلام,",
+ "emails.magicSession.hello": "السلام،",
"emails.magicSession.body": "تبّع هاد الوصلة باش تتكونيكطا.",
"emails.magicSession.footer": "إلا ماشي نتا اللي طلبتي تتكونيكطا بهاد ليميل، ممكن تنخّل هاد البرية.",
- "emails.magicSession.thanks": "شكرا",
+ "emails.magicSession.thanks": "شكرا،",
"emails.magicSession.signature": "فرقة {{project}}",
"emails.recovery.subject": "تبدال كلمة السر",
- "emails.recovery.hello": "السلام {{user}}",
+ "emails.recovery.hello": "السلام {{user}}،",
"emails.recovery.body": "تبّع هاد الوصلة باش تبدّل كلمة السر تاع {{project}}.",
"emails.recovery.footer": "إلا ماشي نتا اللي طلبتي تبدّل كلمة السر، ممكن تنخّل هاد البرية.",
- "emails.recovery.thanks": "شكرا",
+ "emails.recovery.thanks": "شكرا،",
"emails.recovery.signature": "فرقة {{project}}",
"emails.invitation.subject": "عراضة ل فرقة %s ف %s",
- "emails.invitation.hello": "السلام",
+ "emails.invitation.hello": "السلام،",
"emails.invitation.body": "هاد البرية تصيفطات ليك حيت {{owner}} بغى يعرض عليك تولّي عضو ف فرقة {{team}} عند {{project}}.",
"emails.invitation.footer": "إلا كنتي ما مسوّقش, ممكن تنخّل هاد البرية.",
- "emails.invitation.thanks": "شكرا",
+ "emails.invitation.thanks": "شكرا،",
"emails.invitation.signature": "فرقة {{project}}",
"emails.certificate.subject": "السرتافيكة فشلات ل %s",
- "emails.certificate.hello": "السلام",
+ "emails.certificate.hello": "السلام،",
"emails.certificate.body": "السرتافيكة ديال الضومين ديالك '{{domain}}' ما قدّاتش تجينيرا. هادي هي المحاولة نمرة {{attempt}}, السبب ديال هاد الفشل هو: {{error}}",
"emails.certificate.footer": "السرتافيكة الفايتة ديالك غاتبقى مزيانة لمدة 30 يوم من عند أول فشل. كانشجعوك بزاف أنك تبقشش فهاد الموضوع, وا إلّا الضومين ديالك ما غايبقاش خدّام فيه الـ SSL.",
- "emails.certificate.thanks": "شكرا",
+ "emails.certificate.thanks": "شكرا،",
"emails.certificate.signature": "فرقة {{project}}",
"locale.country.unknown": "ما معروفش",
"countries.af": "أفغانستان",
diff --git a/app/config/locale/translations/ar.json b/app/config/locale/translations/ar.json
index cd45b32e02..1d67c2ecf7 100644
--- a/app/config/locale/translations/ar.json
+++ b/app/config/locale/translations/ar.json
@@ -4,28 +4,28 @@
"settings.direction": "rtl",
"emails.sender": "فريق %s",
"emails.verification.subject": "تأكيد الحساب",
- "emails.verification.hello": "مرحبا {{user}}",
+ "emails.verification.hello": "مرحبا {{user}}،",
"emails.verification.body": "برجاء اتباع الرابط التالي لتأكيد بريدك الإلكتروني",
"emails.verification.footer": "لو لم تطلب تأكيد هذا البريد الإلكتروني، يمكنك تجاهل هذه الرسالة",
- "emails.verification.thanks": "شكرا",
+ "emails.verification.thanks": "شكرا،",
"emails.verification.signature": "فريق {{project}}",
"emails.magicSession.subject": "تسجيل الدخول",
- "emails.magicSession.hello": "أهلا",
+ "emails.magicSession.hello": "أهلا،",
"emails.magicSession.body": "اتبع هذا الرابط لتسجيل الدخول",
"emails.magicSession.footer": "لو لم تطلب تسجيل الدخول بهذا البريد الاكتروني ، يمكنك تجاهل هذه الرسالة",
- "emails.magicSession.thanks": "شكرا",
+ "emails.magicSession.thanks": "شكرا،",
"emails.magicSession.signature": "فريق {{project}}",
"emails.recovery.subject": "تغيير كلمة السر",
- "emails.recovery.hello": "أهلا {{user}}",
+ "emails.recovery.hello": "أهلا {{user}}،",
"emails.recovery.body": "برجاء اتباع الراط التالي لتغيير كلمة السر الخاصة بـ{{project}}",
"emails.recovery.footer": "لولم تطلب تغيير كلمة السر، يمكنك تجاهل هذه الرسالة",
- "emails.recovery.thanks": "شكرا",
+ "emails.recovery.thanks": "شكرا،",
"emails.recovery.signature": "فريق {{project}}",
"emails.invitation.subject": "دعوة لفريق %s في %s",
- "emails.invitation.hello": "أهلا",
+ "emails.invitation.hello": "أهلا،",
"emails.invitation.body": "هذة الرسالة تم ارسالها لك لأن {{owner}} ارسل لك دعوة لتكون عضوا بفريق {{team}} في {{project}}",
"emails.invitation.footer": "اذا كنت غير مهتم، يمكنك تجاهل هذه الرسالة",
- "emails.invitation.thanks": "شكرا",
+ "emails.invitation.thanks": "شكرا،",
"emails.invitation.signature": "فريق {{project}}",
"locale.country.unknown": "مجهول",
"countries.af": "أفغانستان",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "عبارة الأمان لهذا البريد الإلكتروني هي {{phrase}}. يمكنك الوثوق بهذا البريد الإلكتروني إذا كانت هذه العبارة تتطابق مع العبارة المعروضة أثناء تسجيل الدخول.",
"emails.otpSession.thanks": "شكرًا،",
"emails.otpSession.signature": "فريق {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/as.json b/app/config/locale/translations/as.json
index aa42483dde..572ed80f1a 100644
--- a/app/config/locale/translations/as.json
+++ b/app/config/locale/translations/as.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s দল",
"emails.verification.subject": "একাউণ্ট প্ৰমাণীকৰণ",
- "emails.verification.hello": "নমস্কাৰ {{user}}",
+ "emails.verification.hello": "নমস্কাৰ {{user}},",
"emails.verification.body": "আপোনাৰ ইমেইল ঠিকনা প্ৰমাণিত কৰিবলৈ এই লিংকটো অনুসৰণ কৰক।",
"emails.verification.footer": "যদি আপুনি এই ঠিকনাটো সত্যাপিত কৰিবলৈ কোৱা নাই, আপুনি এই বাৰ্তাটো উপেক্ষা কৰিব পাৰে।",
- "emails.verification.thanks": "ধন্যবাদ",
+ "emails.verification.thanks": "ধন্যবাদ,",
"emails.verification.signature": "{{project}} দল",
"emails.magicSession.subject": "লগইন",
- "emails.magicSession.hello": "নমস্কাৰ",
+ "emails.magicSession.hello": "নমস্কাৰ,",
"emails.magicSession.body": "লগইন কৰিবলৈ এই লিংকটো অনুসৰণ কৰক।",
"emails.magicSession.footer": "যদি আপুনি এই ইমেইল ব্যৱহাৰ কৰি লগইন কৰিবলৈ কোৱা নাছিল, আপুনি এই বাৰ্তাটো উপেক্ষা কৰিব পাৰে।",
- "emails.magicSession.thanks": "ধন্যবাদ",
+ "emails.magicSession.thanks": "ধন্যবাদ,",
"emails.magicSession.signature": "{{project}} দল",
"emails.recovery.subject": "পাছৱাৰ্ড ৰিছেট",
- "emails.recovery.hello": "ধন্যবাদ {{user}}",
+ "emails.recovery.hello": "ধন্যবাদ {{user}},",
"emails.recovery.body": "আপোনাৰ {{project}} পাছৱৰ্ড ৰিছেট কৰিবলৈ এই লিংকটো অনুসৰণ কৰক।.",
"emails.recovery.footer": "যদি আপুনি আপোনাৰ পাছৱৰ্ড ৰিছেট কৰিবলৈ কোৱা নাছিল, আপুনি এই বাৰ্তাটো উপেক্ষা কৰিব পাৰে।",
- "emails.recovery.thanks": "ধন্যবাদ",
+ "emails.recovery.thanks": "ধন্যবাদ,",
"emails.recovery.signature": "{{project}} দল",
"emails.invitation.subject": "%s বছৰত %s দললৈ নিমন্ত্ৰণ",
- "emails.invitation.hello": "নমস্কাৰ",
+ "emails.invitation.hello": "নমস্কাৰ,",
"emails.invitation.body": "এই মেইলটো আপোনালৈ প্ৰেৰণ কৰা হৈছিল কাৰণ {{owner}} জনে আপোনাক {{project}} বছৰবয়সত {{team}} দলৰ সদস্য হ'বলৈ আমন্ত্ৰণ জনাব বিচাৰিছিল।",
"emails.invitation.footer": "যদি আপুনি আগ্ৰহী নহয়, আপুনি এই বাৰ্তাটো উপেক্ষা কৰিব পাৰে।",
- "emails.invitation.thanks": "ধন্যবাদ",
+ "emails.invitation.thanks": "ধন্যবাদ,",
"emails.invitation.signature": "{{project}} দল",
"locale.country.unknown": "অজ্ঞাত ",
"countries.af": "আফগানিস্তান ",
@@ -245,10 +245,10 @@
"emails.otpSession.thanks": "ধন্যবাদ,",
"emails.otpSession.signature": "{{project}} দল",
"emails.certificate.subject": "%sৰ বাবে প্ৰমাণপত্ৰ ব্যৰ্থতা",
- "emails.certificate.hello": "নমস্কাৰ",
+ "emails.certificate.hello": "নমস্কাৰ,",
"emails.certificate.body": "আপোনাৰ ডোমেইন '{{domain}}' ৰ বাবে প্ৰমাণপত্ৰটো উত্পন্ন কৰিব পৰা নগ'ল। এয়া প্ৰচেষ্টা নম্বৰ {{attempt}}, আৰু বিফলতাৰ কাৰণ হ'ল: {{error}}",
"emails.certificate.footer": "আপোনাৰ পূৰ্বৰ প্ৰমাণপত্ৰটো প্ৰথম ব্ৰিফল হোৱাৰ দিনৰ পৰা ৩০ দিনলৈ বৈধ থাকিব। আমি এই ঘটনাটোৰ তদন্ত কৰিবলৈ উচ্চ পৰামৰ্শ দিয়ে, অন্যথা আপোনাৰ ডোমেইনটো অবৈধ SSL যোগাযোগ অবিহনে থাকিব।",
- "emails.certificate.thanks": "ধন্যবাদ",
+ "emails.certificate.thanks": "ধন্যবাদ,",
"emails.certificate.signature": "{{project}} দল",
"sms.verification.body": "{{secret}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/az.json b/app/config/locale/translations/az.json
index df1264fe8d..5988c51786 100644
--- a/app/config/locale/translations/az.json
+++ b/app/config/locale/translations/az.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s Komandası",
"emails.verification.subject": "Hesab Doğrulama",
- "emails.verification.hello": "Salam {{user}}",
+ "emails.verification.hello": "Salam {{user}},",
"emails.verification.body": "E-poçt ünvanınızı təsdiq etmək üçün bu linki izləyin.",
"emails.verification.footer": "Bu ünvanı doğrulamağı xahiş etməmisinizsə, bu mesajı gözardı edə bilərsiniz.",
- "emails.verification.thanks": "Təşəkkürlər",
+ "emails.verification.thanks": "Təşəkkürlər,",
"emails.verification.signature": "{{project}} komandası",
"emails.magicSession.subject": "Daxil Olmaq",
- "emails.magicSession.hello": "Salam",
+ "emails.magicSession.hello": "Salam,",
"emails.magicSession.body": "Daxil olmaq üçün bu linki izləyin.",
"emails.magicSession.footer": "Bu e-poçtdan istifadə edərək giriş istəməmisinizsə, bu mesajı görməməzlikdən gələ bilərsiniz.",
- "emails.magicSession.thanks": "Təşəkkürlər",
+ "emails.magicSession.thanks": "Təşəkkürlər,",
"emails.magicSession.signature": "{{project}} komandası",
"emails.recovery.subject": "Şifrə Sıfırlanması",
- "emails.recovery.hello": "Salam {{user}}",
+ "emails.recovery.hello": "Salam {{user}},",
"emails.recovery.body": "{{project}} şifrənizi sıfırlamaq üçün bu linki izləyin.",
"emails.recovery.footer": "Şifrənizi sıfırlamağı xahiş etməmisinizsə, bu mesajı gözardı edə bilərsiniz.",
- "emails.recovery.thanks": "Təşəkkürlər",
+ "emails.recovery.thanks": "Təşəkkürlər,",
"emails.recovery.signature": "{{project}} komandası",
"emails.invitation.subject": "%s Komandasına Dəvət %sdə",
- "emails.invitation.hello": "Salam",
+ "emails.invitation.hello": "Salam,",
"emails.invitation.body": "{{owner}}, {{project}}də {{team}} komandasına üzv olmağa dəvət etmək istədiyi üçün bu məktub sizə göndərildi.",
"emails.invitation.footer": "Əgər maraqlanmırsınızsa, bu mesajı gözardı edə bilərsiniz.",
- "emails.invitation.thanks": "Təşəkkürlər",
+ "emails.invitation.thanks": "Təşəkkürlər,",
"emails.invitation.signature": "{{project}} komandası",
"locale.country.unknown": "Naməlum",
"countries.af": "Əfqanıstan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Bu e-poçtun təhlükəsizlik ifadəsi {{phrase}}-dir. Əgər bu ifadə daxil olarkən göstərilən ifadə ilə üst-üstə düşürsə, bu e-poçta etibar edə bilərsiniz.",
"emails.otpSession.thanks": "Sağ olun,",
"emails.otpSession.signature": "{{project}} komandası"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/be.json b/app/config/locale/translations/be.json
index a33916f623..f03a9d5bef 100644
--- a/app/config/locale/translations/be.json
+++ b/app/config/locale/translations/be.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "Каманда %s",
"emails.verification.subject": "Верыфікацыя акаўнта",
- "emails.verification.hello": "Прывітанне {{user}}",
+ "emails.verification.hello": "Прывітанне {{user}},",
"emails.verification.body": "Перайдзіце па гэтай спасылцы, каб пацвердзіць свой адрас электроннай пошты",
"emails.verification.footer": "Калі вы не запытвалі пацвярджэнне гэтага адрасу, праігнаруйце гэтае паведамленне.",
- "emails.verification.thanks": "Дзякуем",
+ "emails.verification.thanks": "Дзякуем,",
"emails.verification.signature": "каманда {{project}}",
"emails.magicSession.subject": "Лагін",
- "emails.magicSession.hello": "Прывітанне",
+ "emails.magicSession.hello": "Прывітанне,",
"emails.magicSession.body": "Перайдзіце па спасылцы, каб увайсці.",
"emails.magicSession.footer": "Калі вы не прасілі ўвайсці, выкарыстоўваючы гэты адрас электроннай пошты, праігнаруйце гэтае паведамленне.",
- "emails.magicSession.thanks": "Дзякуем",
+ "emails.magicSession.thanks": "Дзякуем,",
"emails.magicSession.signature": "каманда {{project}}",
"emails.recovery.subject": "Скід пароля",
- "emails.recovery.hello": "Прывітанне, {{user}}",
+ "emails.recovery.hello": "Прывітанне, {{user}},",
"emails.recovery.body": "Перайдзіце па гэтай спасылцы, каб скінуць пароль для праекта {{project}}.",
"emails.recovery.footer": "Калі вы не прасілі скінуць пароль, вы можаце праігнараваць гэта паведамленне.",
- "emails.recovery.thanks": "Дзякуем",
+ "emails.recovery.thanks": "Дзякуем,",
"emails.recovery.signature": "каманда {{project}}",
"emails.invitation.subject": "Запрошення до Команди %s у %s",
- "emails.invitation.hello": "Прывітанне",
+ "emails.invitation.hello": "Прывітанне,",
"emails.invitation.body": "Гэта паведамленне было адпраўлена вам, таму што {{owner}} хацеў запрасіць вас стаць членам каманды {{team}} у {{project}}.",
"emails.invitation.footer": "Калі вам гэта не цікава, вы можаце праігнараваць гэтае паведамленне.",
- "emails.invitation.thanks": "Дзякуем",
+ "emails.invitation.thanks": "Дзякуем,",
"emails.invitation.signature": "каманда {{project}}",
"locale.country.unknown": "Невядомы",
"countries.af": "Афганістан",
@@ -245,10 +245,10 @@
"emails.otpSession.thanks": "Дзякуй,",
"emails.otpSession.signature": "каманда {{project}}",
"emails.certificate.subject": "Сведчанне няўдалае для %s",
- "emails.certificate.hello": "Прывітанне",
+ "emails.certificate.hello": "Прывітанне,",
"emails.certificate.body": "Сертыфікат для вашага дамена '{{domain}}' не можа быць створаны. Гэта спроба нумар {{attempt}}, і прычынай няўдачы з'яўляецца: {{error}}",
"emails.certificate.footer": "Ваш папярэдні сертыфікат будзе дзейнічаць 30 дзён з моманту першай няўдачы. Мы высока рэкамендуем расследаваць гэтую сітуацыю, інакш ваш дамен апынецца без дзейнага сертыфіката SSL-злучэння.",
- "emails.certificate.thanks": "Дзякуй",
+ "emails.certificate.thanks": "Дзякуй,",
"emails.certificate.signature": "каманда {{project}}",
"sms.verification.body": "{{secret}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/bg.json b/app/config/locale/translations/bg.json
index 2dad3aecbe..086c6b283e 100644
--- a/app/config/locale/translations/bg.json
+++ b/app/config/locale/translations/bg.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s Екип",
"emails.verification.subject": "",
- "emails.verification.hello": "",
+ "emails.verification.hello": ",",
"emails.verification.body": "",
"emails.verification.footer": "",
- "emails.verification.thanks": "",
+ "emails.verification.thanks": ",",
"emails.verification.signature": "",
"emails.magicSession.subject": "",
- "emails.magicSession.hello": "",
+ "emails.magicSession.hello": ",",
"emails.magicSession.body": "",
"emails.magicSession.footer": "",
- "emails.magicSession.thanks": "",
+ "emails.magicSession.thanks": ",",
"emails.magicSession.signature": "",
"emails.recovery.subject": "",
- "emails.recovery.hello": "",
+ "emails.recovery.hello": ",",
"emails.recovery.body": "",
"emails.recovery.footer": "",
- "emails.recovery.thanks": "",
+ "emails.recovery.thanks": ",",
"emails.recovery.signature": "",
"emails.invitation.subject": "",
- "emails.invitation.hello": "",
+ "emails.invitation.hello": ",",
"emails.invitation.body": "",
"emails.invitation.footer": "",
- "emails.invitation.thanks": "",
+ "emails.invitation.thanks": ",",
"emails.invitation.signature": "",
"locale.country.unknown": "Неизвестно",
"countries.af": "Афганистан",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Фразата за сигурност за този имейл е {{phrase}}. Можете да се доверите на този имейл, ако тази фраза съвпада с фразата, показана по време на вписването.",
"emails.otpSession.thanks": "Благодаря,",
"emails.otpSession.signature": "екип на {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/bh.json b/app/config/locale/translations/bh.json
index 347f6f5d31..5cf06bd1dd 100644
--- a/app/config/locale/translations/bh.json
+++ b/app/config/locale/translations/bh.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s टीम",
"emails.verification.subject": "खाता प्रमाणिकरण",
- "emails.verification.hello": "नमस्ते {{user}}",
+ "emails.verification.hello": "नमस्ते {{user}},",
"emails.verification.body": "ईमेल प्रमाणिकरण करे क लेल दिहल गइल लिंक फॉलो करें|",
"emails.verification.footer": "अगर ई पता को सत्यापित करे के लिए ना कहाले, तो आप ई संदेश क अनदेखा कर सकत अछि।",
- "emails.verification.thanks": "धन्यवाद",
+ "emails.verification.thanks": "धन्यवाद,",
"emails.verification.signature": "{{project}} टीम",
"emails.magicSession.subject": "लॉग इन करीं|",
- "emails.magicSession.hello": "प्रणाम",
+ "emails.magicSession.hello": "प्रणाम,",
"emails.magicSession.body": "लॉग इन करें लेल दिहल गइल लिंक फॉलो करें|",
"emails.magicSession.footer": "अगर लॉग इन करे के लिए ना कहाले, तो आप ई संदेश क अनदेखा कर सकत अछि।",
- "emails.magicSession.thanks": "धन्यवाद",
+ "emails.magicSession.thanks": "धन्यवाद,",
"emails.magicSession.signature": "{{project}} टीम",
"emails.recovery.subject": "पासवर्ड बदल क लेल|",
- "emails.recovery.hello": "प्रणाम {{user}}",
+ "emails.recovery.hello": "प्रणाम {{user}},",
"emails.recovery.body": "पासवर्ड बदल क लेल दिहल गइल लिंक फॉलो करें|",
"emails.recovery.footer": "अगर पासवर्ड बदल क लेल ना कहाले, तो आप ई संदेश क अनदेखा कर सकत अछि।",
- "emails.recovery.thanks": "धन्यवाद",
+ "emails.recovery.thanks": "धन्यवाद,",
"emails.recovery.signature": "{{project}} टीम",
"emails.invitation.subject": "%s टीम क %s पे न्योता देवे क लेल|",
- "emails.invitation.hello": "प्रणाम",
+ "emails.invitation.hello": "प्रणाम,",
"emails.invitation.body": "ई मेल आपके एही लेल भेजल गईल रहल काहे क {{owner}} आपके {{project}} क {{team}} टीम का सदस्य बनावे चाहित रहे|",
"emails.invitation.footer": "अगर आवे क इच्छा ना होवत, तो आप ई संदेश क अनदेखा कर सकत अछि।",
- "emails.invitation.thanks": "धन्यवाद",
+ "emails.invitation.thanks": "धन्यवाद,",
"emails.invitation.signature": "{{project}} टीम",
"locale.country.unknown": "अनजान",
"countries.af": "अफ़ग़ानिस्तान",
@@ -242,13 +242,13 @@
"emails.otpSession.description": "जब आपको सुरक्षित रूप से अपना {{project}} खाता में साइन इन करे खातिर कहल जाए तऽ निम्नलिखित सत्यापन कोड दर्ज करीं। ई 15 मिनट में खत्म हो जई।",
"emails.otpSession.clientInfo": "एह साइन इन के अनुरोध {{agentClient}} पर {{agentDevice}} {{agentOs}} का प्रयोग करि कऽ कइल गइल बा। यदि तूँ एह साइन इन के अनुरोध ना कइले रहीं, त तूँ एह ईमेल के नजरअंदाज कर सकेला।",
"emails.otpSession.securityPhrase": "एही ईमेल खातिर सुरक्षा वाक्य {{phrase}} हऽ। अगर ई वाक्य साइन इन कइला के समय देखावल गेल वाक्य से मेल खाता, त एह ईमेल पर भरोसा कर सकैत छी।",
- "emails.otpSession.thanks": "धन्यवाद",
+ "emails.otpSession.thanks": "धन्यवाद,",
"emails.otpSession.signature": "{{project}} टीम",
"emails.certificate.subject": "%s लेल प्रमाणपत्र असफलта",
- "emails.certificate.hello": "नमस्ते",
+ "emails.certificate.hello": "नमस्ते,",
"emails.certificate.body": "आपके डोमेन '{{domain}}' के लिए प्रमाणपत्र नहीं बनाया जा सका। ई प्रयास संख्या {{attempt}} है, और ई असफलता के कारण रहे: {{error}}",
"emails.certificate.footer": "तोहार पिछलका प्रमाणपत्र पहिल असफलता से 30 दिन धरी मान्य होईत। हम बहुत जोर देके सलाह देतानी कि एह मामला के जांच करीं, नहीं त तोहार डोमेन बिना कोनो मान्य SSL संवाद के रहि जाईत।",
- "emails.certificate.thanks": "धन्यवाद",
+ "emails.certificate.thanks": "धन्यवाद,",
"emails.certificate.signature": "{{project}} टीम",
"sms.verification.body": "{{secret}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/bn.json b/app/config/locale/translations/bn.json
index 897faea7c1..495f56e012 100644
--- a/app/config/locale/translations/bn.json
+++ b/app/config/locale/translations/bn.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s টীম",
"emails.verification.subject": "বিষয়",
- "emails.verification.hello": "নমস্কার {{user}}",
+ "emails.verification.hello": "নমস্কার {{user}},",
"emails.verification.body": "এই লিঙ্কের মাধ্যমে ইমেইল যাচাই করুন।",
"emails.verification.footer": "আপনি যদি এই ঠিকানা যাচাই করতে না বলেন, তাহলে আপনি এই বার্তাটি উপেক্ষা করতে পারেন।",
- "emails.verification.thanks": "ধন্যবাদ",
+ "emails.verification.thanks": "ধন্যবাদ,",
"emails.verification.signature": "{{project}} টীম",
"emails.magicSession.subject": "লগ ইন",
- "emails.magicSession.hello": "নমস্কার",
+ "emails.magicSession.hello": "নমস্কার,",
"emails.magicSession.body": "এই লিঙ্কের মাধ্যমে লগ ইন করুন।",
"emails.magicSession.footer": "আপনি যদি এই ইমেলটি ব্যবহার করে লগইন করতে না বলেন, তাহলে আপনি এই বার্তাটি উপেক্ষা করতে পারেন।",
- "emails.magicSession.thanks": "ধন্যবাদ",
+ "emails.magicSession.thanks": "ধন্যবাদ,",
"emails.magicSession.signature": "{{project}} টীম",
"emails.recovery.subject": "পাসওয়ার্ড রিসেট",
- "emails.recovery.hello": "নমস্কার {{user}}",
+ "emails.recovery.hello": "নমস্কার {{user}},",
"emails.recovery.body": "এই লিঙ্কের মাধ্যমে আপনার {{project}} পাসওয়ার্ড পুনরায় সেট করুন।",
"emails.recovery.footer": "আপনি যদি আপনার পাসওয়ার্ড পুনরায় সেট করতে না বলেন, তাহলে আপনি এই বার্তাটি উপেক্ষা করতে পারেন।",
- "emails.recovery.thanks": "ধন্যবাদ",
+ "emails.recovery.thanks": "ধন্যবাদ,",
"emails.recovery.signature": "{{project}} টীম",
"emails.invitation.subject": "%s টিমকে %s তে আমন্ত্রণ জানান",
- "emails.invitation.hello": "নমস্কার",
+ "emails.invitation.hello": "নমস্কার,",
"emails.invitation.body": "এই মেইলটি আপনাকে পাঠানো হয়েছে কারণ {{owner}} আপনাকে {{project}} এর সাথে যুক্ত {{team}} টিমের সদস্য হওয়ার জন্য আমন্ত্রণ জানাতে চেয়েছিলেন।",
"emails.invitation.footer": "যদি এটি আপনার জন্য প্রয়োজনীয় না হয়, আপনি এই বার্তাটি উপেক্ষা করতে পারেন।",
- "emails.invitation.thanks": "ধন্যবাদ",
+ "emails.invitation.thanks": "ধন্যবাদ,",
"emails.invitation.signature": "{{project}} টীম",
"locale.country.unknown": "অজানা",
"countries.af": "আফগানিস্তান",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "এই ইমেইলের জন্য সুরক্ষা বাক্য হলো {{phrase}}। যদি এই বাক্যটি সাইন ইনের সময় দেখানো বাক্যের সাথে মেলে, তাহলে আপনি এই ইমেইলটিকে বিশ্বাস করতে পারেন।",
"emails.otpSession.thanks": "ধন্যবাদ,",
"emails.otpSession.signature": "{{project}} দল"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/bs.json b/app/config/locale/translations/bs.json
index 1ce2d57a3e..1c69619c01 100644
--- a/app/config/locale/translations/bs.json
+++ b/app/config/locale/translations/bs.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s Tim",
"emails.verification.subject": "",
- "emails.verification.hello": "",
+ "emails.verification.hello": ",",
"emails.verification.body": "",
"emails.verification.footer": "",
- "emails.verification.thanks": "",
+ "emails.verification.thanks": ",",
"emails.verification.signature": "",
"emails.magicSession.subject": "",
- "emails.magicSession.hello": "",
+ "emails.magicSession.hello": ",",
"emails.magicSession.body": "",
"emails.magicSession.footer": "",
- "emails.magicSession.thanks": "",
+ "emails.magicSession.thanks": ",",
"emails.magicSession.signature": "",
"emails.recovery.subject": "",
- "emails.recovery.hello": "",
+ "emails.recovery.hello": ",",
"emails.recovery.body": "",
"emails.recovery.footer": "",
- "emails.recovery.thanks": "",
+ "emails.recovery.thanks": ",",
"emails.recovery.signature": "",
"emails.invitation.subject": "",
- "emails.invitation.hello": "",
+ "emails.invitation.hello": ",",
"emails.invitation.body": "",
"emails.invitation.footer": "",
- "emails.invitation.thanks": "",
+ "emails.invitation.thanks": ",",
"emails.invitation.signature": "",
"locale.country.unknown": "Nepoznat",
"countries.af": "Afganistan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Sigurnosna fraza za ovaj email je {{phrase}}. Možete vjerovati ovom emailu ako se ova fraza podudara sa frazom prikazanom prilikom prijave.",
"emails.otpSession.thanks": "Hvala,",
"emails.otpSession.signature": "tim {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/ca.json b/app/config/locale/translations/ca.json
index 94e3ae24c5..98940a4a48 100644
--- a/app/config/locale/translations/ca.json
+++ b/app/config/locale/translations/ca.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s Equip",
"emails.verification.subject": "Verificació del compte",
- "emails.verification.hello": "Hola {{user}}",
+ "emails.verification.hello": "Hola {{user}},",
"emails.verification.body": "Accedeix a aquest enllaç per tal de verificar la teva adreça electrònica.",
"emails.verification.footer": "Si no has sol·licitat la verificació d'aquesta adreça electrònica, pots ignorar aquest missatge.",
- "emails.verification.thanks": "Gràcies",
+ "emails.verification.thanks": "Gràcies,",
"emails.verification.signature": "Equip {{project}}",
"emails.magicSession.subject": "Entrar",
- "emails.magicSession.hello": "Hola",
+ "emails.magicSession.hello": "Hola,",
"emails.magicSession.body": "Accedeix a aquest enllaç per a entrar.",
"emails.magicSession.footer": "Si no has sol·licitat entrar amb aquesta adreça electrònica, pots ignorar aquest missatge.",
- "emails.magicSession.thanks": "Gràcies",
+ "emails.magicSession.thanks": "Gràcies,",
"emails.magicSession.signature": "Equip {{project}}",
"emails.recovery.subject": "Reinicialitzar contrasenya",
- "emails.recovery.hello": "Hola {{user}}",
+ "emails.recovery.hello": "Hola {{user}},",
"emails.recovery.body": "Accedeix a aquest enllaç per a reinicialitzar la teva contrasenya de {{project}}.",
"emails.recovery.footer": "Si no has sol·licitat reinicialitzar la teva contrasenya, pots ignorar aquest missatge.",
- "emails.recovery.thanks": "Gràcies",
+ "emails.recovery.thanks": "Gràcies,",
"emails.recovery.signature": "Equip {{project}}",
"emails.invitation.subject": "Invitació a l'equip %s a s%",
- "emails.invitation.hello": "Hola",
+ "emails.invitation.hello": "Hola,",
"emails.invitation.body": "Aquest correu se t'ha enviat perquè {{owner}} vol convidar-te a formar part de l'equip {{team}} al {{project}}.",
"emails.invitation.footer": "Si no és del teu interès, pots ignorar aquest missatge.",
- "emails.invitation.thanks": "Gràcies",
+ "emails.invitation.thanks": "Gràcies,",
"emails.invitation.signature": "Equip {{project}}",
"locale.country.unknown": "Desconegut",
"countries.af": "Afganistan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "La frase de seguretat d'aquest correu electrònic és {{phrase}}. Podeu confiar en aquest correu electrònic si aquesta frase coincideix amb la frase mostrada durant l'inici de sessió.",
"emails.otpSession.thanks": "Gràcies,",
"emails.otpSession.signature": "equip {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/cs.json b/app/config/locale/translations/cs.json
index 4e3c533c77..c67e9299da 100644
--- a/app/config/locale/translations/cs.json
+++ b/app/config/locale/translations/cs.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s tým",
"emails.verification.subject": "",
- "emails.verification.hello": "",
+ "emails.verification.hello": ",",
"emails.verification.body": "",
"emails.verification.footer": "",
- "emails.verification.thanks": "",
+ "emails.verification.thanks": ",",
"emails.verification.signature": "",
"emails.magicSession.subject": "",
- "emails.magicSession.hello": "",
+ "emails.magicSession.hello": ",",
"emails.magicSession.body": "",
"emails.magicSession.footer": "",
- "emails.magicSession.thanks": "",
+ "emails.magicSession.thanks": ",",
"emails.magicSession.signature": "",
"emails.recovery.subject": "",
- "emails.recovery.hello": "",
+ "emails.recovery.hello": ",",
"emails.recovery.body": "",
"emails.recovery.footer": "",
- "emails.recovery.thanks": "",
+ "emails.recovery.thanks": ",",
"emails.recovery.signature": "",
"emails.invitation.subject": "",
- "emails.invitation.hello": "",
+ "emails.invitation.hello": ",",
"emails.invitation.body": "",
"emails.invitation.footer": "",
- "emails.invitation.thanks": "",
+ "emails.invitation.thanks": ",",
"emails.invitation.signature": "",
"locale.country.unknown": "Neznámý",
"countries.af": "Afghánistán",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Bezpečnostní fráze pro tento e-mail je {{phrase}}. Tomuto e-mailu můžete důvěřovat, pokud se tato fráze shoduje s frází zobrazenou při přihlášení.",
"emails.otpSession.thanks": "Děkuji,",
"emails.otpSession.signature": "tým {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/da.json b/app/config/locale/translations/da.json
index d50d9c46c6..9cec74dbed 100644
--- a/app/config/locale/translations/da.json
+++ b/app/config/locale/translations/da.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s Team",
"emails.verification.subject": "Konto Verifikation",
- "emails.verification.hello": "Hej {{user}}",
+ "emails.verification.hello": "Hej {{user}},",
"emails.verification.body": "Følg dette link, for at verificere din email adresse.",
"emails.verification.footer": "Hvis du ikke har bedt om at verificere denne adresse, ignorer venligst denne besked.",
- "emails.verification.thanks": "Tak",
+ "emails.verification.thanks": "Tak,",
"emails.verification.signature": "{{project}} team",
"emails.magicSession.subject": "Login",
- "emails.magicSession.hello": "Hej",
+ "emails.magicSession.hello": "Hej,",
"emails.magicSession.body": "Følg dette link for at logge ind.",
"emails.magicSession.footer": "Hvis du ikke har bedt om at logge ind med denne email, ignorer venligst denne besked.",
- "emails.magicSession.thanks": "Tak",
+ "emails.magicSession.thanks": "Tak,",
"emails.magicSession.signature": "{{project}} team",
"emails.recovery.subject": "Nulstil Password",
- "emails.recovery.hello": "Hej {{user}}",
+ "emails.recovery.hello": "Hej {{user}},",
"emails.recovery.body": "Følg dette link for at nulstille koden til {{project}}.",
"emails.recovery.footer": "Hvis du ikke har bedt om at nulstille dit password, ignorer venligst denne besked.",
- "emails.recovery.thanks": "Tak",
+ "emails.recovery.thanks": "Tak,",
"emails.recovery.signature": "{{project}} team",
"emails.invitation.subject": "Invitation til %s Team på %s",
- "emails.invitation.hello": "Hej",
+ "emails.invitation.hello": "Hej,",
"emails.invitation.body": "Denne mail blev sendt til dig, fordi {{owner}} vil invitere dig til at blive medlem af {{team}} teamet på {{project}}.",
"emails.invitation.footer": "Hvis du ikke er interesseret, ignorer venligst denne besked.",
- "emails.invitation.thanks": "Tak",
+ "emails.invitation.thanks": "Tak,",
"emails.invitation.signature": "{{project}} team",
"locale.country.unknown": "Ukendt",
"countries.af": "Afghanistan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Sikkerhedsfrasen for denne e-mail er {{phrase}}. Du kan stole på denne e-mail, hvis denne frase matcher frasen vist under login.",
"emails.otpSession.thanks": "Tak,",
"emails.otpSession.signature": "{{project}} team"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/de.json b/app/config/locale/translations/de.json
index 2279fcf4c0..38b1e46870 100644
--- a/app/config/locale/translations/de.json
+++ b/app/config/locale/translations/de.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s Team",
"emails.verification.subject": "Kontoverifizierung",
- "emails.verification.hello": "Hey {{user}}",
+ "emails.verification.hello": "Hey {{user}},",
"emails.verification.body": "Folge diesem Link, um deine E-Mail-Adresse zu bestätigen.",
"emails.verification.footer": "Solltest du keine Verifizierung dieser E-Mail-Adresse angefordert haben, kannst du diese Nachricht ignorieren.",
- "emails.verification.thanks": "Danke",
+ "emails.verification.thanks": "Danke,",
"emails.verification.signature": "{{project}}-Team",
"emails.magicSession.subject": "Login",
- "emails.magicSession.hello": "Hey",
+ "emails.magicSession.hello": "Hey,",
"emails.magicSession.body": "Folge diesem Link, um dich einzuloggen.",
"emails.magicSession.footer": "Solltest du keinen Login für diese E-Mail-Adresse angefordert haben, kannst du diese Nachricht ignorieren.",
- "emails.magicSession.thanks": "Danke",
+ "emails.magicSession.thanks": "Danke,",
"emails.magicSession.signature": "{{project}}-Team",
"emails.recovery.subject": "Kennwort zurücksetzen",
- "emails.recovery.hello": "Hallo {{user}}",
+ "emails.recovery.hello": "Hallo {{user}},",
"emails.recovery.body": "Folge diesem Link, um dein {{project}}-Kennwort zurückzusetzen.",
"emails.recovery.footer": "Solltest du keine Kennwort-Zurücksetzung angefordert haben, kannst du diese Nachricht ignorieren.",
- "emails.recovery.thanks": "Danke",
+ "emails.recovery.thanks": "Danke,",
"emails.recovery.signature": "{{project}}-Team",
"emails.invitation.subject": "Einladung zum %s-Team auf %s",
- "emails.invitation.hello": "Hello",
+ "emails.invitation.hello": "Hello,",
"emails.invitation.body": "Du erhälst diese E-Mail, weil {{owner}} dich in das Team {{team}} auf {{project}} eingeladen hat.",
"emails.invitation.footer": "Wenn du nicht interessiert bist, kannst du diese Nachricht ignorieren.",
- "emails.invitation.thanks": "Danke",
+ "emails.invitation.thanks": "Danke,",
"emails.invitation.signature": "{{project}}-Team",
"locale.country.unknown": "Unbekannt",
"countries.af": "Afghanistan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Die Sicherheitsphrase für diese E-Mail lautet {{phrase}}. Sie können dieser E-Mail vertrauen, wenn diese Phrase mit der Phrase übereinstimmt, die beim Anmelden angezeigt wird.",
"emails.otpSession.thanks": "Danke,",
"emails.otpSession.signature": "{{project}} Team"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/el.json b/app/config/locale/translations/el.json
index 16c165ea39..1ef9cd30df 100644
--- a/app/config/locale/translations/el.json
+++ b/app/config/locale/translations/el.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "Ομάδα %s",
"emails.verification.subject": "Επαλήθευση Λογαριασμού",
- "emails.verification.hello": "Γεια σου {{user}}",
+ "emails.verification.hello": "Γεια σου {{user}},",
"emails.verification.body": "Ακολουθήστε αυτό το link για να επαληθεύσετε τη δ/νση του email σας",
"emails.verification.footer": "Εάν δεν ζητήσατε επαλήθευση αυτής της δ/νσης email, μπορείτε να αγνοήσετε αυτό το μήνυμα",
- "emails.verification.thanks": "Ευχαριστούμε",
+ "emails.verification.thanks": "Ευχαριστούμε,",
"emails.verification.signature": "Η ομάδα του {{project}}",
"emails.magicSession.subject": "Είσοδος",
- "emails.magicSession.hello": "Γεια σου",
+ "emails.magicSession.hello": "Γεια σου,",
"emails.magicSession.body": "Ακολουθήστε αυτό το link για να συνδεθείτε",
"emails.magicSession.footer": "Εάν δεν ζητήσατε να συνδεθείτε χρησιμοποιώντας αυτό το email, μπορείτε να αγνοήσετε αυτό το μήνυμα.",
- "emails.magicSession.thanks": "Ευχαριστούμε",
+ "emails.magicSession.thanks": "Ευχαριστούμε,",
"emails.magicSession.signature": "Η ομάδα του {{project}}",
"emails.recovery.subject": "Αλλαγή κωδικού πρόσβασης",
- "emails.recovery.hello": "Γεια σου {{user}}",
+ "emails.recovery.hello": "Γεια σου {{user}},",
"emails.recovery.body": "Ακολουθήστε αυτό το link για να αλλάξετε τον {{project}} κωδικό σας",
"emails.recovery.footer": "Εάν δεν ζητήσατε αλλαγή του κωδικού σας πρόσβασης, μπορείτε να αγνοήσετε αυτό το μήνυμα",
- "emails.recovery.thanks": "Ευχαριστούμε",
+ "emails.recovery.thanks": "Ευχαριστούμε,",
"emails.recovery.signature": "Η ομάδα του {{project}}",
"emails.invitation.subject": "Πρόσκληση στην %s Ομάδα στον %s",
- "emails.invitation.hello": "Γεια σου",
+ "emails.invitation.hello": "Γεια σου,",
"emails.invitation.body": "Αυτό το email στάλθηκε επειδή ο/η {{owner}} θέλει να σας προσκαλέσει να γίνετε μέλος της ομάδας {{team}} του {{project}}.",
"emails.invitation.footer": "Εάν δεν ενδιαφέρεστε, μπορείτε να αγνοήσετε αυτό το μήνυμα.",
- "emails.invitation.thanks": "Ευχαριστούμε",
+ "emails.invitation.thanks": "Ευχαριστούμε,",
"emails.invitation.signature": "Η ομάδα του {{project}}",
"locale.country.unknown": "Άγνωστο",
"countries.af": "Αφγανιστάν",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Η φράση ασφαλείας για αυτό το email είναι {{phrase}}. Μπορείτε να εμπιστευτείτε αυτό το email αν αυτή η φράση ταιριάζει με τη φράση που εμφανίστηκε κατά την είσοδο.",
"emails.otpSession.thanks": "Ευχαριστώ,",
"emails.otpSession.signature": "ομάδα {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/en.json b/app/config/locale/translations/en.json
index 937ab298de..d9dfddb017 100644
--- a/app/config/locale/translations/en.json
+++ b/app/config/locale/translations/en.json
@@ -4,13 +4,13 @@
"settings.direction": "ltr",
"emails.sender": "%s Team",
"emails.verification.subject": "Account Verification",
- "emails.verification.hello": "Hello {{user}}",
+ "emails.verification.hello": "Hello {{user}},",
"emails.verification.body": "Follow this link to verify your email address to your {{b}}{{project}}{{/b}} account.",
"emails.verification.footer": "If you didn’t ask to verify this address, you can ignore this message.",
- "emails.verification.thanks": "Thanks",
+ "emails.verification.thanks": "Thanks,",
"emails.verification.signature": "{{project}} team",
"emails.magicSession.subject": "{{project}} Login",
- "emails.magicSession.hello": "Hello {{user}}",
+ "emails.magicSession.hello": "Hello {{user}},",
"emails.magicSession.optionButton": "Click the button below to securely sign in to your {{b}}{{project}}{{/b}} account. This link will expire in 1 hour.",
"emails.magicSession.buttonText": "Sign in to {{project}}",
"emails.magicSession.optionUrl": "If you are unable to sign in using the button above, please visit the following link:",
@@ -19,44 +19,44 @@
"emails.magicSession.thanks": "Thanks,",
"emails.magicSession.signature": "{{project}} team",
"emails.sessionAlert.subject": "Security alert: new session on your {{project}} account",
- "emails.sessionAlert.hello":"Hello {{user}}",
+ "emails.sessionAlert.hello": "Hello {{user}},",
"emails.sessionAlert.body": "A new session has been created on your {{b}}{{project}}{{/b}} account, {{b}}on {{date}}, {{year}} at {{time}} UTC{{/b}}.\nHere are the details of the new session: ",
"emails.sessionAlert.listDevice": "Device: {{b}}{{device}}{{/b}}",
"emails.sessionAlert.listIpAddress": "IP Address: {{b}}{{ipAddress}}{{/b}}",
"emails.sessionAlert.listCountry": "Country: {{b}}{{country}}{{/b}}",
- "emails.sessionAlert.footer": "If this was you, there's nothing more you need to do.\nIf you didn't initiate this session or suspect any unauthorized activity, please secure your account.",
+ "emails.sessionAlert.footer": "If this was you, there's nothing more you need to do.\nIf you didn't initiate this session or suspect any unauthorized activity, please secure your account.",
"emails.sessionAlert.thanks": "Thanks,",
"emails.sessionAlert.signature": "{{project}} team",
"emails.otpSession.subject": "OTP for {{project}} Login",
- "emails.otpSession.hello": "Hello {{user}}",
+ "emails.otpSession.hello": "Hello {{user}},",
"emails.otpSession.description": "Enter the following verification code when prompted to securely sign in to your {{b}}{{project}}{{/b}} account. This code will expire in 15 minutes.",
"emails.otpSession.clientInfo": "This sign in was requested using {{b}}{{agentClient}}{{/b}} on {{b}}{{agentDevice}}{{/b}} {{b}}{{agentOs}}{{/b}}. If you didn't request the sign in, you can safely ignore this email.",
"emails.otpSession.securityPhrase": "Security phrase for this email is {{b}}{{phrase}}{{/b}}. You can trust this email if this phrase matches the phrase shown during sign in.",
"emails.otpSession.thanks": "Thanks,",
"emails.otpSession.signature": "{{project}} team",
"emails.mfaChallenge.subject": "Verification Code for {{project}}",
- "emails.mfaChallenge.hello": "Hello {{user}}",
+ "emails.mfaChallenge.hello": "Hello {{user}},",
"emails.mfaChallenge.description": "Enter the following verification code to verify your email and activate two-step verification in {{b}}{{project}}{{/b}}. This code will expire in 15 minutes.",
"emails.mfaChallenge.clientInfo": "This verification code was requested using {{b}}{{agentClient}}{{/b}} on {{b}}{{agentDevice}}{{/b}} {{b}}{{agentOs}}{{/b}}. If you didn't request the verification code, you can safely ignore this email.",
"emails.mfaChallenge.thanks": "Thanks,",
"emails.mfaChallenge.signature": "{{project}} team",
"emails.recovery.subject": "Password Reset",
- "emails.recovery.hello": "Hello {{user}}",
+ "emails.recovery.hello": "Hello {{user}},",
"emails.recovery.body": "Follow this link to reset your {{b}}{{project}}{{/b}} password.",
"emails.recovery.footer": "If you didn't ask to reset your password, you can ignore this message.",
- "emails.recovery.thanks": "Thanks",
+ "emails.recovery.thanks": "Thanks,",
"emails.recovery.signature": "{{project}} team",
"emails.invitation.subject": "Invitation to %s Team at %s",
- "emails.invitation.hello": "Hello {{user}}",
+ "emails.invitation.hello": "Hello {{user}},",
"emails.invitation.body": "This mail was sent to you because {{b}}{{owner}}{{/b}} wanted to invite you to become a member of the {{b}}{{team}}{{/b}} team at {{b}}{{project}}{{/b}}.",
"emails.invitation.footer": "If you are not interested, you can ignore this message.",
- "emails.invitation.thanks": "Thanks",
+ "emails.invitation.thanks": "Thanks,",
"emails.invitation.signature": "{{project}} team",
"emails.certificate.subject": "Certificate failure for %s",
- "emails.certificate.hello": "Hello",
+ "emails.certificate.hello": "Hello,",
"emails.certificate.body": "Certificate for your domain '{{domain}}' could not be generated. This is attempt no. {{attempt}}, and the failure was caused by: {{error}}",
"emails.certificate.footer": "Your previous certificate will be valid for 30 days since the first failure. We highly recommend investigating this case, otherwise your domain will end up without a valid SSL communication.",
- "emails.certificate.thanks": "Thanks",
+ "emails.certificate.thanks": "Thanks,",
"emails.certificate.signature": "{{project}} team",
"sms.verification.body": "{{secret}}",
"locale.country.unknown": "Unknown",
diff --git a/app/config/locale/translations/eo.json b/app/config/locale/translations/eo.json
index 406bd4f52c..ba80bc602d 100644
--- a/app/config/locale/translations/eo.json
+++ b/app/config/locale/translations/eo.json
@@ -3,28 +3,28 @@
"settings.direction": "ltr",
"emails.sender": "Teamo %s",
"emails.verification.subject": "Konta Konfirmo",
- "emails.verification.hello": "Saluton {{user}}",
+ "emails.verification.hello": "Saluton {{user}},",
"emails.verification.body": "Alklaku ĉi tiun ligon por kontroli vian retpoŝtan adreson.",
"emails.verification.footer": "Se vi ne petis ĉi tiun konfirmon de ĉi tiu retpoŝto, vi povas ignori ĉi tiun mesaĝon.",
- "emails.verification.thanks": "Dankegon.",
+ "emails.verification.thanks": "Dankegon.,",
"emails.verification.signature": "Teamo {{project}}",
"emails.magicSession.subject": "Login",
- "emails.magicSession.hello": "Saluton",
+ "emails.magicSession.hello": "Saluton,",
"emails.magicSession.body": "Alklaku ĉi tiun ligon por eniri.",
"emails.magicSession.footer": "Se vi ne petis ĉi tiun konfirmon de ĉi tiu retpoŝto, vi povas ignori ĉi tiun mesaĝon.",
- "emails.magicSession.thanks": "Dankegon",
+ "emails.magicSession.thanks": "Dankegon,",
"emails.magicSession.signature": "Teamo {{project}}",
"emails.recovery.subject": "Parsvorta Restarigo",
- "emails.recovery.hello": "Saluton {{user}}",
+ "emails.recovery.hello": "Saluton {{user}},",
"emails.recovery.body": "Alklaku ĉi tiun ligon por reagordi vian pasvorton. {{project}}",
"emails.recovery.footer": "Se vi ne petis reagordi vian pasvorton, vi povas ignori ĉi tiun mesaĝon.",
- "emails.recovery.thanks": "Dankegon",
+ "emails.recovery.thanks": "Dankegon,",
"emails.recovery.signature": "Teamo {{project}}",
"emails.invitation.subject": "Invito al la Teamo %s em %s",
- "emails.invitation.hello": "Dankegon",
+ "emails.invitation.hello": "Dankegon,",
"emails.invitation.body": "Ĉi tiu retpoŝto estis sendita ĉar la {{owner}} volas inviti vin fariĝi membro de la Teamo {{team}} en {{project}}.",
"emails.invitation.footer": "Se vi ne interesiĝas, vi povas ignori ĉi tiun mesaĝon.",
- "emails.invitation.thanks": "Dankegon",
+ "emails.invitation.thanks": "Dankegon,",
"emails.invitation.signature": "Teamo {{project}}",
"locale.country.unknown": "Unknown",
"countries.af": "Afghanistan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Sekureca frazo por ĉi tiu retpoŝto estas {{phrase}}. Vi povas fidi ĉi tiun retpoŝton se tiu ĉi frazo kongruas kun la frazo montrita dum ensaluto.",
"emails.otpSession.thanks": "Dankon,",
"emails.otpSession.signature": "teamo de {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/es.json b/app/config/locale/translations/es.json
index 0e02f816fe..ff98fd28c7 100644
--- a/app/config/locale/translations/es.json
+++ b/app/config/locale/translations/es.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "El equipo de %s",
"emails.verification.subject": "Verificación de cuenta",
- "emails.verification.hello": "Hola, {{name}}.",
+ "emails.verification.hello": "Hola, {{name}}.,",
"emails.verification.body": "Haz clic en este enlace para verificar tu correo:",
"emails.verification.footer": "Si no has solicitado verificar este correo, puedes ignorar este mensaje.",
- "emails.verification.thanks": "Gracias.",
+ "emails.verification.thanks": "Gracias.,",
"emails.verification.signature": "El equipo de {{project}}.",
"emails.magicSession.subject": "Inicio de sesión",
- "emails.magicSession.hello": "Hola",
+ "emails.magicSession.hello": "Hola,",
"emails.magicSession.body": "Haz clic en este enlace para iniciar sesión:",
"emails.magicSession.footer": "Si no has solicitado iniciar sesión usando este correo, puedes ignorar este mensaje.",
- "emails.magicSession.thanks": "Gracias.",
+ "emails.magicSession.thanks": "Gracias.,",
"emails.magicSession.signature": "El equipo de {{project}}",
"emails.recovery.subject": "Restablecer contraseña",
- "emails.recovery.hello": "Hola, {{name}}.",
+ "emails.recovery.hello": "Hola, {{name}}.,",
"emails.recovery.body": "Haz clic en este enlace para restablecer la contraseña de {{project}}:",
"emails.recovery.footer": "Si no has solicitado restablecer la contraseña, puedes ignorar este mensaje.",
- "emails.recovery.thanks": "Gracias.",
+ "emails.recovery.thanks": "Gracias.,",
"emails.recovery.signature": "El equipo de {{project}}",
"emails.invitation.subject": "Invitación al equipo %s en %s",
- "emails.invitation.hello": "Hola",
+ "emails.invitation.hello": "Hola,",
"emails.invitation.body": "Este correo ha sido enviado a petición de {{owner}} quién quiere invitarte a formar parte del equipo {{team}} en {{project}}.",
"emails.invitation.footer": "Si no estás interesado, puedes ignorar este mensaje.",
- "emails.invitation.thanks": "Gracias.",
+ "emails.invitation.thanks": "Gracias.,",
"emails.invitation.signature": "El equipo de {{project}}",
"locale.country.unknown": "Desconocido",
"countries.af": "Afganistán",
@@ -239,10 +239,10 @@
"emails.magicSession.securityPhrase": "La frase de seguridad para este correo electrónico es {{phrase}}. Puedes confiar en este correo electrónico si esta frase coincide con la frase que se muestra durante el inicio de sesión.",
"emails.magicSession.optionUrl": "Si no puedes iniciar sesión utilizando el botón anterior, visita el siguiente enlace:",
"emails.otpSession.subject": "Inicio de sesión en {{project}}",
- "emails.otpSession.hello": "Hola",
+ "emails.otpSession.hello": "Hola,",
"emails.otpSession.description": "Ingrese el siguiente código de verificación cuando se le solicite para iniciar sesión de forma segura en su cuenta de {{project}}. Expirará en 15 minutos.",
"emails.otpSession.clientInfo": "Este inicio de sesión fue solicitado usando {{agentClient}} en {{agentDevice}} {{agentOs}}. Si no solicitaste el inicio de sesión, puedes ignorar este correo electrónico de forma segura.",
"emails.otpSession.securityPhrase": "La frase de seguridad para este correo electrónico es {{phrase}}. Puedes confiar en este correo si esta frase coincide con la frase mostrada durante el inicio de sesión.",
- "emails.otpSession.thanks": "Gracias.",
+ "emails.otpSession.thanks": "Gracias.,",
"emails.otpSession.signature": "El equipo de {{project}}"
}
diff --git a/app/config/locale/translations/fa.json b/app/config/locale/translations/fa.json
index 9620b2c3f0..f826a75118 100644
--- a/app/config/locale/translations/fa.json
+++ b/app/config/locale/translations/fa.json
@@ -4,28 +4,28 @@
"settings.direction": "rtl",
"emails.sender": "تیم %s",
"emails.verification.subject": "تأیید حساب",
- "emails.verification.hello": "سلام {{user}}",
+ "emails.verification.hello": "سلام {{user}}،",
"emails.verification.body": "برای تأیید ایمیلتان پیوند زیر را دنبال کنید.",
"emails.verification.footer": "اگر شما درخواست تأیید حساب ندادهاید، میتوانید این پیام را نادیده بگیرید.",
- "emails.verification.thanks": "سپاس فراوان",
+ "emails.verification.thanks": "سپاس فراوان،",
"emails.verification.signature": "تیم {{user}}",
"emails.magicSession.subject": "ورود به حساب کاربری",
"emails.magicSession.hello": "سلام،",
"emails.magicSession.body": "برای ورود به حسابتان پیوند زیر را دنبال کنید.",
"emails.magicSession.footer": "اگر شما درخواست ورود به حساب کاربری با استفاده از این ایمیل را ندادهاید، میتوانید این پیام را نادیده بگیرید.",
- "emails.magicSession.thanks": "سپاس فراوان",
+ "emails.magicSession.thanks": "سپاس فراوان،",
"emails.magicSession.signature": "تیم {{user}}",
"emails.recovery.subject": "بازیابی گذرواژه",
- "emails.recovery.hello": "سلام {{user}}",
+ "emails.recovery.hello": "سلام {{user}}،",
"emails.recovery.body": "برای بازیابی گذرواژهتان پیوند زیر را دنبال کنید.",
"emails.recovery.footer": "اگر شما درخواست بازیابی گذرواژه ندادهاید، میتوانید این پیام را نادیده بگیرید.",
- "emails.recovery.thanks": "سپاس فراوان",
+ "emails.recovery.thanks": "سپاس فراوان،",
"emails.recovery.signature": "تیم {{user}}",
"emails.invitation.subject": "دعوت به تیم %s در %s",
- "emails.invitation.hello": "سلام",
+ "emails.invitation.hello": "سلام،",
"emails.invitation.body": "این ایمیل برای شما فرستاده شدهاست زیرا {{owner}} میخواهد شما را به تیم {{team}} در پروژهی {{project}} بیفزاید.",
"emails.invitation.footer": "اگر علاقه ندارید، میتوانید این پیام را نادیده بگیرید.",
- "emails.invitation.thanks": "سپاس فراوان",
+ "emails.invitation.thanks": "سپاس فراوان،",
"emails.invitation.signature": "تیم {{user}}",
"locale.country.unknown": "ناشناخته",
"countries.af": "افغانستان",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "عبارت امنیتی برای این ایمیل {{phrase}} است. اگر این عبارت با عبارت نشان داده شده هنگام ورود به سیستم مطابقت داشته باشد، میتوانید به این ایمیل اعتماد کنید.",
"emails.otpSession.thanks": "متشکرم،",
"emails.otpSession.signature": "تیم {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/fi.json b/app/config/locale/translations/fi.json
index d86810d925..ca61a95653 100644
--- a/app/config/locale/translations/fi.json
+++ b/app/config/locale/translations/fi.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s Tiimi",
"emails.verification.subject": "",
- "emails.verification.hello": "",
+ "emails.verification.hello": ",",
"emails.verification.body": "",
"emails.verification.footer": "",
- "emails.verification.thanks": "",
+ "emails.verification.thanks": ",",
"emails.verification.signature": "",
"emails.magicSession.subject": "",
- "emails.magicSession.hello": "",
+ "emails.magicSession.hello": ",",
"emails.magicSession.body": "",
"emails.magicSession.footer": "",
- "emails.magicSession.thanks": "",
+ "emails.magicSession.thanks": ",",
"emails.magicSession.signature": "",
"emails.recovery.subject": "",
- "emails.recovery.hello": "",
+ "emails.recovery.hello": ",",
"emails.recovery.body": "",
"emails.recovery.footer": "",
- "emails.recovery.thanks": "",
+ "emails.recovery.thanks": ",",
"emails.recovery.signature": "",
"emails.invitation.subject": "",
- "emails.invitation.hello": "",
+ "emails.invitation.hello": ",",
"emails.invitation.body": "",
"emails.invitation.footer": "",
- "emails.invitation.thanks": "",
+ "emails.invitation.thanks": ",",
"emails.invitation.signature": "",
"locale.country.unknown": "Unknown",
"countries.af": "Afganistan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Tämän sähköpostin turvalause on {{phrase}}. Voit luottaa tähän sähköpostiin, jos tämä lause vastaa kirjautumisen yhteydessä näytettyä lausetta.",
"emails.otpSession.thanks": "Kiitos,",
"emails.otpSession.signature": "{{project}} -tiimi"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/fo.json b/app/config/locale/translations/fo.json
index 3853dbab9f..a982fd0590 100644
--- a/app/config/locale/translations/fo.json
+++ b/app/config/locale/translations/fo.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s Lið",
"emails.verification.subject": "",
- "emails.verification.hello": "",
+ "emails.verification.hello": ",",
"emails.verification.body": "",
"emails.verification.footer": "",
- "emails.verification.thanks": "",
+ "emails.verification.thanks": ",",
"emails.verification.signature": "",
"emails.magicSession.subject": "",
- "emails.magicSession.hello": "",
+ "emails.magicSession.hello": ",",
"emails.magicSession.body": "",
"emails.magicSession.footer": "",
- "emails.magicSession.thanks": "",
+ "emails.magicSession.thanks": ",",
"emails.magicSession.signature": "",
"emails.recovery.subject": "",
- "emails.recovery.hello": "",
+ "emails.recovery.hello": ",",
"emails.recovery.body": "",
"emails.recovery.footer": "",
- "emails.recovery.thanks": "",
+ "emails.recovery.thanks": ",",
"emails.recovery.signature": "",
"emails.invitation.subject": "",
- "emails.invitation.hello": "",
+ "emails.invitation.hello": ",",
"emails.invitation.body": "",
"emails.invitation.footer": "",
- "emails.invitation.thanks": "",
+ "emails.invitation.thanks": ",",
"emails.invitation.signature": "",
"locale.country.unknown": "Ókjent",
"countries.af": "Afghanistan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Trygdarorðið fyri hesa teldupostin er {{phrase}}. Tú kanst líta á hesa teldupostin um hetta orðið passar við orðið víst tá tú ritaði inn.",
"emails.otpSession.thanks": "Takk,",
"emails.otpSession.signature": "{{project}} lið"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/fr.json b/app/config/locale/translations/fr.json
index d73f4e7c81..1b60cb1910 100644
--- a/app/config/locale/translations/fr.json
+++ b/app/config/locale/translations/fr.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "Équipe %s",
"emails.verification.subject": "Vérification du compte",
- "emails.verification.hello": "Bonjour {{user}}",
+ "emails.verification.hello": "Bonjour {{user}},",
"emails.verification.body": "Suivez ce lien pour vérifier votre adresse e-mail.",
"emails.verification.footer": "Si vous n'avez pas demandé à vérifier cette adresse, vous pouvez ignorer ce message.",
- "emails.verification.thanks": "Merci",
+ "emails.verification.thanks": "Merci,",
"emails.verification.signature": "Équipe {{project}}",
"emails.magicSession.subject": "Connexion",
- "emails.magicSession.hello": "Bonjour",
+ "emails.magicSession.hello": "Bonjour,",
"emails.magicSession.body": "Suivez ce lien pour vous connecter.",
"emails.magicSession.footer": "Si vous n'avez pas demandé à vous connecter en utilisant cet e-mail, vous pouvez ignorer ce message.",
- "emails.magicSession.thanks": "Merci",
+ "emails.magicSession.thanks": "Merci,",
"emails.magicSession.signature": "L'équipe {{project}}",
"emails.recovery.subject": "Réinitialisation du mot de passe",
- "emails.recovery.hello": "Bonjour {{user}}",
+ "emails.recovery.hello": "Bonjour {{user}},",
"emails.recovery.body": "Suivez ce lien pour réinitialiser votre mot de passe pour {{project}}.",
"emails.recovery.footer": "Si vous n'avez pas demandé à réinitialiser votre mot de passe, vous pouvez ignorer ce message.",
- "emails.recovery.thanks": "Merci",
+ "emails.recovery.thanks": "Merci,",
"emails.recovery.signature": "L'équipe {{project}}",
"emails.invitation.subject": "Invitation à l'équipe %s de %s",
- "emails.invitation.hello": "Bonjour",
+ "emails.invitation.hello": "Bonjour,",
"emails.invitation.body": "Cet e-mail vous a été envoyé parce que {{owner}} souhaite vous inviter à devenir membre de l'équipe {{team}} pour {{project}}.",
"emails.invitation.footer": "Si vous n'êtes pas intéressé, vous pouvez ignorer ce message.",
- "emails.invitation.thanks": "Merci",
+ "emails.invitation.thanks": "Merci,",
"emails.invitation.signature": "L'équipe {{project}}",
"locale.country.unknown": "Inconnu",
"countries.af": "Afghanistan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "La phrase de sécurité pour cet e-mail est {{phrase}}. Vous pouvez faire confiance à cet e-mail si cette phrase correspond à celle affichée lors de la connexion.",
"emails.otpSession.thanks": "Merci,",
"emails.otpSession.signature": "équipe {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/ga.json b/app/config/locale/translations/ga.json
index b7a641ac01..3ed68ad8c3 100644
--- a/app/config/locale/translations/ga.json
+++ b/app/config/locale/translations/ga.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s Foireann",
"emails.verification.subject": "Fíoraithe cuntais",
- "emails.verification.hello": "Haigh {{user}}",
+ "emails.verification.hello": "Haigh {{user}},",
"emails.verification.body": "Lean an nasc seo chun do ríomhphost a fhíorú.",
"emails.verification.footer": "Mura ndearna tú iarratas an seoladh seo a fhíoru, déan neamhaird den teachtaireacht seo.",
- "emails.verification.thanks": "Go raibh maith agat",
+ "emails.verification.thanks": "Go raibh maith agat,",
"emails.verification.signature": "{{project}} foireann",
"emails.magicSession.subject": "Logáil isteach",
- "emails.magicSession.hello": "Haigh",
+ "emails.magicSession.hello": "Haigh,",
"emails.magicSession.body": "Lean an nasc seo chun logáil isteach.",
"emails.magicSession.footer": "Mura ndearna tú iarratas logáil isteach leis an ríomhphost seo, déan neamhaird den teachtaireacht seo.",
- "emails.magicSession.thanks": "Go raibh maith agat",
+ "emails.magicSession.thanks": "Go raibh maith agat,",
"emails.magicSession.signature": "{{project}} foireann",
"emails.recovery.subject": "Athshocrú pasfhocail",
- "emails.recovery.hello": "Haigh {{user}}",
+ "emails.recovery.hello": "Haigh {{user}},",
"emails.recovery.body": "Lean an nasc seo chun do pasfhocal {{project}} a athshocrú.",
"emails.recovery.footer": "Mura ndearna tú iarratas do pasfhocal a athshocrú, déan neamhaird den teachtaireacht seo.",
- "emails.recovery.thanks": "Go raibh maith agat",
+ "emails.recovery.thanks": "Go raibh maith agat,",
"emails.recovery.signature": "{{project}} foireann",
"emails.invitation.subject": "Cuireadh do %s foireann ag %s",
- "emails.invitation.hello": "Haigh",
+ "emails.invitation.hello": "Haigh,",
"emails.invitation.body": "Seoladh an ríomhphost seo chugat mar ba mhaith le {{owner}} cuireadh a thabhairt duit bheith mar bhall den fhoireann {{team}} ag obair ar {{project}}.",
"emails.invitation.footer": "Is cuma leat? Déan neamhaird den teachtaireacht seo.",
- "emails.invitation.thanks": "Go raibh maith agat",
+ "emails.invitation.thanks": "Go raibh maith agat,",
"emails.invitation.signature": "{{project}} foireann",
"locale.country.unknown": "Neamhaithnid",
"countries.af": "An Afganastáin",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Frása slándála don ríomhphost seo ná {{phrase}}. Is féidir muinín a bheith agat as an ríomhphost seo má mheaitseálann an frása seo leis an bhfrása a taispeántar le linn síniú isteach.",
"emails.otpSession.thanks": "Go raibh maith agat,",
"emails.otpSession.signature": "foireann {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/gu.json b/app/config/locale/translations/gu.json
index 8c41c76c54..54378caa9e 100644
--- a/app/config/locale/translations/gu.json
+++ b/app/config/locale/translations/gu.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s ટીમ",
"emails.verification.subject": "ખાતાની ચકાસણી",
- "emails.verification.hello": "નમસ્કાર {{user}}",
+ "emails.verification.hello": "નમસ્કાર {{user}},",
"emails.verification.body": "તમારું ઇમેઇલ સરનામું ચકાસવા માટે આ લિંકને અનુસરો.",
"emails.verification.footer": "જો તમે આ સરનામાંની ચકાસણી કરવાનું ન કહ્યું હોય, તો તમે આ સંદેશને અવગણી શકો છો.",
- "emails.verification.thanks": "આભાર",
+ "emails.verification.thanks": "આભાર,",
"emails.verification.signature": "{{project}} ટીમ",
"emails.magicSession.subject": "પ્રવેશ કરો",
- "emails.magicSession.hello": "નમસ્કાર",
+ "emails.magicSession.hello": "નમસ્કાર,",
"emails.magicSession.body": "પ્રવેશ કરવા માટે આ લિંકને અનુસરો.",
"emails.magicSession.footer": "જો તમે આ ઇમેઇલનો ઉપયોગ કરીને પ્રવેશ કરવાનું ન કહ્યું હોય, તો તમે આ સંદેશને અવગણી શકો છો.",
- "emails.magicSession.thanks": "આભાર",
+ "emails.magicSession.thanks": "આભાર,",
"emails.magicSession.signature": "{{project}} ટીમ",
"emails.recovery.subject": "પાસવર્ડ ફરીથી સેટ કરો",
- "emails.recovery.hello": "નમસ્કાર {{user}}",
+ "emails.recovery.hello": "નમસ્કાર {{user}},",
"emails.recovery.body": "તમારો {{project}} પાસવર્ડ ફરીથી સેટ કરવા માટે આ લિંકને અનુસરો.",
"emails.recovery.footer": "જો તમે તમારો પાસવર્ડ ફરીથી સેટ કરવાનું ન કહ્યું હોય, તો તમે આ સંદેશને અવગણી શકો છો.",
- "emails.recovery.thanks": "આભાર",
+ "emails.recovery.thanks": "આભાર,",
"emails.recovery.signature": "{{project}} ટીમ",
"emails.invitation.subject": "%s ટીમને %s પર આમંત્રણ",
- "emails.invitation.hello": "નમસ્કાર",
+ "emails.invitation.hello": "નમસ્કાર,",
"emails.invitation.body": "આ મેઇલ તમને મોકલવામાં આવ્યો હતો કારણ કે {{owner}} તમને {{project}} માં {{team}} ટીમના સભ્ય બનવા માટે આમંત્રિત કરવા માંગતા હતો.",
"emails.invitation.footer": "જો તમને રસ નથી, તો તમે આ સંદેશને અવગણી શકો છો.",
- "emails.invitation.thanks": "આભાર",
+ "emails.invitation.thanks": "આભાર,",
"emails.invitation.signature": "{{project}} ટીમ",
"locale.country.unknown": "અજાણ",
"countries.af": "અફઘાનિસ્તાન",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "આ ઇમેઇલ માટેનો સુરક્ષા શબ્દ {{phrase}} છે. જો આ શબ્દ સાઇન ઇન વખતે દર્શાવેલા શબ્દ સાથે મેળ ખાતો હોય તો તમે આ ઇમેઇલ પર વિશ્વાસ કરી શકો છો.",
"emails.otpSession.thanks": "આભાર,",
"emails.otpSession.signature": "{{project}} ટીમ"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/he.json b/app/config/locale/translations/he.json
index 81705d3492..b3d4dea2a8 100644
--- a/app/config/locale/translations/he.json
+++ b/app/config/locale/translations/he.json
@@ -4,28 +4,28 @@
"settings.direction": "rtl",
"emails.sender": "צוות %s",
"emails.verification.subject": "אימות חשבון",
- "emails.verification.hello": "שלום {{user}}",
+ "emails.verification.hello": "שלום {{user}},",
"emails.verification.body": "לחץ על קישור זה כדי לאמת את כתובת הדוא\"ל שלך.",
"emails.verification.footer": "אם לא ביקשת לאמת כתובת זו, תוכל להתעלם מהודעה זו.",
- "emails.verification.thanks": "תודה",
+ "emails.verification.thanks": "תודה,",
"emails.verification.signature": "צוות {{project}}",
"emails.magicSession.subject": "כניסה למערכת",
- "emails.magicSession.hello": "שלום",
+ "emails.magicSession.hello": "שלום,",
"emails.magicSession.body": "לחץ על קישור זה כדי להיכנס.",
"emails.magicSession.footer": "אם לא ביקשת להיכנס באמצעות דוא\"ל זה, תוכל להתעלם מהודעה זו.",
- "emails.magicSession.thanks": "תודה",
+ "emails.magicSession.thanks": "תודה,",
"emails.magicSession.signature": "צוות {{project}}",
"emails.recovery.subject": "איפוס סיסמא",
- "emails.recovery.hello": "שלום {{user}}",
+ "emails.recovery.hello": "שלום {{user}},",
"emails.recovery.body": "עקוב אחר קישור זה כדי לאפס את סיסמתך ב-{{project}}.",
"emails.recovery.footer": "אם לא ביקשת לאפס את הסיסמה, תוכל להתעלם מהודעה זו.",
- "emails.recovery.thanks": "תודה",
+ "emails.recovery.thanks": "תודה,",
"emails.recovery.signature": "צוות {{project}}",
"emails.invitation.subject": "הזמנה לצוות %s ב- %s",
- "emails.invitation.hello": "שלום",
+ "emails.invitation.hello": "שלום,",
"emails.invitation.body": "דואר זה נשלח אליך מכיוון ש {{owner}} רצה להזמין אותך להיות חבר בצוות {{team}} ב-{{project}}.",
"emails.invitation.footer": "אם אינך מעוניין, תוכל להתעלם מהודעה זו.",
- "emails.invitation.thanks": "תודה",
+ "emails.invitation.thanks": "תודה,",
"emails.invitation.signature": "צוות {{project}}",
"locale.country.unknown": "לא ידוע",
"countries.af": "אפגניסטן",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "משפט האבטחה למייל זה הוא {{phrase}}. אתה יכול לסמוך על המייל הזה אם המשפט הזה תואם את המשפט שהוצג במהלך הכניסה למערכת.",
"emails.otpSession.thanks": "תודה,",
"emails.otpSession.signature": "צוות {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/hi.json b/app/config/locale/translations/hi.json
index d764205ad6..1c4d531d60 100644
--- a/app/config/locale/translations/hi.json
+++ b/app/config/locale/translations/hi.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s टीम",
"emails.verification.subject": "अकाउंट वेरिफिकेशन ",
- "emails.verification.hello": "नमस्ते {{user}}",
+ "emails.verification.hello": "नमस्ते {{user}},",
"emails.verification.body": "इस लिंक के माध्यम से अपने ईमेल को सत्यापित कीजिये।",
"emails.verification.footer": "यदि आप इस पते को सत्यापित नहीं करना चाहते हैं, तो आप इस संदेश को नज़रअंदाज़ कर सकते हैं।",
- "emails.verification.thanks": "धन्यवाद",
+ "emails.verification.thanks": "धन्यवाद,",
"emails.verification.signature": "{{project}} टीम",
"emails.magicSession.subject": "लॉग इन",
- "emails.magicSession.hello": "नमस्ते",
+ "emails.magicSession.hello": "नमस्ते,",
"emails.magicSession.body": "इस लिंक के माध्यम से लॉग-इन करें।",
"emails.magicSession.footer": "यदि आप इस ईमेल द्वारा लॉगिन नहीं करना चाहते हैं, तो आप इस संदेश को नज़रअंदाज़ कर सकते हैं।",
- "emails.magicSession.thanks": "धन्यवाद",
+ "emails.magicSession.thanks": "धन्यवाद,",
"emails.magicSession.signature": "{{project}} टीम",
"emails.recovery.subject": "पासवर्ड रीसेट",
- "emails.recovery.hello": "नमस्ते {{user}}",
+ "emails.recovery.hello": "नमस्ते {{user}},",
"emails.recovery.body": "इस लिंक के माध्यम से अपना {{project}} पासवर्ड रीसेट करें।",
"emails.recovery.footer": "यदि आप अपना पासवर्ड रीसेट नहीं करना चाहते हैं, तो आप इस संदेश को नज़रअंदाज़ कर सकते हैं।",
- "emails.recovery.thanks": "धन्यवाद",
+ "emails.recovery.thanks": "धन्यवाद,",
"emails.recovery.signature": "{{project}} टीम",
"emails.invitation.subject": "%s टीम का यहाँ %s पर आमंत्रण",
- "emails.invitation.hello": "नमस्ते",
+ "emails.invitation.hello": "नमस्ते,",
"emails.invitation.body": "यह मेल आपको इसलिए भेजा गया है क्योंकि {{owner}} आपको {{team}} टीम का सदस्य बनाना चाहते है, जो {{project}} से जुड़ा हुआ है।",
"emails.invitation.footer": "यदि आप इसमें रूचि नहीं रखते, तो आप इस संदेश को नज़रअंदाज़ कर सकते हैं।",
- "emails.invitation.thanks": "धन्यवाद",
+ "emails.invitation.thanks": "धन्यवाद,",
"emails.invitation.signature": "{{project}} टीम",
"locale.country.unknown": "अज्ञात",
"countries.af": "अफ़ग़ानिस्तान",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "इस ईमेल के लिए सुरक्षा वाक्यांश {{phrase}} है। अगर यह वाक्यांश साइन इन के दौरान दिखाए गए वाक्यांश से मेल खाता है, तो आप इस ईमेल पर भरोसा कर सकते हैं।",
"emails.otpSession.thanks": "धन्यवाद,",
"emails.otpSession.signature": "{{project}} टीम"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/hr.json b/app/config/locale/translations/hr.json
index 8e537f12ec..e5bf4719a9 100644
--- a/app/config/locale/translations/hr.json
+++ b/app/config/locale/translations/hr.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s Tim",
"emails.verification.subject": "Verifikacija računa",
- "emails.verification.hello": "Pozdrav {{user}}",
+ "emails.verification.hello": "Pozdrav {{user}},",
"emails.verification.body": "Slijedite ovu poveznicu da biste potvrdili svoju adresu e-pošte.",
"emails.verification.footer": "Ukoliko niste zatražili potvrdu ove adrese, možete zanemariti ovu poruku.",
- "emails.verification.thanks": "Hvala",
+ "emails.verification.thanks": "Hvala,",
"emails.verification.signature": "{{project}} tim",
"emails.magicSession.subject": "Prijavite se",
- "emails.magicSession.hello": "Pozdrav",
+ "emails.magicSession.hello": "Pozdrav,",
"emails.magicSession.body": "Slijedite ovu poveznicu za prijavu.",
"emails.magicSession.footer": "Ako niste zatražili prijavu putem ove e-pošte, možete zanemariti ovu poruku.",
- "emails.magicSession.thanks": "Hvala",
+ "emails.magicSession.thanks": "Hvala,",
"emails.magicSession.signature": "{{project}} tim",
"emails.recovery.subject": "Ponovno postavljanje lozinke",
- "emails.recovery.hello": "Pozdrav {{user}}",
+ "emails.recovery.hello": "Pozdrav {{user}},",
"emails.recovery.body": "Slijedite ovu poveznicu za ponovno postavljanje {{project}} lozinke.",
"emails.recovery.footer": "Ako niste zatražili ponovno postavljanje Vaše lozinke, možete zanemariti ovu poruku.",
- "emails.recovery.thanks": "Hvala",
+ "emails.recovery.thanks": "Hvala,",
"emails.recovery.signature": "{{project}} tim",
"emails.invitation.subject": "Pozivnica za %s tim na %s",
- "emails.invitation.hello": "Pozdrav",
+ "emails.invitation.hello": "Pozdrav,",
"emails.invitation.body": "Ova poruka Vam je poslana jer Vas je {{owner}} htio pozvati da postanete član {{team}} tima na {{project}}.",
"emails.invitation.footer": "Ukoliko niste zainteresirani, možete zanemariti ovu poruku.",
- "emails.invitation.thanks": "Hvala",
+ "emails.invitation.thanks": "Hvala,",
"emails.invitation.signature": "{{project}} tim",
"locale.country.unknown": "Nepoznato",
"countries.af": "Afganistan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Sigurnosna fraza za ovaj e-mail je {{phrase}}. Možete vjerovati ovom e-mailu ako se ova fraza podudara s frazom prikazanom prilikom prijave.",
"emails.otpSession.thanks": "Hvala,",
"emails.otpSession.signature": "tim {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/hu.json b/app/config/locale/translations/hu.json
index fded03aee1..589cb61859 100644
--- a/app/config/locale/translations/hu.json
+++ b/app/config/locale/translations/hu.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s Csapat",
"emails.verification.subject": "Fiók Megerősítése",
- "emails.verification.hello": "Szia {{user}}",
+ "emails.verification.hello": "Szia {{user}},",
"emails.verification.body": "Kattints a linkre, hogy megerősítsd az email címedet.",
"emails.verification.footer": "Ha nem te kérted a címed megerősítését, akkor nyugodtan hagyd figyelmen kívül ezt az üzenetet.",
- "emails.verification.thanks": "Köszönettel",
+ "emails.verification.thanks": "Köszönettel,",
"emails.verification.signature": "a {{project}} csapat",
"emails.magicSession.subject": "Bejelentkezés",
- "emails.magicSession.hello": "Szia",
+ "emails.magicSession.hello": "Szia,",
"emails.magicSession.body": "Kattints a linkre a bejelentkezéshez.",
"emails.magicSession.footer": "Ha nem te szerettél volna bejelentkezni ezzel az email címmel, akkor nyugodtan hagyd figyelmen kívül ezt az üzenetet.",
- "emails.magicSession.thanks": "Köszönettel",
+ "emails.magicSession.thanks": "Köszönettel,",
"emails.magicSession.signature": "a {{project}} csapat",
"emails.recovery.subject": "Jelszó Visszaállítása",
- "emails.recovery.hello": "Hahó, {{user}}",
+ "emails.recovery.hello": "Hahó, {{user}},",
"emails.recovery.body": "Kattints a linkre a {{project}} jelszavad visszaállításához.",
"emails.recovery.footer": "Ha nem te kezdeményezted a jelszavad visszaállítását, akkor nyugodtan hagyd figyelmen kívül ezt az üzenetet.",
- "emails.recovery.thanks": "Köszönettel",
+ "emails.recovery.thanks": "Köszönettel,",
"emails.recovery.signature": "a {{project}} csapat",
"emails.invitation.subject": "Meghívó a(z) %s csapatba, a(z) %s projektbe",
- "emails.invitation.hello": "Szia",
+ "emails.invitation.hello": "Szia,",
"emails.invitation.body": "Ezt a levelet azért kaptad, mert {{owner}} meghívott, hogy légy a {{team}} csapat tagja a {{project}} projektben.",
"emails.invitation.footer": "Ha nem érdekel a lehetőség, nyugodtan hagyd figyelmen kívül ezt az üzenetet.",
- "emails.invitation.thanks": "Köszönettel",
+ "emails.invitation.thanks": "Köszönettel,",
"emails.invitation.signature": "a {{project}} csapat",
"locale.country.unknown": "Ismeretlen",
"countries.af": "Afganisztán",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Az e-mailhez tartozó biztonsági kód: {{phrase}}. Ennek az e-mailnek megbízhat, ha a megjelenített kód megegyezik a bejelentkezéskor megjelenő kóddal.",
"emails.otpSession.thanks": "Köszönöm,",
"emails.otpSession.signature": "{{project}} csapat"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/hy.json b/app/config/locale/translations/hy.json
index 2c4e72ebe3..c845526607 100644
--- a/app/config/locale/translations/hy.json
+++ b/app/config/locale/translations/hy.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "Թիմ %s",
"emails.verification.subject": "",
- "emails.verification.hello": "",
+ "emails.verification.hello": ",",
"emails.verification.body": "",
"emails.verification.footer": "",
- "emails.verification.thanks": "",
+ "emails.verification.thanks": ",",
"emails.verification.signature": "",
"emails.magicSession.subject": "",
- "emails.magicSession.hello": "",
+ "emails.magicSession.hello": ",",
"emails.magicSession.body": "",
"emails.magicSession.footer": "",
- "emails.magicSession.thanks": "",
+ "emails.magicSession.thanks": ",",
"emails.magicSession.signature": "",
"emails.recovery.subject": "",
- "emails.recovery.hello": "",
+ "emails.recovery.hello": ",",
"emails.recovery.body": "",
"emails.recovery.footer": "",
- "emails.recovery.thanks": "",
+ "emails.recovery.thanks": ",",
"emails.recovery.signature": "",
"emails.invitation.subject": "",
- "emails.invitation.hello": "",
+ "emails.invitation.hello": ",",
"emails.invitation.body": "",
"emails.invitation.footer": "",
- "emails.invitation.thanks": "",
+ "emails.invitation.thanks": ",",
"emails.invitation.signature": "",
"locale.country.unknown": "Անհայտ",
"countries.af": "Աֆղանստան",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Այս էլ.փոստի անվտանգության արտահայտությունը {{phrase}} է: Կարող եք վստահել այս էլ.փոստին, եթե այս արտահայտությունը համընկնում է մուտք գործելու պահին տրված արտահայտության հետ։",
"emails.otpSession.thanks": "Շնորհակալ եմ,",
"emails.otpSession.signature": "{{project}} թիմ"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/id.json b/app/config/locale/translations/id.json
index 90b096e39e..c28b15f15d 100644
--- a/app/config/locale/translations/id.json
+++ b/app/config/locale/translations/id.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "Tim %s",
"emails.verification.subject": "Verifikasi Akun",
- "emails.verification.hello": "Hai {{user}}",
+ "emails.verification.hello": "Hai {{user}},",
"emails.verification.body": "Ikuti tautan ini untuk memverifikasi alamat email Anda.",
"emails.verification.footer": "Jika Anda tidak meminta untuk memverifikasi alamat email ini, Anda dapat mengabaikan pesan ini.",
- "emails.verification.thanks": "Terima kasih",
+ "emails.verification.thanks": "Terima kasih,",
"emails.verification.signature": "Tim {{project}}",
"emails.magicSession.subject": "Masuk",
- "emails.magicSession.hello": "Hai",
+ "emails.magicSession.hello": "Hai,",
"emails.magicSession.body": "Ikuti tautan ini untuk masuk.",
"emails.magicSession.footer": "Jika Anda tidak meminta untuk masuk menggunakan email ini, Anda dapat mengabaikan pesan ini.",
- "emails.magicSession.thanks": "Terima kasih",
+ "emails.magicSession.thanks": "Terima kasih,",
"emails.magicSession.signature": "Tim {{project}}",
"emails.recovery.subject": "Atur Ulang Kata Sandi",
- "emails.recovery.hello": "Halo {{user}}",
+ "emails.recovery.hello": "Halo {{user}},",
"emails.recovery.body": "Ikuti tautan ini untuk menyetel ulang kata sandi {{project}} Anda.",
"emails.recovery.footer": "Jika Anda tidak meminta untuk menyetel ulang kata sandi, Anda dapat mengabaikan pesan ini.",
- "emails.recovery.thanks": "Terima kasih",
+ "emails.recovery.thanks": "Terima kasih,",
"emails.recovery.signature": "Tim {{project}}",
"emails.invitation.subject": "Undangan ke Tim %s di %s",
- "emails.invitation.hello": "Halo",
+ "emails.invitation.hello": "Halo,",
"emails.invitation.body": "Email ini dikirimkan kepada Anda karena {{owner}} ingin mengundang Anda untuk menjadi anggota tim {{team}} di {{project}}.",
"emails.invitation.footer": "Jika Anda tidak tertarik, Anda dapat mengabaikan pesan ini.",
- "emails.invitation.thanks": "Terima kasih",
+ "emails.invitation.thanks": "Terima kasih,",
"emails.invitation.signature": "Tim {{project}}",
"locale.country.unknown": "Tidak diketahui",
"countries.af": "Afganistan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Frasa keamanan untuk email ini adalah {{phrase}}. Anda dapat mempercayai email ini jika frasa tersebut cocok dengan frasa yang ditampilkan saat masuk.",
"emails.otpSession.thanks": "Terima kasih,",
"emails.otpSession.signature": "tim {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/is.json b/app/config/locale/translations/is.json
index 039d6849b7..5fede4dda0 100644
--- a/app/config/locale/translations/is.json
+++ b/app/config/locale/translations/is.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s Teymi",
"emails.verification.subject": "",
- "emails.verification.hello": "",
+ "emails.verification.hello": ",",
"emails.verification.body": "",
"emails.verification.footer": "",
- "emails.verification.thanks": "",
+ "emails.verification.thanks": ",",
"emails.verification.signature": "",
"emails.magicSession.subject": "",
- "emails.magicSession.hello": "",
+ "emails.magicSession.hello": ",",
"emails.magicSession.body": "",
"emails.magicSession.footer": "",
- "emails.magicSession.thanks": "",
+ "emails.magicSession.thanks": ",",
"emails.magicSession.signature": "",
"emails.recovery.subject": "",
- "emails.recovery.hello": "",
+ "emails.recovery.hello": ",",
"emails.recovery.body": "",
"emails.recovery.footer": "",
- "emails.recovery.thanks": "",
+ "emails.recovery.thanks": ",",
"emails.recovery.signature": "",
"emails.invitation.subject": "",
- "emails.invitation.hello": "",
+ "emails.invitation.hello": ",",
"emails.invitation.body": "",
"emails.invitation.footer": "",
- "emails.invitation.thanks": "",
+ "emails.invitation.thanks": ",",
"emails.invitation.signature": "",
"locale.country.unknown": "Óþekktur",
"countries.af": "Afganistan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Öryggissetning fyrir þetta tölvupóst er {{phrase}}. Þú getur treyst þessum tölvupósti ef þessi setning passar við setninguna sem birtist við innskráningu.",
"emails.otpSession.thanks": "Takk,",
"emails.otpSession.signature": "{{project}} liðið"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/it.json b/app/config/locale/translations/it.json
index d0716dd1e2..8d45de9903 100644
--- a/app/config/locale/translations/it.json
+++ b/app/config/locale/translations/it.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "Team %s",
"emails.verification.subject": "Verifica account",
- "emails.verification.hello": "Ciao {{user}}",
+ "emails.verification.hello": "Ciao {{user}},",
"emails.verification.body": "Clicca questo link per verificare il tuo indirizzo email.",
"emails.verification.footer": "Se non hai richiesto la verifica dell’indirizzo email, puoi ignorare questo messaggio.",
- "emails.verification.thanks": "Grazie",
+ "emails.verification.thanks": "Grazie,",
"emails.verification.signature": "Il team {{project}}",
"emails.magicSession.subject": "Login",
- "emails.magicSession.hello": "Ciao",
+ "emails.magicSession.hello": "Ciao,",
"emails.magicSession.body": "Clicca questo link per accedere.",
"emails.magicSession.footer": "Se non hai richiesto di effettuare l’accesso, puoi ignorare questo messaggio.",
- "emails.magicSession.thanks": "Grazie",
+ "emails.magicSession.thanks": "Grazie,",
"emails.magicSession.signature": "Il team {{project}}",
"emails.recovery.subject": "Reimpostazione password",
- "emails.recovery.hello": "Ciao {{user}}",
+ "emails.recovery.hello": "Ciao {{user}},",
"emails.recovery.body": "Clicca questo link per reimpostare la tua password di {{project}}.",
"emails.recovery.footer": "Se non hai richiesto la reimpostazione della password, puoi ignorare questo messaggio.",
- "emails.recovery.thanks": "Grazie",
+ "emails.recovery.thanks": "Grazie,",
"emails.recovery.signature": "Il team {{project}}",
"emails.invitation.subject": "Invito al Team %s per %s",
- "emails.invitation.hello": "Ciao",
+ "emails.invitation.hello": "Ciao,",
"emails.invitation.body": "Hai ricevuto questa email perché {{owner}} ti ha invitato a diventare un membro del team {{team}} di {{project}}.",
"emails.invitation.footer": "Ignora questo messaggio se non sei interessatə.",
- "emails.invitation.thanks": "Grazie",
+ "emails.invitation.thanks": "Grazie,",
"emails.invitation.signature": "Il team {{project}}",
"locale.country.unknown": "Sconosciuto",
"countries.af": "Afghanistan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "La frase di sicurezza per questa email è {{phrase}}. Puoi fidarti di questa email se questa frase corrisponde alla frase mostrata durante l'accesso.",
"emails.otpSession.thanks": "Grazie,",
"emails.otpSession.signature": "team {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/ja.json b/app/config/locale/translations/ja.json
index 6482488cf5..76d9a0cb1f 100644
--- a/app/config/locale/translations/ja.json
+++ b/app/config/locale/translations/ja.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s チーム",
"emails.verification.subject": "アカウント認証",
- "emails.verification.hello": "こんにちは{{user}}さん",
+ "emails.verification.hello": "こんにちは{{user}}さん、",
"emails.verification.body": "メールアドレスを有効化するためには下記リンクをクリックして下さい。",
"emails.verification.footer": "このメールに心当たりが無い場合は破棄をお願いいたします。",
- "emails.verification.thanks": "ご利用いただきありがとうございます。",
+ "emails.verification.thanks": "ご利用いただきありがとうございます。、",
"emails.verification.signature": "{{project}}チーム",
"emails.magicSession.subject": "ログイン",
- "emails.magicSession.hello": "こんにちは",
+ "emails.magicSession.hello": "こんにちは、",
"emails.magicSession.body": "ログインするためには下記リンクをクリックしてください。",
"emails.magicSession.footer": "このメールに心当たりが無い場合は破棄をお願いいたします。",
- "emails.magicSession.thanks": "ご利用いただきありがとうございます。",
+ "emails.magicSession.thanks": "ご利用いただきありがとうございます。、",
"emails.magicSession.signature": "{{project}}チーム",
"emails.recovery.subject": "パスワードリセット",
- "emails.recovery.hello": "こんにちは{{user}}さん",
+ "emails.recovery.hello": "こんにちは{{user}}さん、",
"emails.recovery.body": "パスワードをリセットするためには下記リンクをクリックしてください。",
"emails.recovery.footer": "このメールに心当たりが無い場合は破棄をお願いいたします。",
- "emails.recovery.thanks": "ご利用いただきありがとうございます。",
+ "emails.recovery.thanks": "ご利用いただきありがとうございます。、",
"emails.recovery.signature": "{{project}}チーム",
"emails.invitation.subject": "%sチームへの招待が%sから来ました。",
- "emails.invitation.hello": "こんにちは",
+ "emails.invitation.hello": "こんにちは、",
"emails.invitation.body": "{{owner}}さんが{{project}}の{{team}}チームにあなたを招待しています。",
"emails.invitation.footer": "このメールに心当たりが無い場合は破棄をお願いいたします。",
- "emails.invitation.thanks": "ご利用いただきありがとうございます。",
+ "emails.invitation.thanks": "ご利用いただきありがとうございます。、",
"emails.invitation.signature": "{{project}}チーム",
"locale.country.unknown": "不明",
"countries.af": "アフガニスタン",
@@ -239,10 +239,10 @@
"emails.magicSession.securityPhrase": "このメールのセキュリティフレーズは{{phrase}}です。サインイン時に表示されたフレーズと一致する場合、このメールは信頼できます。",
"emails.magicSession.optionUrl": "上記のボタンを使用してサインインすることができない場合は、次のリンクにアクセスしてください：",
"emails.otpSession.subject": "プロジェクト ログイン",
- "emails.otpSession.hello": "こんにちは。",
+ "emails.otpSession.hello": "こんにちは。、",
"emails.otpSession.description": "以下の確認コードを入力して、{{project}}アカウントに安全にサインインしてください。このコードは15分後に失効します。",
"emails.otpSession.clientInfo": "このサインインは、{{agentClient}} を使い {{agentDevice}} {{agentOs}} で要求されました。サインインを要求していない場合、このメールを無視しても安全です。",
"emails.otpSession.securityPhrase": "このメールのセキュリティフレーズは{{phrase}}です。サインイン時に表示されたフレーズと一致する場合、このメールを信頼できます。",
- "emails.otpSession.thanks": "ありがとうございます。",
+ "emails.otpSession.thanks": "ありがとうございます。、",
"emails.otpSession.signature": "{{project}} チーム"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/jv.json b/app/config/locale/translations/jv.json
index 7f91a8dcef..889e968b4d 100644
--- a/app/config/locale/translations/jv.json
+++ b/app/config/locale/translations/jv.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "Tim %s",
"emails.verification.subject": "Verifikasi Akun",
- "emails.verification.hello": "Hai {{user}}",
+ "emails.verification.hello": "Hai {{user}},",
"emails.verification.body": "Klik link iki kanggo verifikasi alamat email sampeyan.",
"emails.verification.footer": "Yen sampeyan ora njaluk verifikasi alamat iki, sampeyan iso nglirwakake pesen iki.",
- "emails.verification.thanks": "Matur nuwun",
+ "emails.verification.thanks": "Matur nuwun,",
"emails.verification.signature": "Tim {{project}}",
"emails.magicSession.subject": "Masuk",
- "emails.magicSession.hello": "Hai",
+ "emails.magicSession.hello": "Hai,",
"emails.magicSession.body": "Klik link iki kanggo masuk.",
"emails.magicSession.footer": "Yen sampeyan ora njaluk masuk nggunakake alamat email iki, sampeyan iso nglirwakake pesen iki.",
- "emails.magicSession.thanks": "Matur nuwun",
+ "emails.magicSession.thanks": "Matur nuwun,",
"emails.magicSession.signature": "Tim {{project}}",
"emails.recovery.subject": "Setel ulang sandi",
- "emails.recovery.hello": "Halo {{user}}",
+ "emails.recovery.hello": "Halo {{user}},",
"emails.recovery.body": "Klik link iki kanggo setel ulang sandi {{project}}.",
"emails.recovery.footer": "Yen sampeyan ora njaluk setel ulang sandi, sampeyan iso nglirwakake pesen iki.",
- "emails.recovery.thanks": "Matur nuwun",
+ "emails.recovery.thanks": "Matur nuwun,",
"emails.recovery.signature": "Tim {{project}}",
"emails.invitation.subject": "Undangan ke Tim %s di %s",
- "emails.invitation.hello": "Halo",
+ "emails.invitation.hello": "Halo,",
"emails.invitation.body": "Email iki dikirim menyang sampeyan amarga {{owner}} pengin ngajak sampeyan dadi anggota tim {{team}} di {{project}}.",
"emails.invitation.footer": "Yen sampeyan ora tertarik, sampeyan iso nglirwakake pesen iki.",
- "emails.invitation.thanks": "Matur nuwun",
+ "emails.invitation.thanks": "Matur nuwun,",
"emails.invitation.signature": "Tim {{project}}",
"locale.country.unknown": "Ora dingerteni",
"countries.af": "Afghanistan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Tembung keamanan kanggo email iki yaiku {{phrase}}. Sampeyan bisa percaya email iki menawa tembung kasebut cocog karo tembung sing ditampilake nalika mlebu.",
"emails.otpSession.thanks": "Matur nuwun,",
"emails.otpSession.signature": "tim {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/km.json b/app/config/locale/translations/km.json
index 72c362a77c..12ac05e8da 100644
--- a/app/config/locale/translations/km.json
+++ b/app/config/locale/translations/km.json
@@ -239,10 +239,10 @@
"emails.magicSession.securityPhrase": "ឃ្លាសម្ងាត់សម្រាប់អ៊ីមែលនេះគឺ {{phrase}}។ អ្នកអាចទុកចិត្តលើអ៊ីមែលនេះប្រសិនបើឃ្លានេះត្រូវគ្នាជាមួយឃ្លាដែលបង្ហាញឡើងពេលចូលប្រើ។",
"emails.magicSession.optionUrl": "ប្រសិនបើអ្នកមិនអាចចូលប្រើប្រាស់ដោយប្រើប៊ូតុងខាងលើនេះទេ សូមចូលទៅកាន់តំណភ្ជាប់ខាងក្រោម៖",
"emails.otpSession.subject": "ការចូល {{project}}",
- "emails.otpSession.hello": "ជំរាបសួរ,",
+ "emails.otpSession.hello": "ជំរាបសួរ",
"emails.otpSession.description": "បញ្ចូលលេខកូដផ្ទៀងផ្ទាត់ខាងក្រោមនេះនៅពេលដែលបានស្នើ ដើម្បីចូលទៅកាន់គណនី {{project}} របស់អ្នកដោយមានសុវត្ថិភាព។ វានឹងផុតកំណត់ក្នុងរយៈពេល 15 នាទី។",
"emails.otpSession.clientInfo": "ការចូលប្រព័ន្ធនេះត្រូវបានស្នើរបស់អ្នកប្រើប្រាស់តាមរយៈ {{agentClient}} នៅលើ {{agentDevice}} {{agentOs}}។ ប្រសិនបើអ្នកមិនបានស្នើរការចូលប្រព័ន្ធនេះទេ អ្នកអាចមិនអើពើអ៊ីម៉ែលនេះបាន។",
"emails.otpSession.securityPhrase": "ឃ្លាសម្រាប់សុវត្ថិភាពអ៊ីមែលនេះគឺ {{phrase}}។ អ្នកអាចទុកចិត្តនូវអ៊ីមែលនេះប្រសិនបើឃ្លានេះត្រូវគ្នាជាមួយឃ្លាដែលបានបង្ហាញពេលចូលគណនី។",
- "emails.otpSession.thanks": "អរគុណ,",
+ "emails.otpSession.thanks": "អរគុណ",
"emails.otpSession.signature": "ក្រុម {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/kn.json b/app/config/locale/translations/kn.json
index 429958fc1a..ba57c21155 100644
--- a/app/config/locale/translations/kn.json
+++ b/app/config/locale/translations/kn.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s ತಂಡ",
"emails.verification.subject": "ಖಾತೆ ಪರಿಶೀಲನೆ",
- "emails.verification.hello": "ನಮಸ್ಕಾರ {{user}}",
+ "emails.verification.hello": "ನಮಸ್ಕಾರ {{user}},",
"emails.verification.body": "ನಿಮ್ಮ ಇಮೇಲ್ ವಿಳಾಸ ಪರಿಶೀಲನೆಗೆ ಈ ಲಿಂಕನ್ನು ಅನುಸರಿಸಿ",
"emails.verification.footer": "ನೀವು ಇಮೇಲ್ ವಿಳಾಸ ಪರಿಶೀಲನೆಗೆ ಕೇಳದಿದ್ದರೆ, ಈ ಸಂದೇಶವನ್ನು ನಿರ್ಲಕ್ಷಿಸಿ",
- "emails.verification.thanks": "ಧನ್ಯವಾದಗಳು",
+ "emails.verification.thanks": "ಧನ್ಯವಾದಗಳು,",
"emails.verification.signature": "{{project}} ತಂಡ",
"emails.magicSession.subject": "ಲಾಗಿನ್",
- "emails.magicSession.hello": "ನಮಸ್ಕಾರ",
+ "emails.magicSession.hello": "ನಮಸ್ಕಾರ,",
"emails.magicSession.body": "ಲಾಗಿನ್ ಮಾಡಲಿಕ್ಕೆ ಈ ಲಿಂಕನ್ನು ಅನುಸರಿಸಿ",
"emails.magicSession.footer": "ನೀವು ಈ ಇಮೇಲನಿಂದ ಲಾಗಿನ್ ಮಾಡಲು ಕೇಳದಿದ್ದರೆ, ಈ ಸಂದೇಶವನ್ನು ನಿರ್ಲಕ್ಷಿಸಿ",
- "emails.magicSession.thanks": "ಧನ್ಯವಾದಗಳು",
+ "emails.magicSession.thanks": "ಧನ್ಯವಾದಗಳು,",
"emails.magicSession.signature": "{{project}} ತಂಡ",
"emails.recovery.subject": "ಗುಪ್ತಪದ ಮರುಹೊಂದಿಸಿ",
- "emails.recovery.hello": "ನಮಸ್ಕಾರ {{user}}",
+ "emails.recovery.hello": "ನಮಸ್ಕಾರ {{user}},",
"emails.recovery.body": "ನಿಮ್ಮ {{project}} ಗುಪ್ತಪದವನ್ನು ಮರುಹೊಂದಿಸಲು ಈ ಲಿಂಕನ್ನು ಅನುಸರಿಸಿ",
"emails.recovery.footer": "ನೀವು ಗುಪ್ತಪದವನ್ನು ಮರುಹೊಂದಿಸಲು ಕೇಳದಿದ್ದರೆ, ಈ ಸಂದೇಶವನ್ನು ನಿರ್ಲಕ್ಷಿಸಿ",
- "emails.recovery.thanks": "ಧನ್ಯವಾದಗಳು",
+ "emails.recovery.thanks": "ಧನ್ಯವಾದಗಳು,",
"emails.recovery.signature": "{{project}} ತಂಡ",
"emails.invitation.subject": "%s ತಂಡಕ್ಕೆ %s ರಲ್ಲಿ ಆಹ್ವಾನ",
- "emails.invitation.hello": "ನಮಸ್ಕಾರ",
+ "emails.invitation.hello": "ನಮಸ್ಕಾರ,",
"emails.invitation.body": "ಈ ಇಮೇಲ್ ನಿಮಗೆ ಬಂದಿದೆ ಏಕೆಂದರೆ {{owner}} ನಿಮ್ಮನ್ನು {{team}} ತಂಡದ {{project}}ರಲ್ಲಿ ಸದಸ್ಯ ಆಗಲಿಕ್ಕೆ ಆಹ್ವಾನಿಸಿದ್ದಾರೆ",
"emails.invitation.footer": "ನಿಮಗೆ ಆಸಕ್ತಿಯಿಲ್ಲದಿದ್ದರೆ, ಈ ಸಂದೇಶವನ್ನು ನಿರ್ಲಕ್ಷಿಸಿ",
- "emails.invitation.thanks": "ಧನ್ಯವಾದಗಳು",
+ "emails.invitation.thanks": "ಧನ್ಯವಾದಗಳು,",
"emails.invitation.signature": "{{project}} ತಂಡ",
"locale.country.unknown": "Unknown",
"countries.af": "ಅಫ್ಘಾನಿಸ್ತಾನ",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "ಈ ಇಮೇಲ್ಗೆ ಭದ್ರತಾ ಪದವು {{phrase}}. ನೀವು ಸೈನ್ ಇನ್ ಮಾಡುವಾಗ ತೋರಿಸಿದ ಪದವು ಇದರೊಂದಿಗೆ ಹೊಂದಿಕೊಂಡರೆ ಈ ಇಮೇಲನ್ನು ನೀವು ನಂಬಬಹುದು.",
"emails.otpSession.thanks": "ಧನ್ಯವಾದಗಳು,",
"emails.otpSession.signature": "ಪ್ರಾಜೆಕ್ಟ್ ತಂಡ"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/ko.json b/app/config/locale/translations/ko.json
index 372b7f1664..c33c961130 100644
--- a/app/config/locale/translations/ko.json
+++ b/app/config/locale/translations/ko.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s 팀",
"emails.verification.subject": "계정 인증",
- "emails.verification.hello": "안녕하세요 {{user}}님",
+ "emails.verification.hello": "안녕하세요 {{user}}님、",
"emails.verification.body": "이메일 인증을 위해 링크를 클릭하여주세요.",
"emails.verification.footer": "이메일 인증을 부탁하지 않으셨다면 이 메시지를 무시하여주세요.",
- "emails.verification.thanks": "감사합니다",
+ "emails.verification.thanks": "감사합니다、",
"emails.verification.signature": "{{project}} 팀",
"emails.magicSession.subject": "로그인",
- "emails.magicSession.hello": "안녕하세요",
+ "emails.magicSession.hello": "안녕하세요、",
"emails.magicSession.body": "로그인 하시려면 링크를 클릭하여주세요.",
"emails.magicSession.footer": "이 이메일 계정으로 로그인 신청을 하지 않으셨다면 이 메세지를 무시하여주세요.",
- "emails.magicSession.thanks": "감사합니다",
+ "emails.magicSession.thanks": "감사합니다、",
"emails.magicSession.signature": "{{project}} 팀",
"emails.recovery.subject": "비밀번호 재설정",
- "emails.recovery.hello": "안녕하세요 {{user}}님",
+ "emails.recovery.hello": "안녕하세요 {{user}}님、",
"emails.recovery.body": "{{project}}의 비밀번호 재설정을 위해 링크를 클릭하여주세요.",
"emails.recovery.footer": "비밀번호 재설정 신청을 하지 않으셨다면 이 메세지를 무시하여주세요.",
- "emails.recovery.thanks": "감사합니다",
+ "emails.recovery.thanks": "감사합니다、",
"emails.recovery.signature": "{{project}} 팀",
"emails.invitation.subject": "초대장 %s 팀 - %s",
- "emails.invitation.hello": "안녕하세요",
+ "emails.invitation.hello": "안녕하세요、",
"emails.invitation.body": "{{owner}}님이 귀하를 {{project}}의 {{team}} 팀으로 초대합니다.",
"emails.invitation.footer": "팀에 합류할 의사가 없으시면 이 메세지를 무시하여주세요.",
- "emails.invitation.thanks": "감사합니다",
+ "emails.invitation.thanks": "감사합니다、",
"emails.invitation.signature": "{{project}} 팀",
"locale.country.unknown": "알려지지 않은",
"countries.af": "아프가니스탄",
@@ -239,10 +239,10 @@
"emails.magicSession.securityPhrase": "이 이메일의 보안 구절은 {{phrase}}입니다. 로그인할 때 표시되는 구절과 일치한다면 이 이메일을 신뢰할 수 있습니다.",
"emails.magicSession.optionUrl": "위의 버튼을 사용하여 로그인할 수 없다면, 다음 링크를 방문해 주세요:",
"emails.otpSession.subject": "{{project}} 로그인",
- "emails.otpSession.hello": "안녕하세요,",
+ "emails.otpSession.hello": "안녕하세요、",
"emails.otpSession.description": "다음 인증 코드를 입력하면 보안을 유지하며 {{project}} 계정에 안전하게 로그인할 수 있습니다. 15분 후에 만료됩니다.",
"emails.otpSession.clientInfo": "이 로그인은 {{agentClient}}을 사용하여 {{agentDevice}} {{agentOs}}에서 요청되었습니다. 로그인을 요청하지 않았다면, 이 이메일을 안심하고 무시하셔도 됩니다.",
"emails.otpSession.securityPhrase": "이 이메일의 보안 구절은 {{phrase}}입니다. 로그인하는 동안 표시된 구절과 이 구절이 일치하면 이 이메일을 신뢰할 수 있습니다.",
- "emails.otpSession.thanks": "감사합니다,",
+ "emails.otpSession.thanks": "감사합니다、",
"emails.otpSession.signature": "{{project}} 팀"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/la.json b/app/config/locale/translations/la.json
index 9ccbaba86e..bebef26854 100644
--- a/app/config/locale/translations/la.json
+++ b/app/config/locale/translations/la.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr*",
"emails.sender": "%s team",
"emails.verification.subject": "Ratio comprobatio",
- "emails.verification.hello": "Salve ibi {{user}}",
+ "emails.verification.hello": "Salve ibi {{user}},",
"emails.verification.body": "Sequere hanc nexum ut quin inscriptionem tuum.",
"emails.verification.footer": "Si verificationem huius inscriptionis non postulasti, nuntium hunc ignorare potes.",
- "emails.verification.thanks": "Gratias",
+ "emails.verification.thanks": "Gratias,",
"emails.verification.signature": "{{project}} Team",
"emails.magicSession.subject": "Log in",
- "emails.magicSession.hello": "Salve ibi",
+ "emails.magicSession.hello": "Salve ibi,",
"emails.magicSession.body": "Hanc nexum cum login",
"emails.magicSession.footer": "Si verificationem huius inscriptionis non postulasti, nuntium hunc ignorare potes.",
- "emails.magicSession.thanks": "Gratias",
+ "emails.magicSession.thanks": "Gratias,",
"emails.magicSession.signature": "{{project}} team",
"emails.recovery.subject": "Recuperet password",
- "emails.recovery.hello": "Salve ibi {{user}}",
+ "emails.recovery.hello": "Salve ibi {{user}},",
"emails.recovery.body": "Sequere hanc conjunctionem ut recipias project password {{project}}",
"emails.recovery.footer": "Si tesseram tuam recuperare non petis, nuntium hunc ignorare potes",
- "emails.recovery.thanks": "Gratias",
+ "emails.recovery.thanks": "Gratias,",
"emails.recovery.signature": "{{project}} team",
"emails.invitation.subject": "Invitatio pro %s in quadrigis %s",
- "emails.invitation.hello": "Salve ibi",
+ "emails.invitation.hello": "Salve ibi,",
"emails.invitation.body": "Haec inscriptio ad te missa est quia dominus incepto {{owner}} te invitare vult ut membrum {{team}} quadrigis fias ad {{project}}",
"emails.invitation.footer": "Si non quaero, potes hunc nuntium ignorare",
- "emails.invitation.thanks": "Gratias",
+ "emails.invitation.thanks": "Gratias,",
"emails.invitation.signature": "{{project}} team",
"locale.country.unknown": "Ignotum",
"countries.af": "Afghanistan",
@@ -245,10 +245,10 @@
"emails.otpSession.thanks": "Gratias,",
"emails.otpSession.signature": "{{project}} team -> {{project}} grex",
"emails.certificate.subject": "Defectio testimonii pro %s",
- "emails.certificate.hello": "Salve",
+ "emails.certificate.hello": "Salve,",
"emails.certificate.body": "Certificatum pro dominio tuo '{{domain}}' generari non potuit. Hoc conatus num. {{attempt}} est, et defectus causatus est ab: {{error}}",
"emails.certificate.footer": "Praeclarum tuum testificationem valet ad XXX dies a primo defectu. Magnopere suademus ut hoc casum investiges, alioquin dominium tuum sine valida SSL communicatione erit.",
- "emails.certificate.thanks": "Gratias",
+ "emails.certificate.thanks": "Gratias,",
"emails.certificate.signature": "team {{project}}",
"sms.verification.body": "{{secret}}"
}
diff --git a/app/config/locale/translations/lb.json b/app/config/locale/translations/lb.json
index 3f590d5323..91b52e4a18 100644
--- a/app/config/locale/translations/lb.json
+++ b/app/config/locale/translations/lb.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s Team",
"emails.verification.subject": "Kont Verifikatioun",
- "emails.verification.hello": "Hey {{user}}",
+ "emails.verification.hello": "Hey {{user}},",
"emails.verification.body": "Follegt dëse Link fir Är E -Mail Adress z'iwwerpréiwen.",
"emails.verification.footer": "Wann Dir net gefrot hutt dës Adress z'iwwerpréiwen, kënnt Dir dëse Message ignoréieren.",
- "emails.verification.thanks": "Merci",
+ "emails.verification.thanks": "Merci,",
"emails.verification.signature": "{{project}} équipe",
"emails.magicSession.subject": "Login",
- "emails.magicSession.hello": "Hey",
+ "emails.magicSession.hello": "Hey,",
"emails.magicSession.body": "Follegt dëse Link fir umellen.",
"emails.magicSession.footer": "Wann Dir net gefrot hutt Iech mat dëser E -Mail anzemelden, kënnt Dir dëse Message ignoréieren.",
- "emails.magicSession.thanks": "Merci",
+ "emails.magicSession.thanks": "Merci,",
"emails.magicSession.signature": "{{project}} équipe",
"emails.recovery.subject": "Password Reset",
- "emails.recovery.hello": "Hello {{user}}",
+ "emails.recovery.hello": "Hello {{user}},",
"emails.recovery.body": "Follegt dëse Link fir Äert {{project}} Passwuert zréckzesetzen.",
"emails.recovery.footer": "Wann Dir net gefrot hutt Äert Passwuert zréckzesetzen, kënnt Dir dëse Message ignoréieren.",
- "emails.recovery.thanks": "Merci",
+ "emails.recovery.thanks": "Merci,",
"emails.recovery.signature": "{{project}} équipe",
"emails.invitation.subject": "Invitatioun un %s équipe bei %s",
- "emails.invitation.hello": "Hallo",
+ "emails.invitation.hello": "Hallo,",
"emails.invitation.body": "Dës E -Mail gouf un Iech geschéckt well {{owner}} Iech invitéiere wëllt fir Member vum {{team}} Team bei {{project}} ze ginn.",
"emails.invitation.footer": "Wann Dir net interesséiert sidd, kënnt Dir dëse Message ignoréieren.",
- "emails.invitation.thanks": "Merci",
+ "emails.invitation.thanks": "Merci,",
"emails.invitation.signature": "{{project}} équipe",
"locale.country.unknown": "Onbekannt",
"countries.af": "Afghanistan",
@@ -244,4 +244,4 @@
"emails.otpSession.securityPhrase": "D'Sécherheetsausso fir dësen E-Mail ass {{phrase}}. Dir kënnt dësem E-Mail vertrauen, wann dës Ausso mat der Ausso iwwereneestëmmt, déi beim Umellen gewise ginn ass.",
"emails.otpSession.thanks": "Merci,",
"emails.otpSession.signature": "{{project}} Equipe"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/lt.json b/app/config/locale/translations/lt.json
index f72250c98e..94c874ce82 100644
--- a/app/config/locale/translations/lt.json
+++ b/app/config/locale/translations/lt.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s komanda",
"emails.verification.subject": "Paskyros Patvirtinimas",
- "emails.verification.hello": "Labas {{user}}",
+ "emails.verification.hello": "Labas {{user}},",
"emails.verification.body": "Spauskite šią nuorodą, kad patvirtintumėte savo el. paštą.",
"emails.verification.footer": "Jei neprašėte patvirtinti šio el. pašto, galite ignoruoti šį pranešimą.",
- "emails.verification.thanks": "Ačiū",
+ "emails.verification.thanks": "Ačiū,",
"emails.verification.signature": "{{project}} komanda",
"emails.magicSession.subject": "Prisijungti",
- "emails.magicSession.hello": "Labas",
+ "emails.magicSession.hello": "Labas,",
"emails.magicSession.body": "Spauskite šią nuorodą, kad prisijungtumėte.",
"emails.magicSession.footer": "Jei neprašėte prisijungti naudojantis šiuo el. paštu, galite ignoruoti šį pranešimą.",
- "emails.magicSession.thanks": "Ačiū",
+ "emails.magicSession.thanks": "Ačiū,",
"emails.magicSession.signature": "{{project}} komanda",
"emails.recovery.subject": "Slaptažodžio Atkūrimas",
- "emails.recovery.hello": "Labas {{user}}",
+ "emails.recovery.hello": "Labas {{user}},",
"emails.recovery.body": "Spauskite šią nuorodą, kad atkurtumėte projekto {{project}} slaptažodį.",
"emails.recovery.footer": "Jei neprašėte atkurti savo slaptažodzio, galite ignoruoti šį pranešimą.",
- "emails.recovery.thanks": "Ačiū",
+ "emails.recovery.thanks": "Ačiū,",
"emails.recovery.signature": "{{project}} komanda",
"emails.invitation.subject": "Pakvietimas į %s komandą %s projekte",
- "emails.invitation.hello": "Labas",
+ "emails.invitation.hello": "Labas,",
"emails.invitation.body": "Šis el. laiškas buvo atsiųstas jums, nes {{owner}} norėjo jus pakviesti tapti projekto {{project}} dalimi {{team}} komandoje.",
"emails.invitation.footer": "Jei jūsų tai nedomina, galite ignoruoti šį pranešimą.",
- "emails.invitation.thanks": "Ačiū",
+ "emails.invitation.thanks": "Ačiū,",
"emails.invitation.signature": "{{project}} komanda",
"locale.country.unknown": "Nežinoma",
"countries.af": "Afganistanas",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Šio el. laiško saugumo frazė yra {{phrase}}. Galite pasitikėti šiuo el. laišku, jei ši frazė atitinka frazę, rodytą prisijungimo metu.",
"emails.otpSession.thanks": "Ačiū,",
"emails.otpSession.signature": "{{project}} komanda"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/lv.json b/app/config/locale/translations/lv.json
index 66604a0e3e..b4a396367c 100644
--- a/app/config/locale/translations/lv.json
+++ b/app/config/locale/translations/lv.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s komanda",
"emails.verification.subject": "Konta verifikācija",
- "emails.verification.hello": "Sveicināti, {{user}}",
+ "emails.verification.hello": "Sveicināti, {{user}},",
"emails.verification.body": "Sekojiet saitei, lai apstiprinātu savu e-pasta adresi.",
"emails.verification.footer": "Ja Jūs nepieprasījāt šīs adreses apstiprinājumu, lūdzu, ignorējiet šo ziņu.",
- "emails.verification.thanks": "Paldies",
+ "emails.verification.thanks": "Paldies,",
"emails.verification.signature": "{{project}} komanda",
"emails.magicSession.subject": "Ieiet",
- "emails.magicSession.hello": "Sveicināti",
+ "emails.magicSession.hello": "Sveicināti,",
"emails.magicSession.body": "Sekojiet saitei, lai ieietu.",
"emails.magicSession.footer": "Ja Jūs nepieprasījāt ieiet ar šo e-pasta adresi, lūdzu, ignorējiet šo ziņu.",
- "emails.magicSession.thanks": "Paldies",
+ "emails.magicSession.thanks": "Paldies,",
"emails.magicSession.signature": "{{project}} komanda",
"emails.recovery.subject": "Paroles atjaunināšana",
- "emails.recovery.hello": "Labdien, {{user}}",
+ "emails.recovery.hello": "Labdien, {{user}},",
"emails.recovery.body": "Sekojiet saitei, lai atjauninātu {{project}} paroli.",
"emails.recovery.footer": "Ja Jūs nepieprasījāt paroles atjaunināšanu, lūdzu, ignorējiet šo ziņu.",
- "emails.recovery.thanks": "Paldies",
+ "emails.recovery.thanks": "Paldies,",
"emails.recovery.signature": "{{project}} komanda",
"emails.invitation.subject": "Ielūgums piebiedroties %s komandai %s projektā.",
- "emails.invitation.hello": "Labdien",
+ "emails.invitation.hello": "Labdien,",
"emails.invitation.body": "Šis e-pasts tika nosūtīts Jums, jo {{owner}} vēlējās Jūs ielūgt kļūt par {{team}} komandas biedru {{project}} projektā.",
"emails.invitation.footer": "Ja Jūs neesat ieinteresēts, lūdzu, ignorējiet šo ziņu.",
- "emails.invitation.thanks": "Paldies",
+ "emails.invitation.thanks": "Paldies,",
"emails.invitation.signature": "{{project}} komanda",
"locale.country.unknown": "Nav zināms",
"countries.af": "Afganistāna",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Drošības frāze šim e-pastam ir {{phrase}}. Šim e-pastam var uzticēties, ja šī frāze sakrīt ar frāzi, kas parādīta pieslēdzoties.",
"emails.otpSession.thanks": "Paldies,",
"emails.otpSession.signature": "{{project}} komanda"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/ml.json b/app/config/locale/translations/ml.json
index 60e84e2a92..1b57d87865 100644
--- a/app/config/locale/translations/ml.json
+++ b/app/config/locale/translations/ml.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s ടീം",
"emails.verification.subject": "അക്കൗണ്ട് സ്ഥിരീകരണം",
- "emails.verification.hello": "നമസ്കാരം {{user}}",
+ "emails.verification.hello": "നമസ്കാരം {{user}},",
"emails.verification.body": "നിങ്ങളുടെ ഇമെയിൽ വിലാസം സ്ഥിരീകരിക്കുന്നതിനായി ഈ ലിങ്ക് പിന്തുടരുക.",
"emails.verification.footer": "ഈ വിലാസം സ്ഥിരീകരിക്കാന് നിങ്ങൾ ആവശ്യപ്പെട്ടില്ലെങ്കിൽ, നിങ്ങൾക്ക് ഈ സന്ദേശം അവഗണിക്കാവുന്നതാണ്.",
- "emails.verification.thanks": "നന്ദി",
+ "emails.verification.thanks": "നന്ദി,",
"emails.verification.signature": "{{project}} ടീം",
"emails.magicSession.subject": "ലോഗിൻ",
- "emails.magicSession.hello": "നമസ്കാരം",
+ "emails.magicSession.hello": "നമസ്കാരം,",
"emails.magicSession.body": "ലോഗിൻ ചെയ്യുന്നതിനായി ഈ ലിങ്ക് പിന്തുടരുക.",
"emails.magicSession.footer": "ഈ ഇമെയിൽ ഉപയോഗിച്ച് ലോഗിൻ ചെയ്യാൻ നിങ്ങൾ ആവശ്യപ്പെട്ടില്ലെങ്കിൽ, ഈ സന്ദേശം അവഗണിക്കാവുന്നതാണ്.",
- "emails.magicSession.thanks": "നന്ദി",
+ "emails.magicSession.thanks": "നന്ദി,",
"emails.magicSession.signature": "{{project}} ടീം",
"emails.recovery.subject": "രഹസ്യവാക്ക് പുനക്രമീകരണം",
- "emails.recovery.hello": "നമസ്കാരം {{user}}",
+ "emails.recovery.hello": "നമസ്കാരം {{user}},",
"emails.recovery.body": "നിങ്ങളുടെ {{Project}} രഹസ്യവാക്ക് പുനക്രമീകരിക്കുന്നതിന് ഈ ലിങ്ക് പിന്തുടരുക.",
"emails.recovery.footer": "നിങ്ങളുടെ രഹസ്യവാക്ക് പുനക്രമീകരിക്കാന് നിങ്ങൾ ആവശ്യപ്പെട്ടില്ലെങ്കിൽ, ഈ സന്ദേശം അവഗണിക്കാവുന്നതാണ്.",
- "emails.recovery.thanks": "നന്ദി",
+ "emails.recovery.thanks": "നന്ദി,",
"emails.recovery.signature": "{{project}} ടീം",
"emails.invitation.subject": "%s -ലെ %s ടീമിലേക്കുള്ള ക്ഷണം",
- "emails.invitation.hello": "നമസ്കാരം",
+ "emails.invitation.hello": "നമസ്കാരം,",
"emails.invitation.body": "നിങ്ങളെ {{project}} -ലെ {{team}} ടീമിലെ അംഗമാകുവാന് ക്ഷണിക്കാൻ {{owner}} ആഗ്രഹിക്കുന്നതിനാലാണ് ഈ മെയിൽ നിങ്ങൾക്ക് അയക്കുന്നത്.",
"emails.invitation.footer": "നിങ്ങൾക്ക് താൽപ്പര്യമില്ലെങ്കിൽ, ഈ സന്ദേശം അവഗണിക്കാവുന്നതാണ്.",
- "emails.invitation.thanks": "നന്ദി",
+ "emails.invitation.thanks": "നന്ദി,",
"emails.invitation.signature": "{{project}} ടീം",
"locale.country.unknown": "Unknown",
"countries.af": "അഫ്ഗാനിസ്ഥാൻ",
@@ -245,10 +245,10 @@
"emails.otpSession.thanks": "നന്ദി,",
"emails.otpSession.signature": "പ്രോജക്ട് ടീം",
"emails.certificate.subject": "%s ന് സർട്ടിഫിക്കറ്റ് പരാജയപ്പെട്ടു",
- "emails.certificate.hello": "ഹലോ",
+ "emails.certificate.hello": "ഹലോ,",
"emails.certificate.body": "നിങ്ങളുടെ ഡൊമൈൻ '{{domain}}'നു വേണ്ടിയുള്ള സർട്ടിഫിക്കറ്റ് ഉണ്ടാക്കാനായില്ല. ഇത് ശ്രമം നമ്പർ {{attempt}} ആണ്, പരാജയപ്പെട്ടത് ഇതു മൂലമാണ്: {{error}}",
"emails.certificate.footer": "നിങ്ങളുടെ മുൻപത്തെ സർട്ടിഫിക്കറ്റ് ആദ്യ പരാജയത്തിനു ശേഷം 30 ദിവസം വരെ സാധുവായിരിക്കും. ഈ കേസ് അന്വേഷിച്ചു നോക്കുന്നത് ഞങ്ങൾ ശക്തമായി ശുപാർശ ചെയ്യുന്നു, അല്ലെങ്കിൽ നിങ്ങളുടെ ഡൊമെയ്ൻ സാധുവായ SSL കമ്മ്യൂണിക്കേഷനില്ലാത്ത ഒരു അവസ്ഥയിലാകും.",
- "emails.certificate.thanks": "നന്ദി",
+ "emails.certificate.thanks": "നന്ദി,",
"emails.certificate.signature": "{{project}} ടീം",
"sms.verification.body": "{{secret}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/mr.json b/app/config/locale/translations/mr.json
index 4edd6bf617..6550d1c1ba 100644
--- a/app/config/locale/translations/mr.json
+++ b/app/config/locale/translations/mr.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s टीम",
"emails.verification.subject": "खाते सत्यापन",
- "emails.verification.hello": "नमस्कार {{user}}",
+ "emails.verification.hello": "नमस्कार {{user}},",
"emails.verification.body": "आपला ईमेल पत्ता सत्यापित करण्यासाठी या दुव्याचे अनुसरण करा.",
"emails.verification.footer": "आपण या पत्त्याची पडताळणी करण्यास सांगितले नसल्यास, आपण या संदेशाकडे दुर्लक्ष करू शकता.",
- "emails.verification.thanks": "धन्यवाद",
+ "emails.verification.thanks": "धन्यवाद,",
"emails.verification.signature": "{{project}} संघ",
"emails.magicSession.subject": "लॉगिन करा",
- "emails.magicSession.hello": "नमस्कार ",
+ "emails.magicSession.hello": "नमस्कार ,",
"emails.magicSession.body": "लॉगिन करण्यासाठी या लिंकचे अनुसरण करा.",
"emails.magicSession.footer": "आपण या ईमेलचा वापर करून लॉगिन करण्यास सांगितले नसल्यास, आपण या संदेशाकडे दुर्लक्ष करू शकता.",
- "emails.magicSession.thanks": "धन्यवाद",
+ "emails.magicSession.thanks": "धन्यवाद,",
"emails.magicSession.signature": "{{project}} संघ",
"emails.recovery.subject": "पासवर्ड रीसेट",
- "emails.recovery.hello": "नमस्कार {{user}}",
+ "emails.recovery.hello": "नमस्कार {{user}},",
"emails.recovery.body": "आपला {{project}}चे पासवर्ड रीसेट करण्यासाठी या लिंकचे अनुसरण करा",
"emails.recovery.footer": "आपण आपला पासवर्ड रीसेट करण्यास सांगितले नसल्यास, आपण या संदेशाकडे दुर्लक्ष करू शकता.",
- "emails.recovery.thanks": "धन्यवाद",
+ "emails.recovery.thanks": "धन्यवाद,",
"emails.recovery.signature": "{{project}} संघ",
"emails.invitation.subject": "%s संघ %s येथे सामील होण्यासाठी आमंत्रण",
- "emails.invitation.hello": "नमस्कार",
+ "emails.invitation.hello": "नमस्कार,",
"emails.invitation.body": "हा मेल तुम्हाला पाठवला होता कारण {{owner}} तुम्हाला {{project}} येथे {{team}} टीमचे सदस्य होण्यासाठी आमंत्रित करू इच्छित होते.",
"emails.invitation.footer": "आपल्याला स्वारस्य नसल्यास, आपण या संदेशाकडे दुर्लक्ष करू शकता.",
- "emails.invitation.thanks": "धन्यवाद",
+ "emails.invitation.thanks": "धन्यवाद,",
"emails.invitation.signature": "{{project}} संघ",
"locale.country.unknown": "अज्ञात",
"countries.af": "अफगानिस्तान",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "या ईमेलसाठीचे सुरक्षा वाक्यांश {{phrase}} आहे. जर हे वाक्यांश साइन इन करताना दाखवल्या गेलेल्या वाक्यांशाशी जुळत असेल तर आपण या ईमेलवर विश्वास ठेवू शकता.",
"emails.otpSession.thanks": "धन्यवाद,",
"emails.otpSession.signature": "{{project}} संघ"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/ms.json b/app/config/locale/translations/ms.json
index ded7587d34..a02c36b075 100644
--- a/app/config/locale/translations/ms.json
+++ b/app/config/locale/translations/ms.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s Team",
"emails.verification.subject": "Pengesahan Akaun",
- "emails.verification.hello": "Hey {{user}}",
+ "emails.verification.hello": "Hey {{user}},",
"emails.verification.body": "Tekan pautan ini untuk mengesahkan alamat email anda.",
"emails.verification.footer": "Sekiranya anda tidak membuat permintaan untuk mengesahkan email ini, sila abaikan mesej ini.",
- "emails.verification.thanks": "Terima kasih",
+ "emails.verification.thanks": "Terima kasih,",
"emails.verification.signature": "{{project}} team",
"emails.magicSession.subject": "Log masuk",
- "emails.magicSession.hello": "Hey",
+ "emails.magicSession.hello": "Hey,",
"emails.magicSession.body": "Tekan pautan ini untuk log masuk.",
"emails.magicSession.footer": "Sekiranya anda tidak membuat permintaan untuk log masuk menggunakan email ini, sila abaikan mesej ini.",
- "emails.magicSession.thanks": "Terima kasih",
+ "emails.magicSession.thanks": "Terima kasih,",
"emails.magicSession.signature": "{{project}} team",
"emails.recovery.subject": "Menetap semula Kata Laluan",
- "emails.recovery.hello": "Hello {{user}}",
+ "emails.recovery.hello": "Hello {{user}},",
"emails.recovery.body": "Tekan pautan ini untuk menetapkan semula kata laluan {{project}}.",
"emails.recovery.footer": "Sekiranya anda tidak membuat permintaan menetap semula kata laluan, sila abaikan mesej ini.",
- "emails.recovery.thanks": "Terima kasih",
+ "emails.recovery.thanks": "Terima kasih,",
"emails.recovery.signature": "{{project}} team",
"emails.invitation.subject": "Jemputan ke pasukan %s di %s",
- "emails.invitation.hello": "Hello",
+ "emails.invitation.hello": "Hello,",
"emails.invitation.body": "Anda menerima mel ini kerana {{owner}} ingin menjemput anda untuk menjadi ahli pasukan {{team}} di {{project}}.",
"emails.invitation.footer": "Sekiranya anda tidak berminat, sila abaikan mesej ini.",
- "emails.invitation.thanks": "Terima kasih",
+ "emails.invitation.thanks": "Terima kasih,",
"emails.invitation.signature": "{{project}} team",
"locale.country.unknown": "Tidak Diketahui",
"countries.af": "Afghanistan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Frasa keselamatan untuk email ini adalah {{phrase}}. Anda boleh mempercayai email ini jika frasa ini sepadan dengan frasa yang ditunjukkan semasa log masuk.",
"emails.otpSession.thanks": "Terima kasih,",
"emails.otpSession.signature": "pasukan {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/nb.json b/app/config/locale/translations/nb.json
index f8680e8993..daf18abc1c 100644
--- a/app/config/locale/translations/nb.json
+++ b/app/config/locale/translations/nb.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s Team",
"emails.verification.subject": "Kontobekreftelse",
- "emails.verification.hello": "Hei {{user}}",
+ "emails.verification.hello": "Hei {{user}},",
"emails.verification.body": "Følg denne lenken for å bekrefte din e-postadresse.",
"emails.verification.footer": "Dersom du ikke ba om å bekrefte e-postadressen, kan du se bort fra denne meldingen.",
- "emails.verification.thanks": "Takk",
+ "emails.verification.thanks": "Takk,",
"emails.verification.signature": "{{project}} team",
"emails.magicSession.subject": "Pålogging",
- "emails.magicSession.hello": "Hei",
+ "emails.magicSession.hello": "Hei,",
"emails.magicSession.body": "Følg denne lenken for å logge på.",
"emails.magicSession.footer": "Dersom du ikke ba om å logge på med denne e-postadressen, kan du se bort fra denne meldingen.",
- "emails.magicSession.thanks": "Takk",
+ "emails.magicSession.thanks": "Takk,",
"emails.magicSession.signature": "{{project}} team",
"emails.recovery.subject": "Nullstille passord",
- "emails.recovery.hello": "Hei {{user}}",
+ "emails.recovery.hello": "Hei {{user}},",
"emails.recovery.body": "Følg denne lenken for å nullstille ditt {{project}} passord.",
"emails.recovery.footer": "Dersom du ikke ba om å nullstille passordet ditt, kan du se bort fra denne meldingen.",
- "emails.recovery.thanks": "Takk",
+ "emails.recovery.thanks": "Takk,",
"emails.recovery.signature": "{{project}} team",
"emails.invitation.subject": "Invitasjon til %s Team ved %s",
- "emails.invitation.hello": "Hei",
+ "emails.invitation.hello": "Hei,",
"emails.invitation.body": "Denne meldingen ble sendt til deg fordi {{owner}} ønsket å invitere deg til å bli medlem av {{team}} team ved {{project}}.",
"emails.invitation.footer": "Dersom du ikke er interessert, kan du se bort fra denne meldingen.",
- "emails.invitation.thanks": "Takk",
+ "emails.invitation.thanks": "Takk,",
"emails.invitation.signature": "{{project}} team",
"locale.country.unknown": "Ukjent",
"countries.af": "Afghanistan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Sikkerhetsfrasen for denne e-posten er {{phrase}}. Du kan stole på denne e-posten hvis denne frasen stemmer overens med frasen som ble vist under pålogging.",
"emails.otpSession.thanks": "Takk,",
"emails.otpSession.signature": "{{project}} team"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/ne.json b/app/config/locale/translations/ne.json
index f31609eafc..4f05a9b5ba 100644
--- a/app/config/locale/translations/ne.json
+++ b/app/config/locale/translations/ne.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s समूह",
"emails.verification.subject": "खाता प्रमाणिकरण",
- "emails.verification.hello": "नमस्ते {{user}}",
+ "emails.verification.hello": "नमस्ते {{user}},",
"emails.verification.body": "इमेल ठेगाना प्रमाणित गर्नको लागी यो लिंकमा जानुहोस।",
"emails.verification.footer": "यदि तपाइँले आफ्नो खाता प्रमाणित गर्न सोध्नु भएको छैन भने तपाइँले यो सन्देश लाई बेवास्ता गर्न सक्नुहुन्छ।",
- "emails.verification.thanks": "धन्यवाद",
+ "emails.verification.thanks": "धन्यवाद,",
"emails.verification.signature": "{{project}} समूह",
"emails.magicSession.subject": "लगइन",
- "emails.magicSession.hello": "नमस्ते",
+ "emails.magicSession.hello": "नमस्ते,",
"emails.magicSession.body": "लगइन गर्नको लागी यो लिंकमा जानुहोस।",
"emails.magicSession.footer": "यदि तपाइँले यो इमेल प्रयोग गरेर लगइन गर्न सोध्नु भएको छैन भने तपाइँले यो सन्देश लाई बेवास्ता गर्न सक्नुहुन्छ।",
- "emails.magicSession.thanks": "धन्यवाद",
+ "emails.magicSession.thanks": "धन्यवाद,",
"emails.magicSession.signature": "{{project}} समूह",
"emails.recovery.subject": "पासवर्ड रिसेट",
- "emails.recovery.hello": "नमस्ते {{user}}",
+ "emails.recovery.hello": "नमस्ते {{user}},",
"emails.recovery.body": "{{project}}को पासवर्ड रिसेट गर्नको लागी यो लिंकमा जानुहोस।",
"emails.recovery.footer": "यदि तपाइँले आफ्नो पासवर्ड रिसेट गर्न सोध्नु भएको छैन भने तपाइँले यो सन्देश लाई बेवास्ता गर्न सक्नुहुन्छ।",
- "emails.recovery.thanks": "धन्यवाद",
+ "emails.recovery.thanks": "धन्यवाद,",
"emails.recovery.signature": "{{project}} समूह",
"emails.invitation.subject": "%s समूहको लागि %s मा निमन्त्रणा",
- "emails.invitation.hello": "नमस्ते",
+ "emails.invitation.hello": "नमस्ते,",
"emails.invitation.body": "{{owner}}ले तपाइँलाई {{project}}मा {{team}}को सदस्य बन्न आमन्त्रित गर्न चाहनु भएको छ। त्येसैले तपाइँलाई यो सन्देश पठाइएको हो।",
"emails.invitation.footer": "यदि तपाइँ इच्छुक हुनुहुन्न भने, तपाइँले यो सन्देशलाई बेवास्ता गर्न सक्नुहुन्छ।",
- "emails.invitation.thanks": "धन्यवाद",
+ "emails.invitation.thanks": "धन्यवाद,",
"emails.invitation.signature": "{{project}} समूह",
"locale.country.unknown": "अज्ञात",
"countries.af": "अफगानिस्तान",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "यस ईमेलको लागि सुरक्षा वाक्य {{phrase}} हो। यदि यो वाक्य साइन इन गर्दा देखाइएको वाक्यसँग मेल खान्छ भने तपाईँले यो ईमेलमा विश्वास गर्न सक्नुहुन्छ।",
"emails.otpSession.thanks": "धन्यवाद,",
"emails.otpSession.signature": "{{project}} टिम"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/nl.json b/app/config/locale/translations/nl.json
index 55e48fa753..cae82a9a37 100644
--- a/app/config/locale/translations/nl.json
+++ b/app/config/locale/translations/nl.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s Team",
"emails.verification.subject": "Account Verificatie",
- "emails.verification.hello": "Hoi {{user}}",
+ "emails.verification.hello": "Hoi {{user}},",
"emails.verification.body": "Volg deze link om uw e-mail te verifieren",
"emails.verification.footer": "Als u geen aanvraag voor verificatie heeft gemaakt, kan u deze mail negeren",
- "emails.verification.thanks": "Bedankt",
+ "emails.verification.thanks": "Bedankt,",
"emails.verification.signature": "{{project}} team",
"emails.magicSession.subject": "Login",
- "emails.magicSession.hello": "Hoi",
+ "emails.magicSession.hello": "Hoi,",
"emails.magicSession.body": "Volg deze link om in te loggen",
"emails.magicSession.footer": "Als u geen aanvraag heeft gemaakt om met deze mail in te loggen, kan u deze mail negeren",
- "emails.magicSession.thanks": "Bedankt",
+ "emails.magicSession.thanks": "Bedankt,",
"emails.magicSession.signature": "{{project}} team",
"emails.recovery.subject": "Wachtwoord Herinstellen",
- "emails.recovery.hello": "Hallo {{user}}",
+ "emails.recovery.hello": "Hallo {{user}},",
"emails.recovery.body": "Volg deze link om het wachtwoord van uw project {{project}} te wijzigen",
"emails.recovery.footer": "Als u geen aanvraag heeft gemaakt om uw wachtwoord te wijzigen, kan u deze mail negeren",
- "emails.recovery.thanks": "Bedankt",
+ "emails.recovery.thanks": "Bedankt,",
"emails.recovery.signature": "{{project}} team",
"emails.invitation.subject": "Uitnodiging van %s Team uit %s",
"emails.invitation.hello": "Hallo,",
"emails.invitation.body": "U ontvangt deze mail want u was uitgenodig door {{owner}} om lid van het {{team}} team te worden in {{project}} ",
"emails.invitation.footer": "Als u niet geintereseerd bent, kan u deze mail negeren.",
- "emails.invitation.thanks": "Bedankt",
+ "emails.invitation.thanks": "Bedankt,",
"emails.invitation.signature": "{{project}} team",
"locale.country.unknown": "Onbekend",
"countries.af": "Afghanistan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "De beveiligingszin voor deze e-mail is {{phrase}}. U kunt deze e-mail vertrouwen als deze zin overeenkomt met de zin die wordt getoond tijdens het inloggen.",
"emails.otpSession.thanks": "Bedankt,",
"emails.otpSession.signature": "{{project}} team"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/nn.json b/app/config/locale/translations/nn.json
index 6ab037466f..44be0f9845 100644
--- a/app/config/locale/translations/nn.json
+++ b/app/config/locale/translations/nn.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s Team",
"emails.verification.subject": "Kontostadfesting",
- "emails.verification.hello": "Hallo {{user}}",
+ "emails.verification.hello": "Hallo {{user}},",
"emails.verification.body": "Følg denne lenkja for å bekrefta din e-postadresse.",
"emails.verification.footer": "Om du ikkje bad om å bekrefta e-postadressa, kan du ignorera denne meldinga.",
- "emails.verification.thanks": "Takk",
+ "emails.verification.thanks": "Takk,",
"emails.verification.signature": "{{project}} team",
"emails.magicSession.subject": "Pålogging",
- "emails.magicSession.hello": "Hei",
+ "emails.magicSession.hello": "Hei,",
"emails.magicSession.body": "Følg denne lenkja for å logge på.",
"emails.magicSession.footer": "Om du ikkje ba om å logge på med denne e-postadressa, kan du ignorera denne meldinga.",
- "emails.magicSession.thanks": "Takk",
+ "emails.magicSession.thanks": "Takk,",
"emails.magicSession.signature": "{{project}} team",
"emails.recovery.subject": "Nullstilla passord",
- "emails.recovery.hello": "Hallo {{user}}",
+ "emails.recovery.hello": "Hallo {{user}},",
"emails.recovery.body": "Følg denne lenkja for å nullstilla ditt {{project}} passord.",
"emails.recovery.footer": "Om du ikkje ba om å nullstilla passordet ditt, kan du ignorera denne meldinga.",
- "emails.recovery.thanks": "Takk",
+ "emails.recovery.thanks": "Takk,",
"emails.recovery.signature": "{{project}} team",
"emails.invitation.subject": "Innbyding til %s Team ved %s",
- "emails.invitation.hello": "Hallo",
+ "emails.invitation.hello": "Hallo,",
"emails.invitation.body": "Denne meldinga ble sendt til deg fordi {{owner}} ynskja å invitera deg til å bli medlem av {{team}} team i {{project}}.",
"emails.invitation.footer": "Om du ikkje er interessert, kan du ignorera denne meldinga.",
- "emails.invitation.thanks": "Takk",
+ "emails.invitation.thanks": "Takk,",
"emails.invitation.signature": "{{project}} team",
"locale.country.unknown": "Ukjend",
"countries.af": "Afghanistan",
@@ -245,10 +245,10 @@
"emails.otpSession.thanks": "Takk,",
"emails.otpSession.signature": "{{project}}-laget",
"emails.certificate.subject": "Sertifikatfeil for %s",
- "emails.certificate.hello": "Hei",
+ "emails.certificate.hello": "Hei,",
"emails.certificate.body": "Sertifikatet for domenet ditt '{{domain}}' kunne ikkje opprettast. Dette er forsøk nr. {{attempt}}, og feilen blei forårsaka av: {{error}}",
"emails.certificate.footer": "Førre sertifikatet ditt vil vere gyldig i 30 dagar sidan den første feilen. Vi rår sterkt til at du undersøkjer denne saka, elles vil domenet ditt ende opp utan gyldig SSL-kommunikasjon.",
- "emails.certificate.thanks": "Takk",
+ "emails.certificate.thanks": "Takk,",
"emails.certificate.signature": "{{project}} team",
"sms.verification.body": "{{secret}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/or.json b/app/config/locale/translations/or.json
index 08b150fbb7..efd516f23a 100644
--- a/app/config/locale/translations/or.json
+++ b/app/config/locale/translations/or.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s ଦଳ",
"emails.verification.subject": "ଖାତା ଯାଞ୍ଚ",
- "emails.verification.hello": "ନମସ୍କାର {{user}}",
+ "emails.verification.hello": "ନମସ୍କାର {{user}},",
"emails.verification.body": "ଆପଣଙ୍କର ଇମେଲ୍ ଠିକଣା ଯାଞ୍ଚ କରିବାକୁ ଏହି ଲିଙ୍କ୍ ଅନୁସରଣ କରନ୍ତୁ |",
"emails.verification.footer": "ଯଦି ଆପଣ ଏହି ଠିକଣା ଯାଞ୍ଚ କରିବାକୁ କହି ନାହାଁନ୍ତି, ତେବେ ଆପଣ ଏହି ସନ୍ଦେଶକୁ ଉପେକ୍ଷା କରିପାରିବେ |",
- "emails.verification.thanks": "ଧନ୍ୟବାଦ",
+ "emails.verification.thanks": "ଧନ୍ୟବାଦ,",
"emails.verification.signature": "{{project}} ଦଳ",
"emails.magicSession.subject": "ଲଗଇନ୍ କରନ୍ତୁ",
- "emails.magicSession.hello": "ନମସ୍କାର",
+ "emails.magicSession.hello": "ନମସ୍କାର,",
"emails.magicSession.body": "ଲଗଇନ୍ କରିବାକୁ ଏହି ଲିଙ୍କ୍ ଅନୁସରଣ କରନ୍ତୁ |",
"emails.magicSession.footer": "ଯଦି ଆପଣ ଏହି ଇମେଲ୍ ବ୍ୟବହାର କରି ଲଗଇନ୍ କରିବାକୁ କହି ନାହାଁନ୍ତି, ତେବେ ଆପଣ ଏହି ସନ୍ଦେଶକୁ ଉପେକ୍ଷା କରିପାରିବେ |",
- "emails.magicSession.thanks": "ଧନ୍ୟବାଦ",
+ "emails.magicSession.thanks": "ଧନ୍ୟବାଦ,",
"emails.magicSession.signature": "{{project}} ଦଳ",
"emails.recovery.subject": "ପାସୱାର୍ଡ ପୁନଃ ସେଟ୍ କରନ୍ତୁ |",
- "emails.recovery.hello": "ନମସ୍କାର {{user}}",
+ "emails.recovery.hello": "ନମସ୍କାର {{user}},",
"emails.recovery.body": "ଆପଣଙ୍କର {{project}} ପାସୱାର୍ଡ ପୁନଃ ସେଟ୍ କରିବାକୁ ଏହି ଲିଙ୍କକୁ ଅନୁସରଣ କରନ୍ତୁ |",
"emails.recovery.footer": "ଯଦି ଆପଣ ଆପଣଙ୍କର ପାସୱାର୍ଡ ପୁନଃ ସେଟ୍ କରିବାକୁ କହି ନାହାଁନ୍ତି, ତେବେ ଆପଣ ଏହି ସନ୍ଦେଶକୁ ଉପେକ୍ଷା କରିପାରିବେ |",
- "emails.recovery.thanks": "ଧନ୍ୟବାଦ",
+ "emails.recovery.thanks": "ଧନ୍ୟବାଦ,",
"emails.recovery.signature": "{{project}} ଦଳ",
"emails.invitation.subject": "%s ରେ %s ଦଳକୁ ନିମନ୍ତ୍ରଣ |",
- "emails.invitation.hello": "ନମସ୍କାର",
+ "emails.invitation.hello": "ନମସ୍କାର,",
"emails.invitation.body": "ଏହି ମେଲ୍ ଆପଣଙ୍କୁ ପଠାଯାଇଥିଲା କାରଣ {{owner}} ଆପଣଙ୍କୁ {{project} ରେ {{team}} ଦଳର ସଦସ୍ୟ ହେବାକୁ ଆମନ୍ତ୍ରଣ କରିବାକୁ ଚାହୁଁଥିଲେ |",
"emails.invitation.footer": "ଯଦି ଆପଣ ଆଗ୍ରହୀ ନୁହଁନ୍ତି, ଆପଣ ଏହି ସନ୍ଦେଶକୁ ଅଣଦେଖା କରିପାରିବେ |",
- "emails.invitation.thanks": "ଧନ୍ୟବାଦ",
+ "emails.invitation.thanks": "ଧନ୍ୟବାଦ,",
"emails.invitation.signature": "{{project}} ଦଳ",
"locale.country.unknown": "ଅଜ୍ଞାତ",
"countries.af": "ଆଫଗାନିସ୍ତାନ",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "ଏହି ଇମେଲର ସୁରକ୍ଷା ବାକ୍ୟାଂଶ ହେଉଛି {{phrase}}। ସାଇନ୍ ଇନ୍ କରିବା ସମୟରେ ଦେଖାଯାଇଥିବା ବାକ୍ୟାଂଶ ସହ ଏହା ମେଳେ ଯଦି, ଆପଣ ଏହି ଇମେଲକୁ ଆସ୍ଥା କରି ପାରିବେ।",
"emails.otpSession.thanks": "ଧନ୍ୟବାଦ,",
"emails.otpSession.signature": "ପ୍ରକଳ୍ପ ଟିମ୍ବ୍"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/pa.json b/app/config/locale/translations/pa.json
index 76efde346b..de71be9f49 100644
--- a/app/config/locale/translations/pa.json
+++ b/app/config/locale/translations/pa.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s ਟੀਮ",
"emails.verification.subject": "",
- "emails.verification.hello": "",
+ "emails.verification.hello": ",",
"emails.verification.body": "",
"emails.verification.footer": "",
- "emails.verification.thanks": "",
+ "emails.verification.thanks": ",",
"emails.verification.signature": "",
"emails.magicSession.subject": "",
- "emails.magicSession.hello": "",
+ "emails.magicSession.hello": ",",
"emails.magicSession.body": "",
"emails.magicSession.footer": "",
- "emails.magicSession.thanks": "",
+ "emails.magicSession.thanks": ",",
"emails.magicSession.signature": "",
"emails.recovery.subject": "",
- "emails.recovery.hello": "",
+ "emails.recovery.hello": ",",
"emails.recovery.body": "",
"emails.recovery.footer": "",
- "emails.recovery.thanks": "",
+ "emails.recovery.thanks": ",",
"emails.recovery.signature": "",
"emails.invitation.subject": "",
- "emails.invitation.hello": "",
+ "emails.invitation.hello": ",",
"emails.invitation.body": "",
"emails.invitation.footer": "",
- "emails.invitation.thanks": "",
+ "emails.invitation.thanks": ",",
"emails.invitation.signature": "",
"locale.country.unknown": "ਅਣਜਾਣ",
"countries.af": "ਅਫਗਾਨਿਸਤਾਨ",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "ਇਸ ਈਮੇਲ ਲਈ ਸੁਰੱਖਿਆ ਵਾਕ ਹੈ {{phrase}}। ਜੇ ਇਹ ਵਾਕ ਸਾਈਨ ਇਨ ਕਰਨ ਸਮੇਂ ਦਿਖਾਈ ਦੇਣ ਵਾਲੇ ਵਾਕ ਨਾਲ ਮੇਲ ਖਾਂਦਾ ਹੈ ਤਾਂ ਤੁਸੀਂ ਇਸ ਈਮੇਲ 'ਤੇ ਭਰੋਸਾ ਕਰ ਸਕਦੇ ਹੋ।",
"emails.otpSession.thanks": "ਧੰਨਵਾਦ,",
"emails.otpSession.signature": "{{project}} ਟੀਮ"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/pl.json b/app/config/locale/translations/pl.json
index e596d2c04b..ee5811fb59 100644
--- a/app/config/locale/translations/pl.json
+++ b/app/config/locale/translations/pl.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "Zespół %s",
"emails.verification.subject": "Weryfikacja konta",
- "emails.verification.hello": "Cześć {{user}}",
+ "emails.verification.hello": "Cześć {{user}},",
"emails.verification.body": "Przejdź do tego linku, aby zweryfikować swój adres e-mail.",
"emails.verification.footer": "Jeśli to nie Ty prosiłeś o zweryfikowanie tego adresu, zignoruj tę wiadomość.",
- "emails.verification.thanks": "Dziękujemy",
+ "emails.verification.thanks": "Dziękujemy,",
"emails.verification.signature": "Zespół {{project}}",
"emails.magicSession.subject": "Logowanie",
- "emails.magicSession.hello": "Cześć",
+ "emails.magicSession.hello": "Cześć,",
"emails.magicSession.body": "Kliknij w ten link, aby zalogować się.",
"emails.magicSession.footer": "Jeśli to nie Ty prosiłeś o logowanie przy użyciu tego adresu e-mail, zignoruj tę wiadomość.",
- "emails.magicSession.thanks": "Dziękujemy",
+ "emails.magicSession.thanks": "Dziękujemy,",
"emails.magicSession.signature": "Zespół {{project}}",
"emails.recovery.subject": "Resetowanie hasła",
- "emails.recovery.hello": "Cześć {{user}}",
+ "emails.recovery.hello": "Cześć {{user}},",
"emails.recovery.body": "Przejdź do tego linku, aby zresetować hasło dla {{project}}.",
"emails.recovery.footer": "Jeśli to nie Ty prosiłeś o zresetowanie swojego hasła, zignoruj tę wiadomość.",
- "emails.recovery.thanks": "Dziękujemy",
+ "emails.recovery.thanks": "Dziękujemy,",
"emails.recovery.signature": "Zespół {{project}}",
"emails.invitation.subject": "Zaproszenie do zespołu %s w %s",
- "emails.invitation.hello": "Cześć",
+ "emails.invitation.hello": "Cześć,",
"emails.invitation.body": "Otrzymujesz tę wiadomość, ponieważ {{owner}} zaprasza Cię do grona członków zespołu {{team}} w projekcie {{project}}.",
"emails.invitation.footer": "Jeśli nie jesteś zainteresowany, zignoruj tę wiadomość.",
- "emails.invitation.thanks": "Dziękujemy",
+ "emails.invitation.thanks": "Dziękujemy,",
"emails.invitation.signature": "Zespół {{project}}",
"locale.country.unknown": "Nieznany",
"countries.af": "Afganistan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Hasłem zabezpieczającym dla tego e-maila jest {{phrase}}. Możesz zaufać temu e-mailowi, jeśli hasło zgadza się z hasłem wyświetlonym podczas logowania.",
"emails.otpSession.thanks": "Dzięki,",
"emails.otpSession.signature": "team {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/pt-br.json b/app/config/locale/translations/pt-br.json
index b2c4931011..a53ca79813 100644
--- a/app/config/locale/translations/pt-br.json
+++ b/app/config/locale/translations/pt-br.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "Time %s",
"emails.verification.subject": "Verificação da Conta",
- "emails.verification.hello": "Olá {{user}}",
+ "emails.verification.hello": "Olá {{user}},",
"emails.verification.body": "Clique neste link para verificar o seu endereço de e-mail.",
"emails.verification.footer": "Se você não solicitou a verificação deste e-mail, ignore essa mensagem.",
- "emails.verification.thanks": "Muito obrigado",
+ "emails.verification.thanks": "Muito obrigado,",
"emails.verification.signature": "Time {{project}}",
"emails.magicSession.subject": "Login",
- "emails.magicSession.hello": "Olá",
+ "emails.magicSession.hello": "Olá,",
"emails.magicSession.body": "Clique neste link para entrar.",
"emails.magicSession.footer": "Se você não solicitou conectar-se com este e-mail, ignore essa mensagem.",
- "emails.magicSession.thanks": "Muito obrigado",
+ "emails.magicSession.thanks": "Muito obrigado,",
"emails.magicSession.signature": "Time {{project}}",
"emails.recovery.subject": "Redefinição de senha",
- "emails.recovery.hello": "Olá {{user}}",
+ "emails.recovery.hello": "Olá {{user}},",
"emails.recovery.body": "Clique neste link para redefinir sua senha do {{project}}.",
"emails.recovery.footer": "Se você não solicitou a redefinição da sua senha, você pode ignorar essa mensagem.",
- "emails.recovery.thanks": "Muito obrigado",
+ "emails.recovery.thanks": "Muito obrigado,",
"emails.recovery.signature": "Time {{project}}",
"emails.invitation.subject": "Convite para o Time %s em %s",
- "emails.invitation.hello": "Olá",
+ "emails.invitation.hello": "Olá,",
"emails.invitation.body": "Este e-mail foi enviado porque {{owner}} deseja convidar você a se tornar membro do Time {{team}} em {{project}}.",
"emails.invitation.footer": "Caso não tenha interesse, ignore essa mensagem.",
- "emails.invitation.thanks": "Muito obrigado",
+ "emails.invitation.thanks": "Muito obrigado,",
"emails.invitation.signature": "Time {{project}}",
"locale.country.unknown": "Desconhecido",
"countries.af": "Afeganistão",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "A frase de segurança para este e-mail é {{phrase}}. Você pode confiar neste e-mail se esta frase corresponder à frase mostrada durante o login.",
"emails.otpSession.thanks": "Obrigado,",
"emails.otpSession.signature": "equipe {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/pt-pt.json b/app/config/locale/translations/pt-pt.json
index 2dab03c9dd..d85dca9300 100644
--- a/app/config/locale/translations/pt-pt.json
+++ b/app/config/locale/translations/pt-pt.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "Equipa %s",
"emails.verification.subject": "Verificação de contas",
- "emails.verification.hello": "Hey {{user}}",
+ "emails.verification.hello": "Hey {{user}},",
"emails.verification.body": "Siga esta ligação para verificar o seu endereço de correio electrónico.",
"emails.verification.footer": "Se não pediu para verificar este endereço, pode ignorar esta mensagem.",
- "emails.verification.thanks": "Obrigado",
+ "emails.verification.thanks": "Obrigado,",
"emails.verification.signature": "Equipa {{project}}",
"emails.magicSession.subject": "Login",
- "emails.magicSession.hello": "Olá ",
+ "emails.magicSession.hello": "Olá ,",
"emails.magicSession.body": "Siga esta ligação para iniciar sessão.",
"emails.magicSession.footer": "Se não pediu para entrar usando este e-mail, pode ignorar esta mensagem.",
- "emails.magicSession.thanks": "Obrigado",
+ "emails.magicSession.thanks": "Obrigado,",
"emails.magicSession.signature": "Equipa {{project}}",
"emails.recovery.subject": "Redefinição de senha",
- "emails.recovery.hello": "Olá {{user}}",
+ "emails.recovery.hello": "Olá {{user}},",
"emails.recovery.body": "Utilize este link para redefinir a palavra-passe do seu projecto {{project}}",
"emails.recovery.footer": "Se não pediu para redefinir a sua palavra-passe, pode ignorar esta mensagem.",
- "emails.recovery.thanks": "Obrigado",
+ "emails.recovery.thanks": "Obrigado,",
"emails.recovery.signature": "Equipa {{project}}",
"emails.invitation.subject": "Convite à equipa de %s às %s",
- "emails.invitation.hello": "Olá",
+ "emails.invitation.hello": "Olá,",
"emails.invitation.body": "Este correio foi-lhe enviado porque {{owner}} queria convidá-lo a tornar-se membro da equipa {{team}} da {{project}}.",
"emails.invitation.footer": "Se não estiver interessado, pode ignorar esta mensagem.",
- "emails.invitation.thanks": "Obrigado",
+ "emails.invitation.thanks": "Obrigado,",
"emails.invitation.signature": "Equipa {{project}}",
"locale.country.unknown": "Desconhecido",
"countries.af": "Afeganistão",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "A frase de segurança para este email é {{phrase}}. Você pode confiar neste email se essa frase corresponder à frase mostrada durante o login.",
"emails.otpSession.thanks": "Obrigado,",
"emails.otpSession.signature": "equipe {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/ro.json b/app/config/locale/translations/ro.json
index 45fb71d190..04cb22dd6b 100644
--- a/app/config/locale/translations/ro.json
+++ b/app/config/locale/translations/ro.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s Echipa",
"emails.verification.subject": "Verificare cont",
- "emails.verification.hello": "Bună ziua, {{user}}",
+ "emails.verification.hello": "Bună ziua, {{user}},",
"emails.verification.body": "Click pe acest link pentru a valida adresa de email.",
"emails.verification.footer": "Dacă nu ai cerut validarea adresei de email, poți ignora acest mesaj.",
- "emails.verification.thanks": "Mulțumim",
+ "emails.verification.thanks": "Mulțumim,",
"emails.verification.signature": "Echipa {{project}}",
"emails.magicSession.subject": "Login",
- "emails.magicSession.hello": "Bună ziua",
+ "emails.magicSession.hello": "Bună ziua,",
"emails.magicSession.body": "Urmează acest link pentru logare.",
"emails.magicSession.footer": "Dacă nu ai incercat să te loghezi folosing această adresa de email, poți ignora acest mesaj.",
- "emails.magicSession.thanks": "Mulțumim",
+ "emails.magicSession.thanks": "Mulțumim,",
"emails.magicSession.signature": "Echipa {{project}}",
"emails.recovery.subject": "Resetare parolă",
- "emails.recovery.hello": "Bună ziua, {{user}}",
+ "emails.recovery.hello": "Bună ziua, {{user}},",
"emails.recovery.body": "Click aici pentru a reseta parola pentru {{project}}",
"emails.recovery.footer": "Dacă nu ai cerut să îți schimbi parola, ignoră acest mesaj.",
- "emails.recovery.thanks": "Mulțumim",
+ "emails.recovery.thanks": "Mulțumim,",
"emails.recovery.signature": "Echipa {{project}}",
"emails.invitation.subject": "Invitatie catre %s Echipa la %s",
- "emails.invitation.hello": "Bună ziua",
+ "emails.invitation.hello": "Bună ziua,",
"emails.invitation.body": "Acest email a fost trimis pentru că {{owner}} a vrut ca tu să devii membru al echipei {{team}} la {{project}}.",
"emails.invitation.footer": "Dacă nu esti interesat, poți ignora acest email.",
- "emails.invitation.thanks": "Mulțumim",
+ "emails.invitation.thanks": "Mulțumim,",
"emails.invitation.signature": "Echipa {{project}}",
"locale.country.unknown": "Necunoscut",
"countries.af": "Afghanistan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Fraza de securitate pentru acest e-mail este {{phrase}}. Puteți avea încredere în acest e-mail dacă fraza se potrivește cu cea afișată în timpul autentificării.",
"emails.otpSession.thanks": "Mulțumesc,",
"emails.otpSession.signature": "echipa {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/ru.json b/app/config/locale/translations/ru.json
index a1d740bea2..029aa06ee7 100644
--- a/app/config/locale/translations/ru.json
+++ b/app/config/locale/translations/ru.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "Команда %s",
"emails.verification.subject": "Верификация аккаунта",
- "emails.verification.hello": "Здравствуйте, {{user}}",
+ "emails.verification.hello": "Здравствуйте, {{user}},",
"emails.verification.body": "Перейдите по ссылке, чтобы подтвердить свой адрес электронной почты.",
"emails.verification.footer": "Если вы не запрашивали подтверждение этого адреса, проигнорируйте это сообщение.",
- "emails.verification.thanks": "Спасибо",
+ "emails.verification.thanks": "Спасибо,",
"emails.verification.signature": "команда {{project}}",
"emails.magicSession.subject": "Логин",
- "emails.magicSession.hello": "Здравствуйте",
+ "emails.magicSession.hello": "Здравствуйте,",
"emails.magicSession.body": "Перейдите по ссылке, чтобы войти.",
"emails.magicSession.footer": "Если вы не просили войти, используя этот адрес электронной почты, проигнорируйте это сообщение.",
- "emails.magicSession.thanks": "Спасибо",
+ "emails.magicSession.thanks": "Спасибо,",
"emails.magicSession.signature": "команда {{project}}",
"emails.recovery.subject": "Сброс пароля",
- "emails.recovery.hello": "Здравствуйте, {{user}}",
+ "emails.recovery.hello": "Здравствуйте, {{user}},",
"emails.recovery.body": "Перейдите по этой ссылке для того чтобы сбросить свой пароль для проекта {{project}}",
"emails.recovery.footer": "Если вы не запрашивали сброс пароля, проигнорируйте это сообщение.",
- "emails.recovery.thanks": "Спасибо",
+ "emails.recovery.thanks": "Спасибо,",
"emails.recovery.signature": "команда {{project}}",
"emails.invitation.subject": "Приглашение в команду %s по проекту %s",
- "emails.invitation.hello": "Здравствуйте",
+ "emails.invitation.hello": "Здравствуйте,",
"emails.invitation.body": "Это письмо отправлено вам, потому что {{owner}} приглашает стать членом команды {{team}} в проекте {{project}}.",
"emails.invitation.footer": "Если вы не заинтересованы, проигнорируйте это сообщение.",
- "emails.invitation.thanks": "Спасибо",
+ "emails.invitation.thanks": "Спасибо,",
"emails.invitation.signature": "команда {{project}}",
"locale.country.unknown": "Неизвестно",
"countries.af": "Афганистан",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Фраза безопасности для этого письма {{phrase}}. Вы можете доверять этому письму, если эта фраза совпадает с фразой, показанной во время входа в систему.",
"emails.otpSession.thanks": "Спасибо,",
"emails.otpSession.signature": "команда {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/sa.json b/app/config/locale/translations/sa.json
index b82a3ed9ba..7aa8c90d77 100644
--- a/app/config/locale/translations/sa.json
+++ b/app/config/locale/translations/sa.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s गणः",
"emails.verification.subject": "पञ्जिकानिर्णायनम्",
- "emails.verification.hello": "अयि {{user}}",
+ "emails.verification.hello": "अयि {{user}},",
"emails.verification.body": "ई-पत्रनिर्णायनार्थमिदं संयोगसूत्रमनुसरतु।",
"emails.verification.footer": "यदि अस्य संकेतस्य निर्णायनं नेष्यते तर्हि वात्र्तामिमामुपेक्षताम्।",
- "emails.verification.thanks": "धन्यवादः",
+ "emails.verification.thanks": "धन्यवादः,",
"emails.verification.signature": "{{project}} गणः",
"emails.magicSession.subject": "संप्रवेशः",
- "emails.magicSession.hello": "अयि",
+ "emails.magicSession.hello": "अयि,",
"emails.magicSession.body": "संप्रवेशार्थमिदं संयोगसूत्रमनुसरतु।",
"emails.magicSession.footer": "अनेन ई-पत्रण यदि संप्रवेशो नेष्यते तर्हि वात्र्तामिमामुपेक्षताम्।",
- "emails.magicSession.thanks": "धन्यवादः",
+ "emails.magicSession.thanks": "धन्यवादः,",
"emails.magicSession.signature": "{{project}} गणः",
"emails.recovery.subject": "कूटशब्दपुनयाेजनम्",
- "emails.recovery.hello": "अयि भो {{user}}",
+ "emails.recovery.hello": "अयि भो {{user}},",
"emails.recovery.body": "{{project}} कूटशब्दपुनयाेजनाय संयोगमेनमनुसरतु।",
"emails.recovery.footer": "यदि कूटशब्दस्य पुनयाेजनं नेष्यते तर्हि वात्र्तामिमामुपेक्षताम्।",
- "emails.recovery.thanks": "धन्यवादः",
+ "emails.recovery.thanks": "धन्यवादः,",
"emails.recovery.signature": "{{project}} गणः",
"emails.invitation.subject": "गणस्य आमन्त्रणम् %s इति %s",
- "emails.invitation.hello": "अयि भो",
+ "emails.invitation.hello": "अयि भो,",
"emails.invitation.body": "{{owner}} {{team}} गणे {{project}} मध्ये भवद्योगदानमच्छितीति हेतोः पत्रमदिं भवत्सकाशं प्रेषतिम्।",
"emails.invitation.footer": "यदि भवदनिच्छा तर्हि वात्र्तामिमामुपेक्षताम्।",
- "emails.invitation.thanks": "धन्यवादः",
+ "emails.invitation.thanks": "धन्यवादः,",
"emails.invitation.signature": "{{project}} गणः",
"locale.country.unknown": "अज्ञातम् ",
"countries.af": "आफगानिस्थानम्",
@@ -239,10 +239,10 @@
"emails.magicSession.securityPhrase": "العبارة الأمنية لهذا البريد الإلكتروني هي {{phrase}}. يمكنك الوثوق بهذا البريد الإلكتروني إذا كانت هذه العبارة متطابقة مع العبارة المعروضة أثناء تسجيل الدخول.",
"emails.magicSession.optionUrl": "إذا لم تتمكن من تسجيل الدخول باستخدام الزر أعلاه، يرجى زيارة الرابط التالي:",
"emails.otpSession.subject": "प्रवेशनम्",
- "emails.otpSession.hello": "नमस्ते।",
+ "emails.otpSession.hello": "नमस्ते।,",
"emails.otpSession.description": "प्रविष्ट कुरु अनुसृत विश्वासनीयकोडम् यदा पृच्छ्यसे भवतः {{project}} खातायां सुरक्षितरूपेण प्रवेशे। एषः पन्द्रह मिनितेषु समाप्तिं गच्छति।",
"emails.otpSession.clientInfo": "एष प्रवेशनं प्रार्थितं {{agentClient}} नाम प्रतिनिधौ {{agentDevice}} {{agentOs}} इत्यस्मिन्। यदि त्वमेव प्रवेशनं न प्रार्थितवानसि, तर्हि त्वमनेन ईपत्रेण उपेक्षितुं शक्नोसि।",
"emails.otpSession.securityPhrase": "अस्य ईमेलस्य सुरक्षा वाक्यं {{phrase}} अस्ति। यदि अयं वाक्यः प्रवेशकाले दृष्टवाक्येन साम्यं याति तर्हि अस्माकं ईमेलं विश्वसनीयम् अस्ति।",
- "emails.otpSession.thanks": "धन्यवादाः",
+ "emails.otpSession.thanks": "धन्यवादाः,",
"emails.otpSession.signature": "कार्यक्रमस्य समूहः"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/sd.json b/app/config/locale/translations/sd.json
index 69cad52549..3f1f7678db 100644
--- a/app/config/locale/translations/sd.json
+++ b/app/config/locale/translations/sd.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s ٽيم",
"emails.verification.subject": " اڪائونٽ جي تصديق",
- "emails.verification.hello": "سلام {{user}}",
+ "emails.verification.hello": "سلام {{user}},",
"emails.verification.body": "پنھنجي اي ميل ايڊريس جي تصديق ڪرڻ لاءِ ھن لنڪ تي عمل ڪريو.",
"emails.verification.footer": "جيڪڏھن توھان نه پ askيا ھئا ھن ايڊريس جي تصديق ڪرڻ لاءِ ، توھان نظر انداز ڪري سگھوٿا ھن پيغام کي.",
- "emails.verification.thanks": "مهرباني",
+ "emails.verification.thanks": "مهرباني,",
"emails.verification.signature": "{{project}} ٽيم",
"emails.magicSession.subject": "لاگ ان",
- "emails.magicSession.hello": "هي ،",
+ "emails.magicSession.hello": "هي ,",
"emails.magicSession.body": "لاگ ان ٿيڻ لاءِ ھن لنڪ تي عمل ڪريو.",
"emails.magicSession.footer": "جيڪڏھن توھان نه پ پيا ھي لاگ ان استعمال ڪندي اي ميل ، توھان نظر انداز ڪري سگھوٿا ھن پيغام کي.",
- "emails.magicSession.thanks": "مهرباني",
+ "emails.magicSession.thanks": "مهرباني,",
"emails.magicSession.signature": "{{project}} ٽيم",
"emails.recovery.subject": "پاسورڊ ري سيٽ",
- "emails.recovery.hello": "هيلو {{user}}",
+ "emails.recovery.hello": "هيلو {{user}},",
"emails.recovery.body": "ھن لنڪ تي عمل ڪريو پنھنجو {{project}} پاسورڊ ري سيٽ ڪرڻ لاءِ.",
"emails.recovery.footer": "جيڪڏھن توھان نه پ پيو ھو پنھنجي پاسورڊ کي ري سيٽ ڪرڻ لاءِ ، توھان نظر انداز ڪري سگھوٿا ھن پيغام کي.",
- "emails.recovery.thanks": "مهرباني",
+ "emails.recovery.thanks": "مهرباني,",
"emails.recovery.signature": "{{project}} ٽيم",
"emails.invitation.subject": "%s ٽيم %s تيجي دعوت",
- "emails.invitation.hello": "هيلو",
+ "emails.invitation.hello": "هيلو,",
"emails.invitation.body": "ھي اي ميل توھان ڏانھن موڪليو ويو آھي {اڪاڻ ته {{owner}} توھان کي دعوت ڏيڻ چاھي ٿو ته توھان {{team}} ٽيم جو ميمبر بڻجي {{project}} تي.",
"emails.invitation.footer": "جيڪڏھن توھان دلچسپي نٿا رکو ، توھان نظر انداز ڪري سگھوٿا ھن پيغام کي.",
- "emails.invitation.thanks": "مهرباني",
+ "emails.invitation.thanks": "مهرباني,",
"emails.invitation.signature": "{{project}} ٽيم",
"locale.country.unknown": "نامعلوم",
"countries.af": "افغانستان",
@@ -238,17 +238,17 @@
"emails.magicSession.clientInfo": "هي سائن ان درخواست ورتو {{agentClient}} استعمال ڪري ٿو {{agentDevice}} {{agentOs}}. جيڪڏهن توهان سائن ان جي درخواست ڪئي نه ورتي، ته توهان هن اي ميل کي محفوظ طور تي نظر انداز ڪري سگهو ٿا.",
"emails.magicSession.securityPhrase": "اس ای میل جو سیکيورٽي جملو {{phrase}} آهي. جيڪڏهن هن جملو توهان جي سائن ان وقتي ڏيکاري واري جملي سان ميل آهي ته توهان اس ای میل تي اعتماد ڪري سگھو ٿا.",
"emails.otpSession.subject": "پروجيڪٽ جي لاگ ان",
- "emails.otpSession.hello": "ہيلو،",
+ "emails.otpSession.hello": "ہيلو,",
"emails.otpSession.description": "جڏهن توهان کي محفوظ طريقي سان اپني {{project}} اڪائونٽ ۾ سائن ان ڪرڻ لاءِ ڪہي ويندي، ته هيٺيان دنل ويريفڪيشن ڪوڊ ڏيو. هي 15 منٽن ۾ ختم ٿي ويندي.",
"emails.otpSession.clientInfo": "هي سائن ان توهان جو درخواست گهريو ويو آهي {{agentClient}} جي واپار ۾ {{agentDevice}} {{agentOs}} تي. جيڪڏهن توهان سائن ان جي درخواست ڪئي نه آهي، ته توهان هن ايميل کي نظر انداز ڪري سگهو ٿا.",
"emails.otpSession.securityPhrase": "هن ای میل لاءِ سیکيورٽي جملو {{phrase}} آھي. توهان هن ای میل تي اعتماد ڪري سگهو ٿا جيڪڏهن هن جملو لاڳو ٿيندڙ جملي سان ميل کاندي.",
- "emails.otpSession.thanks": "مهرباني",
+ "emails.otpSession.thanks": "مهرباني,",
"emails.otpSession.signature": "پروجيڪٽ جي ٽيم",
"emails.certificate.subject": "%s لاءِ سند جو ناکامی",
- "emails.certificate.hello": "هيلو",
+ "emails.certificate.hello": "هيلو,",
"emails.certificate.body": "توهان جي ڊومين '{{domain}}' لاءِ سرٽيفڪيٽ ٺاهڻ جو نه ٿي سگهيو. هي ڪوشش نمبر {{attempt}} آهي، ۽ ناڪامي جو سبب ٿيو: {{error}}",
"emails.certificate.footer": "توهان جو اڳيون سرٽيفڪيٽ اولهو فئيلر جي ݙينهن کان ٣٠ ݙينهن لاءِ ماني ويندو. اسان ان جي چھان بني جي بھرپور خواهش ڪنداسين، نہ ته توهان جو ݙومين بغير ڪوري SSL ڪميونڪيشن آڻي ويندي.",
- "emails.certificate.thanks": "شُكريا",
+ "emails.certificate.thanks": "شُكريا,",
"emails.certificate.signature": "ٽيم",
"sms.verification.body": "{{secret}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/si.json b/app/config/locale/translations/si.json
index f1c4b7c86b..536e8d3604 100644
--- a/app/config/locale/translations/si.json
+++ b/app/config/locale/translations/si.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s කණ්ඩායම",
"emails.verification.subject": "ගිණුම් සත්යාපනය",
- "emails.verification.hello": "හේයි {{user}}",
+ "emails.verification.hello": "හේයි {{user}},",
"emails.verification.body": "ඔබගේ විද්යුත් තැපැල් ලිපිනය සත්යාපනය කිරීමට මෙම සම්බන්ධකය අනුගමනය කරන්න.",
"emails.verification.footer": "මෙම ලිපිනය සත්යාපනය කරන ලෙස ඔබ ඉල්ලුවේ නැත්නම්, ඔබට මෙම පණිවිඩය නොසලකා හැරිය හැක.",
- "emails.verification.thanks": "ස්තුතියි",
+ "emails.verification.thanks": "ස්තුතියි,",
"emails.verification.signature": "{{project}} කණ්ඩායම",
"emails.magicSession.subject": "ප්රවේශ වන්න",
- "emails.magicSession.hello": "හේයි",
+ "emails.magicSession.hello": "හේයි,",
"emails.magicSession.body": "ප්රවේශ වීමට මෙම සම්බන්ධකය අනුගමනය කරන්න.",
"emails.magicSession.footer": "මෙම විද්යුත් තැපෑල භාවිතයෙන් ප්රවේශ වීමට ඔබ ඉල්ලුවේ නැත්නම්, ඔබට මෙම පණිවිඩය නොසලකා හැරිය හැක.",
- "emails.magicSession.thanks": "ස්තුතියි",
+ "emails.magicSession.thanks": "ස්තුතියි,",
"emails.magicSession.signature": "{{project}} කණ්ඩායම",
"emails.recovery.subject": "මුරපද යළි පිහිටුවීම",
- "emails.recovery.hello": "ආයුබෝවන් {{user}}",
+ "emails.recovery.hello": "ආයුබෝවන් {{user}},",
"emails.recovery.body": "ඔබගේ {{project}} මුරපදය නැවත සැකසීමට මෙම සම්බන්ධකය අනුගමනය කරන්න.",
"emails.recovery.footer": "ඔබගේ මුරපදය නැවත සකසන ලෙස ඔබ ඉල්ලුවේ නැත්නම්, ඔබට මෙම පණිවිඩය නොසලකා හැරිය හැක.",
- "emails.recovery.thanks": "ස්තුතියි",
+ "emails.recovery.thanks": "ස්තුතියි,",
"emails.recovery.signature": "{{project}} කණ්ඩායම",
"emails.invitation.subject": "%s කණ්ඩායමට ආරාධනා %s හි",
- "emails.invitation.hello": "ආයුබෝවන්",
+ "emails.invitation.hello": "ආයුබෝවන්,",
"emails.invitation.body": "මෙම තැපැල් ඔබට එව්වේ, {{owner}} හට {{project}} හි {{team}} කණ්ඩායමේ සාමාජිකයෙකු වීමට ඔබට ආරාධනා කිරීමට අවශ්ය වූ බැවිනි.",
"emails.invitation.footer": "ඔබ උනන්දුවක් නොදක්වන්නේ නම්, ඔබට මෙම පණිවිඩය නොසලකා හැරිය හැක.",
- "emails.invitation.thanks": "ස්තුතියි",
+ "emails.invitation.thanks": "ස්තුතියි,",
"emails.invitation.signature": "{{project}} කණ්ඩායම",
"locale.country.unknown": "නොදන්නා",
"countries.af": "ඇෆ්ගනිස්ථානය",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "මෙම ඊමේල්ට සඳහා ආරක්ෂක පාඨය {{phrase}}. පුරන්න විට පෙන්වන පාඨයට මෙම පාඨය ගැලපෙනවා නම්, ඔබට මෙම ඊමේල් විශ්වාස කළ හැකිය.",
"emails.otpSession.thanks": "ස්තුතියි,",
"emails.otpSession.signature": "{{project}} කණ්ඩායම"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/sk.json b/app/config/locale/translations/sk.json
index 457e756c9a..93c12c0881 100644
--- a/app/config/locale/translations/sk.json
+++ b/app/config/locale/translations/sk.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s Tím",
"emails.verification.subject": "Overenie účtu",
- "emails.verification.hello": "Ahoj {{user}}",
+ "emails.verification.hello": "Ahoj {{user}},",
"emails.verification.body": "Použi tento link pre overenie svojej emailovej adresy.",
"emails.verification.footer": "Ak si nepožiadal o overenie tejto adresy, môžeš túto správu ignorovať.",
- "emails.verification.thanks": "Ďakujeme.",
+ "emails.verification.thanks": "Ďakujeme.,",
"emails.verification.signature": "{{project}} tím",
"emails.magicSession.subject": "Prihlásenie",
- "emails.magicSession.hello": "Ahoj",
+ "emails.magicSession.hello": "Ahoj,",
"emails.magicSession.body": "Použi tento link pre prihlásenie.",
"emails.magicSession.footer": "Ak si nepožiadal o prihlásenie cez email, túto správu môžeš ignorovať.",
- "emails.magicSession.thanks": "Ďakujeme",
+ "emails.magicSession.thanks": "Ďakujeme,",
"emails.magicSession.signature": "{{project}} tím",
"emails.recovery.subject": "Obnovenie hesla",
- "emails.recovery.hello": "Ahoj {{user}}",
+ "emails.recovery.hello": "Ahoj {{user}},",
"emails.recovery.body": "Použi tento link pre obnovenie svojho {{project}} hesla.",
"emails.recovery.footer": "Ak si nepožiadal o obnovu svojho hesla, túto správu môžeš ignorovať.",
- "emails.recovery.thanks": "Ďakujeme",
+ "emails.recovery.thanks": "Ďakujeme,",
"emails.recovery.signature": "{{project}} tím",
"emails.invitation.subject": "Pozvánka do %s Tímu v %s",
- "emails.invitation.hello": "Ahoj",
+ "emails.invitation.hello": "Ahoj,",
"emails.invitation.body": "Tento email ti bol zaslaný, pretože {{owner}} ťa pozval, aby si sa stal členom {{team}} tímu v projekte {{project}}.",
"emails.invitation.footer": "Ak nemáš záujem, môžeš túto správu ignorovať.",
- "emails.invitation.thanks": "Ďakujeme",
+ "emails.invitation.thanks": "Ďakujeme,",
"emails.invitation.signature": "{{project}} tím",
"locale.country.unknown": "Neznámy",
"countries.af": "Afganistan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Bezpečnostná fráza pre tento e-mail je {{phrase}}. Tento e-mail môžete dôverovať, ak táto fráza zodpovedá fráze zobrazenej počas prihlasovania.",
"emails.otpSession.thanks": "Ďakujem,",
"emails.otpSession.signature": "tím {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/sl.json b/app/config/locale/translations/sl.json
index ec7b4c1ebf..f7c4f41255 100644
--- a/app/config/locale/translations/sl.json
+++ b/app/config/locale/translations/sl.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s Ekipa",
"emails.verification.subject": "",
- "emails.verification.hello": "",
+ "emails.verification.hello": ",",
"emails.verification.body": "",
"emails.verification.footer": "",
- "emails.verification.thanks": "",
+ "emails.verification.thanks": ",",
"emails.verification.signature": "",
"emails.magicSession.subject": "",
- "emails.magicSession.hello": "",
+ "emails.magicSession.hello": ",",
"emails.magicSession.body": "",
"emails.magicSession.footer": "",
- "emails.magicSession.thanks": "",
+ "emails.magicSession.thanks": ",",
"emails.magicSession.signature": "",
"emails.recovery.subject": "",
- "emails.recovery.hello": "",
+ "emails.recovery.hello": ",",
"emails.recovery.body": "",
"emails.recovery.footer": "",
- "emails.recovery.thanks": "",
+ "emails.recovery.thanks": ",",
"emails.recovery.signature": "",
"emails.invitation.subject": "",
- "emails.invitation.hello": "",
+ "emails.invitation.hello": ",",
"emails.invitation.body": "",
"emails.invitation.footer": "",
- "emails.invitation.thanks": "",
+ "emails.invitation.thanks": ",",
"emails.invitation.signature": "",
"locale.country.unknown": "Neznano",
"countries.af": "Afganistan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Varnostni stavek za to e-pošto je {{phrase}}. Temu e-sporočilu lahko zaupate, če se ta stavek ujema s stavkom, ki je prikazan ob prijavi.",
"emails.otpSession.thanks": "Hvala,",
"emails.otpSession.signature": "ekipa {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/sn.json b/app/config/locale/translations/sn.json
index d8b2f2c682..d17a98ff42 100644
--- a/app/config/locale/translations/sn.json
+++ b/app/config/locale/translations/sn.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "Chikwata che%s",
"emails.verification.subject": "Kuratidzi kuti ndiwe muridzi weakaundi",
- "emails.verification.hello": "Hesi {{user}}",
+ "emails.verification.hello": "Hesi {{user}},",
"emails.verification.body": "Tevedza chinongedzo ichi kuti uratidze kuti kero iyi ndeyako.",
"emails.verification.footer": "Kana usina kukumbira kuti uratidze kuti kero iyi ndeyako, unogona kufuratira meseji iyi.",
- "emails.verification.thanks": "Ndatenda",
+ "emails.verification.thanks": "Ndatenda,",
"emails.verification.signature": "Chikwata che{{project}}",
"emails.magicSession.subject": "Pinda",
- "emails.magicSession.hello": "Hesi",
+ "emails.magicSession.hello": "Hesi,",
"emails.magicSession.body": "Baya chinongedzo ichi kuti upinde muakaundi yako.",
"emails.magicSession.footer": "Kana usina kukumbira kupinda muakaundi yako uchishandisa email iyi, unogona kufuratira meseji iyi.",
- "emails.magicSession.thanks": "Ndatenda",
+ "emails.magicSession.thanks": "Ndatenda,",
"emails.magicSession.signature": "Chikwata che{{project}}",
"emails.recovery.subject": "Kuchinja pasiwedhi",
- "emails.recovery.hello": "Mhoro {{user}}",
+ "emails.recovery.hello": "Mhoro {{user}},",
"emails.recovery.body": "Baya chinongedzo ichi kuti uchinje pasiwedhi yako ye{{project}}.",
"emails.recovery.footer": "Kana usina kukumbira kuchinja pasiwedhi yako, unogona kufuratira meseji iyi.",
- "emails.recovery.thanks": "Ndatenda",
+ "emails.recovery.thanks": "Ndatenda,",
"emails.recovery.signature": "Chikwata che{{project}}",
"emails.invitation.subject": "Kukokwa kuchikwata che%s ku%s",
- "emails.invitation.hello": "Mhoro",
+ "emails.invitation.hello": "Mhoro,",
"emails.invitation.body": "Tsamba iyi yatumirwa kwauri nekuti {{owner}} anga achida kuti uve nhengo yechikwata che{{team}} pachirongwa che{{project}}.",
"emails.invitation.footer": "Kana usiri kufarira kuve nhengo yechikwata ichi, unogona kufuratira meseji iyi.",
- "emails.invitation.thanks": "Ndatenda",
+ "emails.invitation.thanks": "Ndatenda,",
"emails.invitation.signature": "Chikwata che{{project}}",
"locale.country.unknown": "Haizivikanwe",
"countries.af": "Afuganisitani",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Chirevo chekuchengetedza cheemail iyi ndechekuti {{phrase}}. Unogona kuvimba neemail iyi kana chirevo ichi chichienderana nechirevo chakaratidzwa panguva yekupinda.",
"emails.otpSession.thanks": "Ndatenda,",
"emails.otpSession.signature": "chikwata {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/sq.json b/app/config/locale/translations/sq.json
index 0fb066a8ea..85aa6637f6 100644
--- a/app/config/locale/translations/sq.json
+++ b/app/config/locale/translations/sq.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "Grup %s",
"emails.verification.subject": "",
- "emails.verification.hello": "",
+ "emails.verification.hello": ",",
"emails.verification.body": "",
"emails.verification.footer": "",
- "emails.verification.thanks": "",
+ "emails.verification.thanks": ",",
"emails.verification.signature": "",
"emails.magicSession.subject": "",
- "emails.magicSession.hello": "",
+ "emails.magicSession.hello": ",",
"emails.magicSession.body": "",
"emails.magicSession.footer": "",
- "emails.magicSession.thanks": "",
+ "emails.magicSession.thanks": ",",
"emails.magicSession.signature": "",
"emails.recovery.subject": "",
- "emails.recovery.hello": "",
+ "emails.recovery.hello": ",",
"emails.recovery.body": "",
"emails.recovery.footer": "",
- "emails.recovery.thanks": "",
+ "emails.recovery.thanks": ",",
"emails.recovery.signature": "",
"emails.invitation.subject": "",
- "emails.invitation.hello": "",
+ "emails.invitation.hello": ",",
"emails.invitation.body": "",
"emails.invitation.footer": "",
- "emails.invitation.thanks": "",
+ "emails.invitation.thanks": ",",
"emails.invitation.signature": "",
"locale.country.unknown": "I panjohur",
"countries.af": "Afganistani",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Fjala e sigurisë për këtë email është {{phrase}}. Ju mund të besoni këtë email nëse kjo fjalë përputhet me fjalën që shfaqet gjatë kyçjes.",
"emails.otpSession.thanks": "Faleminderit,",
"emails.otpSession.signature": "ekipi i {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/sv.json b/app/config/locale/translations/sv.json
index b838c05084..8997fd53f8 100644
--- a/app/config/locale/translations/sv.json
+++ b/app/config/locale/translations/sv.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s-teamet",
"emails.verification.subject": "Verifiera konto",
- "emails.verification.hello": "Hej {{user}}",
+ "emails.verification.hello": "Hej {{user}},",
"emails.verification.body": "Klicka på denna länk för att verifiera din email",
"emails.verification.footer": "Om du inte bad om att verifiera den här e-postadressen kan du ignorera detta mail.",
- "emails.verification.thanks": "Tack",
+ "emails.verification.thanks": "Tack,",
"emails.verification.signature": "{{project}} teamet",
"emails.magicSession.subject": "Logga in",
- "emails.magicSession.hello": "Hej",
+ "emails.magicSession.hello": "Hej,",
"emails.magicSession.body": "Klicka på denna länk för att logga in.",
"emails.magicSession.footer": "Om du inte bad om att logga in med denna e-postadress kan du ignorera detta mail.",
- "emails.magicSession.thanks": "Tack",
+ "emails.magicSession.thanks": "Tack,",
"emails.magicSession.signature": "{{project}} teamet",
"emails.recovery.subject": "Återställ lösenord",
- "emails.recovery.hello": "Hej {{user}}",
+ "emails.recovery.hello": "Hej {{user}},",
"emails.recovery.body": "Klicka på denna länk för att återställa lösenordet på {{project}}",
"emails.recovery.footer": "Om du inte bad om att återställa ditt lösenord kan du ignorera detta mail.",
- "emails.recovery.thanks": "Tack",
+ "emails.recovery.thanks": "Tack,",
"emails.recovery.signature": "{{project}} teamet",
"emails.invitation.subject": "Inbjudan till %s teamet på %s",
- "emails.invitation.hello": "Hej",
+ "emails.invitation.hello": "Hej,",
"emails.invitation.body": "Detta mail skickades till dig eftersom {{owner}} ville bjuda in dig att bli medlem i teamet {{team}} på {{project}}.",
"emails.invitation.footer": "Om du inte är intresserad kan du ignorera detta mail.",
- "emails.invitation.thanks": "Tack",
+ "emails.invitation.thanks": "Tack,",
"emails.invitation.signature": "{{project}} teamet",
"locale.country.unknown": "Okänt",
"countries.af": "Afghanistan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Säkerhetsfrasen för detta e-postmeddelande är {{phrase}}. Du kan lita på detta e-postmeddelande om frasen stämmer överens med frasen som visades vid inloggningen.",
"emails.otpSession.thanks": "Tack,",
"emails.otpSession.signature": "{{project}} team"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/ta.json b/app/config/locale/translations/ta.json
index 659306c977..f0695867a9 100644
--- a/app/config/locale/translations/ta.json
+++ b/app/config/locale/translations/ta.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s குழு",
"emails.verification.subject": "கணக்கு சரிபார்ப்பு",
- "emails.verification.hello": "ஏய் {{user}}",
+ "emails.verification.hello": "ஏய் {{user}},",
"emails.verification.body": "உங்கள் மின்னஞ்சல் முகவரியைச் சரிபார்க்க இந்த இணைப்பைப் பின்தொடரவும்.",
"emails.verification.footer": "இந்த முகவரியைச் சரிபார்க்கும்படி உங்களிடம் கேட்கப்படவில்லை என்றால், இந்தச் செய்தியை நீங்கள் புறக்கணிக்கலாம்.",
- "emails.verification.thanks": "நன்றி",
+ "emails.verification.thanks": "நன்றி,",
"emails.verification.signature": "{{project}} குழு ",
"emails.magicSession.subject": "உள்நுழைய",
- "emails.magicSession.hello": "ஏய்",
+ "emails.magicSession.hello": "ஏய்,",
"emails.magicSession.body": "இந்த இணைப்பைப் பின்தொடரவும் உள்நுழைய",
"emails.magicSession.footer": "இந்த மின்னஞ்சலைப் பயன்படுத்தி உள்நுழையுமாறு உங்களிடம் கேட்கப்படாவிட்டால், இந்தச் செய்தியைப் புறக்கணிக்கலாம்.",
- "emails.magicSession.thanks": "நன்றி",
+ "emails.magicSession.thanks": "நன்றி,",
"emails.magicSession.signature": "{{project}} குழு",
"emails.recovery.subject": "கடவுச்சொல் மீட்டமைப்பு",
- "emails.recovery.hello": "வணக்கம் {{user}}",
+ "emails.recovery.hello": "வணக்கம் {{user}},",
"emails.recovery.body": "மீட்டமைக்க இந்த இணைப்பைப் பின்தொடரவும் {{project}} கடவுச்சொல்.",
"emails.recovery.footer": "உங்கள் கடவுச்சொல்லை மீட்டமைக்கும்படி உங்களிடம் கேட்கப்படவில்லை என்றால், இந்தச் செய்தியை நீங்கள் புறக்கணிக்கலாம்.",
- "emails.recovery.thanks": "நன்றி",
+ "emails.recovery.thanks": "நன்றி,",
"emails.recovery.signature": "{{project}} குழு",
"emails.invitation.subject": "அழைப்பிதழ் %s குழு %s ",
- "emails.invitation.hello": "வணக்கம்",
+ "emails.invitation.hello": "வணக்கம்,",
"emails.invitation.body": "{{project}} இல் {{team}} குழுவில் உறுப்பினராக உங்களை {{owner}} அழைக்க விரும்புவதால், இந்த அஞ்சல் உங்களுக்கு அனுப்பப்பட்டது.",
"emails.invitation.footer": "உங்களுக்கு ஆர்வம் இல்லை என்றால், இந்த செய்தியை நீங்கள் புறக்கணிக்கலாம்.",
- "emails.invitation.thanks": "நன்றி",
+ "emails.invitation.thanks": "நன்றி,",
"emails.invitation.signature": "{{project}} குழு",
"locale.country.unknown": "அறியவில்லை",
"countries.af": "ஆப்கானித்தான்",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "இந்த மின்னஞ்சலுக்கான பாதுகாப்பு வாசகம் {{phrase}} ஆகும். இந்த வாசகம் உள்நுழையும் போது காட்டப்பட்ட வாசகத்துடன் பொருந்துமானால், இந்த மின்னஞ்சலை நம்பலாம்.",
"emails.otpSession.thanks": "நன்றி,",
"emails.otpSession.signature": "{{project}} குழு"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/te.json b/app/config/locale/translations/te.json
index 019b4581ca..870b0b82a2 100644
--- a/app/config/locale/translations/te.json
+++ b/app/config/locale/translations/te.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s జట్టు",
"emails.verification.subject": "ఖాతా ధృవీకరణ",
- "emails.verification.hello": "నమస్కారము {{user}}",
+ "emails.verification.hello": "నమస్కారము {{user}},",
"emails.verification.body": "ఈ లింక్ ద్వారా ఇమెయిల్ ని ధృవీకరించండి",
"emails.verification.footer": "మీరు ఈ చిరునామాను ధృవీకరించమని అడగనట్లయితే, మీరు ఈ సందేశాన్ని విస్మరించవచ్చు",
- "emails.verification.thanks": "ధన్యవాదాలు",
+ "emails.verification.thanks": "ధన్యవాదాలు,",
"emails.verification.signature": "{{project}} జట్",
"emails.magicSession.subject": "లాగిన్",
- "emails.magicSession.hello": "నమస్కారము",
+ "emails.magicSession.hello": "నమస్కారము,",
"emails.magicSession.body": "లాగిన్ చేయడానికి ఈ లింక్ ని అనుసరించండి",
"emails.magicSession.footer": "మీరు ఈ ఇమెయిల్ ని ఉపయోగించి లాగిన్ చేయమని అడగకపోతే, మీరు ఈ సందేశాన్ని విస్మరించవచ్చు",
- "emails.magicSession.thanks": "ధన్యవాదాలు",
+ "emails.magicSession.thanks": "ధన్యవాదాలు,",
"emails.magicSession.signature": "{{project}} జట్",
"emails.recovery.subject": "పాస్వర్డ్ రీసెట్",
- "emails.recovery.hello": "నమస్కారమ {{user}}",
+ "emails.recovery.hello": "నమస్కారమ {{user}},",
"emails.recovery.body": "మీ {{project}} పాస్వర్డ్ ని రీసెట్ చేయడానికి ఈ లింక్ ని అనుసరించండి",
"emails.recovery.footer": "మీరు మీ పాస్వర్డ్ ని రీసెట్ చేయమని అడగనట్లయితే, మీరు ఈ సందేశాన్ని విస్మరించవచ్చు",
- "emails.recovery.thanks": "ధన్యవాదాల",
+ "emails.recovery.thanks": "ధన్యవాదాల,",
"emails.recovery.signature": "{{project}} జట్",
"emails.invitation.subject": "%s వద్ద %s బృందానికి ఆహ్వానం",
- "emails.invitation.hello": "నమస్కారమ",
+ "emails.invitation.hello": "నమస్కారమ,",
"emails.invitation.body": "{{owner}} మిమ్మల్ని {{project}} లో {{team}} బృందంలో సభ్యునిగా ఉండమని ఆహ్వానించాలనుకుంటున్నందున ఈ మెయిల్ మీకు పంపబడింది.",
"emails.invitation.footer": "మీకు ఆసక్తి లేకుంటే, మీరు ఈ సందేశాన్ని విస్మరించవచ్చు.",
- "emails.invitation.thanks": "ధన్యవాదాల",
+ "emails.invitation.thanks": "ధన్యవాదాల,",
"emails.invitation.signature": "{{project}} జట్",
"locale.country.unknown": "తెలియని",
"countries.af": "ఆఫ్ఘనిస్తాన్",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "ఈ ఇమెయిల్కు భద్రతా పదం {{phrase}}. మీరు సైన్ ఇన్ సమయంలో చూపించబడిన పదంతో ఈ పదం సరిపోలుస్తుంటే ఈ ఇమెయిల్ను నమ్మవచ్చు.",
"emails.otpSession.thanks": "ధన్యవాదాలు,",
"emails.otpSession.signature": "ప్రాజెక్టు బృందం"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/th.json b/app/config/locale/translations/th.json
index 97d224de1f..5a53b16055 100644
--- a/app/config/locale/translations/th.json
+++ b/app/config/locale/translations/th.json
@@ -239,10 +239,10 @@
"emails.magicSession.securityPhrase": "วลีรักษาความปลอดภัยสำหรับอีเมลนี้คือ {{phrase}} คุณสามารถเชื่อถืออีเมลนี้ได้หากวลีนี้ตรงกับวลีที่แสดงในระหว่างการเข้าสู่ระบบ",
"emails.magicSession.optionUrl": "หากคุณไม่สามารถเข้าสู่ระบบโดยใช้ปุ่มด้านบน โปรดเยี่ยมชมลิงก์ต่อไปนี้:",
"emails.otpSession.subject": "การเข้าสู่ระบบ {{project}}",
- "emails.otpSession.hello": "สวัสดี,",
+ "emails.otpSession.hello": "สวัสดี",
"emails.otpSession.description": "ป้อนรหัสยืนยันต่อไปนี้เมื่อได้รับการสั่งให้ทำเพื่อลงชื่อเข้าใช้บัญชี {{project}} ของคุณอย่างปลอดภัย รหัสนี้จะหมดอายุใน 15 นาที.",
"emails.otpSession.clientInfo": "การลงชื่อเข้าใช้งานนี้ได้รับการทำผ่าน {{agentClient}} บน {{agentDevice}} {{agentOs}} หากคุณไม่ได้ทำการขอลงชื่อเข้าใช้นี้ คุณสามารถเพิกเฉยต่ออีเมลนี้ได้เลย",
"emails.otpSession.securityPhrase": "วลีความปลอดภัยสำหรับอีเมลนี้คือ {{phrase}} คุณสามารถเชื่อถืออีเมลนี้ได้หากวลีนี้ตรงกับวลีที่แสดงขณะลงชื่อเข้าใช้งาน.",
"emails.otpSession.thanks": "ขอบคุณครับ/ค่ะ",
"emails.otpSession.signature": "ทีม {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/tl.json b/app/config/locale/translations/tl.json
index e6df9f8aef..6d0be01095 100644
--- a/app/config/locale/translations/tl.json
+++ b/app/config/locale/translations/tl.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "Pangkat ng %s",
"emails.verification.subject": "Pagpapatunay ng account",
- "emails.verification.hello": "Kamusta {{user}}",
+ "emails.verification.hello": "Kamusta {{user}},",
"emails.verification.body": "Sundin ang link na ito upang ma-verify ang iyong email address.",
"emails.verification.footer": "Kung hindi mo hiningi na i-verify ang address na ito, maaari mong balewalain ang mensahe na ito.",
- "emails.verification.thanks": "Salamat",
+ "emails.verification.thanks": "Salamat,",
"emails.verification.signature": "Pangkat ng {{project}}",
"emails.magicSession.subject": "Mag log in",
- "emails.magicSession.hello": "Kamusta ",
+ "emails.magicSession.hello": "Kamusta ,",
"emails.magicSession.body": "Sundin ang link na ito upang mag-login.",
"emails.magicSession.footer": "Kung hindi mo hiningi na mag-login gamit ang email na ito, maaari mong balewalain ang mensahe na ito.",
- "emails.magicSession.thanks": "Salamat",
+ "emails.magicSession.thanks": "Salamat,",
"emails.magicSession.signature": "Pangkat ng {{project}}",
"emails.recovery.subject": "I-reset ang password",
- "emails.recovery.hello": "Kamusta {{user}}",
+ "emails.recovery.hello": "Kamusta {{user}},",
"emails.recovery.body": "Sundin ang link na ito upang i-reset ang password ng iyong {{project}}.",
"emails.recovery.footer": "Kung hindi mo hiningi na i-reset ang iyong password, maaari mong balewalain ang mensahe na ito.",
- "emails.recovery.thanks": "Salamat",
+ "emails.recovery.thanks": "Salamat,",
"emails.recovery.signature": "Pangkat ng {{project}}",
"emails.invitation.subject": "Imbitasyon para sa Pangkat %s sa %s",
- "emails.invitation.hello": "Kamusta",
+ "emails.invitation.hello": "Kamusta,",
"emails.invitation.body": "Ipinadala sa iyo ang mail na ito dahil gusto kang imbitahan ni {{owner}} na maging miyembro ng Pangkat {{team}} sa ilalim ng proyektong {{project}}.",
"emails.invitation.footer": "Kung ikaw ay hindi interesado, maaari mong balewalain ang mensaheng ito.",
- "emails.invitation.thanks": "Salamat",
+ "emails.invitation.thanks": "Salamat,",
"emails.invitation.signature": "Pangkat ng {{project}}",
"locale.country.unknown": "Hindi kilala",
"countries.af": "Apganistan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Ang security phrase para sa email na ito ay {{phrase}}. Maaari mong pagkatiwalaan ang email na ito kung ang phrase na ito ay tugma sa phrase na ipinakita noong nag-sign in.",
"emails.otpSession.thanks": "Salamat,",
"emails.otpSession.signature": "team ng {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/tr.json b/app/config/locale/translations/tr.json
index 808a20576c..115050c2e2 100644
--- a/app/config/locale/translations/tr.json
+++ b/app/config/locale/translations/tr.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s Takımı",
"emails.verification.subject": "Hesabını Doğrula",
- "emails.verification.hello": "Merhaba {{user}}",
+ "emails.verification.hello": "Merhaba {{user}},",
"emails.verification.body": "Eposta adresini doğrulamak için bu bağlantıyı kullanın.",
"emails.verification.footer": "Eğer bu eposta adresini doğrulamak isteyen siz değilseniz devam etmeyin.",
- "emails.verification.thanks": "Teşekkürler",
+ "emails.verification.thanks": "Teşekkürler,",
"emails.verification.signature": "{{project}} takımı",
"emails.magicSession.subject": "Giriş",
- "emails.magicSession.hello": "Merhaba",
+ "emails.magicSession.hello": "Merhaba,",
"emails.magicSession.body": "Giriş yapmak için tıklayın.",
"emails.magicSession.footer": "Eğer bu eposta adresini kullanarak giriş yapmak istemediyseniz devam etmeyin.",
- "emails.magicSession.thanks": "Teşekkürler",
+ "emails.magicSession.thanks": "Teşekkürler,",
"emails.magicSession.signature": "{{project}} takımı",
"emails.recovery.subject": "Şifremi Sıfırla",
- "emails.recovery.hello": "Merhaba {{user}}",
+ "emails.recovery.hello": "Merhaba {{user}},",
"emails.recovery.body": "{{project}} şifrenizi sıfırlamak için bu bağlantıyı kullanın.",
"emails.recovery.footer": "Eğer şifre sıfırlama talebinde bulunmadıysanız devam etmeyin.",
- "emails.recovery.thanks": "Teşekkürler",
+ "emails.recovery.thanks": "Teşekkürler,",
"emails.recovery.signature": "{{project}} takımı",
"emails.invitation.subject": "%s üzerinde %s Takımına Davet",
- "emails.invitation.hello": "Merhaba",
+ "emails.invitation.hello": "Merhaba,",
"emails.invitation.body": "Bu epostayı aldınız, çünkü {{owner}} sizi {{project}} üzerinde {{team}} takımının üyesi olmaya davet etti.",
"emails.invitation.footer": "Eğer ilgilenmiyorsanız devam etmeyin.",
- "emails.invitation.thanks": "Teşekkürler",
+ "emails.invitation.thanks": "Teşekkürler,",
"emails.invitation.signature": "{{project}} takımı",
"locale.country.unknown": "Bilinmeyen",
"countries.af": "Afganistan",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Bu e-postanın güvenlik ifadesi {{phrase}}. Giriş sırasında gösterilen ifade ile bu ifade eşleşiyorsa bu e-postaya güvenebilirsiniz.",
"emails.otpSession.thanks": "Teşekkürler,",
"emails.otpSession.signature": "{{project}} takımı"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/uk.json b/app/config/locale/translations/uk.json
index 78e3a6c556..3f66bd1c58 100644
--- a/app/config/locale/translations/uk.json
+++ b/app/config/locale/translations/uk.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "Команда %s",
"emails.verification.subject": "Верифікація акаунта",
- "emails.verification.hello": "Вітаємо, {{user}}",
+ "emails.verification.hello": "Вітаємо, {{user}},",
"emails.verification.body": "Перейдіть за цим посиланням, щоб підтвердити свою електронну адресу.",
"emails.verification.footer": "Якщо ви не запитували підтвердження цієї адреси, ви можете ігнорувати це повідомлення.",
- "emails.verification.thanks": "Дякуємо",
+ "emails.verification.thanks": "Дякуємо,",
"emails.verification.signature": "команда {{project}}",
"emails.magicSession.subject": "Логін",
- "emails.magicSession.hello": "Вітаємо",
+ "emails.magicSession.hello": "Вітаємо,",
"emails.magicSession.body": "Перейдіть за цим посиланням, щоб увійти.",
"emails.magicSession.footer": "Якщо ви не просили увійти за допомогою цієї електронної пошти, ви можете ігнорувати це повідомлення.",
- "emails.magicSession.thanks": "Дякуємо",
+ "emails.magicSession.thanks": "Дякуємо,",
"emails.magicSession.signature": "команда {{project}}",
"emails.recovery.subject": "Скидання пароля",
- "emails.recovery.hello": "Вітаємо, {{user}}",
+ "emails.recovery.hello": "Вітаємо, {{user}},",
"emails.recovery.body": "Перейдіть за цим посиланням для того щоб скинути свій пароль для проекту {{project}}",
"emails.recovery.footer": "Якщо ви не запитували скидання паролю, проігноруйте це повідомлення.",
- "emails.recovery.thanks": "Дякуємо",
+ "emails.recovery.thanks": "Дякуємо,",
"emails.recovery.signature": "команда {{project}}",
"emails.invitation.subject": "Запрошення до %s Команди у %s",
- "emails.invitation.hello": "Вітаємо",
+ "emails.invitation.hello": "Вітаємо,",
"emails.invitation.body": "Цей лист був надісланий вам тому що {{owner}} запрошує вас стати членом команди {{team}} у проекті {{project}}.",
"emails.invitation.footer": "Якщо ви не зацікавлені, проігноруйте це повідомлення.",
- "emails.invitation.thanks": "Дякуємо",
+ "emails.invitation.thanks": "Дякуємо,",
"emails.invitation.signature": "команда {{project}}",
"locale.country.unknown": "Невідомо",
"countries.af": "Афганістан",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "Фраза безпеки для цього електронного листа - {{phrase}}. Ви можете довіряти цьому електронному листу, якщо ця фраза відповідає фразі, показаній під час входу в систему.",
"emails.otpSession.thanks": "Дякую,",
"emails.otpSession.signature": "команда {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/ur.json b/app/config/locale/translations/ur.json
index 060cea0736..9d6aa47762 100644
--- a/app/config/locale/translations/ur.json
+++ b/app/config/locale/translations/ur.json
@@ -4,28 +4,28 @@
"settings.direction": "rtl",
"emails.sender": "%s ٹیم",
"emails.verification.subject": "اکاؤنٹ کی تصدیق",
- "emails.verification.hello": "خوش آمدید {{user}}",
+ "emails.verification.hello": "خوش آمدید {{user}}،",
"emails.verification.body": "براہ کرم اپنے ای میل کی تصدیق کے لیے درج ذیل لنک پر عمل کریں۔",
"emails.verification.footer": "اگر آپ نے اس پتے کی تصدیق کے لیے نہیں کہا تو آپ اس پیغام کو نظر انداز کر سکتے ہیں۔",
- "emails.verification.thanks": "شکریہ",
+ "emails.verification.thanks": "شکریہ،",
"emails.verification.signature": "ٹیم۔ {{project}}",
"emails.magicSession.subject": "اگ ان کریں",
- "emails.magicSession.hello": "خوش آمدید",
+ "emails.magicSession.hello": "خوش آمدید،",
"emails.magicSession.body": "لاگ ان کرنے کے لیے اس لنک پر عمل کریں۔",
"emails.magicSession.footer": "اگر آپ نے اس ای میل کا استعمال کرتے ہوئے لاگ ان کرنے کے لیے نہیں کہا تو آپ اس پیغام کو نظر انداز کر سکتے ہیں۔",
- "emails.magicSession.thanks": "شکریہ",
+ "emails.magicSession.thanks": "شکریہ،",
"emails.magicSession.signature": "ٹیم۔ {{project}}",
"emails.recovery.subject": "پاس ورڈ ری سیٹ۔",
- "emails.recovery.hello": "ہیلو {{user}}",
+ "emails.recovery.hello": "ہیلو {{user}}،",
"emails.recovery.body": "{{project}} کا پاس ورڈ تبدیل کرنے کے لیے درج ذیل لنک پر عمل کریں",
"emails.recovery.footer": "اگر آپ نے اپنا پاس ورڈ دوبارہ ترتیب دینے کے لیے نہیں کہا تو آپ اس پیغام کو نظر انداز کر سکتے ہیں۔",
- "emails.recovery.thanks": "شکریہ",
+ "emails.recovery.thanks": "شکریہ،",
"emails.recovery.signature": "ٹیم۔ {{project}}",
"emails.invitation.subject": "%s پر %s ٹیم کو دعوت",
- "emails.invitation.hello": "خوش آمدید",
+ "emails.invitation.hello": "خوش آمدید،",
"emails.invitation.body": "یہ پیغام آپ کو اس لیے بھیجا گیا تھا کہ {{owner}} نے آپ کو {{project}} میں {{team}} ٹیم کا رکن بننے کی دعوت بھیجی",
"emails.invitation.footer": "اگر آپ دلچسپی نہیں رکھتے تو آپ اس پیغام کو نظر انداز کر سکتے ہیں۔",
- "emails.invitation.thanks": "شکریہ",
+ "emails.invitation.thanks": "شکریہ،",
"emails.invitation.signature": "ٹیم۔ {{project}",
"locale.country.unknown": "نامعلوم",
"countries.af": "افغانستان",
@@ -245,4 +245,4 @@
"emails.otpSession.securityPhrase": "اس ایمیل کے لئے حفاظتی جملہ {{phrase}} ہے۔ اگر یہ جملہ سائن ان کے دوران دکھائے گئے جملے سے میل کھاتا ہے تو آپ اس ایمیل پر بھروسہ کر سکتے ہیں۔",
"emails.otpSession.thanks": "شکریہ،",
"emails.otpSession.signature": "ٹیم {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/vi.json b/app/config/locale/translations/vi.json
index cf04a5b737..76a545a1d4 100644
--- a/app/config/locale/translations/vi.json
+++ b/app/config/locale/translations/vi.json
@@ -239,10 +239,10 @@
"emails.magicSession.securityPhrase": "Cụm từ bảo mật cho email này là {{phrase}}. Bạn có thể tin tưởng email này nếu cụm từ này khớp với cụm từ hiển thị khi đăng nhập.",
"emails.magicSession.optionUrl": "Nếu bạn không thể đăng nhập bằng cách sử dụng nút ở trên, vui lòng truy cập liên kết sau:",
"emails.otpSession.subject": "Đăng nhập {{project}}",
- "emails.otpSession.hello": "Xin chào,",
+ "emails.otpSession.hello": "Xin chào",
"emails.otpSession.description": "Nhập mã xác minh sau đây khi được yêu cầu để đăng nhập an toàn vào tài khoản {{project}} của bạn. Mã này sẽ hết hạn trong 15 phút.",
"emails.otpSession.clientInfo": "Đăng nhập này được yêu cầu sử dụng {{agentClient}} trên {{agentDevice}} {{agentOs}}. Nếu bạn không yêu cầu đăng nhập, bạn có thể bỏ qua email này một cách an toàn.",
"emails.otpSession.securityPhrase": "Cụm từ bảo mật cho email này là {{phrase}}. Bạn có thể tin tưởng email này nếu cụm từ này khớp với cụm từ hiển thị khi đăng nhập.",
- "emails.otpSession.thanks": "Cảm ơn,",
+ "emails.otpSession.thanks": "Cảm ơn",
"emails.otpSession.signature": "nhóm {{project}}"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/zh-cn.json b/app/config/locale/translations/zh-cn.json
index 0bfbc54e0e..5e35a89bfe 100644
--- a/app/config/locale/translations/zh-cn.json
+++ b/app/config/locale/translations/zh-cn.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s 小组",
"emails.verification.subject": "帐户验证",
- "emails.verification.hello": "你好 {{user}}",
+ "emails.verification.hello": "你好 {{user}}、",
"emails.verification.body": "点此链接验证您的电子邮件地址。",
"emails.verification.footer": "如果您没有要求验证此地址，则可忽略此消息。",
- "emails.verification.thanks": "谢谢",
+ "emails.verification.thanks": "谢谢、",
"emails.verification.signature": "{{project}} 团队",
"emails.magicSession.subject": "登录",
- "emails.magicSession.hello": "你好",
+ "emails.magicSession.hello": "你好、",
"emails.magicSession.body": "点此链接登录。",
"emails.magicSession.footer": "如果您没有要求使用此电子邮件登录，则可忽略此消息。",
- "emails.magicSession.thanks": "谢谢",
+ "emails.magicSession.thanks": "谢谢、",
"emails.magicSession.signature": "{{project}} 团队",
"emails.recovery.subject": "重设密码",
- "emails.recovery.hello": "你好 {{user}}",
+ "emails.recovery.hello": "你好 {{user}}、",
"emails.recovery.body": "点此链接重置您的 {{project}} 密码。",
"emails.recovery.footer": "如果您没有要求重置密码，则可以忽略此消息。",
- "emails.recovery.thanks": "谢谢",
+ "emails.recovery.thanks": "谢谢、",
"emails.recovery.signature": "{{project}} 团队",
"emails.invitation.subject": "邀请 %s 团队在 %s",
- "emails.invitation.hello": "你好",
+ "emails.invitation.hello": "你好、",
"emails.invitation.body": "这封邮件发送给您是因为 {{owner}} 想邀请您成为 {{team}} 团队在 {{project}}.",
"emails.invitation.footer": "如果您不感兴趣，可以忽略此消息。",
- "emails.invitation.thanks": "谢谢",
+ "emails.invitation.thanks": "谢谢、",
"emails.invitation.signature": "{{project}} 团队",
"locale.country.unknown": "未知",
"countries.af": "阿富汗",
@@ -239,10 +239,10 @@
"emails.magicSession.securityPhrase": "此电子邮件的安全短语是{{phrase}}。如果此短语与登录时显示的短语相匹配，则您可以信任此电子邮件。",
"emails.magicSession.optionUrl": "如果您无法使用上面的按钮登录，请访问以下链接：",
"emails.otpSession.subject": "{{project}} 登录",
- "emails.otpSession.hello": "你好，\n",
+ "emails.otpSession.hello": "你好，\n、",
"emails.otpSession.description": "在提示时输入以下验证码以安全登录您的{{project}}账户。该验证码将在15分钟后过期。",
"emails.otpSession.clientInfo": "此次登录是通过{{agentClient}}在{{agentDevice}} {{agentOs}}上请求的。如果您没有请求登录，可以放心忽略此电子邮件。",
"emails.otpSession.securityPhrase": "此电子邮件的安全短语是{{phrase}}。如果此短语与登录时显示的短语一致，您可以信任此邮件。",
- "emails.otpSession.thanks": "谢谢，",
+ "emails.otpSession.thanks": "谢谢，、",
"emails.otpSession.signature": "{{project}} 团队"
-}
\ No newline at end of file
+}
diff --git a/app/config/locale/translations/zh-tw.json b/app/config/locale/translations/zh-tw.json
index 24729de6b3..146dd0a401 100644
--- a/app/config/locale/translations/zh-tw.json
+++ b/app/config/locale/translations/zh-tw.json
@@ -4,28 +4,28 @@
"settings.direction": "ltr",
"emails.sender": "%s 小組",
"emails.verification.subject": "帳戶驗證",
- "emails.verification.hello": "嗨 {{user}}",
+ "emails.verification.hello": "嗨 {{user}}、",
"emails.verification.body": "按照此連結驗證您的電子郵件地址。",
"emails.verification.footer": "如果您沒有要求驗證此地址，則可以忽略此消息。",
- "emails.verification.thanks": "謝謝",
+ "emails.verification.thanks": "謝謝、",
"emails.verification.signature": "{{project}} 團隊",
"emails.magicSession.subject": "登入",
- "emails.magicSession.hello": "嗨",
+ "emails.magicSession.hello": "嗨、",
"emails.magicSession.body": "點此連結登入。",
"emails.magicSession.footer": "如果您沒有要求使用此電子郵件登入，則可以忽略此消息。",
- "emails.magicSession.thanks": "謝謝",
+ "emails.magicSession.thanks": "謝謝、",
"emails.magicSession.signature": "{{project}} 團隊",
"emails.recovery.subject": "重設密碼",
- "emails.recovery.hello": "您好 {{user}}",
+ "emails.recovery.hello": "您好 {{user}}、",
"emails.recovery.body": "按照此連結重置您的 {{project}} 密碼。",
"emails.recovery.footer": "如果您沒有要求重置密碼，則可以忽略此消息。",
- "emails.recovery.thanks": "謝謝",
+ "emails.recovery.thanks": "謝謝、",
"emails.recovery.signature": "{{project}} 團隊",
"emails.invitation.subject": "邀請 %s 團隊在 %s",
- "emails.invitation.hello": "您好",
+ "emails.invitation.hello": "您好、",
"emails.invitation.body": "發送這封郵件給您是因為 {{owner}} 想邀請您成為 {{team}} 團隊在 {{project}}。",
"emails.invitation.footer": "如果您不感興趣，可以忽略此消息。",
- "emails.invitation.thanks": "謝謝",
+ "emails.invitation.thanks": "謝謝、",
"emails.invitation.signature": "{{project}} 團隊",
"locale.country.unknown": "未知",
"countries.af": "阿富汗",
@@ -239,10 +239,10 @@
"sms.verification.body": "{{secret}}",
"emails.magicSession.securityPhrase": "這封電子郵件的安全密語是{{phrase}}。如果此密語與登入時顯示的密語相符，您就可以信任此郵件。",
"emails.otpSession.subject": "{{project}} 登入",
- "emails.otpSession.hello": "你好，",
+ "emails.otpSession.hello": "你好，、",
"emails.otpSession.description": "在提示时輸入以下驗證碼以安全地登入您的{{project}}帳戶。該驗證碼將在15分鐘後過期。",
"emails.otpSession.clientInfo": "這次的登入是使用{{agentClient}}在{{agentDevice}} {{agentOs}}上請求的。如果您沒有請求這次的登入，您可以放心地忽略這封電子郵件。",
"emails.otpSession.securityPhrase": "這封電子郵件的安全口令是{{phrase}}。如果這個口令與登入時顯示的口令相匹配，您可以信任這封電子郵件。",
- "emails.otpSession.thanks": "謝謝，",
+ "emails.otpSession.thanks": "謝謝，、",
"emails.otpSession.signature": "{{project}} 團隊"
-}
\ No newline at end of file
+}
diff --git a/app/config/platforms.php b/app/config/platforms.php
index 40cea19fd3..e54fb0a073 100644
--- a/app/config/platforms.php
+++ b/app/config/platforms.php
@@ -1,9 +1,5 @@
[
'key' => APP_PLATFORM_CLIENT,
@@ -15,7 +11,7 @@ return [
[
'key' => 'web',
'name' => 'Web',
- 'version' => '16.0.0',
+ 'version' => '16.0.2',
'url' => 'https://github.com/appwrite/sdk-for-web',
'package' => 'https://www.npmjs.com/package/appwrite',
'enabled' => true,
@@ -203,7 +199,7 @@ return [
[
'key' => 'web',
'name' => 'Console',
- 'version' => '1.1.0',
+ 'version' => '1.2.1',
'url' => 'https://github.com/appwrite/sdk-for-console',
'package' => '',
'enabled' => true,
@@ -285,7 +281,7 @@ return [
[
'key' => 'php',
'name' => 'PHP',
- 'version' => '12.0.0',
+ 'version' => '12.1.0',
'url' => 'https://github.com/appwrite/sdk-for-php',
'package' => 'https://packagist.org/packages/appwrite/appwrite',
'enabled' => true,
@@ -321,7 +317,7 @@ return [
[
'key' => 'ruby',
'name' => 'Ruby',
- 'version' => '12.1.0',
+ 'version' => '12.1.1',
'url' => 'https://github.com/appwrite/sdk-for-ruby',
'package' => 'https://rubygems.org/gems/appwrite',
'enabled' => true,
@@ -357,7 +353,7 @@ return [
[
'key' => 'dotnet',
'name' => '.NET',
- 'version' => '0.10.0',
+ 'version' => '0.10.1',
'url' => 'https://github.com/appwrite/sdk-for-dotnet',
'package' => 'https://www.nuget.org/packages/Appwrite',
'enabled' => true,
diff --git a/app/config/regions.php b/app/config/regions.php
index b40667ab5e..61029a9996 100644
--- a/app/config/regions.php
+++ b/app/config/regions.php
@@ -31,7 +31,7 @@ return [
],
'blr' => [
'$id' => 'blr',
- 'name' => 'Banglore',
+ 'name' => 'Bengaluru',
'disabled' => true,
'flag' => 'in',
'default' => true,
diff --git a/app/config/roles.php b/app/config/roles.php
index 65b9643b89..fae97895b8 100644
--- a/app/config/roles.php
+++ b/app/config/roles.php
@@ -17,7 +17,6 @@ $member = [
'files.read',
'files.write',
'projects.read',
- 'projects.write',
'locale.read',
'avatars.read',
'execution.read',
@@ -49,6 +48,7 @@ $admins = [
'collections.write',
'platforms.read',
'platforms.write',
+ 'projects.write',
'keys.read',
'keys.write',
'webhooks.read',
@@ -75,7 +75,7 @@ $admins = [
'topics.write',
'topics.read',
'subscribers.write',
- 'subscribers.read'
+ 'subscribers.read',
];
return [
diff --git a/app/config/runtimes/specifications.php b/app/config/runtimes/specifications.php
index d3625db8a2..68880f4d4e 100644
--- a/app/config/runtimes/specifications.php
+++ b/app/config/runtimes/specifications.php
@@ -6,7 +6,7 @@ return [
Specification::S_05VCPU_512MB => [
'slug' => Specification::S_05VCPU_512MB,
'memory' => 512,
- 'cpus' => 0.5
+ 'cpus' => 1 // TODO: revert this, it's a temporary change to test function performance.
],
Specification::S_1VCPU_512MB => [
'slug' => Specification::S_1VCPU_512MB,
diff --git a/app/config/specs/open-api3-1.6.x-client.json b/app/config/specs/open-api3-1.6.x-client.json
index 8a9967090d..e3cd909b4e 100644
--- a/app/config/specs/open-api3-1.6.x-client.json
+++ b/app/config/specs/open-api3-1.6.x-client.json
@@ -43,7 +43,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 8,
+ "weight": 9,
"cookies": false,
"type": "",
"deprecated": false,
@@ -94,7 +94,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 7,
+ "weight": 8,
"cookies": false,
"type": "",
"deprecated": false,
@@ -181,7 +181,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 33,
+ "weight": 34,
"cookies": false,
"type": "",
"deprecated": false,
@@ -239,7 +239,7 @@
},
"\/account\/identities": {
"get": {
- "summary": "List Identities",
+ "summary": "List identities",
"operationId": "accountListIdentities",
"tags": [
"account"
@@ -259,7 +259,7 @@
},
"x-appwrite": {
"method": "listIdentities",
- "weight": 56,
+ "weight": 57,
"cookies": false,
"type": "",
"deprecated": false,
@@ -320,7 +320,7 @@
},
"x-appwrite": {
"method": "deleteIdentity",
- "weight": 57,
+ "weight": 58,
"cookies": false,
"type": "",
"deprecated": false,
@@ -385,7 +385,7 @@
},
"x-appwrite": {
"method": "createJWT",
- "weight": 28,
+ "weight": 29,
"cookies": false,
"type": "",
"deprecated": false,
@@ -436,7 +436,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 30,
+ "weight": 31,
"cookies": false,
"type": "",
"deprecated": false,
@@ -504,7 +504,7 @@
},
"x-appwrite": {
"method": "updateMFA",
- "weight": 43,
+ "weight": 44,
"cookies": false,
"type": "",
"deprecated": false,
@@ -556,7 +556,7 @@
},
"\/account\/mfa\/authenticators\/{type}": {
"post": {
- "summary": "Create Authenticator",
+ "summary": "Create authenticator",
"operationId": "accountCreateMfaAuthenticator",
"tags": [
"account"
@@ -576,7 +576,7 @@
},
"x-appwrite": {
"method": "createMfaAuthenticator",
- "weight": 45,
+ "weight": 46,
"cookies": false,
"type": "",
"deprecated": false,
@@ -624,7 +624,7 @@
]
},
"put": {
- "summary": "Verify Authenticator",
+ "summary": "Verify authenticator",
"operationId": "accountUpdateMfaAuthenticator",
"tags": [
"account"
@@ -644,7 +644,7 @@
},
"x-appwrite": {
"method": "updateMfaAuthenticator",
- "weight": 46,
+ "weight": 47,
"cookies": false,
"type": "",
"deprecated": false,
@@ -711,7 +711,7 @@
}
},
"delete": {
- "summary": "Delete Authenticator",
+ "summary": "Delete authenticator",
"operationId": "accountDeleteMfaAuthenticator",
"tags": [
"account"
@@ -724,7 +724,7 @@
},
"x-appwrite": {
"method": "deleteMfaAuthenticator",
- "weight": 50,
+ "weight": 51,
"cookies": false,
"type": "",
"deprecated": false,
@@ -774,7 +774,7 @@
},
"\/account\/mfa\/challenge": {
"post": {
- "summary": "Create MFA Challenge",
+ "summary": "Create MFA challenge",
"operationId": "accountCreateMfaChallenge",
"tags": [
"account"
@@ -794,7 +794,7 @@
},
"x-appwrite": {
"method": "createMfaChallenge",
- "weight": 51,
+ "weight": 52,
"cookies": false,
"type": "",
"deprecated": false,
@@ -850,7 +850,7 @@
}
},
"put": {
- "summary": "Create MFA Challenge (confirmation)",
+ "summary": "Create MFA challenge (confirmation)",
"operationId": "accountUpdateMfaChallenge",
"tags": [
"account"
@@ -870,7 +870,7 @@
},
"x-appwrite": {
"method": "updateMfaChallenge",
- "weight": 52,
+ "weight": 53,
"cookies": false,
"type": "",
"deprecated": false,
@@ -928,7 +928,7 @@
},
"\/account\/mfa\/factors": {
"get": {
- "summary": "List Factors",
+ "summary": "List factors",
"operationId": "accountListMfaFactors",
"tags": [
"account"
@@ -948,7 +948,7 @@
},
"x-appwrite": {
"method": "listMfaFactors",
- "weight": 44,
+ "weight": 45,
"cookies": false,
"type": "",
"deprecated": false,
@@ -981,7 +981,7 @@
},
"\/account\/mfa\/recovery-codes": {
"get": {
- "summary": "Get MFA Recovery Codes",
+ "summary": "Get MFA recovery codes",
"operationId": "accountGetMfaRecoveryCodes",
"tags": [
"account"
@@ -1001,7 +1001,7 @@
},
"x-appwrite": {
"method": "getMfaRecoveryCodes",
- "weight": 49,
+ "weight": 50,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1032,7 +1032,7 @@
]
},
"post": {
- "summary": "Create MFA Recovery Codes",
+ "summary": "Create MFA recovery codes",
"operationId": "accountCreateMfaRecoveryCodes",
"tags": [
"account"
@@ -1052,7 +1052,7 @@
},
"x-appwrite": {
"method": "createMfaRecoveryCodes",
- "weight": 47,
+ "weight": 48,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1083,7 +1083,7 @@
]
},
"patch": {
- "summary": "Regenerate MFA Recovery Codes",
+ "summary": "Regenerate MFA recovery codes",
"operationId": "accountUpdateMfaRecoveryCodes",
"tags": [
"account"
@@ -1103,7 +1103,7 @@
},
"x-appwrite": {
"method": "updateMfaRecoveryCodes",
- "weight": 48,
+ "weight": 49,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1156,7 +1156,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 31,
+ "weight": 32,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1228,7 +1228,7 @@
},
"x-appwrite": {
"method": "updatePassword",
- "weight": 32,
+ "weight": 33,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1305,7 +1305,7 @@
},
"x-appwrite": {
"method": "updatePhone",
- "weight": 34,
+ "weight": 35,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1383,7 +1383,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 29,
+ "weight": 30,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1434,7 +1434,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 35,
+ "weight": 36,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1506,7 +1506,7 @@
},
"x-appwrite": {
"method": "createRecovery",
- "weight": 37,
+ "weight": 38,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1585,7 +1585,7 @@
},
"x-appwrite": {
"method": "updateRecovery",
- "weight": 38,
+ "weight": 39,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1669,7 +1669,7 @@
},
"x-appwrite": {
"method": "listSessions",
- "weight": 10,
+ "weight": 11,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1713,7 +1713,7 @@
},
"x-appwrite": {
"method": "deleteSessions",
- "weight": 11,
+ "weight": 12,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1766,7 +1766,7 @@
},
"x-appwrite": {
"method": "createAnonymousSession",
- "weight": 16,
+ "weight": 17,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1817,7 +1817,7 @@
},
"x-appwrite": {
"method": "createEmailPasswordSession",
- "weight": 15,
+ "weight": 16,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1893,7 +1893,7 @@
},
"x-appwrite": {
"method": "updateMagicURLSession",
- "weight": 25,
+ "weight": 26,
"cookies": false,
"type": "",
"deprecated": true,
@@ -1962,7 +1962,7 @@
},
"x-appwrite": {
"method": "createOAuth2Session",
- "weight": 18,
+ "weight": 19,
"cookies": false,
"type": "webAuth",
"deprecated": false,
@@ -2105,7 +2105,7 @@
},
"x-appwrite": {
"method": "updatePhoneSession",
- "weight": 26,
+ "weight": 27,
"cookies": false,
"type": "",
"deprecated": true,
@@ -2181,7 +2181,7 @@
},
"x-appwrite": {
"method": "createSession",
- "weight": 17,
+ "weight": 18,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2257,7 +2257,7 @@
},
"x-appwrite": {
"method": "getSession",
- "weight": 12,
+ "weight": 13,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2320,7 +2320,7 @@
},
"x-appwrite": {
"method": "updateSession",
- "weight": 14,
+ "weight": 15,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2376,7 +2376,7 @@
},
"x-appwrite": {
"method": "deleteSession",
- "weight": 13,
+ "weight": 14,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2441,7 +2441,7 @@
},
"x-appwrite": {
"method": "updateStatus",
- "weight": 36,
+ "weight": 37,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2494,7 +2494,7 @@
},
"x-appwrite": {
"method": "createPushTarget",
- "weight": 53,
+ "weight": 54,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2575,7 +2575,7 @@
},
"x-appwrite": {
"method": "updatePushTarget",
- "weight": 54,
+ "weight": 55,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2655,7 +2655,7 @@
},
"x-appwrite": {
"method": "deletePushTarget",
- "weight": 55,
+ "weight": 56,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2718,7 +2718,7 @@
},
"x-appwrite": {
"method": "createEmailToken",
- "weight": 24,
+ "weight": 25,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2799,7 +2799,7 @@
},
"x-appwrite": {
"method": "createMagicURLToken",
- "weight": 23,
+ "weight": 24,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2881,7 +2881,7 @@
},
"x-appwrite": {
"method": "createOAuth2Token",
- "weight": 22,
+ "weight": 23,
"cookies": false,
"type": "webAuth",
"deprecated": false,
@@ -3024,7 +3024,7 @@
},
"x-appwrite": {
"method": "createPhoneToken",
- "weight": 27,
+ "weight": 28,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3103,7 +3103,7 @@
},
"x-appwrite": {
"method": "createVerification",
- "weight": 39,
+ "weight": 40,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3173,7 +3173,7 @@
},
"x-appwrite": {
"method": "updateVerification",
- "weight": 40,
+ "weight": 41,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3251,7 +3251,7 @@
},
"x-appwrite": {
"method": "createPhoneVerification",
- "weight": 41,
+ "weight": 42,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3305,7 +3305,7 @@
},
"x-appwrite": {
"method": "updatePhoneVerification",
- "weight": 42,
+ "weight": 43,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3376,7 +3376,7 @@
},
"x-appwrite": {
"method": "getBrowser",
- "weight": 59,
+ "weight": 60,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3504,7 +3504,7 @@
},
"x-appwrite": {
"method": "getCreditCard",
- "weight": 58,
+ "weight": 59,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3636,7 +3636,7 @@
},
"x-appwrite": {
"method": "getFavicon",
- "weight": 62,
+ "weight": 63,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3696,7 +3696,7 @@
},
"x-appwrite": {
"method": "getFlag",
- "weight": 60,
+ "weight": 61,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4186,7 +4186,7 @@
},
"x-appwrite": {
"method": "getImage",
- "weight": 61,
+ "weight": 62,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4270,7 +4270,7 @@
},
"x-appwrite": {
"method": "getInitials",
- "weight": 64,
+ "weight": 65,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4364,7 +4364,7 @@
},
"x-appwrite": {
"method": "getQR",
- "weight": 63,
+ "weight": 64,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4465,7 +4465,7 @@
},
"x-appwrite": {
"method": "listDocuments",
- "weight": 108,
+ "weight": 109,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4552,7 +4552,7 @@
},
"x-appwrite": {
"method": "createDocument",
- "weight": 107,
+ "weight": 108,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4661,7 +4661,7 @@
},
"x-appwrite": {
"method": "getDocument",
- "weight": 109,
+ "weight": 110,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4758,7 +4758,7 @@
},
"x-appwrite": {
"method": "updateDocument",
- "weight": 111,
+ "weight": 112,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4859,7 +4859,7 @@
},
"x-appwrite": {
"method": "deleteDocument",
- "weight": 112,
+ "weight": 113,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4945,7 +4945,7 @@
},
"x-appwrite": {
"method": "listExecutions",
- "weight": 304,
+ "weight": 306,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5033,7 +5033,7 @@
},
"x-appwrite": {
"method": "createExecution",
- "weight": 303,
+ "weight": 305,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5084,7 +5084,7 @@
"body": {
"type": "string",
"description": "HTTP body of execution. Default value is empty string.",
- "x-example": null
+ "x-example": ""
},
"async": {
"type": "boolean",
@@ -5150,7 +5150,7 @@
},
"x-appwrite": {
"method": "getExecution",
- "weight": 305,
+ "weight": 307,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5226,7 +5226,7 @@
},
"x-appwrite": {
"method": "query",
- "weight": 329,
+ "weight": 331,
"cookies": false,
"type": "graphql",
"deprecated": false,
@@ -5280,7 +5280,7 @@
},
"x-appwrite": {
"method": "mutation",
- "weight": 328,
+ "weight": 330,
"cookies": false,
"type": "graphql",
"deprecated": false,
@@ -5334,7 +5334,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 116,
+ "weight": 117,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5368,7 +5368,7 @@
},
"\/locale\/codes": {
"get": {
- "summary": "List Locale Codes",
+ "summary": "List locale codes",
"operationId": "localeListCodes",
"tags": [
"locale"
@@ -5388,7 +5388,7 @@
},
"x-appwrite": {
"method": "listCodes",
- "weight": 117,
+ "weight": 118,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5442,7 +5442,7 @@
},
"x-appwrite": {
"method": "listContinents",
- "weight": 121,
+ "weight": 122,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5496,7 +5496,7 @@
},
"x-appwrite": {
"method": "listCountries",
- "weight": 118,
+ "weight": 119,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5550,7 +5550,7 @@
},
"x-appwrite": {
"method": "listCountriesEU",
- "weight": 119,
+ "weight": 120,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5604,7 +5604,7 @@
},
"x-appwrite": {
"method": "listCountriesPhones",
- "weight": 120,
+ "weight": 121,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5658,7 +5658,7 @@
},
"x-appwrite": {
"method": "listCurrencies",
- "weight": 122,
+ "weight": 123,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5712,7 +5712,7 @@
},
"x-appwrite": {
"method": "listLanguages",
- "weight": 123,
+ "weight": 124,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5766,7 +5766,7 @@
},
"x-appwrite": {
"method": "createSubscriber",
- "weight": 380,
+ "weight": 382,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5851,7 +5851,7 @@
},
"x-appwrite": {
"method": "deleteSubscriber",
- "weight": 384,
+ "weight": 386,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5928,7 +5928,7 @@
},
"x-appwrite": {
"method": "listFiles",
- "weight": 206,
+ "weight": 208,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6016,7 +6016,7 @@
},
"x-appwrite": {
"method": "createFile",
- "weight": 205,
+ "weight": 207,
"cookies": false,
"type": "upload",
"deprecated": false,
@@ -6116,7 +6116,7 @@
},
"x-appwrite": {
"method": "getFile",
- "weight": 207,
+ "weight": 209,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6190,7 +6190,7 @@
},
"x-appwrite": {
"method": "updateFile",
- "weight": 212,
+ "weight": 214,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6268,7 +6268,7 @@
}
},
"delete": {
- "summary": "Delete File",
+ "summary": "Delete file",
"operationId": "storageDeleteFile",
"tags": [
"storage"
@@ -6281,7 +6281,7 @@
},
"x-appwrite": {
"method": "deleteFile",
- "weight": 213,
+ "weight": 215,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6350,7 +6350,7 @@
},
"x-appwrite": {
"method": "getFileDownload",
- "weight": 209,
+ "weight": 211,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -6419,7 +6419,7 @@
},
"x-appwrite": {
"method": "getFilePreview",
- "weight": 208,
+ "weight": 210,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -6610,7 +6610,8 @@
"jpeg",
"gif",
"png",
- "webp"
+ "webp",
+ "avif"
],
"x-enum-name": "ImageFormat",
"x-enum-keys": [],
@@ -6636,7 +6637,7 @@
},
"x-appwrite": {
"method": "getFileView",
- "weight": 210,
+ "weight": 212,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -6712,7 +6713,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 217,
+ "weight": 219,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6790,7 +6791,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 216,
+ "weight": 218,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6877,7 +6878,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 218,
+ "weight": 220,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6941,7 +6942,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 220,
+ "weight": 222,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7017,7 +7018,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 222,
+ "weight": 224,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7068,7 +7069,7 @@
"tags": [
"teams"
],
- "description": "Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint.",
+ "description": "Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint. Hide sensitive attributes from the response by toggling membership privacy in the Console.",
"responses": {
"200": {
"description": "Memberships List",
@@ -7083,7 +7084,7 @@
},
"x-appwrite": {
"method": "listMemberships",
- "weight": 224,
+ "weight": 226,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7171,7 +7172,7 @@
},
"x-appwrite": {
"method": "createMembership",
- "weight": 223,
+ "weight": 225,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7269,7 +7270,7 @@
"tags": [
"teams"
],
- "description": "Get a team member by the membership unique id. All team members have read access for this resource.",
+ "description": "Get a team member by the membership unique id. All team members have read access for this resource. Hide sensitive attributes from the response by toggling membership privacy in the Console.",
"responses": {
"200": {
"description": "Membership",
@@ -7284,7 +7285,7 @@
},
"x-appwrite": {
"method": "getMembership",
- "weight": 225,
+ "weight": 227,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7358,7 +7359,7 @@
},
"x-appwrite": {
"method": "updateMembership",
- "weight": 226,
+ "weight": 228,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7447,7 +7448,7 @@
},
"x-appwrite": {
"method": "deleteMembership",
- "weight": 228,
+ "weight": 230,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7523,7 +7524,7 @@
},
"x-appwrite": {
"method": "updateMembershipStatus",
- "weight": 227,
+ "weight": 229,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7623,7 +7624,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 219,
+ "weight": 221,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7686,7 +7687,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 221,
+ "weight": 223,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9265,12 +9266,12 @@
},
"userName": {
"type": "string",
- "description": "User name.",
+ "description": "User name. Hide this attribute by toggling membership privacy in the Console.",
"x-example": "John Doe"
},
"userEmail": {
"type": "string",
- "description": "User email address.",
+ "description": "User email address. Hide this attribute by toggling membership privacy in the Console.",
"x-example": "john@appwrite.io"
},
"teamId": {
@@ -9300,7 +9301,7 @@
},
"mfa": {
"type": "boolean",
- "description": "Multi factor authentication status, true if the user has MFA enabled or false otherwise.",
+ "description": "Multi factor authentication status, true if the user has MFA enabled or false otherwise. Hide this attribute by toggling membership privacy in the Console.",
"x-example": false
},
"roles": {
@@ -9405,7 +9406,7 @@
"responseBody": {
"type": "string",
"description": "HTTP response body. This will return empty unless execution is created as synchronous.",
- "x-example": "Developers are awesome."
+ "x-example": ""
},
"responseHeaders": {
"type": "array",
@@ -9825,7 +9826,7 @@
"name": {
"type": "string",
"description": "Target Name.",
- "x-example": "Aegon apple token"
+ "x-example": "Apple iPhone 12"
},
"userId": {
"type": "string",
@@ -9847,6 +9848,11 @@
"type": "string",
"description": "The target identifier.",
"x-example": "token"
+ },
+ "expired": {
+ "type": "boolean",
+ "description": "Is the target expired.",
+ "x-example": false
}
},
"required": [
@@ -9856,7 +9862,8 @@
"name",
"userId",
"providerType",
- "identifier"
+ "identifier",
+ "expired"
]
}
},
diff --git a/app/config/specs/open-api3-1.6.x-console.json b/app/config/specs/open-api3-1.6.x-console.json
index 07749889d8..369fea741a 100644
--- a/app/config/specs/open-api3-1.6.x-console.json
+++ b/app/config/specs/open-api3-1.6.x-console.json
@@ -43,7 +43,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 8,
+ "weight": 9,
"cookies": false,
"type": "",
"deprecated": false,
@@ -93,7 +93,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 7,
+ "weight": 8,
"cookies": false,
"type": "",
"deprecated": false,
@@ -171,7 +171,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 9,
+ "weight": 10,
"cookies": false,
"type": "",
"deprecated": false,
@@ -221,7 +221,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 33,
+ "weight": 34,
"cookies": false,
"type": "",
"deprecated": false,
@@ -278,7 +278,7 @@
},
"\/account\/identities": {
"get": {
- "summary": "List Identities",
+ "summary": "List identities",
"operationId": "accountListIdentities",
"tags": [
"account"
@@ -298,7 +298,7 @@
},
"x-appwrite": {
"method": "listIdentities",
- "weight": 56,
+ "weight": 57,
"cookies": false,
"type": "",
"deprecated": false,
@@ -358,7 +358,7 @@
},
"x-appwrite": {
"method": "deleteIdentity",
- "weight": 57,
+ "weight": 58,
"cookies": false,
"type": "",
"deprecated": false,
@@ -422,7 +422,7 @@
},
"x-appwrite": {
"method": "createJWT",
- "weight": 28,
+ "weight": 29,
"cookies": false,
"type": "",
"deprecated": false,
@@ -473,7 +473,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 30,
+ "weight": 31,
"cookies": false,
"type": "",
"deprecated": false,
@@ -540,7 +540,7 @@
},
"x-appwrite": {
"method": "updateMFA",
- "weight": 43,
+ "weight": 44,
"cookies": false,
"type": "",
"deprecated": false,
@@ -591,7 +591,7 @@
},
"\/account\/mfa\/authenticators\/{type}": {
"post": {
- "summary": "Create Authenticator",
+ "summary": "Create authenticator",
"operationId": "accountCreateMfaAuthenticator",
"tags": [
"account"
@@ -611,7 +611,7 @@
},
"x-appwrite": {
"method": "createMfaAuthenticator",
- "weight": 45,
+ "weight": 46,
"cookies": false,
"type": "",
"deprecated": false,
@@ -658,7 +658,7 @@
]
},
"put": {
- "summary": "Verify Authenticator",
+ "summary": "Verify authenticator",
"operationId": "accountUpdateMfaAuthenticator",
"tags": [
"account"
@@ -678,7 +678,7 @@
},
"x-appwrite": {
"method": "updateMfaAuthenticator",
- "weight": 46,
+ "weight": 47,
"cookies": false,
"type": "",
"deprecated": false,
@@ -744,7 +744,7 @@
}
},
"delete": {
- "summary": "Delete Authenticator",
+ "summary": "Delete authenticator",
"operationId": "accountDeleteMfaAuthenticator",
"tags": [
"account"
@@ -757,7 +757,7 @@
},
"x-appwrite": {
"method": "deleteMfaAuthenticator",
- "weight": 50,
+ "weight": 51,
"cookies": false,
"type": "",
"deprecated": false,
@@ -806,7 +806,7 @@
},
"\/account\/mfa\/challenge": {
"post": {
- "summary": "Create MFA Challenge",
+ "summary": "Create MFA challenge",
"operationId": "accountCreateMfaChallenge",
"tags": [
"account"
@@ -826,7 +826,7 @@
},
"x-appwrite": {
"method": "createMfaChallenge",
- "weight": 51,
+ "weight": 52,
"cookies": false,
"type": "",
"deprecated": false,
@@ -882,7 +882,7 @@
}
},
"put": {
- "summary": "Create MFA Challenge (confirmation)",
+ "summary": "Create MFA challenge (confirmation)",
"operationId": "accountUpdateMfaChallenge",
"tags": [
"account"
@@ -902,7 +902,7 @@
},
"x-appwrite": {
"method": "updateMfaChallenge",
- "weight": 52,
+ "weight": 53,
"cookies": false,
"type": "",
"deprecated": false,
@@ -959,7 +959,7 @@
},
"\/account\/mfa\/factors": {
"get": {
- "summary": "List Factors",
+ "summary": "List factors",
"operationId": "accountListMfaFactors",
"tags": [
"account"
@@ -979,7 +979,7 @@
},
"x-appwrite": {
"method": "listMfaFactors",
- "weight": 44,
+ "weight": 45,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1011,7 +1011,7 @@
},
"\/account\/mfa\/recovery-codes": {
"get": {
- "summary": "Get MFA Recovery Codes",
+ "summary": "Get MFA recovery codes",
"operationId": "accountGetMfaRecoveryCodes",
"tags": [
"account"
@@ -1031,7 +1031,7 @@
},
"x-appwrite": {
"method": "getMfaRecoveryCodes",
- "weight": 49,
+ "weight": 50,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1061,7 +1061,7 @@
]
},
"post": {
- "summary": "Create MFA Recovery Codes",
+ "summary": "Create MFA recovery codes",
"operationId": "accountCreateMfaRecoveryCodes",
"tags": [
"account"
@@ -1081,7 +1081,7 @@
},
"x-appwrite": {
"method": "createMfaRecoveryCodes",
- "weight": 47,
+ "weight": 48,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1111,7 +1111,7 @@
]
},
"patch": {
- "summary": "Regenerate MFA Recovery Codes",
+ "summary": "Regenerate MFA recovery codes",
"operationId": "accountUpdateMfaRecoveryCodes",
"tags": [
"account"
@@ -1131,7 +1131,7 @@
},
"x-appwrite": {
"method": "updateMfaRecoveryCodes",
- "weight": 48,
+ "weight": 49,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1183,7 +1183,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 31,
+ "weight": 32,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1254,7 +1254,7 @@
},
"x-appwrite": {
"method": "updatePassword",
- "weight": 32,
+ "weight": 33,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1330,7 +1330,7 @@
},
"x-appwrite": {
"method": "updatePhone",
- "weight": 34,
+ "weight": 35,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1407,7 +1407,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 29,
+ "weight": 30,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1457,7 +1457,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 35,
+ "weight": 36,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1528,7 +1528,7 @@
},
"x-appwrite": {
"method": "createRecovery",
- "weight": 37,
+ "weight": 38,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1606,7 +1606,7 @@
},
"x-appwrite": {
"method": "updateRecovery",
- "weight": 38,
+ "weight": 39,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1689,7 +1689,7 @@
},
"x-appwrite": {
"method": "listSessions",
- "weight": 10,
+ "weight": 11,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1732,7 +1732,7 @@
},
"x-appwrite": {
"method": "deleteSessions",
- "weight": 11,
+ "weight": 12,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1784,7 +1784,7 @@
},
"x-appwrite": {
"method": "createAnonymousSession",
- "weight": 16,
+ "weight": 17,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1835,7 +1835,7 @@
},
"x-appwrite": {
"method": "createEmailPasswordSession",
- "weight": 15,
+ "weight": 16,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1911,7 +1911,7 @@
},
"x-appwrite": {
"method": "updateMagicURLSession",
- "weight": 25,
+ "weight": 26,
"cookies": false,
"type": "",
"deprecated": true,
@@ -1980,7 +1980,7 @@
},
"x-appwrite": {
"method": "createOAuth2Session",
- "weight": 18,
+ "weight": 19,
"cookies": false,
"type": "webAuth",
"deprecated": false,
@@ -2123,7 +2123,7 @@
},
"x-appwrite": {
"method": "updatePhoneSession",
- "weight": 26,
+ "weight": 27,
"cookies": false,
"type": "",
"deprecated": true,
@@ -2199,7 +2199,7 @@
},
"x-appwrite": {
"method": "createSession",
- "weight": 17,
+ "weight": 18,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2275,7 +2275,7 @@
},
"x-appwrite": {
"method": "getSession",
- "weight": 12,
+ "weight": 13,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2337,7 +2337,7 @@
},
"x-appwrite": {
"method": "updateSession",
- "weight": 14,
+ "weight": 15,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2392,7 +2392,7 @@
},
"x-appwrite": {
"method": "deleteSession",
- "weight": 13,
+ "weight": 14,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2456,7 +2456,7 @@
},
"x-appwrite": {
"method": "updateStatus",
- "weight": 36,
+ "weight": 37,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2508,7 +2508,7 @@
},
"x-appwrite": {
"method": "createPushTarget",
- "weight": 53,
+ "weight": 54,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2588,7 +2588,7 @@
},
"x-appwrite": {
"method": "updatePushTarget",
- "weight": 54,
+ "weight": 55,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2667,7 +2667,7 @@
},
"x-appwrite": {
"method": "deletePushTarget",
- "weight": 55,
+ "weight": 56,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2729,7 +2729,7 @@
},
"x-appwrite": {
"method": "createEmailToken",
- "weight": 24,
+ "weight": 25,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2810,7 +2810,7 @@
},
"x-appwrite": {
"method": "createMagicURLToken",
- "weight": 23,
+ "weight": 24,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2892,7 +2892,7 @@
},
"x-appwrite": {
"method": "createOAuth2Token",
- "weight": 22,
+ "weight": 23,
"cookies": false,
"type": "webAuth",
"deprecated": false,
@@ -3035,7 +3035,7 @@
},
"x-appwrite": {
"method": "createPhoneToken",
- "weight": 27,
+ "weight": 28,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3114,7 +3114,7 @@
},
"x-appwrite": {
"method": "createVerification",
- "weight": 39,
+ "weight": 40,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3183,7 +3183,7 @@
},
"x-appwrite": {
"method": "updateVerification",
- "weight": 40,
+ "weight": 41,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3260,7 +3260,7 @@
},
"x-appwrite": {
"method": "createPhoneVerification",
- "weight": 41,
+ "weight": 42,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3313,7 +3313,7 @@
},
"x-appwrite": {
"method": "updatePhoneVerification",
- "weight": 42,
+ "weight": 43,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3383,7 +3383,7 @@
},
"x-appwrite": {
"method": "getBrowser",
- "weight": 59,
+ "weight": 60,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3511,7 +3511,7 @@
},
"x-appwrite": {
"method": "getCreditCard",
- "weight": 58,
+ "weight": 59,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3643,7 +3643,7 @@
},
"x-appwrite": {
"method": "getFavicon",
- "weight": 62,
+ "weight": 63,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3703,7 +3703,7 @@
},
"x-appwrite": {
"method": "getFlag",
- "weight": 60,
+ "weight": 61,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4193,7 +4193,7 @@
},
"x-appwrite": {
"method": "getImage",
- "weight": 61,
+ "weight": 62,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4277,7 +4277,7 @@
},
"x-appwrite": {
"method": "getInitials",
- "weight": 64,
+ "weight": 65,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4371,7 +4371,7 @@
},
"x-appwrite": {
"method": "getQR",
- "weight": 63,
+ "weight": 64,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4452,7 +4452,7 @@
},
"\/console\/assistant": {
"post": {
- "summary": "Ask Query",
+ "summary": "Ask query",
"operationId": "assistantChat",
"tags": [
"assistant"
@@ -4465,7 +4465,7 @@
},
"x-appwrite": {
"method": "chat",
- "weight": 331,
+ "weight": 333,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4534,7 +4534,7 @@
},
"x-appwrite": {
"method": "variables",
- "weight": 330,
+ "weight": 332,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4584,7 +4584,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 69,
+ "weight": 70,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4659,7 +4659,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 68,
+ "weight": 69,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4740,7 +4740,7 @@
},
"x-appwrite": {
"method": "getUsage",
- "weight": 113,
+ "weight": 114,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4814,7 +4814,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 70,
+ "weight": 71,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4875,7 +4875,7 @@
},
"x-appwrite": {
"method": "update",
- "weight": 72,
+ "weight": 73,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4953,7 +4953,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 73,
+ "weight": 74,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5016,7 +5016,7 @@
},
"x-appwrite": {
"method": "listCollections",
- "weight": 75,
+ "weight": 76,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5101,7 +5101,7 @@
},
"x-appwrite": {
"method": "createCollection",
- "weight": 74,
+ "weight": 75,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5207,7 +5207,7 @@
},
"x-appwrite": {
"method": "getCollection",
- "weight": 76,
+ "weight": 77,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5278,7 +5278,7 @@
},
"x-appwrite": {
"method": "updateCollection",
- "weight": 78,
+ "weight": 79,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5379,7 +5379,7 @@
},
"x-appwrite": {
"method": "deleteCollection",
- "weight": 79,
+ "weight": 80,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5452,7 +5452,7 @@
},
"x-appwrite": {
"method": "listAttributes",
- "weight": 90,
+ "weight": 91,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5538,7 +5538,7 @@
},
"x-appwrite": {
"method": "createBooleanAttribute",
- "weight": 87,
+ "weight": 88,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5646,7 +5646,7 @@
},
"x-appwrite": {
"method": "updateBooleanAttribute",
- "weight": 99,
+ "weight": 100,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5759,7 +5759,7 @@
},
"x-appwrite": {
"method": "createDatetimeAttribute",
- "weight": 88,
+ "weight": 89,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5867,7 +5867,7 @@
},
"x-appwrite": {
"method": "updateDatetimeAttribute",
- "weight": 100,
+ "weight": 101,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5980,7 +5980,7 @@
},
"x-appwrite": {
"method": "createEmailAttribute",
- "weight": 81,
+ "weight": 82,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6088,7 +6088,7 @@
},
"x-appwrite": {
"method": "updateEmailAttribute",
- "weight": 93,
+ "weight": 94,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6201,7 +6201,7 @@
},
"x-appwrite": {
"method": "createEnumAttribute",
- "weight": 82,
+ "weight": 83,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6318,7 +6318,7 @@
},
"x-appwrite": {
"method": "updateEnumAttribute",
- "weight": 94,
+ "weight": 95,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6440,7 +6440,7 @@
},
"x-appwrite": {
"method": "createFloatAttribute",
- "weight": 86,
+ "weight": 87,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6558,7 +6558,7 @@
},
"x-appwrite": {
"method": "updateFloatAttribute",
- "weight": 98,
+ "weight": 99,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6683,7 +6683,7 @@
},
"x-appwrite": {
"method": "createIntegerAttribute",
- "weight": 85,
+ "weight": 86,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6801,7 +6801,7 @@
},
"x-appwrite": {
"method": "updateIntegerAttribute",
- "weight": 97,
+ "weight": 98,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6926,7 +6926,7 @@
},
"x-appwrite": {
"method": "createIpAttribute",
- "weight": 83,
+ "weight": 84,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7034,7 +7034,7 @@
},
"x-appwrite": {
"method": "updateIpAttribute",
- "weight": 95,
+ "weight": 96,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7147,7 +7147,7 @@
},
"x-appwrite": {
"method": "createRelationshipAttribute",
- "weight": 89,
+ "weight": 90,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7280,7 +7280,7 @@
},
"x-appwrite": {
"method": "createStringAttribute",
- "weight": 80,
+ "weight": 81,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7399,7 +7399,7 @@
},
"x-appwrite": {
"method": "updateStringAttribute",
- "weight": 92,
+ "weight": 93,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7477,7 +7477,7 @@
"size": {
"type": "integer",
"description": "Maximum size of the string attribute.",
- "x-example": null
+ "x-example": 1
},
"newKey": {
"type": "string",
@@ -7517,7 +7517,7 @@
},
"x-appwrite": {
"method": "createUrlAttribute",
- "weight": 84,
+ "weight": 85,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7625,7 +7625,7 @@
},
"x-appwrite": {
"method": "updateUrlAttribute",
- "weight": 96,
+ "weight": 97,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7769,7 +7769,7 @@
},
"x-appwrite": {
"method": "getAttribute",
- "weight": 91,
+ "weight": 92,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7842,7 +7842,7 @@
},
"x-appwrite": {
"method": "deleteAttribute",
- "weight": 102,
+ "weight": 103,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7924,7 +7924,7 @@
},
"x-appwrite": {
"method": "updateRelationshipAttribute",
- "weight": 101,
+ "weight": 102,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8034,7 +8034,7 @@
},
"x-appwrite": {
"method": "listDocuments",
- "weight": 108,
+ "weight": 109,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8121,7 +8121,7 @@
},
"x-appwrite": {
"method": "createDocument",
- "weight": 107,
+ "weight": 108,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8230,7 +8230,7 @@
},
"x-appwrite": {
"method": "getDocument",
- "weight": 109,
+ "weight": 110,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8327,7 +8327,7 @@
},
"x-appwrite": {
"method": "updateDocument",
- "weight": 111,
+ "weight": 112,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8428,7 +8428,7 @@
},
"x-appwrite": {
"method": "deleteDocument",
- "weight": 112,
+ "weight": 113,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8514,7 +8514,7 @@
},
"x-appwrite": {
"method": "listDocumentLogs",
- "weight": 110,
+ "weight": 111,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8609,7 +8609,7 @@
},
"x-appwrite": {
"method": "listIndexes",
- "weight": 104,
+ "weight": 105,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8693,7 +8693,7 @@
},
"x-appwrite": {
"method": "createIndex",
- "weight": 103,
+ "weight": 104,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8815,7 +8815,7 @@
},
"x-appwrite": {
"method": "getIndex",
- "weight": 105,
+ "weight": 106,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8888,7 +8888,7 @@
},
"x-appwrite": {
"method": "deleteIndex",
- "weight": 106,
+ "weight": 107,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8970,7 +8970,7 @@
},
"x-appwrite": {
"method": "listCollectionLogs",
- "weight": 77,
+ "weight": 78,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9055,7 +9055,7 @@
},
"x-appwrite": {
"method": "getCollectionUsage",
- "weight": 115,
+ "weight": 116,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9149,7 +9149,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 71,
+ "weight": 72,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9224,7 +9224,7 @@
},
"x-appwrite": {
"method": "getDatabaseUsage",
- "weight": 114,
+ "weight": 115,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9308,7 +9308,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 287,
+ "weight": 289,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9383,7 +9383,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 286,
+ "weight": 288,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9437,6 +9437,7 @@
"node-19.0",
"node-20.0",
"node-21.0",
+ "node-22",
"php-8.0",
"php-8.1",
"php-8.2",
@@ -9455,6 +9456,8 @@
"deno-1.24",
"deno-1.35",
"deno-1.40",
+ "deno-1.46",
+ "deno-2.0",
"dart-2.15",
"dart-2.16",
"dart-2.17",
@@ -9462,24 +9465,30 @@
"dart-3.0",
"dart-3.1",
"dart-3.3",
- "dotnet-3.1",
+ "dart-3.5",
"dotnet-6.0",
"dotnet-7.0",
+ "dotnet-8.0",
"java-8.0",
"java-11.0",
"java-17.0",
"java-18.0",
"java-21.0",
+ "java-22",
"swift-5.5",
"swift-5.8",
"swift-5.9",
+ "swift-5.10",
"kotlin-1.6",
"kotlin-1.8",
"kotlin-1.9",
+ "kotlin-2.0",
"cpp-17",
"cpp-20",
"bun-1.0",
- "go-1.23"
+ "bun-1.1",
+ "go-1.23",
+ "static-1"
],
"x-enum-name": null,
"x-enum-keys": []
@@ -9622,7 +9631,7 @@
},
"x-appwrite": {
"method": "listRuntimes",
- "weight": 288,
+ "weight": 290,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9673,7 +9682,7 @@
},
"x-appwrite": {
"method": "listSpecifications",
- "weight": 289,
+ "weight": 291,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9725,7 +9734,7 @@
},
"x-appwrite": {
"method": "listTemplates",
- "weight": 312,
+ "weight": 314,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9827,7 +9836,7 @@
},
"x-appwrite": {
"method": "getTemplate",
- "weight": 313,
+ "weight": 315,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9889,7 +9898,7 @@
},
"x-appwrite": {
"method": "getUsage",
- "weight": 292,
+ "weight": 294,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9963,7 +9972,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 290,
+ "weight": 292,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10024,7 +10033,7 @@
},
"x-appwrite": {
"method": "update",
- "weight": 293,
+ "weight": 295,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10085,6 +10094,7 @@
"node-19.0",
"node-20.0",
"node-21.0",
+ "node-22",
"php-8.0",
"php-8.1",
"php-8.2",
@@ -10103,6 +10113,8 @@
"deno-1.24",
"deno-1.35",
"deno-1.40",
+ "deno-1.46",
+ "deno-2.0",
"dart-2.15",
"dart-2.16",
"dart-2.17",
@@ -10110,24 +10122,30 @@
"dart-3.0",
"dart-3.1",
"dart-3.3",
- "dotnet-3.1",
+ "dart-3.5",
"dotnet-6.0",
"dotnet-7.0",
+ "dotnet-8.0",
"java-8.0",
"java-11.0",
"java-17.0",
"java-18.0",
"java-21.0",
+ "java-22",
"swift-5.5",
"swift-5.8",
"swift-5.9",
+ "swift-5.10",
"kotlin-1.6",
"kotlin-1.8",
"kotlin-1.9",
+ "kotlin-2.0",
"cpp-17",
"cpp-20",
"bun-1.0",
- "go-1.23"
+ "bun-1.1",
+ "go-1.23",
+ "static-1"
],
"x-enum-name": null,
"x-enum-keys": []
@@ -10240,7 +10258,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 296,
+ "weight": 298,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10303,7 +10321,7 @@
},
"x-appwrite": {
"method": "listDeployments",
- "weight": 298,
+ "weight": 300,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10388,7 +10406,7 @@
},
"x-appwrite": {
"method": "createDeployment",
- "weight": 297,
+ "weight": 299,
"cookies": false,
"type": "upload",
"deprecated": false,
@@ -10486,7 +10504,7 @@
},
"x-appwrite": {
"method": "getDeployment",
- "weight": 299,
+ "weight": 301,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10557,7 +10575,7 @@
},
"x-appwrite": {
"method": "updateDeployment",
- "weight": 295,
+ "weight": 297,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10621,7 +10639,7 @@
},
"x-appwrite": {
"method": "deleteDeployment",
- "weight": 300,
+ "weight": 302,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10687,7 +10705,7 @@
},
"x-appwrite": {
"method": "createBuild",
- "weight": 301,
+ "weight": 303,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10774,7 +10792,7 @@
},
"x-appwrite": {
"method": "updateDeploymentBuild",
- "weight": 302,
+ "weight": 304,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10840,7 +10858,7 @@
},
"x-appwrite": {
"method": "getDeploymentDownload",
- "weight": 294,
+ "weight": 296,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -10915,7 +10933,7 @@
},
"x-appwrite": {
"method": "listExecutions",
- "weight": 304,
+ "weight": 306,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11003,7 +11021,7 @@
},
"x-appwrite": {
"method": "createExecution",
- "weight": 303,
+ "weight": 305,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11054,7 +11072,7 @@
"body": {
"type": "string",
"description": "HTTP body of execution. Default value is empty string.",
- "x-example": null
+ "x-example": ""
},
"async": {
"type": "boolean",
@@ -11120,7 +11138,7 @@
},
"x-appwrite": {
"method": "getExecution",
- "weight": 305,
+ "weight": 307,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11187,7 +11205,7 @@
},
"x-appwrite": {
"method": "deleteExecution",
- "weight": 306,
+ "weight": 308,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11260,7 +11278,7 @@
},
"x-appwrite": {
"method": "getFunctionUsage",
- "weight": 291,
+ "weight": 293,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11344,7 +11362,7 @@
},
"x-appwrite": {
"method": "listVariables",
- "weight": 308,
+ "weight": 310,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11405,7 +11423,7 @@
},
"x-appwrite": {
"method": "createVariable",
- "weight": 307,
+ "weight": 309,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11493,7 +11511,7 @@
},
"x-appwrite": {
"method": "getVariable",
- "weight": 309,
+ "weight": 311,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11564,7 +11582,7 @@
},
"x-appwrite": {
"method": "updateVariable",
- "weight": 310,
+ "weight": 312,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11652,7 +11670,7 @@
},
"x-appwrite": {
"method": "deleteVariable",
- "weight": 311,
+ "weight": 313,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11725,7 +11743,7 @@
},
"x-appwrite": {
"method": "query",
- "weight": 329,
+ "weight": 331,
"cookies": false,
"type": "graphql",
"deprecated": false,
@@ -11779,7 +11797,7 @@
},
"x-appwrite": {
"method": "mutation",
- "weight": 328,
+ "weight": 330,
"cookies": false,
"type": "graphql",
"deprecated": false,
@@ -11833,7 +11851,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 124,
+ "weight": 125,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11884,7 +11902,7 @@
},
"x-appwrite": {
"method": "getAntivirus",
- "weight": 146,
+ "weight": 147,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11935,7 +11953,7 @@
},
"x-appwrite": {
"method": "getCache",
- "weight": 127,
+ "weight": 128,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11986,7 +12004,7 @@
},
"x-appwrite": {
"method": "getCertificate",
- "weight": 133,
+ "weight": 134,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12048,7 +12066,7 @@
},
"x-appwrite": {
"method": "getDB",
- "weight": 126,
+ "weight": 127,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12099,7 +12117,7 @@
},
"x-appwrite": {
"method": "getPubSub",
- "weight": 129,
+ "weight": 130,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12150,7 +12168,7 @@
},
"x-appwrite": {
"method": "getQueue",
- "weight": 128,
+ "weight": 129,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12201,7 +12219,7 @@
},
"x-appwrite": {
"method": "getQueueBuilds",
- "weight": 135,
+ "weight": 136,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12265,7 +12283,7 @@
},
"x-appwrite": {
"method": "getQueueCertificates",
- "weight": 134,
+ "weight": 135,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12329,7 +12347,7 @@
},
"x-appwrite": {
"method": "getQueueDatabases",
- "weight": 136,
+ "weight": 137,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12404,7 +12422,7 @@
},
"x-appwrite": {
"method": "getQueueDeletes",
- "weight": 137,
+ "weight": 138,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12468,7 +12486,7 @@
},
"x-appwrite": {
"method": "getFailedJobs",
- "weight": 147,
+ "weight": 148,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12558,7 +12576,7 @@
},
"x-appwrite": {
"method": "getQueueFunctions",
- "weight": 141,
+ "weight": 142,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12622,7 +12640,7 @@
},
"x-appwrite": {
"method": "getQueueLogs",
- "weight": 132,
+ "weight": 133,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12686,7 +12704,7 @@
},
"x-appwrite": {
"method": "getQueueMails",
- "weight": 138,
+ "weight": 139,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12750,7 +12768,7 @@
},
"x-appwrite": {
"method": "getQueueMessaging",
- "weight": 139,
+ "weight": 140,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12814,7 +12832,7 @@
},
"x-appwrite": {
"method": "getQueueMigrations",
- "weight": 140,
+ "weight": 141,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12878,7 +12896,7 @@
},
"x-appwrite": {
"method": "getQueueUsage",
- "weight": 142,
+ "weight": 143,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12942,7 +12960,7 @@
},
"x-appwrite": {
"method": "getQueueUsageDump",
- "weight": 143,
+ "weight": 144,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13006,7 +13024,7 @@
},
"x-appwrite": {
"method": "getQueueWebhooks",
- "weight": 131,
+ "weight": 132,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13070,7 +13088,7 @@
},
"x-appwrite": {
"method": "getStorage",
- "weight": 145,
+ "weight": 146,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13121,7 +13139,7 @@
},
"x-appwrite": {
"method": "getStorageLocal",
- "weight": 144,
+ "weight": 145,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13172,7 +13190,7 @@
},
"x-appwrite": {
"method": "getTime",
- "weight": 130,
+ "weight": 131,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13223,7 +13241,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 116,
+ "weight": 117,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13257,7 +13275,7 @@
},
"\/locale\/codes": {
"get": {
- "summary": "List Locale Codes",
+ "summary": "List locale codes",
"operationId": "localeListCodes",
"tags": [
"locale"
@@ -13277,7 +13295,7 @@
},
"x-appwrite": {
"method": "listCodes",
- "weight": 117,
+ "weight": 118,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13331,7 +13349,7 @@
},
"x-appwrite": {
"method": "listContinents",
- "weight": 121,
+ "weight": 122,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13385,7 +13403,7 @@
},
"x-appwrite": {
"method": "listCountries",
- "weight": 118,
+ "weight": 119,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13439,7 +13457,7 @@
},
"x-appwrite": {
"method": "listCountriesEU",
- "weight": 119,
+ "weight": 120,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13493,7 +13511,7 @@
},
"x-appwrite": {
"method": "listCountriesPhones",
- "weight": 120,
+ "weight": 121,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13547,7 +13565,7 @@
},
"x-appwrite": {
"method": "listCurrencies",
- "weight": 122,
+ "weight": 123,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13601,7 +13619,7 @@
},
"x-appwrite": {
"method": "listLanguages",
- "weight": 123,
+ "weight": 124,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13655,7 +13673,7 @@
},
"x-appwrite": {
"method": "listMessages",
- "weight": 388,
+ "weight": 390,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13733,7 +13751,7 @@
},
"x-appwrite": {
"method": "createEmail",
- "weight": 385,
+ "weight": 387,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13879,7 +13897,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 392,
+ "weight": 394,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14027,7 +14045,7 @@
},
"x-appwrite": {
"method": "createPush",
- "weight": 387,
+ "weight": 389,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14184,7 +14202,7 @@
},
"x-appwrite": {
"method": "updatePush",
- "weight": 394,
+ "weight": 396,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14343,7 +14361,7 @@
},
"x-appwrite": {
"method": "createSms",
- "weight": 386,
+ "weight": 388,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14454,7 +14472,7 @@
},
"x-appwrite": {
"method": "updateSms",
- "weight": 393,
+ "weight": 395,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14568,7 +14586,7 @@
},
"x-appwrite": {
"method": "getMessage",
- "weight": 391,
+ "weight": 393,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14623,7 +14641,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 395,
+ "weight": 397,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14687,7 +14705,7 @@
},
"x-appwrite": {
"method": "listMessageLogs",
- "weight": 389,
+ "weight": 391,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14764,7 +14782,7 @@
},
"x-appwrite": {
"method": "listTargets",
- "weight": 390,
+ "weight": 392,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14841,7 +14859,7 @@
},
"x-appwrite": {
"method": "listProviders",
- "weight": 360,
+ "weight": 362,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14919,7 +14937,7 @@
},
"x-appwrite": {
"method": "createApnsProvider",
- "weight": 359,
+ "weight": 361,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15026,7 +15044,7 @@
},
"x-appwrite": {
"method": "updateApnsProvider",
- "weight": 372,
+ "weight": 374,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15136,7 +15154,7 @@
},
"x-appwrite": {
"method": "createFcmProvider",
- "weight": 358,
+ "weight": 360,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15223,7 +15241,7 @@
},
"x-appwrite": {
"method": "updateFcmProvider",
- "weight": 371,
+ "weight": 373,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15313,7 +15331,7 @@
},
"x-appwrite": {
"method": "createMailgunProvider",
- "weight": 350,
+ "weight": 352,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15430,7 +15448,7 @@
},
"x-appwrite": {
"method": "updateMailgunProvider",
- "weight": 363,
+ "weight": 365,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15550,7 +15568,7 @@
},
"x-appwrite": {
"method": "createMsg91Provider",
- "weight": 353,
+ "weight": 355,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15647,7 +15665,7 @@
},
"x-appwrite": {
"method": "updateMsg91Provider",
- "weight": 366,
+ "weight": 368,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15747,7 +15765,7 @@
},
"x-appwrite": {
"method": "createSendgridProvider",
- "weight": 351,
+ "weight": 353,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15854,7 +15872,7 @@
},
"x-appwrite": {
"method": "updateSendgridProvider",
- "weight": 364,
+ "weight": 366,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15964,7 +15982,7 @@
},
"x-appwrite": {
"method": "createSmtpProvider",
- "weight": 352,
+ "weight": 354,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16109,7 +16127,7 @@
},
"x-appwrite": {
"method": "updateSmtpProvider",
- "weight": 365,
+ "weight": 367,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16256,7 +16274,7 @@
},
"x-appwrite": {
"method": "createTelesignProvider",
- "weight": 354,
+ "weight": 356,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16353,7 +16371,7 @@
},
"x-appwrite": {
"method": "updateTelesignProvider",
- "weight": 367,
+ "weight": 369,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16453,7 +16471,7 @@
},
"x-appwrite": {
"method": "createTextmagicProvider",
- "weight": 355,
+ "weight": 357,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16550,7 +16568,7 @@
},
"x-appwrite": {
"method": "updateTextmagicProvider",
- "weight": 368,
+ "weight": 370,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16650,7 +16668,7 @@
},
"x-appwrite": {
"method": "createTwilioProvider",
- "weight": 356,
+ "weight": 358,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16747,7 +16765,7 @@
},
"x-appwrite": {
"method": "updateTwilioProvider",
- "weight": 369,
+ "weight": 371,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16847,7 +16865,7 @@
},
"x-appwrite": {
"method": "createVonageProvider",
- "weight": 357,
+ "weight": 359,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16944,7 +16962,7 @@
},
"x-appwrite": {
"method": "updateVonageProvider",
- "weight": 370,
+ "weight": 372,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17044,7 +17062,7 @@
},
"x-appwrite": {
"method": "getProvider",
- "weight": 362,
+ "weight": 364,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17099,7 +17117,7 @@
},
"x-appwrite": {
"method": "deleteProvider",
- "weight": 373,
+ "weight": 375,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17163,7 +17181,7 @@
},
"x-appwrite": {
"method": "listProviderLogs",
- "weight": 361,
+ "weight": 363,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17240,7 +17258,7 @@
},
"x-appwrite": {
"method": "listSubscriberLogs",
- "weight": 382,
+ "weight": 384,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17317,7 +17335,7 @@
},
"x-appwrite": {
"method": "listTopics",
- "weight": 375,
+ "weight": 377,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17393,7 +17411,7 @@
},
"x-appwrite": {
"method": "createTopic",
- "weight": 374,
+ "weight": 376,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17478,7 +17496,7 @@
},
"x-appwrite": {
"method": "getTopic",
- "weight": 377,
+ "weight": 379,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17540,7 +17558,7 @@
},
"x-appwrite": {
"method": "updateTopic",
- "weight": 378,
+ "weight": 380,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17619,7 +17637,7 @@
},
"x-appwrite": {
"method": "deleteTopic",
- "weight": 379,
+ "weight": 381,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17683,7 +17701,7 @@
},
"x-appwrite": {
"method": "listTopicLogs",
- "weight": 376,
+ "weight": 378,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17760,7 +17778,7 @@
},
"x-appwrite": {
"method": "listSubscribers",
- "weight": 381,
+ "weight": 383,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17846,7 +17864,7 @@
},
"x-appwrite": {
"method": "createSubscriber",
- "weight": 380,
+ "weight": 382,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17938,7 +17956,7 @@
},
"x-appwrite": {
"method": "getSubscriber",
- "weight": 383,
+ "weight": 385,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18003,7 +18021,7 @@
},
"x-appwrite": {
"method": "deleteSubscriber",
- "weight": 384,
+ "weight": 386,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18060,7 +18078,7 @@
},
"\/migrations": {
"get": {
- "summary": "List Migrations",
+ "summary": "List migrations",
"operationId": "migrationsList",
"tags": [
"migrations"
@@ -18080,7 +18098,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 337,
+ "weight": 339,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18109,7 +18127,7 @@
"parameters": [
{
"name": "queries",
- "description": "Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https:\/\/appwrite.io\/docs\/databases#querying-documents). Maximum of 100 queries are allowed, each 4096 characters long. You may filter on the following attributes: status, stage, source, resources, statusCounters, resourceData, errors",
+ "description": "Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https:\/\/appwrite.io\/docs\/databases#querying-documents). Maximum of 100 queries are allowed, each 4096 characters long. You may filter on the following attributes: status, stage, source, destination, resources, statusCounters, resourceData, errors",
"required": false,
"schema": {
"type": "array",
@@ -18136,7 +18154,7 @@
},
"\/migrations\/appwrite": {
"post": {
- "summary": "Migrate Appwrite Data",
+ "summary": "Migrate Appwrite data",
"operationId": "migrationsCreateAppwriteMigration",
"tags": [
"migrations"
@@ -18156,7 +18174,7 @@
},
"x-appwrite": {
"method": "createAppwriteMigration",
- "weight": 332,
+ "weight": 334,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18226,7 +18244,7 @@
},
"\/migrations\/appwrite\/report": {
"get": {
- "summary": "Generate a report on Appwrite Data",
+ "summary": "Generate a report on Appwrite data",
"operationId": "migrationsGetAppwriteReport",
"tags": [
"migrations"
@@ -18246,7 +18264,7 @@
},
"x-appwrite": {
"method": "getAppwriteReport",
- "weight": 339,
+ "weight": 341,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18321,7 +18339,7 @@
},
"\/migrations\/firebase": {
"post": {
- "summary": "Migrate Firebase Data (Service Account)",
+ "summary": "Migrate Firebase data (Service Account)",
"operationId": "migrationsCreateFirebaseMigration",
"tags": [
"migrations"
@@ -18341,7 +18359,7 @@
},
"x-appwrite": {
"method": "createFirebaseMigration",
- "weight": 334,
+ "weight": 336,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18399,7 +18417,7 @@
},
"\/migrations\/firebase\/deauthorize": {
"get": {
- "summary": "Revoke Appwrite's authorization to access Firebase Projects",
+ "summary": "Revoke Appwrite's authorization to access Firebase projects",
"operationId": "migrationsDeleteFirebaseAuth",
"tags": [
"migrations"
@@ -18412,7 +18430,7 @@
},
"x-appwrite": {
"method": "deleteFirebaseAuth",
- "weight": 345,
+ "weight": 347,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18442,7 +18460,7 @@
},
"\/migrations\/firebase\/oauth": {
"post": {
- "summary": "Migrate Firebase Data (OAuth)",
+ "summary": "Migrate Firebase data (OAuth)",
"operationId": "migrationsCreateFirebaseOAuthMigration",
"tags": [
"migrations"
@@ -18462,7 +18480,7 @@
},
"x-appwrite": {
"method": "createFirebaseOAuthMigration",
- "weight": 333,
+ "weight": 335,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18520,7 +18538,7 @@
},
"\/migrations\/firebase\/projects": {
"get": {
- "summary": "List Firebase Projects",
+ "summary": "List Firebase projects",
"operationId": "migrationsListFirebaseProjects",
"tags": [
"migrations"
@@ -18540,7 +18558,7 @@
},
"x-appwrite": {
"method": "listFirebaseProjects",
- "weight": 344,
+ "weight": 346,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18570,7 +18588,7 @@
},
"\/migrations\/firebase\/report": {
"get": {
- "summary": "Generate a report on Firebase Data",
+ "summary": "Generate a report on Firebase data",
"operationId": "migrationsGetFirebaseReport",
"tags": [
"migrations"
@@ -18590,7 +18608,7 @@
},
"x-appwrite": {
"method": "getFirebaseReport",
- "weight": 340,
+ "weight": 342,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18644,7 +18662,7 @@
},
"\/migrations\/firebase\/report\/oauth": {
"get": {
- "summary": "Generate a report on Firebase Data using OAuth",
+ "summary": "Generate a report on Firebase data using OAuth",
"operationId": "migrationsGetFirebaseReportOAuth",
"tags": [
"migrations"
@@ -18664,7 +18682,7 @@
},
"x-appwrite": {
"method": "getFirebaseReportOAuth",
- "weight": 341,
+ "weight": 343,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18718,7 +18736,7 @@
},
"\/migrations\/nhost": {
"post": {
- "summary": "Migrate NHost Data",
+ "summary": "Migrate NHost data",
"operationId": "migrationsCreateNHostMigration",
"tags": [
"migrations"
@@ -18738,7 +18756,7 @@
},
"x-appwrite": {
"method": "createNHostMigration",
- "weight": 336,
+ "weight": 338,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18851,7 +18869,7 @@
},
"x-appwrite": {
"method": "getNHostReport",
- "weight": 347,
+ "weight": 349,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18966,7 +18984,7 @@
},
"\/migrations\/supabase": {
"post": {
- "summary": "Migrate Supabase Data",
+ "summary": "Migrate Supabase data",
"operationId": "migrationsCreateSupabaseMigration",
"tags": [
"migrations"
@@ -18986,7 +19004,7 @@
},
"x-appwrite": {
"method": "createSupabaseMigration",
- "weight": 335,
+ "weight": 337,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19093,7 +19111,7 @@
},
"x-appwrite": {
"method": "getSupabaseReport",
- "weight": 346,
+ "weight": 348,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19199,7 +19217,7 @@
},
"\/migrations\/{migrationId}": {
"get": {
- "summary": "Get Migration",
+ "summary": "Get migration",
"operationId": "migrationsGet",
"tags": [
"migrations"
@@ -19219,7 +19237,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 338,
+ "weight": 340,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19259,7 +19277,7 @@
]
},
"patch": {
- "summary": "Retry Migration",
+ "summary": "Retry migration",
"operationId": "migrationsRetry",
"tags": [
"migrations"
@@ -19279,7 +19297,7 @@
},
"x-appwrite": {
"method": "retry",
- "weight": 348,
+ "weight": 350,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19319,7 +19337,7 @@
]
},
"delete": {
- "summary": "Delete Migration",
+ "summary": "Delete migration",
"operationId": "migrationsDelete",
"tags": [
"migrations"
@@ -19332,7 +19350,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 349,
+ "weight": 351,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19394,7 +19412,7 @@
},
"x-appwrite": {
"method": "getUsage",
- "weight": 194,
+ "weight": 196,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19464,7 +19482,7 @@
},
"\/project\/variables": {
"get": {
- "summary": "List Variables",
+ "summary": "List variables",
"operationId": "projectListVariables",
"tags": [
"project"
@@ -19484,7 +19502,7 @@
},
"x-appwrite": {
"method": "listVariables",
- "weight": 196,
+ "weight": 198,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19512,7 +19530,7 @@
]
},
"post": {
- "summary": "Create Variable",
+ "summary": "Create variable",
"operationId": "projectCreateVariable",
"tags": [
"project"
@@ -19532,7 +19550,7 @@
},
"x-appwrite": {
"method": "createVariable",
- "weight": 195,
+ "weight": 197,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19587,7 +19605,7 @@
},
"\/project\/variables\/{variableId}": {
"get": {
- "summary": "Get Variable",
+ "summary": "Get variable",
"operationId": "projectGetVariable",
"tags": [
"project"
@@ -19607,7 +19625,7 @@
},
"x-appwrite": {
"method": "getVariable",
- "weight": 197,
+ "weight": 199,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19647,7 +19665,7 @@
]
},
"put": {
- "summary": "Update Variable",
+ "summary": "Update variable",
"operationId": "projectUpdateVariable",
"tags": [
"project"
@@ -19667,7 +19685,7 @@
},
"x-appwrite": {
"method": "updateVariable",
- "weight": 198,
+ "weight": 200,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19731,7 +19749,7 @@
}
},
"delete": {
- "summary": "Delete Variable",
+ "summary": "Delete variable",
"operationId": "projectDeleteVariable",
"tags": [
"project"
@@ -19744,7 +19762,7 @@
},
"x-appwrite": {
"method": "deleteVariable",
- "weight": 199,
+ "weight": 201,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19806,7 +19824,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 150,
+ "weight": 151,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19880,7 +19898,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 149,
+ "weight": 150,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20017,7 +20035,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 151,
+ "weight": 152,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20077,7 +20095,7 @@
},
"x-appwrite": {
"method": "update",
- "weight": 152,
+ "weight": 153,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20194,7 +20212,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 168,
+ "weight": 170,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20256,7 +20274,7 @@
},
"x-appwrite": {
"method": "updateApiStatus",
- "weight": 156,
+ "weight": 157,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20350,7 +20368,7 @@
},
"x-appwrite": {
"method": "updateApiStatusAll",
- "weight": 157,
+ "weight": 158,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20431,7 +20449,7 @@
},
"x-appwrite": {
"method": "updateAuthDuration",
- "weight": 161,
+ "weight": 163,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20512,7 +20530,7 @@
},
"x-appwrite": {
"method": "updateAuthLimit",
- "weight": 160,
+ "weight": 162,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20593,7 +20611,7 @@
},
"x-appwrite": {
"method": "updateAuthSessionsLimit",
- "weight": 166,
+ "weight": 168,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20652,6 +20670,99 @@
}
}
},
+ "\/projects\/{projectId}\/auth\/memberships-privacy": {
+ "patch": {
+ "summary": "Update project memberships privacy attributes",
+ "operationId": "projectsUpdateMembershipsPrivacy",
+ "tags": [
+ "projects"
+ ],
+ "description": "",
+ "responses": {
+ "200": {
+ "description": "Project",
+ "content": {
+ "application\/json": {
+ "schema": {
+ "$ref": "#\/components\/schemas\/project"
+ }
+ }
+ }
+ }
+ },
+ "x-appwrite": {
+ "method": "updateMembershipsPrivacy",
+ "weight": 161,
+ "cookies": false,
+ "type": "",
+ "deprecated": false,
+ "demo": "projects\/update-memberships-privacy.md",
+ "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master",
+ "rate-limit": 0,
+ "rate-time": 3600,
+ "rate-key": "url:{url},ip:{ip}",
+ "scope": "projects.write",
+ "platforms": [
+ "console"
+ ],
+ "packaging": false,
+ "offline-model": "",
+ "offline-key": "",
+ "offline-response-key": "$id",
+ "auth": {
+ "Project": []
+ }
+ },
+ "security": [
+ {
+ "Project": []
+ }
+ ],
+ "parameters": [
+ {
+ "name": "projectId",
+ "description": "Project unique ID.",
+ "required": true,
+ "schema": {
+ "type": "string",
+ "x-example": ""
+ },
+ "in": "path"
+ }
+ ],
+ "requestBody": {
+ "content": {
+ "application\/json": {
+ "schema": {
+ "type": "object",
+ "properties": {
+ "userName": {
+ "type": "boolean",
+ "description": "Set to true to show userName to members of a team.",
+ "x-example": false
+ },
+ "userEmail": {
+ "type": "boolean",
+ "description": "Set to true to show email to members of a team.",
+ "x-example": false
+ },
+ "mfa": {
+ "type": "boolean",
+ "description": "Set to true to show mfa to members of a team.",
+ "x-example": false
+ }
+ },
+ "required": [
+ "userName",
+ "userEmail",
+ "mfa"
+ ]
+ }
+ }
+ }
+ }
+ }
+ },
"\/projects\/{projectId}\/auth\/mock-numbers": {
"patch": {
"summary": "Update the mock numbers for the project",
@@ -20674,7 +20785,7 @@
},
"x-appwrite": {
"method": "updateMockNumbers",
- "weight": 167,
+ "weight": 169,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20758,7 +20869,7 @@
},
"x-appwrite": {
"method": "updateAuthPasswordDictionary",
- "weight": 164,
+ "weight": 166,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20839,7 +20950,7 @@
},
"x-appwrite": {
"method": "updateAuthPasswordHistory",
- "weight": 163,
+ "weight": 165,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20920,7 +21031,7 @@
},
"x-appwrite": {
"method": "updatePersonalDataCheck",
- "weight": 165,
+ "weight": 167,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21001,7 +21112,7 @@
},
"x-appwrite": {
"method": "updateSessionAlerts",
- "weight": 159,
+ "weight": 160,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21082,7 +21193,7 @@
},
"x-appwrite": {
"method": "updateAuthStatus",
- "weight": 162,
+ "weight": 164,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21184,7 +21295,7 @@
},
"x-appwrite": {
"method": "createJWT",
- "weight": 180,
+ "weight": 182,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21273,7 +21384,7 @@
},
"x-appwrite": {
"method": "listKeys",
- "weight": 176,
+ "weight": 178,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21282,7 +21393,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.read",
+ "scope": "keys.read",
"platforms": [
"console"
],
@@ -21333,7 +21444,7 @@
},
"x-appwrite": {
"method": "createKey",
- "weight": 175,
+ "weight": 177,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21342,7 +21453,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.write",
+ "scope": "keys.write",
"platforms": [
"console"
],
@@ -21428,7 +21539,7 @@
},
"x-appwrite": {
"method": "getKey",
- "weight": 177,
+ "weight": 179,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21437,7 +21548,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.read",
+ "scope": "keys.read",
"platforms": [
"console"
],
@@ -21498,7 +21609,7 @@
},
"x-appwrite": {
"method": "updateKey",
- "weight": 178,
+ "weight": 180,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21507,7 +21618,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.write",
+ "scope": "keys.write",
"platforms": [
"console"
],
@@ -21594,7 +21705,7 @@
},
"x-appwrite": {
"method": "deleteKey",
- "weight": 179,
+ "weight": 181,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21603,7 +21714,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.write",
+ "scope": "keys.write",
"platforms": [
"console"
],
@@ -21666,7 +21777,7 @@
},
"x-appwrite": {
"method": "updateOAuth2",
- "weight": 158,
+ "weight": 159,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21805,7 +21916,7 @@
},
"x-appwrite": {
"method": "listPlatforms",
- "weight": 182,
+ "weight": 184,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21814,7 +21925,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.read",
+ "scope": "platforms.read",
"platforms": [
"console"
],
@@ -21865,7 +21976,7 @@
},
"x-appwrite": {
"method": "createPlatform",
- "weight": 181,
+ "weight": 183,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21874,7 +21985,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.write",
+ "scope": "platforms.write",
"platforms": [
"console"
],
@@ -21986,7 +22097,7 @@
},
"x-appwrite": {
"method": "getPlatform",
- "weight": 183,
+ "weight": 185,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21995,7 +22106,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.read",
+ "scope": "platforms.read",
"platforms": [
"console"
],
@@ -22056,7 +22167,7 @@
},
"x-appwrite": {
"method": "updatePlatform",
- "weight": 184,
+ "weight": 186,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22065,7 +22176,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.write",
+ "scope": "platforms.write",
"platforms": [
"console"
],
@@ -22153,7 +22264,7 @@
},
"x-appwrite": {
"method": "deletePlatform",
- "weight": 185,
+ "weight": 187,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22162,7 +22273,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.write",
+ "scope": "platforms.write",
"platforms": [
"console"
],
@@ -22225,7 +22336,7 @@
},
"x-appwrite": {
"method": "updateServiceStatus",
- "weight": 154,
+ "weight": 155,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22327,7 +22438,7 @@
},
"x-appwrite": {
"method": "updateServiceStatusAll",
- "weight": 155,
+ "weight": 156,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22408,7 +22519,7 @@
},
"x-appwrite": {
"method": "updateSmtp",
- "weight": 186,
+ "weight": 188,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22528,7 +22639,7 @@
},
"x-appwrite": {
"method": "createSmtpTest",
- "weight": 187,
+ "weight": 189,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22620,7 +22731,8 @@
"description": "Does SMTP server use secure connection",
"x-example": "tls",
"enum": [
- "tls"
+ "tls",
+ "ssl"
],
"x-enum-name": "SMTPSecure",
"x-enum-keys": []
@@ -22660,7 +22772,7 @@
},
"x-appwrite": {
"method": "updateTeam",
- "weight": 153,
+ "weight": 154,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22741,7 +22853,7 @@
},
"x-appwrite": {
"method": "getEmailTemplate",
- "weight": 189,
+ "weight": 191,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22967,7 +23079,7 @@
},
"x-appwrite": {
"method": "updateEmailTemplate",
- "weight": 191,
+ "weight": 193,
"cookies": false,
"type": "",
"deprecated": false,
@@ -23233,7 +23345,7 @@
},
"x-appwrite": {
"method": "deleteEmailTemplate",
- "weight": 193,
+ "weight": 195,
"cookies": false,
"type": "",
"deprecated": false,
@@ -23461,7 +23573,7 @@
},
"x-appwrite": {
"method": "getSmsTemplate",
- "weight": 188,
+ "weight": 190,
"cookies": false,
"type": "",
"deprecated": false,
@@ -23684,7 +23796,7 @@
},
"x-appwrite": {
"method": "updateSmsTemplate",
- "weight": 190,
+ "weight": 192,
"cookies": false,
"type": "",
"deprecated": false,
@@ -23926,7 +24038,7 @@
},
"x-appwrite": {
"method": "deleteSmsTemplate",
- "weight": 192,
+ "weight": 194,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24151,7 +24263,7 @@
},
"x-appwrite": {
"method": "listWebhooks",
- "weight": 170,
+ "weight": 172,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24211,7 +24323,7 @@
},
"x-appwrite": {
"method": "createWebhook",
- "weight": 169,
+ "weight": 171,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24328,7 +24440,7 @@
},
"x-appwrite": {
"method": "getWebhook",
- "weight": 171,
+ "weight": 173,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24398,7 +24510,7 @@
},
"x-appwrite": {
"method": "updateWebhook",
- "weight": 172,
+ "weight": 174,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24516,7 +24628,7 @@
},
"x-appwrite": {
"method": "deleteWebhook",
- "weight": 174,
+ "weight": 176,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24588,7 +24700,7 @@
},
"x-appwrite": {
"method": "updateWebhookSignature",
- "weight": 173,
+ "weight": 175,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24640,7 +24752,7 @@
},
"\/proxy\/rules": {
"get": {
- "summary": "List Rules",
+ "summary": "List rules",
"operationId": "proxyListRules",
"tags": [
"proxy"
@@ -24660,7 +24772,7 @@
},
"x-appwrite": {
"method": "listRules",
- "weight": 315,
+ "weight": 317,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24714,7 +24826,7 @@
]
},
"post": {
- "summary": "Create Rule",
+ "summary": "Create rule",
"operationId": "proxyCreateRule",
"tags": [
"proxy"
@@ -24734,7 +24846,7 @@
},
"x-appwrite": {
"method": "createRule",
- "weight": 314,
+ "weight": 316,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24800,7 +24912,7 @@
},
"\/proxy\/rules\/{ruleId}": {
"get": {
- "summary": "Get Rule",
+ "summary": "Get rule",
"operationId": "proxyGetRule",
"tags": [
"proxy"
@@ -24820,7 +24932,7 @@
},
"x-appwrite": {
"method": "getRule",
- "weight": 316,
+ "weight": 318,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24860,7 +24972,7 @@
]
},
"delete": {
- "summary": "Delete Rule",
+ "summary": "Delete rule",
"operationId": "proxyDeleteRule",
"tags": [
"proxy"
@@ -24873,7 +24985,7 @@
},
"x-appwrite": {
"method": "deleteRule",
- "weight": 317,
+ "weight": 319,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24915,7 +25027,7 @@
},
"\/proxy\/rules\/{ruleId}\/verification": {
"patch": {
- "summary": "Update Rule Verification Status",
+ "summary": "Update rule verification status",
"operationId": "proxyUpdateRuleVerification",
"tags": [
"proxy"
@@ -24935,7 +25047,7 @@
},
"x-appwrite": {
"method": "updateRuleVerification",
- "weight": 318,
+ "weight": 320,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24997,7 +25109,7 @@
},
"x-appwrite": {
"method": "listBuckets",
- "weight": 201,
+ "weight": 203,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25072,7 +25184,7 @@
},
"x-appwrite": {
"method": "createBucket",
- "weight": 200,
+ "weight": 202,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25201,7 +25313,7 @@
},
"x-appwrite": {
"method": "getBucket",
- "weight": 202,
+ "weight": 204,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25262,7 +25374,7 @@
},
"x-appwrite": {
"method": "updateBucket",
- "weight": 203,
+ "weight": 205,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25388,7 +25500,7 @@
},
"x-appwrite": {
"method": "deleteBucket",
- "weight": 204,
+ "weight": 206,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25451,7 +25563,7 @@
},
"x-appwrite": {
"method": "listFiles",
- "weight": 206,
+ "weight": 208,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25539,7 +25651,7 @@
},
"x-appwrite": {
"method": "createFile",
- "weight": 205,
+ "weight": 207,
"cookies": false,
"type": "upload",
"deprecated": false,
@@ -25639,7 +25751,7 @@
},
"x-appwrite": {
"method": "getFile",
- "weight": 207,
+ "weight": 209,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25713,7 +25825,7 @@
},
"x-appwrite": {
"method": "updateFile",
- "weight": 212,
+ "weight": 214,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25791,7 +25903,7 @@
}
},
"delete": {
- "summary": "Delete File",
+ "summary": "Delete file",
"operationId": "storageDeleteFile",
"tags": [
"storage"
@@ -25804,7 +25916,7 @@
},
"x-appwrite": {
"method": "deleteFile",
- "weight": 213,
+ "weight": 215,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25873,7 +25985,7 @@
},
"x-appwrite": {
"method": "getFileDownload",
- "weight": 209,
+ "weight": 211,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -25942,7 +26054,7 @@
},
"x-appwrite": {
"method": "getFilePreview",
- "weight": 208,
+ "weight": 210,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -26133,7 +26245,8 @@
"jpeg",
"gif",
"png",
- "webp"
+ "webp",
+ "avif"
],
"x-enum-name": "ImageFormat",
"x-enum-keys": [],
@@ -26159,7 +26272,7 @@
},
"x-appwrite": {
"method": "getFileView",
- "weight": 210,
+ "weight": 212,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -26235,7 +26348,7 @@
},
"x-appwrite": {
"method": "getUsage",
- "weight": 214,
+ "weight": 216,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26309,7 +26422,7 @@
},
"x-appwrite": {
"method": "getBucketUsage",
- "weight": 215,
+ "weight": 217,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26393,7 +26506,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 217,
+ "weight": 219,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26471,7 +26584,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 216,
+ "weight": 218,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26558,7 +26671,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 218,
+ "weight": 220,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26622,7 +26735,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 220,
+ "weight": 222,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26698,7 +26811,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 222,
+ "weight": 224,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26764,7 +26877,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 229,
+ "weight": 231,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26824,7 +26937,7 @@
"tags": [
"teams"
],
- "description": "Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint.",
+ "description": "Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint. Hide sensitive attributes from the response by toggling membership privacy in the Console.",
"responses": {
"200": {
"description": "Memberships List",
@@ -26839,7 +26952,7 @@
},
"x-appwrite": {
"method": "listMemberships",
- "weight": 224,
+ "weight": 226,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26927,7 +27040,7 @@
},
"x-appwrite": {
"method": "createMembership",
- "weight": 223,
+ "weight": 225,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27025,7 +27138,7 @@
"tags": [
"teams"
],
- "description": "Get a team member by the membership unique id. All team members have read access for this resource.",
+ "description": "Get a team member by the membership unique id. All team members have read access for this resource. Hide sensitive attributes from the response by toggling membership privacy in the Console.",
"responses": {
"200": {
"description": "Membership",
@@ -27040,7 +27153,7 @@
},
"x-appwrite": {
"method": "getMembership",
- "weight": 225,
+ "weight": 227,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27114,7 +27227,7 @@
},
"x-appwrite": {
"method": "updateMembership",
- "weight": 226,
+ "weight": 228,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27203,7 +27316,7 @@
},
"x-appwrite": {
"method": "deleteMembership",
- "weight": 228,
+ "weight": 230,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27279,7 +27392,7 @@
},
"x-appwrite": {
"method": "updateMembershipStatus",
- "weight": 227,
+ "weight": 229,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27378,7 +27491,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 219,
+ "weight": 221,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27440,7 +27553,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 221,
+ "weight": 223,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27523,7 +27636,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 239,
+ "weight": 241,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27598,7 +27711,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 230,
+ "weight": 232,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27688,7 +27801,7 @@
},
"x-appwrite": {
"method": "createArgon2User",
- "weight": 233,
+ "weight": 235,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27775,7 +27888,7 @@
},
"x-appwrite": {
"method": "createBcryptUser",
- "weight": 231,
+ "weight": 233,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27842,7 +27955,7 @@
},
"\/users\/identities": {
"get": {
- "summary": "List Identities",
+ "summary": "List identities",
"operationId": "usersListIdentities",
"tags": [
"users"
@@ -27862,7 +27975,7 @@
},
"x-appwrite": {
"method": "listIdentities",
- "weight": 247,
+ "weight": 249,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27932,7 +28045,7 @@
},
"x-appwrite": {
"method": "deleteIdentity",
- "weight": 270,
+ "weight": 272,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27995,7 +28108,7 @@
},
"x-appwrite": {
"method": "createMD5User",
- "weight": 232,
+ "weight": 234,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28082,7 +28195,7 @@
},
"x-appwrite": {
"method": "createPHPassUser",
- "weight": 235,
+ "weight": 237,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28169,7 +28282,7 @@
},
"x-appwrite": {
"method": "createScryptUser",
- "weight": 236,
+ "weight": 238,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28286,7 +28399,7 @@
},
"x-appwrite": {
"method": "createScryptModifiedUser",
- "weight": 237,
+ "weight": 239,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28391,7 +28504,7 @@
},
"x-appwrite": {
"method": "createSHAUser",
- "weight": 234,
+ "weight": 236,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28498,7 +28611,7 @@
},
"x-appwrite": {
"method": "getUsage",
- "weight": 272,
+ "weight": 274,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28572,7 +28685,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 240,
+ "weight": 242,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28626,7 +28739,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 268,
+ "weight": 270,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28689,7 +28802,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 253,
+ "weight": 255,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28771,7 +28884,7 @@
},
"x-appwrite": {
"method": "createJWT",
- "weight": 271,
+ "weight": 273,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28855,7 +28968,7 @@
},
"x-appwrite": {
"method": "updateLabels",
- "weight": 249,
+ "weight": 251,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28940,7 +29053,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 245,
+ "weight": 247,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29016,7 +29129,7 @@
},
"x-appwrite": {
"method": "listMemberships",
- "weight": 244,
+ "weight": 246,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29079,7 +29192,7 @@
},
"x-appwrite": {
"method": "updateMfa",
- "weight": 258,
+ "weight": 260,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29141,7 +29254,7 @@
},
"\/users\/{userId}\/mfa\/authenticators\/{type}": {
"delete": {
- "summary": "Delete Authenticator",
+ "summary": "Delete authenticator",
"operationId": "usersDeleteMfaAuthenticator",
"tags": [
"users"
@@ -29161,7 +29274,7 @@
},
"x-appwrite": {
"method": "deleteMfaAuthenticator",
- "weight": 263,
+ "weight": 265,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29219,7 +29332,7 @@
},
"\/users\/{userId}\/mfa\/factors": {
"get": {
- "summary": "List Factors",
+ "summary": "List factors",
"operationId": "usersListMfaFactors",
"tags": [
"users"
@@ -29239,7 +29352,7 @@
},
"x-appwrite": {
"method": "listMfaFactors",
- "weight": 259,
+ "weight": 261,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29282,7 +29395,7 @@
},
"\/users\/{userId}\/mfa\/recovery-codes": {
"get": {
- "summary": "Get MFA Recovery Codes",
+ "summary": "Get MFA recovery codes",
"operationId": "usersGetMfaRecoveryCodes",
"tags": [
"users"
@@ -29302,7 +29415,7 @@
},
"x-appwrite": {
"method": "getMfaRecoveryCodes",
- "weight": 260,
+ "weight": 262,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29343,7 +29456,7 @@
]
},
"put": {
- "summary": "Regenerate MFA Recovery Codes",
+ "summary": "Regenerate MFA recovery codes",
"operationId": "usersUpdateMfaRecoveryCodes",
"tags": [
"users"
@@ -29363,7 +29476,7 @@
},
"x-appwrite": {
"method": "updateMfaRecoveryCodes",
- "weight": 262,
+ "weight": 264,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29404,7 +29517,7 @@
]
},
"patch": {
- "summary": "Create MFA Recovery Codes",
+ "summary": "Create MFA recovery codes",
"operationId": "usersCreateMfaRecoveryCodes",
"tags": [
"users"
@@ -29424,7 +29537,7 @@
},
"x-appwrite": {
"method": "createMfaRecoveryCodes",
- "weight": 261,
+ "weight": 263,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29487,7 +29600,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 251,
+ "weight": 253,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29569,7 +29682,7 @@
},
"x-appwrite": {
"method": "updatePassword",
- "weight": 252,
+ "weight": 254,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29651,7 +29764,7 @@
},
"x-appwrite": {
"method": "updatePhone",
- "weight": 254,
+ "weight": 256,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29733,7 +29846,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 241,
+ "weight": 243,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29794,7 +29907,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 256,
+ "weight": 258,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29876,7 +29989,7 @@
},
"x-appwrite": {
"method": "listSessions",
- "weight": 243,
+ "weight": 245,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29937,7 +30050,7 @@
},
"x-appwrite": {
"method": "createSession",
- "weight": 264,
+ "weight": 266,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29991,7 +30104,7 @@
},
"x-appwrite": {
"method": "deleteSessions",
- "weight": 267,
+ "weight": 269,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30047,7 +30160,7 @@
},
"x-appwrite": {
"method": "deleteSession",
- "weight": 266,
+ "weight": 268,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30120,7 +30233,7 @@
},
"x-appwrite": {
"method": "updateStatus",
- "weight": 248,
+ "weight": 250,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30182,7 +30295,7 @@
},
"\/users\/{userId}\/targets": {
"get": {
- "summary": "List User Targets",
+ "summary": "List user targets",
"operationId": "usersListTargets",
"tags": [
"users"
@@ -30202,7 +30315,7 @@
},
"x-appwrite": {
"method": "listTargets",
- "weight": 246,
+ "weight": 248,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30257,7 +30370,7 @@
]
},
"post": {
- "summary": "Create User Target",
+ "summary": "Create user target",
"operationId": "usersCreateTarget",
"tags": [
"users"
@@ -30277,7 +30390,7 @@
},
"x-appwrite": {
"method": "createTarget",
- "weight": 238,
+ "weight": 240,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30369,7 +30482,7 @@
},
"\/users\/{userId}\/targets\/{targetId}": {
"get": {
- "summary": "Get User Target",
+ "summary": "Get user target",
"operationId": "usersGetTarget",
"tags": [
"users"
@@ -30389,7 +30502,7 @@
},
"x-appwrite": {
"method": "getTarget",
- "weight": 242,
+ "weight": 244,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30441,7 +30554,7 @@
]
},
"patch": {
- "summary": "Update User target",
+ "summary": "Update user target",
"operationId": "usersUpdateTarget",
"tags": [
"users"
@@ -30461,7 +30574,7 @@
},
"x-appwrite": {
"method": "updateTarget",
- "weight": 257,
+ "weight": 259,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30552,7 +30665,7 @@
},
"x-appwrite": {
"method": "deleteTarget",
- "weight": 269,
+ "weight": 271,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30626,7 +30739,7 @@
},
"x-appwrite": {
"method": "createToken",
- "weight": 265,
+ "weight": 267,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30710,7 +30823,7 @@
},
"x-appwrite": {
"method": "updateEmailVerification",
- "weight": 255,
+ "weight": 257,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30792,7 +30905,7 @@
},
"x-appwrite": {
"method": "updatePhoneVerification",
- "weight": 250,
+ "weight": 252,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30854,7 +30967,7 @@
},
"\/vcs\/github\/installations\/{installationId}\/providerRepositories": {
"get": {
- "summary": "List Repositories",
+ "summary": "List repositories",
"operationId": "vcsListRepositories",
"tags": [
"vcs"
@@ -30874,7 +30987,7 @@
},
"x-appwrite": {
"method": "listRepositories",
- "weight": 277,
+ "weight": 279,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30945,7 +31058,7 @@
},
"x-appwrite": {
"method": "createRepository",
- "weight": 278,
+ "weight": 280,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31032,7 +31145,7 @@
},
"x-appwrite": {
"method": "getRepository",
- "weight": 279,
+ "weight": 281,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31084,7 +31197,7 @@
},
"\/vcs\/github\/installations\/{installationId}\/providerRepositories\/{providerRepositoryId}\/branches": {
"get": {
- "summary": "List Repository Branches",
+ "summary": "List repository branches",
"operationId": "vcsListRepositoryBranches",
"tags": [
"vcs"
@@ -31104,7 +31217,7 @@
},
"x-appwrite": {
"method": "listRepositoryBranches",
- "weight": 280,
+ "weight": 282,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31176,7 +31289,7 @@
},
"x-appwrite": {
"method": "getRepositoryContents",
- "weight": 275,
+ "weight": 277,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31259,7 +31372,7 @@
},
"x-appwrite": {
"method": "createRepositoryDetection",
- "weight": 276,
+ "weight": 278,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31340,7 +31453,7 @@
},
"x-appwrite": {
"method": "updateExternalDeployments",
- "weight": 285,
+ "weight": 287,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31431,7 +31544,7 @@
},
"x-appwrite": {
"method": "listInstallations",
- "weight": 282,
+ "weight": 284,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31507,7 +31620,7 @@
},
"x-appwrite": {
"method": "getInstallation",
- "weight": 283,
+ "weight": 285,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31547,7 +31660,7 @@
]
},
"delete": {
- "summary": "Delete Installation",
+ "summary": "Delete installation",
"operationId": "vcsDeleteInstallation",
"tags": [
"vcs"
@@ -31560,7 +31673,7 @@
},
"x-appwrite": {
"method": "deleteInstallation",
- "weight": 284,
+ "weight": 286,
"cookies": false,
"type": "",
"deprecated": false,
@@ -32946,6 +33059,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"size": {
"type": "integer",
"description": "Attribute size.",
@@ -32965,6 +33088,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"size"
]
},
@@ -33003,6 +33128,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"min": {
"type": "integer",
"description": "Minimum value to enforce for new documents.",
@@ -33030,7 +33165,9 @@
"type",
"status",
"error",
- "required"
+ "required",
+ "$createdAt",
+ "$updatedAt"
]
},
"attributeFloat": {
@@ -33068,6 +33205,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"min": {
"type": "number",
"description": "Minimum value to enforce for new documents.",
@@ -33095,7 +33242,9 @@
"type",
"status",
"error",
- "required"
+ "required",
+ "$createdAt",
+ "$updatedAt"
]
},
"attributeBoolean": {
@@ -33133,6 +33282,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"default": {
"type": "boolean",
"description": "Default value for attribute when not provided. Cannot be set when attribute is required.",
@@ -33145,7 +33304,9 @@
"type",
"status",
"error",
- "required"
+ "required",
+ "$createdAt",
+ "$updatedAt"
]
},
"attributeEmail": {
@@ -33183,6 +33344,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "String format.",
@@ -33201,6 +33372,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -33239,6 +33412,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"elements": {
"type": "array",
"description": "Array of elements in enumerated type.",
@@ -33265,6 +33448,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"elements",
"format"
]
@@ -33304,6 +33489,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "String format.",
@@ -33322,6 +33517,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -33360,6 +33557,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "String format.",
@@ -33378,6 +33585,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -33416,6 +33625,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "ISO 8601 format.",
@@ -33434,6 +33653,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -33472,6 +33693,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"relatedCollection": {
"type": "string",
"description": "The ID of the related collection.",
@@ -33509,6 +33740,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"relatedCollection",
"relationType",
"twoWay",
@@ -33557,6 +33790,16 @@
},
"x-example": [],
"nullable": true
+ },
+ "$createdAt": {
+ "type": "string",
+ "description": "Index creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Index update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
}
},
"required": [
@@ -33564,7 +33807,9 @@
"type",
"status",
"error",
- "attributes"
+ "attributes",
+ "$createdAt",
+ "$updatedAt"
]
},
"document": {
@@ -34716,12 +34961,12 @@
},
"userName": {
"type": "string",
- "description": "User name.",
+ "description": "User name. Hide this attribute by toggling membership privacy in the Console.",
"x-example": "John Doe"
},
"userEmail": {
"type": "string",
- "description": "User email address.",
+ "description": "User email address. Hide this attribute by toggling membership privacy in the Console.",
"x-example": "john@appwrite.io"
},
"teamId": {
@@ -34751,7 +34996,7 @@
},
"mfa": {
"type": "boolean",
- "description": "Multi factor authentication status, true if the user has MFA enabled or false otherwise.",
+ "description": "Multi factor authentication status, true if the user has MFA enabled or false otherwise. Hide this attribute by toggling membership privacy in the Console.",
"x-example": false
},
"roles": {
@@ -34916,7 +35161,7 @@
"specification": {
"type": "string",
"description": "Machine specification for builds and executions.",
- "x-example": "s-0.5vcpu-512mb"
+ "x-example": "s-1vcpu-512mb"
}
},
"required": [
@@ -35589,7 +35834,7 @@
"responseBody": {
"type": "string",
"description": "HTTP response body. This will return empty unless execution is created as synchronous.",
- "x-example": "Developers are awesome."
+ "x-example": ""
},
"responseHeaders": {
"type": "array",
@@ -35832,6 +36077,21 @@
"description": "Whether or not to send session alert emails to users.",
"x-example": true
},
+ "authMembershipsUserName": {
+ "type": "boolean",
+ "description": "Whether or not to show user names in the teams membership response.",
+ "x-example": true
+ },
+ "authMembershipsUserEmail": {
+ "type": "boolean",
+ "description": "Whether or not to show user emails in the teams membership response.",
+ "x-example": true
+ },
+ "authMembershipsMfa": {
+ "type": "boolean",
+ "description": "Whether or not to show user MFA status in the teams membership response.",
+ "x-example": true
+ },
"oAuthProviders": {
"type": "array",
"description": "List of Auth Providers.",
@@ -35912,6 +36172,17 @@
"description": "SMTP server secure protocol",
"x-example": "tls"
},
+ "pingCount": {
+ "type": "integer",
+ "description": "Number of times the ping was received for this project.",
+ "x-example": 1,
+ "format": "int32"
+ },
+ "pingedAt": {
+ "type": "string",
+ "description": "Last ping datetime in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"authEmailPassword": {
"type": "boolean",
"description": "Email\/Password auth method status",
@@ -36026,6 +36297,9 @@
"authPersonalDataCheck",
"authMockNumbers",
"authSessionAlerts",
+ "authMembershipsUserName",
+ "authMembershipsUserEmail",
+ "authMembershipsMfa",
"oAuthProviders",
"platforms",
"webhooks",
@@ -36039,6 +36313,8 @@
"smtpUsername",
"smtpPassword",
"smtpSecure",
+ "pingCount",
+ "pingedAt",
"authEmailPassword",
"authUsersAuthMagicURL",
"authEmailOtp",
@@ -36747,6 +37023,12 @@
"x-example": 0,
"format": "int32"
},
+ "storageTotal": {
+ "type": "integer",
+ "description": "Total aggregated number of total databases storage in bytes.",
+ "x-example": 0,
+ "format": "int32"
+ },
"databases": {
"type": "array",
"description": "Aggregated number of databases per period.",
@@ -36770,6 +37052,14 @@
"$ref": "#\/components\/schemas\/metric"
},
"x-example": []
+ },
+ "storage": {
+ "type": "array",
+ "description": "An array of the aggregated number of databases storage in bytes per period.",
+ "items": {
+ "$ref": "#\/components\/schemas\/metric"
+ },
+ "x-example": []
}
},
"required": [
@@ -36777,9 +37067,11 @@
"databasesTotal",
"collectionsTotal",
"documentsTotal",
+ "storageTotal",
"databases",
"collections",
- "documents"
+ "documents",
+ "storage"
]
},
"usageDatabase": {
@@ -36803,6 +37095,12 @@
"x-example": 0,
"format": "int32"
},
+ "storageTotal": {
+ "type": "integer",
+ "description": "Total aggregated number of total storage used in bytes.",
+ "x-example": 0,
+ "format": "int32"
+ },
"collections": {
"type": "array",
"description": "Aggregated number of collections per period.",
@@ -36818,14 +37116,24 @@
"$ref": "#\/components\/schemas\/metric"
},
"x-example": []
+ },
+ "storage": {
+ "type": "array",
+ "description": "Aggregated storage used in bytes per period.",
+ "items": {
+ "$ref": "#\/components\/schemas\/metric"
+ },
+ "x-example": []
}
},
"required": [
"range",
"collectionsTotal",
"documentsTotal",
+ "storageTotal",
"collections",
- "documents"
+ "documents",
+ "storage"
]
},
"usageCollection": {
@@ -37366,6 +37674,12 @@
"x-example": 0,
"format": "int32"
},
+ "databasesStorageTotal": {
+ "type": "integer",
+ "description": "Total aggregated sum of databases storage size (in bytes).",
+ "x-example": 0,
+ "format": "int32"
+ },
"usersTotal": {
"type": "integer",
"description": "Total aggregated number of users.",
@@ -37462,6 +37776,14 @@
},
"x-example": []
},
+ "databasesStorageBreakdown": {
+ "type": "array",
+ "description": "An array of the aggregated breakdown of storage usage by databases.",
+ "items": {
+ "$ref": "#\/components\/schemas\/metricBreakdown"
+ },
+ "x-example": []
+ },
"executionsMbSecondsBreakdown": {
"type": "array",
"description": "Aggregated breakdown in totals of execution mbSeconds by functions.",
@@ -37491,6 +37813,7 @@
"executionsTotal",
"documentsTotal",
"databasesTotal",
+ "databasesStorageTotal",
"usersTotal",
"filesStorageTotal",
"functionsStorageTotal",
@@ -37505,6 +37828,7 @@
"executions",
"executionsBreakdown",
"bucketsBreakdown",
+ "databasesStorageBreakdown",
"executionsMbSecondsBreakdown",
"buildsMbSecondsBreakdown",
"functionsStorageBreakdown"
@@ -37554,7 +37878,7 @@
"slug": {
"type": "string",
"description": "Size slug.",
- "x-example": "s-0.5vcpu-512mb"
+ "x-example": "s-1vcpu-512mb"
}
},
"required": [
@@ -38192,7 +38516,7 @@
"name": {
"type": "string",
"description": "Target Name.",
- "x-example": "Aegon apple token"
+ "x-example": "Apple iPhone 12"
},
"userId": {
"type": "string",
@@ -38214,6 +38538,11 @@
"type": "string",
"description": "The target identifier.",
"x-example": "token"
+ },
+ "expired": {
+ "type": "boolean",
+ "description": "Is the target expired.",
+ "x-example": false
}
},
"required": [
@@ -38223,7 +38552,8 @@
"name",
"userId",
"providerType",
- "identifier"
+ "identifier",
+ "expired"
]
},
"migration": {
@@ -38237,7 +38567,7 @@
},
"$createdAt": {
"type": "string",
- "description": "Variable creation date in ISO 8601 format.",
+ "description": "Migration creation date in ISO 8601 format.",
"x-example": "2020-10-15T06:38:00.000+00:00"
},
"$updatedAt": {
@@ -38260,9 +38590,14 @@
"description": "A string containing the type of source of the migration.",
"x-example": "Appwrite"
},
+ "destination": {
+ "type": "string",
+ "description": "A string containing the type of destination of the migration.",
+ "x-example": "Appwrite"
+ },
"resources": {
"type": "array",
- "description": "Resources to migration.",
+ "description": "Resources to migrate.",
"items": {
"type": "string"
},
@@ -38296,6 +38631,7 @@
"status",
"stage",
"source",
+ "destination",
"resources",
"statusCounters",
"resourceData",
diff --git a/app/config/specs/open-api3-1.6.x-server.json b/app/config/specs/open-api3-1.6.x-server.json
index ef41688ca8..e84b751743 100644
--- a/app/config/specs/open-api3-1.6.x-server.json
+++ b/app/config/specs/open-api3-1.6.x-server.json
@@ -43,7 +43,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 8,
+ "weight": 9,
"cookies": false,
"type": "",
"deprecated": false,
@@ -95,7 +95,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 7,
+ "weight": 8,
"cookies": false,
"type": "",
"deprecated": false,
@@ -182,7 +182,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 33,
+ "weight": 34,
"cookies": false,
"type": "",
"deprecated": false,
@@ -241,7 +241,7 @@
},
"\/account\/identities": {
"get": {
- "summary": "List Identities",
+ "summary": "List identities",
"operationId": "accountListIdentities",
"tags": [
"account"
@@ -261,7 +261,7 @@
},
"x-appwrite": {
"method": "listIdentities",
- "weight": 56,
+ "weight": 57,
"cookies": false,
"type": "",
"deprecated": false,
@@ -323,7 +323,7 @@
},
"x-appwrite": {
"method": "deleteIdentity",
- "weight": 57,
+ "weight": 58,
"cookies": false,
"type": "",
"deprecated": false,
@@ -389,7 +389,7 @@
},
"x-appwrite": {
"method": "createJWT",
- "weight": 28,
+ "weight": 29,
"cookies": false,
"type": "",
"deprecated": false,
@@ -440,7 +440,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 30,
+ "weight": 31,
"cookies": false,
"type": "",
"deprecated": false,
@@ -509,7 +509,7 @@
},
"x-appwrite": {
"method": "updateMFA",
- "weight": 43,
+ "weight": 44,
"cookies": false,
"type": "",
"deprecated": false,
@@ -562,7 +562,7 @@
},
"\/account\/mfa\/authenticators\/{type}": {
"post": {
- "summary": "Create Authenticator",
+ "summary": "Create authenticator",
"operationId": "accountCreateMfaAuthenticator",
"tags": [
"account"
@@ -582,7 +582,7 @@
},
"x-appwrite": {
"method": "createMfaAuthenticator",
- "weight": 45,
+ "weight": 46,
"cookies": false,
"type": "",
"deprecated": false,
@@ -631,7 +631,7 @@
]
},
"put": {
- "summary": "Verify Authenticator",
+ "summary": "Verify authenticator",
"operationId": "accountUpdateMfaAuthenticator",
"tags": [
"account"
@@ -651,7 +651,7 @@
},
"x-appwrite": {
"method": "updateMfaAuthenticator",
- "weight": 46,
+ "weight": 47,
"cookies": false,
"type": "",
"deprecated": false,
@@ -719,7 +719,7 @@
}
},
"delete": {
- "summary": "Delete Authenticator",
+ "summary": "Delete authenticator",
"operationId": "accountDeleteMfaAuthenticator",
"tags": [
"account"
@@ -732,7 +732,7 @@
},
"x-appwrite": {
"method": "deleteMfaAuthenticator",
- "weight": 50,
+ "weight": 51,
"cookies": false,
"type": "",
"deprecated": false,
@@ -783,7 +783,7 @@
},
"\/account\/mfa\/challenge": {
"post": {
- "summary": "Create MFA Challenge",
+ "summary": "Create MFA challenge",
"operationId": "accountCreateMfaChallenge",
"tags": [
"account"
@@ -803,7 +803,7 @@
},
"x-appwrite": {
"method": "createMfaChallenge",
- "weight": 51,
+ "weight": 52,
"cookies": false,
"type": "",
"deprecated": false,
@@ -859,7 +859,7 @@
}
},
"put": {
- "summary": "Create MFA Challenge (confirmation)",
+ "summary": "Create MFA challenge (confirmation)",
"operationId": "accountUpdateMfaChallenge",
"tags": [
"account"
@@ -879,7 +879,7 @@
},
"x-appwrite": {
"method": "updateMfaChallenge",
- "weight": 52,
+ "weight": 53,
"cookies": false,
"type": "",
"deprecated": false,
@@ -938,7 +938,7 @@
},
"\/account\/mfa\/factors": {
"get": {
- "summary": "List Factors",
+ "summary": "List factors",
"operationId": "accountListMfaFactors",
"tags": [
"account"
@@ -958,7 +958,7 @@
},
"x-appwrite": {
"method": "listMfaFactors",
- "weight": 44,
+ "weight": 45,
"cookies": false,
"type": "",
"deprecated": false,
@@ -992,7 +992,7 @@
},
"\/account\/mfa\/recovery-codes": {
"get": {
- "summary": "Get MFA Recovery Codes",
+ "summary": "Get MFA recovery codes",
"operationId": "accountGetMfaRecoveryCodes",
"tags": [
"account"
@@ -1012,7 +1012,7 @@
},
"x-appwrite": {
"method": "getMfaRecoveryCodes",
- "weight": 49,
+ "weight": 50,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1044,7 +1044,7 @@
]
},
"post": {
- "summary": "Create MFA Recovery Codes",
+ "summary": "Create MFA recovery codes",
"operationId": "accountCreateMfaRecoveryCodes",
"tags": [
"account"
@@ -1064,7 +1064,7 @@
},
"x-appwrite": {
"method": "createMfaRecoveryCodes",
- "weight": 47,
+ "weight": 48,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1096,7 +1096,7 @@
]
},
"patch": {
- "summary": "Regenerate MFA Recovery Codes",
+ "summary": "Regenerate MFA recovery codes",
"operationId": "accountUpdateMfaRecoveryCodes",
"tags": [
"account"
@@ -1116,7 +1116,7 @@
},
"x-appwrite": {
"method": "updateMfaRecoveryCodes",
- "weight": 48,
+ "weight": 49,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1170,7 +1170,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 31,
+ "weight": 32,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1243,7 +1243,7 @@
},
"x-appwrite": {
"method": "updatePassword",
- "weight": 32,
+ "weight": 33,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1321,7 +1321,7 @@
},
"x-appwrite": {
"method": "updatePhone",
- "weight": 34,
+ "weight": 35,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1400,7 +1400,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 29,
+ "weight": 30,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1452,7 +1452,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 35,
+ "weight": 36,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1525,7 +1525,7 @@
},
"x-appwrite": {
"method": "createRecovery",
- "weight": 37,
+ "weight": 38,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1605,7 +1605,7 @@
},
"x-appwrite": {
"method": "updateRecovery",
- "weight": 38,
+ "weight": 39,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1690,7 +1690,7 @@
},
"x-appwrite": {
"method": "listSessions",
- "weight": 10,
+ "weight": 11,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1735,7 +1735,7 @@
},
"x-appwrite": {
"method": "deleteSessions",
- "weight": 11,
+ "weight": 12,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1789,7 +1789,7 @@
},
"x-appwrite": {
"method": "createAnonymousSession",
- "weight": 16,
+ "weight": 17,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1840,7 +1840,7 @@
},
"x-appwrite": {
"method": "createEmailPasswordSession",
- "weight": 15,
+ "weight": 16,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1916,7 +1916,7 @@
},
"x-appwrite": {
"method": "updateMagicURLSession",
- "weight": 25,
+ "weight": 26,
"cookies": false,
"type": "",
"deprecated": true,
@@ -1992,7 +1992,7 @@
},
"x-appwrite": {
"method": "updatePhoneSession",
- "weight": 26,
+ "weight": 27,
"cookies": false,
"type": "",
"deprecated": true,
@@ -2068,7 +2068,7 @@
},
"x-appwrite": {
"method": "createSession",
- "weight": 17,
+ "weight": 18,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2144,7 +2144,7 @@
},
"x-appwrite": {
"method": "getSession",
- "weight": 12,
+ "weight": 13,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2208,7 +2208,7 @@
},
"x-appwrite": {
"method": "updateSession",
- "weight": 14,
+ "weight": 15,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2265,7 +2265,7 @@
},
"x-appwrite": {
"method": "deleteSession",
- "weight": 13,
+ "weight": 14,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2331,7 +2331,7 @@
},
"x-appwrite": {
"method": "updateStatus",
- "weight": 36,
+ "weight": 37,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2385,7 +2385,7 @@
},
"x-appwrite": {
"method": "createEmailToken",
- "weight": 24,
+ "weight": 25,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2466,7 +2466,7 @@
},
"x-appwrite": {
"method": "createMagicURLToken",
- "weight": 23,
+ "weight": 24,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2548,7 +2548,7 @@
},
"x-appwrite": {
"method": "createOAuth2Token",
- "weight": 22,
+ "weight": 23,
"cookies": false,
"type": "webAuth",
"deprecated": false,
@@ -2691,7 +2691,7 @@
},
"x-appwrite": {
"method": "createPhoneToken",
- "weight": 27,
+ "weight": 28,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2770,7 +2770,7 @@
},
"x-appwrite": {
"method": "createVerification",
- "weight": 39,
+ "weight": 40,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2841,7 +2841,7 @@
},
"x-appwrite": {
"method": "updateVerification",
- "weight": 40,
+ "weight": 41,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2920,7 +2920,7 @@
},
"x-appwrite": {
"method": "createPhoneVerification",
- "weight": 41,
+ "weight": 42,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2975,7 +2975,7 @@
},
"x-appwrite": {
"method": "updatePhoneVerification",
- "weight": 42,
+ "weight": 43,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3047,7 +3047,7 @@
},
"x-appwrite": {
"method": "getBrowser",
- "weight": 59,
+ "weight": 60,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3177,7 +3177,7 @@
},
"x-appwrite": {
"method": "getCreditCard",
- "weight": 58,
+ "weight": 59,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3311,7 +3311,7 @@
},
"x-appwrite": {
"method": "getFavicon",
- "weight": 62,
+ "weight": 63,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3373,7 +3373,7 @@
},
"x-appwrite": {
"method": "getFlag",
- "weight": 60,
+ "weight": 61,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3865,7 +3865,7 @@
},
"x-appwrite": {
"method": "getImage",
- "weight": 61,
+ "weight": 62,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3951,7 +3951,7 @@
},
"x-appwrite": {
"method": "getInitials",
- "weight": 64,
+ "weight": 65,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4047,7 +4047,7 @@
},
"x-appwrite": {
"method": "getQR",
- "weight": 63,
+ "weight": 64,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4150,7 +4150,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 69,
+ "weight": 70,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4226,7 +4226,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 68,
+ "weight": 69,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4308,7 +4308,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 70,
+ "weight": 71,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4370,7 +4370,7 @@
},
"x-appwrite": {
"method": "update",
- "weight": 72,
+ "weight": 73,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4449,7 +4449,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 73,
+ "weight": 74,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4513,7 +4513,7 @@
},
"x-appwrite": {
"method": "listCollections",
- "weight": 75,
+ "weight": 76,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4599,7 +4599,7 @@
},
"x-appwrite": {
"method": "createCollection",
- "weight": 74,
+ "weight": 75,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4706,7 +4706,7 @@
},
"x-appwrite": {
"method": "getCollection",
- "weight": 76,
+ "weight": 77,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4778,7 +4778,7 @@
},
"x-appwrite": {
"method": "updateCollection",
- "weight": 78,
+ "weight": 79,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4880,7 +4880,7 @@
},
"x-appwrite": {
"method": "deleteCollection",
- "weight": 79,
+ "weight": 80,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4954,7 +4954,7 @@
},
"x-appwrite": {
"method": "listAttributes",
- "weight": 90,
+ "weight": 91,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5041,7 +5041,7 @@
},
"x-appwrite": {
"method": "createBooleanAttribute",
- "weight": 87,
+ "weight": 88,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5150,7 +5150,7 @@
},
"x-appwrite": {
"method": "updateBooleanAttribute",
- "weight": 99,
+ "weight": 100,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5264,7 +5264,7 @@
},
"x-appwrite": {
"method": "createDatetimeAttribute",
- "weight": 88,
+ "weight": 89,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5373,7 +5373,7 @@
},
"x-appwrite": {
"method": "updateDatetimeAttribute",
- "weight": 100,
+ "weight": 101,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5487,7 +5487,7 @@
},
"x-appwrite": {
"method": "createEmailAttribute",
- "weight": 81,
+ "weight": 82,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5596,7 +5596,7 @@
},
"x-appwrite": {
"method": "updateEmailAttribute",
- "weight": 93,
+ "weight": 94,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5710,7 +5710,7 @@
},
"x-appwrite": {
"method": "createEnumAttribute",
- "weight": 82,
+ "weight": 83,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5828,7 +5828,7 @@
},
"x-appwrite": {
"method": "updateEnumAttribute",
- "weight": 94,
+ "weight": 95,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5951,7 +5951,7 @@
},
"x-appwrite": {
"method": "createFloatAttribute",
- "weight": 86,
+ "weight": 87,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6070,7 +6070,7 @@
},
"x-appwrite": {
"method": "updateFloatAttribute",
- "weight": 98,
+ "weight": 99,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6196,7 +6196,7 @@
},
"x-appwrite": {
"method": "createIntegerAttribute",
- "weight": 85,
+ "weight": 86,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6315,7 +6315,7 @@
},
"x-appwrite": {
"method": "updateIntegerAttribute",
- "weight": 97,
+ "weight": 98,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6441,7 +6441,7 @@
},
"x-appwrite": {
"method": "createIpAttribute",
- "weight": 83,
+ "weight": 84,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6550,7 +6550,7 @@
},
"x-appwrite": {
"method": "updateIpAttribute",
- "weight": 95,
+ "weight": 96,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6664,7 +6664,7 @@
},
"x-appwrite": {
"method": "createRelationshipAttribute",
- "weight": 89,
+ "weight": 90,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6798,7 +6798,7 @@
},
"x-appwrite": {
"method": "createStringAttribute",
- "weight": 80,
+ "weight": 81,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6918,7 +6918,7 @@
},
"x-appwrite": {
"method": "updateStringAttribute",
- "weight": 92,
+ "weight": 93,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6997,7 +6997,7 @@
"size": {
"type": "integer",
"description": "Maximum size of the string attribute.",
- "x-example": null
+ "x-example": 1
},
"newKey": {
"type": "string",
@@ -7037,7 +7037,7 @@
},
"x-appwrite": {
"method": "createUrlAttribute",
- "weight": 84,
+ "weight": 85,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7146,7 +7146,7 @@
},
"x-appwrite": {
"method": "updateUrlAttribute",
- "weight": 96,
+ "weight": 97,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7291,7 +7291,7 @@
},
"x-appwrite": {
"method": "getAttribute",
- "weight": 91,
+ "weight": 92,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7365,7 +7365,7 @@
},
"x-appwrite": {
"method": "deleteAttribute",
- "weight": 102,
+ "weight": 103,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7448,7 +7448,7 @@
},
"x-appwrite": {
"method": "updateRelationshipAttribute",
- "weight": 101,
+ "weight": 102,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7559,7 +7559,7 @@
},
"x-appwrite": {
"method": "listDocuments",
- "weight": 108,
+ "weight": 109,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7648,7 +7648,7 @@
},
"x-appwrite": {
"method": "createDocument",
- "weight": 107,
+ "weight": 108,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7759,7 +7759,7 @@
},
"x-appwrite": {
"method": "getDocument",
- "weight": 109,
+ "weight": 110,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7858,7 +7858,7 @@
},
"x-appwrite": {
"method": "updateDocument",
- "weight": 111,
+ "weight": 112,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7961,7 +7961,7 @@
},
"x-appwrite": {
"method": "deleteDocument",
- "weight": 112,
+ "weight": 113,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8049,7 +8049,7 @@
},
"x-appwrite": {
"method": "listIndexes",
- "weight": 104,
+ "weight": 105,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8134,7 +8134,7 @@
},
"x-appwrite": {
"method": "createIndex",
- "weight": 103,
+ "weight": 104,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8257,7 +8257,7 @@
},
"x-appwrite": {
"method": "getIndex",
- "weight": 105,
+ "weight": 106,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8331,7 +8331,7 @@
},
"x-appwrite": {
"method": "deleteIndex",
- "weight": 106,
+ "weight": 107,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8414,7 +8414,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 287,
+ "weight": 289,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8490,7 +8490,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 286,
+ "weight": 288,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8545,6 +8545,7 @@
"node-19.0",
"node-20.0",
"node-21.0",
+ "node-22",
"php-8.0",
"php-8.1",
"php-8.2",
@@ -8563,6 +8564,8 @@
"deno-1.24",
"deno-1.35",
"deno-1.40",
+ "deno-1.46",
+ "deno-2.0",
"dart-2.15",
"dart-2.16",
"dart-2.17",
@@ -8570,24 +8573,30 @@
"dart-3.0",
"dart-3.1",
"dart-3.3",
- "dotnet-3.1",
+ "dart-3.5",
"dotnet-6.0",
"dotnet-7.0",
+ "dotnet-8.0",
"java-8.0",
"java-11.0",
"java-17.0",
"java-18.0",
"java-21.0",
+ "java-22",
"swift-5.5",
"swift-5.8",
"swift-5.9",
+ "swift-5.10",
"kotlin-1.6",
"kotlin-1.8",
"kotlin-1.9",
+ "kotlin-2.0",
"cpp-17",
"cpp-20",
"bun-1.0",
- "go-1.23"
+ "bun-1.1",
+ "go-1.23",
+ "static-1"
],
"x-enum-name": null,
"x-enum-keys": []
@@ -8730,7 +8739,7 @@
},
"x-appwrite": {
"method": "listRuntimes",
- "weight": 288,
+ "weight": 290,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8782,7 +8791,7 @@
},
"x-appwrite": {
"method": "listSpecifications",
- "weight": 289,
+ "weight": 291,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8835,7 +8844,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 290,
+ "weight": 292,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8897,7 +8906,7 @@
},
"x-appwrite": {
"method": "update",
- "weight": 293,
+ "weight": 295,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8959,6 +8968,7 @@
"node-19.0",
"node-20.0",
"node-21.0",
+ "node-22",
"php-8.0",
"php-8.1",
"php-8.2",
@@ -8977,6 +8987,8 @@
"deno-1.24",
"deno-1.35",
"deno-1.40",
+ "deno-1.46",
+ "deno-2.0",
"dart-2.15",
"dart-2.16",
"dart-2.17",
@@ -8984,24 +8996,30 @@
"dart-3.0",
"dart-3.1",
"dart-3.3",
- "dotnet-3.1",
+ "dart-3.5",
"dotnet-6.0",
"dotnet-7.0",
+ "dotnet-8.0",
"java-8.0",
"java-11.0",
"java-17.0",
"java-18.0",
"java-21.0",
+ "java-22",
"swift-5.5",
"swift-5.8",
"swift-5.9",
+ "swift-5.10",
"kotlin-1.6",
"kotlin-1.8",
"kotlin-1.9",
+ "kotlin-2.0",
"cpp-17",
"cpp-20",
"bun-1.0",
- "go-1.23"
+ "bun-1.1",
+ "go-1.23",
+ "static-1"
],
"x-enum-name": null,
"x-enum-keys": []
@@ -9114,7 +9132,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 296,
+ "weight": 298,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9178,7 +9196,7 @@
},
"x-appwrite": {
"method": "listDeployments",
- "weight": 298,
+ "weight": 300,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9264,7 +9282,7 @@
},
"x-appwrite": {
"method": "createDeployment",
- "weight": 297,
+ "weight": 299,
"cookies": false,
"type": "upload",
"deprecated": false,
@@ -9363,7 +9381,7 @@
},
"x-appwrite": {
"method": "getDeployment",
- "weight": 299,
+ "weight": 301,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9435,7 +9453,7 @@
},
"x-appwrite": {
"method": "updateDeployment",
- "weight": 295,
+ "weight": 297,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9500,7 +9518,7 @@
},
"x-appwrite": {
"method": "deleteDeployment",
- "weight": 300,
+ "weight": 302,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9567,7 +9585,7 @@
},
"x-appwrite": {
"method": "createBuild",
- "weight": 301,
+ "weight": 303,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9655,7 +9673,7 @@
},
"x-appwrite": {
"method": "updateDeploymentBuild",
- "weight": 302,
+ "weight": 304,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9722,7 +9740,7 @@
},
"x-appwrite": {
"method": "getDeploymentDownload",
- "weight": 294,
+ "weight": 296,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -9798,7 +9816,7 @@
},
"x-appwrite": {
"method": "listExecutions",
- "weight": 304,
+ "weight": 306,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9888,7 +9906,7 @@
},
"x-appwrite": {
"method": "createExecution",
- "weight": 303,
+ "weight": 305,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9941,7 +9959,7 @@
"body": {
"type": "string",
"description": "HTTP body of execution. Default value is empty string.",
- "x-example": null
+ "x-example": ""
},
"async": {
"type": "boolean",
@@ -10007,7 +10025,7 @@
},
"x-appwrite": {
"method": "getExecution",
- "weight": 305,
+ "weight": 307,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10076,7 +10094,7 @@
},
"x-appwrite": {
"method": "deleteExecution",
- "weight": 306,
+ "weight": 308,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10150,7 +10168,7 @@
},
"x-appwrite": {
"method": "listVariables",
- "weight": 308,
+ "weight": 310,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10212,7 +10230,7 @@
},
"x-appwrite": {
"method": "createVariable",
- "weight": 307,
+ "weight": 309,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10301,7 +10319,7 @@
},
"x-appwrite": {
"method": "getVariable",
- "weight": 309,
+ "weight": 311,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10373,7 +10391,7 @@
},
"x-appwrite": {
"method": "updateVariable",
- "weight": 310,
+ "weight": 312,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10462,7 +10480,7 @@
},
"x-appwrite": {
"method": "deleteVariable",
- "weight": 311,
+ "weight": 313,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10536,7 +10554,7 @@
},
"x-appwrite": {
"method": "query",
- "weight": 329,
+ "weight": 331,
"cookies": false,
"type": "graphql",
"deprecated": false,
@@ -10592,7 +10610,7 @@
},
"x-appwrite": {
"method": "mutation",
- "weight": 328,
+ "weight": 330,
"cookies": false,
"type": "graphql",
"deprecated": false,
@@ -10648,7 +10666,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 124,
+ "weight": 125,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10700,7 +10718,7 @@
},
"x-appwrite": {
"method": "getAntivirus",
- "weight": 146,
+ "weight": 147,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10752,7 +10770,7 @@
},
"x-appwrite": {
"method": "getCache",
- "weight": 127,
+ "weight": 128,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10804,7 +10822,7 @@
},
"x-appwrite": {
"method": "getCertificate",
- "weight": 133,
+ "weight": 134,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10867,7 +10885,7 @@
},
"x-appwrite": {
"method": "getDB",
- "weight": 126,
+ "weight": 127,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10919,7 +10937,7 @@
},
"x-appwrite": {
"method": "getPubSub",
- "weight": 129,
+ "weight": 130,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10971,7 +10989,7 @@
},
"x-appwrite": {
"method": "getQueue",
- "weight": 128,
+ "weight": 129,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11023,7 +11041,7 @@
},
"x-appwrite": {
"method": "getQueueBuilds",
- "weight": 135,
+ "weight": 136,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11088,7 +11106,7 @@
},
"x-appwrite": {
"method": "getQueueCertificates",
- "weight": 134,
+ "weight": 135,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11153,7 +11171,7 @@
},
"x-appwrite": {
"method": "getQueueDatabases",
- "weight": 136,
+ "weight": 137,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11229,7 +11247,7 @@
},
"x-appwrite": {
"method": "getQueueDeletes",
- "weight": 137,
+ "weight": 138,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11294,7 +11312,7 @@
},
"x-appwrite": {
"method": "getFailedJobs",
- "weight": 147,
+ "weight": 148,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11385,7 +11403,7 @@
},
"x-appwrite": {
"method": "getQueueFunctions",
- "weight": 141,
+ "weight": 142,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11450,7 +11468,7 @@
},
"x-appwrite": {
"method": "getQueueLogs",
- "weight": 132,
+ "weight": 133,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11515,7 +11533,7 @@
},
"x-appwrite": {
"method": "getQueueMails",
- "weight": 138,
+ "weight": 139,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11580,7 +11598,7 @@
},
"x-appwrite": {
"method": "getQueueMessaging",
- "weight": 139,
+ "weight": 140,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11645,7 +11663,7 @@
},
"x-appwrite": {
"method": "getQueueMigrations",
- "weight": 140,
+ "weight": 141,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11710,7 +11728,7 @@
},
"x-appwrite": {
"method": "getQueueUsage",
- "weight": 142,
+ "weight": 143,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11775,7 +11793,7 @@
},
"x-appwrite": {
"method": "getQueueUsageDump",
- "weight": 143,
+ "weight": 144,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11840,7 +11858,7 @@
},
"x-appwrite": {
"method": "getQueueWebhooks",
- "weight": 131,
+ "weight": 132,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11905,7 +11923,7 @@
},
"x-appwrite": {
"method": "getStorage",
- "weight": 145,
+ "weight": 146,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11957,7 +11975,7 @@
},
"x-appwrite": {
"method": "getStorageLocal",
- "weight": 144,
+ "weight": 145,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12009,7 +12027,7 @@
},
"x-appwrite": {
"method": "getTime",
- "weight": 130,
+ "weight": 131,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12061,7 +12079,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 116,
+ "weight": 117,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12097,7 +12115,7 @@
},
"\/locale\/codes": {
"get": {
- "summary": "List Locale Codes",
+ "summary": "List locale codes",
"operationId": "localeListCodes",
"tags": [
"locale"
@@ -12117,7 +12135,7 @@
},
"x-appwrite": {
"method": "listCodes",
- "weight": 117,
+ "weight": 118,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12173,7 +12191,7 @@
},
"x-appwrite": {
"method": "listContinents",
- "weight": 121,
+ "weight": 122,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12229,7 +12247,7 @@
},
"x-appwrite": {
"method": "listCountries",
- "weight": 118,
+ "weight": 119,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12285,7 +12303,7 @@
},
"x-appwrite": {
"method": "listCountriesEU",
- "weight": 119,
+ "weight": 120,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12341,7 +12359,7 @@
},
"x-appwrite": {
"method": "listCountriesPhones",
- "weight": 120,
+ "weight": 121,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12397,7 +12415,7 @@
},
"x-appwrite": {
"method": "listCurrencies",
- "weight": 122,
+ "weight": 123,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12453,7 +12471,7 @@
},
"x-appwrite": {
"method": "listLanguages",
- "weight": 123,
+ "weight": 124,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12509,7 +12527,7 @@
},
"x-appwrite": {
"method": "listMessages",
- "weight": 388,
+ "weight": 390,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12588,7 +12606,7 @@
},
"x-appwrite": {
"method": "createEmail",
- "weight": 385,
+ "weight": 387,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12735,7 +12753,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 392,
+ "weight": 394,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12884,7 +12902,7 @@
},
"x-appwrite": {
"method": "createPush",
- "weight": 387,
+ "weight": 389,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13042,7 +13060,7 @@
},
"x-appwrite": {
"method": "updatePush",
- "weight": 394,
+ "weight": 396,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13202,7 +13220,7 @@
},
"x-appwrite": {
"method": "createSms",
- "weight": 386,
+ "weight": 388,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13314,7 +13332,7 @@
},
"x-appwrite": {
"method": "updateSms",
- "weight": 393,
+ "weight": 395,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13429,7 +13447,7 @@
},
"x-appwrite": {
"method": "getMessage",
- "weight": 391,
+ "weight": 393,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13485,7 +13503,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 395,
+ "weight": 397,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13550,7 +13568,7 @@
},
"x-appwrite": {
"method": "listMessageLogs",
- "weight": 389,
+ "weight": 391,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13628,7 +13646,7 @@
},
"x-appwrite": {
"method": "listTargets",
- "weight": 390,
+ "weight": 392,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13706,7 +13724,7 @@
},
"x-appwrite": {
"method": "listProviders",
- "weight": 360,
+ "weight": 362,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13785,7 +13803,7 @@
},
"x-appwrite": {
"method": "createApnsProvider",
- "weight": 359,
+ "weight": 361,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13893,7 +13911,7 @@
},
"x-appwrite": {
"method": "updateApnsProvider",
- "weight": 372,
+ "weight": 374,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14004,7 +14022,7 @@
},
"x-appwrite": {
"method": "createFcmProvider",
- "weight": 358,
+ "weight": 360,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14092,7 +14110,7 @@
},
"x-appwrite": {
"method": "updateFcmProvider",
- "weight": 371,
+ "weight": 373,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14183,7 +14201,7 @@
},
"x-appwrite": {
"method": "createMailgunProvider",
- "weight": 350,
+ "weight": 352,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14301,7 +14319,7 @@
},
"x-appwrite": {
"method": "updateMailgunProvider",
- "weight": 363,
+ "weight": 365,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14422,7 +14440,7 @@
},
"x-appwrite": {
"method": "createMsg91Provider",
- "weight": 353,
+ "weight": 355,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14520,7 +14538,7 @@
},
"x-appwrite": {
"method": "updateMsg91Provider",
- "weight": 366,
+ "weight": 368,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14621,7 +14639,7 @@
},
"x-appwrite": {
"method": "createSendgridProvider",
- "weight": 351,
+ "weight": 353,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14729,7 +14747,7 @@
},
"x-appwrite": {
"method": "updateSendgridProvider",
- "weight": 364,
+ "weight": 366,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14840,7 +14858,7 @@
},
"x-appwrite": {
"method": "createSmtpProvider",
- "weight": 352,
+ "weight": 354,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14986,7 +15004,7 @@
},
"x-appwrite": {
"method": "updateSmtpProvider",
- "weight": 365,
+ "weight": 367,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15134,7 +15152,7 @@
},
"x-appwrite": {
"method": "createTelesignProvider",
- "weight": 354,
+ "weight": 356,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15232,7 +15250,7 @@
},
"x-appwrite": {
"method": "updateTelesignProvider",
- "weight": 367,
+ "weight": 369,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15333,7 +15351,7 @@
},
"x-appwrite": {
"method": "createTextmagicProvider",
- "weight": 355,
+ "weight": 357,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15431,7 +15449,7 @@
},
"x-appwrite": {
"method": "updateTextmagicProvider",
- "weight": 368,
+ "weight": 370,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15532,7 +15550,7 @@
},
"x-appwrite": {
"method": "createTwilioProvider",
- "weight": 356,
+ "weight": 358,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15630,7 +15648,7 @@
},
"x-appwrite": {
"method": "updateTwilioProvider",
- "weight": 369,
+ "weight": 371,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15731,7 +15749,7 @@
},
"x-appwrite": {
"method": "createVonageProvider",
- "weight": 357,
+ "weight": 359,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15829,7 +15847,7 @@
},
"x-appwrite": {
"method": "updateVonageProvider",
- "weight": 370,
+ "weight": 372,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15930,7 +15948,7 @@
},
"x-appwrite": {
"method": "getProvider",
- "weight": 362,
+ "weight": 364,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15986,7 +16004,7 @@
},
"x-appwrite": {
"method": "deleteProvider",
- "weight": 373,
+ "weight": 375,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16051,7 +16069,7 @@
},
"x-appwrite": {
"method": "listProviderLogs",
- "weight": 361,
+ "weight": 363,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16129,7 +16147,7 @@
},
"x-appwrite": {
"method": "listSubscriberLogs",
- "weight": 382,
+ "weight": 384,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16207,7 +16225,7 @@
},
"x-appwrite": {
"method": "listTopics",
- "weight": 375,
+ "weight": 377,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16284,7 +16302,7 @@
},
"x-appwrite": {
"method": "createTopic",
- "weight": 374,
+ "weight": 376,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16370,7 +16388,7 @@
},
"x-appwrite": {
"method": "getTopic",
- "weight": 377,
+ "weight": 379,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16433,7 +16451,7 @@
},
"x-appwrite": {
"method": "updateTopic",
- "weight": 378,
+ "weight": 380,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16513,7 +16531,7 @@
},
"x-appwrite": {
"method": "deleteTopic",
- "weight": 379,
+ "weight": 381,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16578,7 +16596,7 @@
},
"x-appwrite": {
"method": "listTopicLogs",
- "weight": 376,
+ "weight": 378,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16656,7 +16674,7 @@
},
"x-appwrite": {
"method": "listSubscribers",
- "weight": 381,
+ "weight": 383,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16743,7 +16761,7 @@
},
"x-appwrite": {
"method": "createSubscriber",
- "weight": 380,
+ "weight": 382,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16837,7 +16855,7 @@
},
"x-appwrite": {
"method": "getSubscriber",
- "weight": 383,
+ "weight": 385,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16903,7 +16921,7 @@
},
"x-appwrite": {
"method": "deleteSubscriber",
- "weight": 384,
+ "weight": 386,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16982,7 +17000,7 @@
},
"x-appwrite": {
"method": "listBuckets",
- "weight": 201,
+ "weight": 203,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17058,7 +17076,7 @@
},
"x-appwrite": {
"method": "createBucket",
- "weight": 200,
+ "weight": 202,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17188,7 +17206,7 @@
},
"x-appwrite": {
"method": "getBucket",
- "weight": 202,
+ "weight": 204,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17250,7 +17268,7 @@
},
"x-appwrite": {
"method": "updateBucket",
- "weight": 203,
+ "weight": 205,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17377,7 +17395,7 @@
},
"x-appwrite": {
"method": "deleteBucket",
- "weight": 204,
+ "weight": 206,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17441,7 +17459,7 @@
},
"x-appwrite": {
"method": "listFiles",
- "weight": 206,
+ "weight": 208,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17531,7 +17549,7 @@
},
"x-appwrite": {
"method": "createFile",
- "weight": 205,
+ "weight": 207,
"cookies": false,
"type": "upload",
"deprecated": false,
@@ -17633,7 +17651,7 @@
},
"x-appwrite": {
"method": "getFile",
- "weight": 207,
+ "weight": 209,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17709,7 +17727,7 @@
},
"x-appwrite": {
"method": "updateFile",
- "weight": 212,
+ "weight": 214,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17789,7 +17807,7 @@
}
},
"delete": {
- "summary": "Delete File",
+ "summary": "Delete file",
"operationId": "storageDeleteFile",
"tags": [
"storage"
@@ -17802,7 +17820,7 @@
},
"x-appwrite": {
"method": "deleteFile",
- "weight": 213,
+ "weight": 215,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17873,7 +17891,7 @@
},
"x-appwrite": {
"method": "getFileDownload",
- "weight": 209,
+ "weight": 211,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -17944,7 +17962,7 @@
},
"x-appwrite": {
"method": "getFilePreview",
- "weight": 208,
+ "weight": 210,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -18137,7 +18155,8 @@
"jpeg",
"gif",
"png",
- "webp"
+ "webp",
+ "avif"
],
"x-enum-name": "ImageFormat",
"x-enum-keys": [],
@@ -18163,7 +18182,7 @@
},
"x-appwrite": {
"method": "getFileView",
- "weight": 210,
+ "weight": 212,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -18241,7 +18260,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 217,
+ "weight": 219,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18321,7 +18340,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 216,
+ "weight": 218,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18410,7 +18429,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 218,
+ "weight": 220,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18476,7 +18495,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 220,
+ "weight": 222,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18554,7 +18573,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 222,
+ "weight": 224,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18607,7 +18626,7 @@
"tags": [
"teams"
],
- "description": "Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint.",
+ "description": "Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint. Hide sensitive attributes from the response by toggling membership privacy in the Console.",
"responses": {
"200": {
"description": "Memberships List",
@@ -18622,7 +18641,7 @@
},
"x-appwrite": {
"method": "listMemberships",
- "weight": 224,
+ "weight": 226,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18712,7 +18731,7 @@
},
"x-appwrite": {
"method": "createMembership",
- "weight": 223,
+ "weight": 225,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18812,7 +18831,7 @@
"tags": [
"teams"
],
- "description": "Get a team member by the membership unique id. All team members have read access for this resource.",
+ "description": "Get a team member by the membership unique id. All team members have read access for this resource. Hide sensitive attributes from the response by toggling membership privacy in the Console.",
"responses": {
"200": {
"description": "Membership",
@@ -18827,7 +18846,7 @@
},
"x-appwrite": {
"method": "getMembership",
- "weight": 225,
+ "weight": 227,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18903,7 +18922,7 @@
},
"x-appwrite": {
"method": "updateMembership",
- "weight": 226,
+ "weight": 228,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18994,7 +19013,7 @@
},
"x-appwrite": {
"method": "deleteMembership",
- "weight": 228,
+ "weight": 230,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19072,7 +19091,7 @@
},
"x-appwrite": {
"method": "updateMembershipStatus",
- "weight": 227,
+ "weight": 229,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19173,7 +19192,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 219,
+ "weight": 221,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19237,7 +19256,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 221,
+ "weight": 223,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19322,7 +19341,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 239,
+ "weight": 241,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19398,7 +19417,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 230,
+ "weight": 232,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19489,7 +19508,7 @@
},
"x-appwrite": {
"method": "createArgon2User",
- "weight": 233,
+ "weight": 235,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19577,7 +19596,7 @@
},
"x-appwrite": {
"method": "createBcryptUser",
- "weight": 231,
+ "weight": 233,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19645,7 +19664,7 @@
},
"\/users\/identities": {
"get": {
- "summary": "List Identities",
+ "summary": "List identities",
"operationId": "usersListIdentities",
"tags": [
"users"
@@ -19665,7 +19684,7 @@
},
"x-appwrite": {
"method": "listIdentities",
- "weight": 247,
+ "weight": 249,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19736,7 +19755,7 @@
},
"x-appwrite": {
"method": "deleteIdentity",
- "weight": 270,
+ "weight": 272,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19800,7 +19819,7 @@
},
"x-appwrite": {
"method": "createMD5User",
- "weight": 232,
+ "weight": 234,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19888,7 +19907,7 @@
},
"x-appwrite": {
"method": "createPHPassUser",
- "weight": 235,
+ "weight": 237,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19976,7 +19995,7 @@
},
"x-appwrite": {
"method": "createScryptUser",
- "weight": 236,
+ "weight": 238,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20094,7 +20113,7 @@
},
"x-appwrite": {
"method": "createScryptModifiedUser",
- "weight": 237,
+ "weight": 239,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20200,7 +20219,7 @@
},
"x-appwrite": {
"method": "createSHAUser",
- "weight": 234,
+ "weight": 236,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20308,7 +20327,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 240,
+ "weight": 242,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20363,7 +20382,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 268,
+ "weight": 270,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20427,7 +20446,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 253,
+ "weight": 255,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20510,7 +20529,7 @@
},
"x-appwrite": {
"method": "createJWT",
- "weight": 271,
+ "weight": 273,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20595,7 +20614,7 @@
},
"x-appwrite": {
"method": "updateLabels",
- "weight": 249,
+ "weight": 251,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20681,7 +20700,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 245,
+ "weight": 247,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20758,7 +20777,7 @@
},
"x-appwrite": {
"method": "listMemberships",
- "weight": 244,
+ "weight": 246,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20822,7 +20841,7 @@
},
"x-appwrite": {
"method": "updateMfa",
- "weight": 258,
+ "weight": 260,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20885,7 +20904,7 @@
},
"\/users\/{userId}\/mfa\/authenticators\/{type}": {
"delete": {
- "summary": "Delete Authenticator",
+ "summary": "Delete authenticator",
"operationId": "usersDeleteMfaAuthenticator",
"tags": [
"users"
@@ -20905,7 +20924,7 @@
},
"x-appwrite": {
"method": "deleteMfaAuthenticator",
- "weight": 263,
+ "weight": 265,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20964,7 +20983,7 @@
},
"\/users\/{userId}\/mfa\/factors": {
"get": {
- "summary": "List Factors",
+ "summary": "List factors",
"operationId": "usersListMfaFactors",
"tags": [
"users"
@@ -20984,7 +21003,7 @@
},
"x-appwrite": {
"method": "listMfaFactors",
- "weight": 259,
+ "weight": 261,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21028,7 +21047,7 @@
},
"\/users\/{userId}\/mfa\/recovery-codes": {
"get": {
- "summary": "Get MFA Recovery Codes",
+ "summary": "Get MFA recovery codes",
"operationId": "usersGetMfaRecoveryCodes",
"tags": [
"users"
@@ -21048,7 +21067,7 @@
},
"x-appwrite": {
"method": "getMfaRecoveryCodes",
- "weight": 260,
+ "weight": 262,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21090,7 +21109,7 @@
]
},
"put": {
- "summary": "Regenerate MFA Recovery Codes",
+ "summary": "Regenerate MFA recovery codes",
"operationId": "usersUpdateMfaRecoveryCodes",
"tags": [
"users"
@@ -21110,7 +21129,7 @@
},
"x-appwrite": {
"method": "updateMfaRecoveryCodes",
- "weight": 262,
+ "weight": 264,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21152,7 +21171,7 @@
]
},
"patch": {
- "summary": "Create MFA Recovery Codes",
+ "summary": "Create MFA recovery codes",
"operationId": "usersCreateMfaRecoveryCodes",
"tags": [
"users"
@@ -21172,7 +21191,7 @@
},
"x-appwrite": {
"method": "createMfaRecoveryCodes",
- "weight": 261,
+ "weight": 263,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21236,7 +21255,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 251,
+ "weight": 253,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21319,7 +21338,7 @@
},
"x-appwrite": {
"method": "updatePassword",
- "weight": 252,
+ "weight": 254,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21402,7 +21421,7 @@
},
"x-appwrite": {
"method": "updatePhone",
- "weight": 254,
+ "weight": 256,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21485,7 +21504,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 241,
+ "weight": 243,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21547,7 +21566,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 256,
+ "weight": 258,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21630,7 +21649,7 @@
},
"x-appwrite": {
"method": "listSessions",
- "weight": 243,
+ "weight": 245,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21692,7 +21711,7 @@
},
"x-appwrite": {
"method": "createSession",
- "weight": 264,
+ "weight": 266,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21747,7 +21766,7 @@
},
"x-appwrite": {
"method": "deleteSessions",
- "weight": 267,
+ "weight": 269,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21804,7 +21823,7 @@
},
"x-appwrite": {
"method": "deleteSession",
- "weight": 266,
+ "weight": 268,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21878,7 +21897,7 @@
},
"x-appwrite": {
"method": "updateStatus",
- "weight": 248,
+ "weight": 250,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21941,7 +21960,7 @@
},
"\/users\/{userId}\/targets": {
"get": {
- "summary": "List User Targets",
+ "summary": "List user targets",
"operationId": "usersListTargets",
"tags": [
"users"
@@ -21961,7 +21980,7 @@
},
"x-appwrite": {
"method": "listTargets",
- "weight": 246,
+ "weight": 248,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22017,7 +22036,7 @@
]
},
"post": {
- "summary": "Create User Target",
+ "summary": "Create user target",
"operationId": "usersCreateTarget",
"tags": [
"users"
@@ -22037,7 +22056,7 @@
},
"x-appwrite": {
"method": "createTarget",
- "weight": 238,
+ "weight": 240,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22130,7 +22149,7 @@
},
"\/users\/{userId}\/targets\/{targetId}": {
"get": {
- "summary": "Get User Target",
+ "summary": "Get user target",
"operationId": "usersGetTarget",
"tags": [
"users"
@@ -22150,7 +22169,7 @@
},
"x-appwrite": {
"method": "getTarget",
- "weight": 242,
+ "weight": 244,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22203,7 +22222,7 @@
]
},
"patch": {
- "summary": "Update User target",
+ "summary": "Update user target",
"operationId": "usersUpdateTarget",
"tags": [
"users"
@@ -22223,7 +22242,7 @@
},
"x-appwrite": {
"method": "updateTarget",
- "weight": 257,
+ "weight": 259,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22315,7 +22334,7 @@
},
"x-appwrite": {
"method": "deleteTarget",
- "weight": 269,
+ "weight": 271,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22390,7 +22409,7 @@
},
"x-appwrite": {
"method": "createToken",
- "weight": 265,
+ "weight": 267,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22475,7 +22494,7 @@
},
"x-appwrite": {
"method": "updateEmailVerification",
- "weight": 255,
+ "weight": 257,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22558,7 +22577,7 @@
},
"x-appwrite": {
"method": "updatePhoneVerification",
- "weight": 250,
+ "weight": 252,
"cookies": false,
"type": "",
"deprecated": false,
@@ -23677,6 +23696,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"size": {
"type": "integer",
"description": "Attribute size.",
@@ -23696,6 +23725,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"size"
]
},
@@ -23734,6 +23765,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"min": {
"type": "integer",
"description": "Minimum value to enforce for new documents.",
@@ -23761,7 +23802,9 @@
"type",
"status",
"error",
- "required"
+ "required",
+ "$createdAt",
+ "$updatedAt"
]
},
"attributeFloat": {
@@ -23799,6 +23842,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"min": {
"type": "number",
"description": "Minimum value to enforce for new documents.",
@@ -23826,7 +23879,9 @@
"type",
"status",
"error",
- "required"
+ "required",
+ "$createdAt",
+ "$updatedAt"
]
},
"attributeBoolean": {
@@ -23864,6 +23919,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"default": {
"type": "boolean",
"description": "Default value for attribute when not provided. Cannot be set when attribute is required.",
@@ -23876,7 +23941,9 @@
"type",
"status",
"error",
- "required"
+ "required",
+ "$createdAt",
+ "$updatedAt"
]
},
"attributeEmail": {
@@ -23914,6 +23981,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "String format.",
@@ -23932,6 +24009,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -23970,6 +24049,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"elements": {
"type": "array",
"description": "Array of elements in enumerated type.",
@@ -23996,6 +24085,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"elements",
"format"
]
@@ -24035,6 +24126,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "String format.",
@@ -24053,6 +24154,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -24091,6 +24194,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "String format.",
@@ -24109,6 +24222,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -24147,6 +24262,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "ISO 8601 format.",
@@ -24165,6 +24290,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -24203,6 +24330,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"relatedCollection": {
"type": "string",
"description": "The ID of the related collection.",
@@ -24240,6 +24377,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"relatedCollection",
"relationType",
"twoWay",
@@ -24288,6 +24427,16 @@
},
"x-example": [],
"nullable": true
+ },
+ "$createdAt": {
+ "type": "string",
+ "description": "Index creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Index update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
}
},
"required": [
@@ -24295,7 +24444,9 @@
"type",
"status",
"error",
- "attributes"
+ "attributes",
+ "$createdAt",
+ "$updatedAt"
]
},
"document": {
@@ -25447,12 +25598,12 @@
},
"userName": {
"type": "string",
- "description": "User name.",
+ "description": "User name. Hide this attribute by toggling membership privacy in the Console.",
"x-example": "John Doe"
},
"userEmail": {
"type": "string",
- "description": "User email address.",
+ "description": "User email address. Hide this attribute by toggling membership privacy in the Console.",
"x-example": "john@appwrite.io"
},
"teamId": {
@@ -25482,7 +25633,7 @@
},
"mfa": {
"type": "boolean",
- "description": "Multi factor authentication status, true if the user has MFA enabled or false otherwise.",
+ "description": "Multi factor authentication status, true if the user has MFA enabled or false otherwise. Hide this attribute by toggling membership privacy in the Console.",
"x-example": false
},
"roles": {
@@ -25647,7 +25798,7 @@
"specification": {
"type": "string",
"description": "Machine specification for builds and executions.",
- "x-example": "s-0.5vcpu-512mb"
+ "x-example": "s-1vcpu-512mb"
}
},
"required": [
@@ -25966,7 +26117,7 @@
"responseBody": {
"type": "string",
"description": "HTTP response body. This will return empty unless execution is created as synchronous.",
- "x-example": "Developers are awesome."
+ "x-example": ""
},
"responseHeaders": {
"type": "array",
@@ -26459,7 +26610,7 @@
"slug": {
"type": "string",
"description": "Size slug.",
- "x-example": "s-0.5vcpu-512mb"
+ "x-example": "s-1vcpu-512mb"
}
},
"required": [
@@ -26907,7 +27058,7 @@
"name": {
"type": "string",
"description": "Target Name.",
- "x-example": "Aegon apple token"
+ "x-example": "Apple iPhone 12"
},
"userId": {
"type": "string",
@@ -26929,6 +27080,11 @@
"type": "string",
"description": "The target identifier.",
"x-example": "token"
+ },
+ "expired": {
+ "type": "boolean",
+ "description": "Is the target expired.",
+ "x-example": false
}
},
"required": [
@@ -26938,7 +27094,8 @@
"name",
"userId",
"providerType",
- "identifier"
+ "identifier",
+ "expired"
]
}
},
diff --git a/app/config/specs/open-api3-latest-client.json b/app/config/specs/open-api3-latest-client.json
index 50e3426e0b..d948a101f2 100644
--- a/app/config/specs/open-api3-latest-client.json
+++ b/app/config/specs/open-api3-latest-client.json
@@ -43,7 +43,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 8,
+ "weight": 9,
"cookies": false,
"type": "",
"deprecated": false,
@@ -94,7 +94,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 7,
+ "weight": 8,
"cookies": false,
"type": "",
"deprecated": false,
@@ -181,7 +181,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 33,
+ "weight": 34,
"cookies": false,
"type": "",
"deprecated": false,
@@ -259,7 +259,7 @@
},
"x-appwrite": {
"method": "listIdentities",
- "weight": 56,
+ "weight": 57,
"cookies": false,
"type": "",
"deprecated": false,
@@ -320,7 +320,7 @@
},
"x-appwrite": {
"method": "deleteIdentity",
- "weight": 57,
+ "weight": 58,
"cookies": false,
"type": "",
"deprecated": false,
@@ -385,7 +385,7 @@
},
"x-appwrite": {
"method": "createJWT",
- "weight": 28,
+ "weight": 29,
"cookies": false,
"type": "",
"deprecated": false,
@@ -436,7 +436,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 30,
+ "weight": 31,
"cookies": false,
"type": "",
"deprecated": false,
@@ -504,7 +504,7 @@
},
"x-appwrite": {
"method": "updateMFA",
- "weight": 43,
+ "weight": 44,
"cookies": false,
"type": "",
"deprecated": false,
@@ -576,7 +576,7 @@
},
"x-appwrite": {
"method": "createMfaAuthenticator",
- "weight": 45,
+ "weight": 46,
"cookies": false,
"type": "",
"deprecated": false,
@@ -644,7 +644,7 @@
},
"x-appwrite": {
"method": "updateMfaAuthenticator",
- "weight": 46,
+ "weight": 47,
"cookies": false,
"type": "",
"deprecated": false,
@@ -724,7 +724,7 @@
},
"x-appwrite": {
"method": "deleteMfaAuthenticator",
- "weight": 50,
+ "weight": 51,
"cookies": false,
"type": "",
"deprecated": false,
@@ -794,7 +794,7 @@
},
"x-appwrite": {
"method": "createMfaChallenge",
- "weight": 51,
+ "weight": 52,
"cookies": false,
"type": "",
"deprecated": false,
@@ -870,7 +870,7 @@
},
"x-appwrite": {
"method": "updateMfaChallenge",
- "weight": 52,
+ "weight": 53,
"cookies": false,
"type": "",
"deprecated": false,
@@ -948,7 +948,7 @@
},
"x-appwrite": {
"method": "listMfaFactors",
- "weight": 44,
+ "weight": 45,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1001,7 +1001,7 @@
},
"x-appwrite": {
"method": "getMfaRecoveryCodes",
- "weight": 49,
+ "weight": 50,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1052,7 +1052,7 @@
},
"x-appwrite": {
"method": "createMfaRecoveryCodes",
- "weight": 47,
+ "weight": 48,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1103,7 +1103,7 @@
},
"x-appwrite": {
"method": "updateMfaRecoveryCodes",
- "weight": 48,
+ "weight": 49,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1156,7 +1156,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 31,
+ "weight": 32,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1228,7 +1228,7 @@
},
"x-appwrite": {
"method": "updatePassword",
- "weight": 32,
+ "weight": 33,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1305,7 +1305,7 @@
},
"x-appwrite": {
"method": "updatePhone",
- "weight": 34,
+ "weight": 35,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1383,7 +1383,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 29,
+ "weight": 30,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1434,7 +1434,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 35,
+ "weight": 36,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1506,7 +1506,7 @@
},
"x-appwrite": {
"method": "createRecovery",
- "weight": 37,
+ "weight": 38,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1585,7 +1585,7 @@
},
"x-appwrite": {
"method": "updateRecovery",
- "weight": 38,
+ "weight": 39,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1669,7 +1669,7 @@
},
"x-appwrite": {
"method": "listSessions",
- "weight": 10,
+ "weight": 11,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1713,7 +1713,7 @@
},
"x-appwrite": {
"method": "deleteSessions",
- "weight": 11,
+ "weight": 12,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1766,7 +1766,7 @@
},
"x-appwrite": {
"method": "createAnonymousSession",
- "weight": 16,
+ "weight": 17,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1817,7 +1817,7 @@
},
"x-appwrite": {
"method": "createEmailPasswordSession",
- "weight": 15,
+ "weight": 16,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1893,7 +1893,7 @@
},
"x-appwrite": {
"method": "updateMagicURLSession",
- "weight": 25,
+ "weight": 26,
"cookies": false,
"type": "",
"deprecated": true,
@@ -1962,7 +1962,7 @@
},
"x-appwrite": {
"method": "createOAuth2Session",
- "weight": 18,
+ "weight": 19,
"cookies": false,
"type": "webAuth",
"deprecated": false,
@@ -2105,7 +2105,7 @@
},
"x-appwrite": {
"method": "updatePhoneSession",
- "weight": 26,
+ "weight": 27,
"cookies": false,
"type": "",
"deprecated": true,
@@ -2181,7 +2181,7 @@
},
"x-appwrite": {
"method": "createSession",
- "weight": 17,
+ "weight": 18,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2257,7 +2257,7 @@
},
"x-appwrite": {
"method": "getSession",
- "weight": 12,
+ "weight": 13,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2320,7 +2320,7 @@
},
"x-appwrite": {
"method": "updateSession",
- "weight": 14,
+ "weight": 15,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2376,7 +2376,7 @@
},
"x-appwrite": {
"method": "deleteSession",
- "weight": 13,
+ "weight": 14,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2441,7 +2441,7 @@
},
"x-appwrite": {
"method": "updateStatus",
- "weight": 36,
+ "weight": 37,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2494,7 +2494,7 @@
},
"x-appwrite": {
"method": "createPushTarget",
- "weight": 53,
+ "weight": 54,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2575,7 +2575,7 @@
},
"x-appwrite": {
"method": "updatePushTarget",
- "weight": 54,
+ "weight": 55,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2655,7 +2655,7 @@
},
"x-appwrite": {
"method": "deletePushTarget",
- "weight": 55,
+ "weight": 56,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2718,7 +2718,7 @@
},
"x-appwrite": {
"method": "createEmailToken",
- "weight": 24,
+ "weight": 25,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2784,7 +2784,7 @@
"tags": [
"account"
],
- "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour. If you are on a mobile device you can leave the URL parameter empty, so that the login completion will be handled by your Appwrite instance by default.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
+ "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
"responses": {
"201": {
"description": "Token",
@@ -2799,7 +2799,7 @@
},
"x-appwrite": {
"method": "createMagicURLToken",
- "weight": 23,
+ "weight": 24,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2881,7 +2881,7 @@
},
"x-appwrite": {
"method": "createOAuth2Token",
- "weight": 22,
+ "weight": 23,
"cookies": false,
"type": "webAuth",
"deprecated": false,
@@ -3024,7 +3024,7 @@
},
"x-appwrite": {
"method": "createPhoneToken",
- "weight": 27,
+ "weight": 28,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3103,7 +3103,7 @@
},
"x-appwrite": {
"method": "createVerification",
- "weight": 39,
+ "weight": 40,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3173,7 +3173,7 @@
},
"x-appwrite": {
"method": "updateVerification",
- "weight": 40,
+ "weight": 41,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3251,7 +3251,7 @@
},
"x-appwrite": {
"method": "createPhoneVerification",
- "weight": 41,
+ "weight": 42,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3305,7 +3305,7 @@
},
"x-appwrite": {
"method": "updatePhoneVerification",
- "weight": 42,
+ "weight": 43,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3376,7 +3376,7 @@
},
"x-appwrite": {
"method": "getBrowser",
- "weight": 59,
+ "weight": 60,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3504,7 +3504,7 @@
},
"x-appwrite": {
"method": "getCreditCard",
- "weight": 58,
+ "weight": 59,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3636,7 +3636,7 @@
},
"x-appwrite": {
"method": "getFavicon",
- "weight": 62,
+ "weight": 63,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3696,7 +3696,7 @@
},
"x-appwrite": {
"method": "getFlag",
- "weight": 60,
+ "weight": 61,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4186,7 +4186,7 @@
},
"x-appwrite": {
"method": "getImage",
- "weight": 61,
+ "weight": 62,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4270,7 +4270,7 @@
},
"x-appwrite": {
"method": "getInitials",
- "weight": 64,
+ "weight": 65,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4364,7 +4364,7 @@
},
"x-appwrite": {
"method": "getQR",
- "weight": 63,
+ "weight": 64,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4465,7 +4465,7 @@
},
"x-appwrite": {
"method": "listDocuments",
- "weight": 108,
+ "weight": 109,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4552,7 +4552,7 @@
},
"x-appwrite": {
"method": "createDocument",
- "weight": 107,
+ "weight": 108,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4661,7 +4661,7 @@
},
"x-appwrite": {
"method": "getDocument",
- "weight": 109,
+ "weight": 110,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4758,7 +4758,7 @@
},
"x-appwrite": {
"method": "updateDocument",
- "weight": 111,
+ "weight": 112,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4859,7 +4859,7 @@
},
"x-appwrite": {
"method": "deleteDocument",
- "weight": 112,
+ "weight": 113,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4945,7 +4945,7 @@
},
"x-appwrite": {
"method": "listExecutions",
- "weight": 304,
+ "weight": 306,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5033,7 +5033,7 @@
},
"x-appwrite": {
"method": "createExecution",
- "weight": 303,
+ "weight": 305,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5082,9 +5082,9 @@
"type": "object",
"properties": {
"body": {
- "type": "object",
+ "type": "string",
"description": "HTTP body of execution. Default value is empty string.",
- "x-example": "{}"
+ "x-example": ""
},
"async": {
"type": "boolean",
@@ -5150,7 +5150,7 @@
},
"x-appwrite": {
"method": "getExecution",
- "weight": 305,
+ "weight": 307,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5226,7 +5226,7 @@
},
"x-appwrite": {
"method": "query",
- "weight": 329,
+ "weight": 331,
"cookies": false,
"type": "graphql",
"deprecated": false,
@@ -5280,7 +5280,7 @@
},
"x-appwrite": {
"method": "mutation",
- "weight": 328,
+ "weight": 330,
"cookies": false,
"type": "graphql",
"deprecated": false,
@@ -5334,7 +5334,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 116,
+ "weight": 117,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5388,7 +5388,7 @@
},
"x-appwrite": {
"method": "listCodes",
- "weight": 117,
+ "weight": 118,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5442,7 +5442,7 @@
},
"x-appwrite": {
"method": "listContinents",
- "weight": 121,
+ "weight": 122,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5496,7 +5496,7 @@
},
"x-appwrite": {
"method": "listCountries",
- "weight": 118,
+ "weight": 119,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5550,7 +5550,7 @@
},
"x-appwrite": {
"method": "listCountriesEU",
- "weight": 119,
+ "weight": 120,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5604,7 +5604,7 @@
},
"x-appwrite": {
"method": "listCountriesPhones",
- "weight": 120,
+ "weight": 121,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5658,7 +5658,7 @@
},
"x-appwrite": {
"method": "listCurrencies",
- "weight": 122,
+ "weight": 123,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5712,7 +5712,7 @@
},
"x-appwrite": {
"method": "listLanguages",
- "weight": 123,
+ "weight": 124,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5766,7 +5766,7 @@
},
"x-appwrite": {
"method": "createSubscriber",
- "weight": 380,
+ "weight": 382,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5851,7 +5851,7 @@
},
"x-appwrite": {
"method": "deleteSubscriber",
- "weight": 384,
+ "weight": 386,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5928,7 +5928,7 @@
},
"x-appwrite": {
"method": "listFiles",
- "weight": 206,
+ "weight": 208,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6016,7 +6016,7 @@
},
"x-appwrite": {
"method": "createFile",
- "weight": 205,
+ "weight": 207,
"cookies": false,
"type": "upload",
"deprecated": false,
@@ -6116,7 +6116,7 @@
},
"x-appwrite": {
"method": "getFile",
- "weight": 207,
+ "weight": 209,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6190,7 +6190,7 @@
},
"x-appwrite": {
"method": "updateFile",
- "weight": 212,
+ "weight": 214,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6281,7 +6281,7 @@
},
"x-appwrite": {
"method": "deleteFile",
- "weight": 213,
+ "weight": 215,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6350,7 +6350,7 @@
},
"x-appwrite": {
"method": "getFileDownload",
- "weight": 209,
+ "weight": 211,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -6419,7 +6419,7 @@
},
"x-appwrite": {
"method": "getFilePreview",
- "weight": 208,
+ "weight": 210,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -6610,7 +6610,8 @@
"jpeg",
"gif",
"png",
- "webp"
+ "webp",
+ "avif"
],
"x-enum-name": "ImageFormat",
"x-enum-keys": [],
@@ -6636,7 +6637,7 @@
},
"x-appwrite": {
"method": "getFileView",
- "weight": 210,
+ "weight": 212,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -6712,7 +6713,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 217,
+ "weight": 219,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6790,7 +6791,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 216,
+ "weight": 218,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6877,7 +6878,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 218,
+ "weight": 220,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6941,7 +6942,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 220,
+ "weight": 222,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7017,7 +7018,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 222,
+ "weight": 224,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7068,7 +7069,7 @@
"tags": [
"teams"
],
- "description": "Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint.",
+ "description": "Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint. Hide sensitive attributes from the response by toggling membership privacy in the Console.",
"responses": {
"200": {
"description": "Memberships List",
@@ -7083,7 +7084,7 @@
},
"x-appwrite": {
"method": "listMemberships",
- "weight": 224,
+ "weight": 226,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7171,7 +7172,7 @@
},
"x-appwrite": {
"method": "createMembership",
- "weight": 223,
+ "weight": 225,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7269,7 +7270,7 @@
"tags": [
"teams"
],
- "description": "Get a team member by the membership unique id. All team members have read access for this resource.",
+ "description": "Get a team member by the membership unique id. All team members have read access for this resource. Hide sensitive attributes from the response by toggling membership privacy in the Console.",
"responses": {
"200": {
"description": "Membership",
@@ -7284,7 +7285,7 @@
},
"x-appwrite": {
"method": "getMembership",
- "weight": 225,
+ "weight": 227,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7358,7 +7359,7 @@
},
"x-appwrite": {
"method": "updateMembership",
- "weight": 226,
+ "weight": 228,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7447,7 +7448,7 @@
},
"x-appwrite": {
"method": "deleteMembership",
- "weight": 228,
+ "weight": 230,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7523,7 +7524,7 @@
},
"x-appwrite": {
"method": "updateMembershipStatus",
- "weight": 227,
+ "weight": 229,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7623,7 +7624,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 219,
+ "weight": 221,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7686,7 +7687,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 221,
+ "weight": 223,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9265,12 +9266,12 @@
},
"userName": {
"type": "string",
- "description": "User name.",
+ "description": "User name. Hide this attribute by toggling membership privacy in the Console.",
"x-example": "John Doe"
},
"userEmail": {
"type": "string",
- "description": "User email address.",
+ "description": "User email address. Hide this attribute by toggling membership privacy in the Console.",
"x-example": "john@appwrite.io"
},
"teamId": {
@@ -9300,7 +9301,7 @@
},
"mfa": {
"type": "boolean",
- "description": "Multi factor authentication status, true if the user has MFA enabled or false otherwise.",
+ "description": "Multi factor authentication status, true if the user has MFA enabled or false otherwise. Hide this attribute by toggling membership privacy in the Console.",
"x-example": false
},
"roles": {
@@ -9405,7 +9406,7 @@
"responseBody": {
"type": "string",
"description": "HTTP response body. This will return empty unless execution is created as synchronous.",
- "x-example": "Developers are awesome."
+ "x-example": ""
},
"responseHeaders": {
"type": "array",
@@ -9825,7 +9826,7 @@
"name": {
"type": "string",
"description": "Target Name.",
- "x-example": "Aegon apple token"
+ "x-example": "Apple iPhone 12"
},
"userId": {
"type": "string",
@@ -9847,6 +9848,11 @@
"type": "string",
"description": "The target identifier.",
"x-example": "token"
+ },
+ "expired": {
+ "type": "boolean",
+ "description": "Is the target expired.",
+ "x-example": false
}
},
"required": [
@@ -9856,7 +9862,8 @@
"name",
"userId",
"providerType",
- "identifier"
+ "identifier",
+ "expired"
]
}
},
diff --git a/app/config/specs/open-api3-latest-console.json b/app/config/specs/open-api3-latest-console.json
index e5f1ad6549..fb01509ecd 100644
--- a/app/config/specs/open-api3-latest-console.json
+++ b/app/config/specs/open-api3-latest-console.json
@@ -43,7 +43,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 8,
+ "weight": 9,
"cookies": false,
"type": "",
"deprecated": false,
@@ -93,7 +93,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 7,
+ "weight": 8,
"cookies": false,
"type": "",
"deprecated": false,
@@ -171,7 +171,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 9,
+ "weight": 10,
"cookies": false,
"type": "",
"deprecated": false,
@@ -221,7 +221,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 33,
+ "weight": 34,
"cookies": false,
"type": "",
"deprecated": false,
@@ -298,7 +298,7 @@
},
"x-appwrite": {
"method": "listIdentities",
- "weight": 56,
+ "weight": 57,
"cookies": false,
"type": "",
"deprecated": false,
@@ -358,7 +358,7 @@
},
"x-appwrite": {
"method": "deleteIdentity",
- "weight": 57,
+ "weight": 58,
"cookies": false,
"type": "",
"deprecated": false,
@@ -422,7 +422,7 @@
},
"x-appwrite": {
"method": "createJWT",
- "weight": 28,
+ "weight": 29,
"cookies": false,
"type": "",
"deprecated": false,
@@ -473,7 +473,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 30,
+ "weight": 31,
"cookies": false,
"type": "",
"deprecated": false,
@@ -540,7 +540,7 @@
},
"x-appwrite": {
"method": "updateMFA",
- "weight": 43,
+ "weight": 44,
"cookies": false,
"type": "",
"deprecated": false,
@@ -611,7 +611,7 @@
},
"x-appwrite": {
"method": "createMfaAuthenticator",
- "weight": 45,
+ "weight": 46,
"cookies": false,
"type": "",
"deprecated": false,
@@ -678,7 +678,7 @@
},
"x-appwrite": {
"method": "updateMfaAuthenticator",
- "weight": 46,
+ "weight": 47,
"cookies": false,
"type": "",
"deprecated": false,
@@ -757,7 +757,7 @@
},
"x-appwrite": {
"method": "deleteMfaAuthenticator",
- "weight": 50,
+ "weight": 51,
"cookies": false,
"type": "",
"deprecated": false,
@@ -826,7 +826,7 @@
},
"x-appwrite": {
"method": "createMfaChallenge",
- "weight": 51,
+ "weight": 52,
"cookies": false,
"type": "",
"deprecated": false,
@@ -902,7 +902,7 @@
},
"x-appwrite": {
"method": "updateMfaChallenge",
- "weight": 52,
+ "weight": 53,
"cookies": false,
"type": "",
"deprecated": false,
@@ -979,7 +979,7 @@
},
"x-appwrite": {
"method": "listMfaFactors",
- "weight": 44,
+ "weight": 45,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1031,7 +1031,7 @@
},
"x-appwrite": {
"method": "getMfaRecoveryCodes",
- "weight": 49,
+ "weight": 50,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1081,7 +1081,7 @@
},
"x-appwrite": {
"method": "createMfaRecoveryCodes",
- "weight": 47,
+ "weight": 48,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1131,7 +1131,7 @@
},
"x-appwrite": {
"method": "updateMfaRecoveryCodes",
- "weight": 48,
+ "weight": 49,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1183,7 +1183,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 31,
+ "weight": 32,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1254,7 +1254,7 @@
},
"x-appwrite": {
"method": "updatePassword",
- "weight": 32,
+ "weight": 33,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1330,7 +1330,7 @@
},
"x-appwrite": {
"method": "updatePhone",
- "weight": 34,
+ "weight": 35,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1407,7 +1407,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 29,
+ "weight": 30,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1457,7 +1457,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 35,
+ "weight": 36,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1528,7 +1528,7 @@
},
"x-appwrite": {
"method": "createRecovery",
- "weight": 37,
+ "weight": 38,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1606,7 +1606,7 @@
},
"x-appwrite": {
"method": "updateRecovery",
- "weight": 38,
+ "weight": 39,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1689,7 +1689,7 @@
},
"x-appwrite": {
"method": "listSessions",
- "weight": 10,
+ "weight": 11,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1732,7 +1732,7 @@
},
"x-appwrite": {
"method": "deleteSessions",
- "weight": 11,
+ "weight": 12,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1784,7 +1784,7 @@
},
"x-appwrite": {
"method": "createAnonymousSession",
- "weight": 16,
+ "weight": 17,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1835,7 +1835,7 @@
},
"x-appwrite": {
"method": "createEmailPasswordSession",
- "weight": 15,
+ "weight": 16,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1911,7 +1911,7 @@
},
"x-appwrite": {
"method": "updateMagicURLSession",
- "weight": 25,
+ "weight": 26,
"cookies": false,
"type": "",
"deprecated": true,
@@ -1980,7 +1980,7 @@
},
"x-appwrite": {
"method": "createOAuth2Session",
- "weight": 18,
+ "weight": 19,
"cookies": false,
"type": "webAuth",
"deprecated": false,
@@ -2123,7 +2123,7 @@
},
"x-appwrite": {
"method": "updatePhoneSession",
- "weight": 26,
+ "weight": 27,
"cookies": false,
"type": "",
"deprecated": true,
@@ -2199,7 +2199,7 @@
},
"x-appwrite": {
"method": "createSession",
- "weight": 17,
+ "weight": 18,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2275,7 +2275,7 @@
},
"x-appwrite": {
"method": "getSession",
- "weight": 12,
+ "weight": 13,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2337,7 +2337,7 @@
},
"x-appwrite": {
"method": "updateSession",
- "weight": 14,
+ "weight": 15,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2392,7 +2392,7 @@
},
"x-appwrite": {
"method": "deleteSession",
- "weight": 13,
+ "weight": 14,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2456,7 +2456,7 @@
},
"x-appwrite": {
"method": "updateStatus",
- "weight": 36,
+ "weight": 37,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2508,7 +2508,7 @@
},
"x-appwrite": {
"method": "createPushTarget",
- "weight": 53,
+ "weight": 54,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2588,7 +2588,7 @@
},
"x-appwrite": {
"method": "updatePushTarget",
- "weight": 54,
+ "weight": 55,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2667,7 +2667,7 @@
},
"x-appwrite": {
"method": "deletePushTarget",
- "weight": 55,
+ "weight": 56,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2729,7 +2729,7 @@
},
"x-appwrite": {
"method": "createEmailToken",
- "weight": 24,
+ "weight": 25,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2795,7 +2795,7 @@
"tags": [
"account"
],
- "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour. If you are on a mobile device you can leave the URL parameter empty, so that the login completion will be handled by your Appwrite instance by default.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
+ "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
"responses": {
"201": {
"description": "Token",
@@ -2810,7 +2810,7 @@
},
"x-appwrite": {
"method": "createMagicURLToken",
- "weight": 23,
+ "weight": 24,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2892,7 +2892,7 @@
},
"x-appwrite": {
"method": "createOAuth2Token",
- "weight": 22,
+ "weight": 23,
"cookies": false,
"type": "webAuth",
"deprecated": false,
@@ -3035,7 +3035,7 @@
},
"x-appwrite": {
"method": "createPhoneToken",
- "weight": 27,
+ "weight": 28,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3114,7 +3114,7 @@
},
"x-appwrite": {
"method": "createVerification",
- "weight": 39,
+ "weight": 40,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3183,7 +3183,7 @@
},
"x-appwrite": {
"method": "updateVerification",
- "weight": 40,
+ "weight": 41,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3260,7 +3260,7 @@
},
"x-appwrite": {
"method": "createPhoneVerification",
- "weight": 41,
+ "weight": 42,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3313,7 +3313,7 @@
},
"x-appwrite": {
"method": "updatePhoneVerification",
- "weight": 42,
+ "weight": 43,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3383,7 +3383,7 @@
},
"x-appwrite": {
"method": "getBrowser",
- "weight": 59,
+ "weight": 60,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3511,7 +3511,7 @@
},
"x-appwrite": {
"method": "getCreditCard",
- "weight": 58,
+ "weight": 59,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3643,7 +3643,7 @@
},
"x-appwrite": {
"method": "getFavicon",
- "weight": 62,
+ "weight": 63,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3703,7 +3703,7 @@
},
"x-appwrite": {
"method": "getFlag",
- "weight": 60,
+ "weight": 61,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4193,7 +4193,7 @@
},
"x-appwrite": {
"method": "getImage",
- "weight": 61,
+ "weight": 62,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4277,7 +4277,7 @@
},
"x-appwrite": {
"method": "getInitials",
- "weight": 64,
+ "weight": 65,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4371,7 +4371,7 @@
},
"x-appwrite": {
"method": "getQR",
- "weight": 63,
+ "weight": 64,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4465,7 +4465,7 @@
},
"x-appwrite": {
"method": "chat",
- "weight": 331,
+ "weight": 333,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4534,7 +4534,7 @@
},
"x-appwrite": {
"method": "variables",
- "weight": 330,
+ "weight": 332,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4584,7 +4584,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 69,
+ "weight": 70,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4659,7 +4659,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 68,
+ "weight": 69,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4740,7 +4740,7 @@
},
"x-appwrite": {
"method": "getUsage",
- "weight": 113,
+ "weight": 114,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4814,7 +4814,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 70,
+ "weight": 71,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4875,7 +4875,7 @@
},
"x-appwrite": {
"method": "update",
- "weight": 72,
+ "weight": 73,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4953,7 +4953,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 73,
+ "weight": 74,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5016,7 +5016,7 @@
},
"x-appwrite": {
"method": "listCollections",
- "weight": 75,
+ "weight": 76,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5101,7 +5101,7 @@
},
"x-appwrite": {
"method": "createCollection",
- "weight": 74,
+ "weight": 75,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5207,7 +5207,7 @@
},
"x-appwrite": {
"method": "getCollection",
- "weight": 76,
+ "weight": 77,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5278,7 +5278,7 @@
},
"x-appwrite": {
"method": "updateCollection",
- "weight": 78,
+ "weight": 79,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5379,7 +5379,7 @@
},
"x-appwrite": {
"method": "deleteCollection",
- "weight": 79,
+ "weight": 80,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5452,7 +5452,7 @@
},
"x-appwrite": {
"method": "listAttributes",
- "weight": 90,
+ "weight": 91,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5538,7 +5538,7 @@
},
"x-appwrite": {
"method": "createBooleanAttribute",
- "weight": 87,
+ "weight": 88,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5646,7 +5646,7 @@
},
"x-appwrite": {
"method": "updateBooleanAttribute",
- "weight": 99,
+ "weight": 100,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5759,7 +5759,7 @@
},
"x-appwrite": {
"method": "createDatetimeAttribute",
- "weight": 88,
+ "weight": 89,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5867,7 +5867,7 @@
},
"x-appwrite": {
"method": "updateDatetimeAttribute",
- "weight": 100,
+ "weight": 101,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5980,7 +5980,7 @@
},
"x-appwrite": {
"method": "createEmailAttribute",
- "weight": 81,
+ "weight": 82,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6088,7 +6088,7 @@
},
"x-appwrite": {
"method": "updateEmailAttribute",
- "weight": 93,
+ "weight": 94,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6201,7 +6201,7 @@
},
"x-appwrite": {
"method": "createEnumAttribute",
- "weight": 82,
+ "weight": 83,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6318,7 +6318,7 @@
},
"x-appwrite": {
"method": "updateEnumAttribute",
- "weight": 94,
+ "weight": 95,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6440,7 +6440,7 @@
},
"x-appwrite": {
"method": "createFloatAttribute",
- "weight": 86,
+ "weight": 87,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6558,7 +6558,7 @@
},
"x-appwrite": {
"method": "updateFloatAttribute",
- "weight": 98,
+ "weight": 99,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6683,7 +6683,7 @@
},
"x-appwrite": {
"method": "createIntegerAttribute",
- "weight": 85,
+ "weight": 86,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6801,7 +6801,7 @@
},
"x-appwrite": {
"method": "updateIntegerAttribute",
- "weight": 97,
+ "weight": 98,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6926,7 +6926,7 @@
},
"x-appwrite": {
"method": "createIpAttribute",
- "weight": 83,
+ "weight": 84,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7034,7 +7034,7 @@
},
"x-appwrite": {
"method": "updateIpAttribute",
- "weight": 95,
+ "weight": 96,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7147,7 +7147,7 @@
},
"x-appwrite": {
"method": "createRelationshipAttribute",
- "weight": 89,
+ "weight": 90,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7280,7 +7280,7 @@
},
"x-appwrite": {
"method": "createStringAttribute",
- "weight": 80,
+ "weight": 81,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7399,7 +7399,7 @@
},
"x-appwrite": {
"method": "updateStringAttribute",
- "weight": 92,
+ "weight": 93,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7477,7 +7477,7 @@
"size": {
"type": "integer",
"description": "Maximum size of the string attribute.",
- "x-example": null
+ "x-example": 1
},
"newKey": {
"type": "string",
@@ -7517,7 +7517,7 @@
},
"x-appwrite": {
"method": "createUrlAttribute",
- "weight": 84,
+ "weight": 85,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7625,7 +7625,7 @@
},
"x-appwrite": {
"method": "updateUrlAttribute",
- "weight": 96,
+ "weight": 97,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7769,7 +7769,7 @@
},
"x-appwrite": {
"method": "getAttribute",
- "weight": 91,
+ "weight": 92,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7842,7 +7842,7 @@
},
"x-appwrite": {
"method": "deleteAttribute",
- "weight": 102,
+ "weight": 103,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7924,7 +7924,7 @@
},
"x-appwrite": {
"method": "updateRelationshipAttribute",
- "weight": 101,
+ "weight": 102,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8034,7 +8034,7 @@
},
"x-appwrite": {
"method": "listDocuments",
- "weight": 108,
+ "weight": 109,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8121,7 +8121,7 @@
},
"x-appwrite": {
"method": "createDocument",
- "weight": 107,
+ "weight": 108,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8230,7 +8230,7 @@
},
"x-appwrite": {
"method": "getDocument",
- "weight": 109,
+ "weight": 110,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8327,7 +8327,7 @@
},
"x-appwrite": {
"method": "updateDocument",
- "weight": 111,
+ "weight": 112,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8428,7 +8428,7 @@
},
"x-appwrite": {
"method": "deleteDocument",
- "weight": 112,
+ "weight": 113,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8514,7 +8514,7 @@
},
"x-appwrite": {
"method": "listDocumentLogs",
- "weight": 110,
+ "weight": 111,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8609,7 +8609,7 @@
},
"x-appwrite": {
"method": "listIndexes",
- "weight": 104,
+ "weight": 105,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8693,7 +8693,7 @@
},
"x-appwrite": {
"method": "createIndex",
- "weight": 103,
+ "weight": 104,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8815,7 +8815,7 @@
},
"x-appwrite": {
"method": "getIndex",
- "weight": 105,
+ "weight": 106,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8888,7 +8888,7 @@
},
"x-appwrite": {
"method": "deleteIndex",
- "weight": 106,
+ "weight": 107,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8970,7 +8970,7 @@
},
"x-appwrite": {
"method": "listCollectionLogs",
- "weight": 77,
+ "weight": 78,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9055,7 +9055,7 @@
},
"x-appwrite": {
"method": "getCollectionUsage",
- "weight": 115,
+ "weight": 116,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9149,7 +9149,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 71,
+ "weight": 72,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9224,7 +9224,7 @@
},
"x-appwrite": {
"method": "getDatabaseUsage",
- "weight": 114,
+ "weight": 115,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9308,7 +9308,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 287,
+ "weight": 289,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9383,7 +9383,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 286,
+ "weight": 288,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9437,6 +9437,7 @@
"node-19.0",
"node-20.0",
"node-21.0",
+ "node-22",
"php-8.0",
"php-8.1",
"php-8.2",
@@ -9455,6 +9456,8 @@
"deno-1.24",
"deno-1.35",
"deno-1.40",
+ "deno-1.46",
+ "deno-2.0",
"dart-2.15",
"dart-2.16",
"dart-2.17",
@@ -9462,24 +9465,30 @@
"dart-3.0",
"dart-3.1",
"dart-3.3",
- "dotnet-3.1",
+ "dart-3.5",
"dotnet-6.0",
"dotnet-7.0",
+ "dotnet-8.0",
"java-8.0",
"java-11.0",
"java-17.0",
"java-18.0",
"java-21.0",
+ "java-22",
"swift-5.5",
"swift-5.8",
"swift-5.9",
+ "swift-5.10",
"kotlin-1.6",
"kotlin-1.8",
"kotlin-1.9",
+ "kotlin-2.0",
"cpp-17",
"cpp-20",
"bun-1.0",
- "go-1.23"
+ "bun-1.1",
+ "go-1.23",
+ "static-1"
],
"x-enum-name": null,
"x-enum-keys": []
@@ -9622,7 +9631,7 @@
},
"x-appwrite": {
"method": "listRuntimes",
- "weight": 288,
+ "weight": 290,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9673,7 +9682,7 @@
},
"x-appwrite": {
"method": "listSpecifications",
- "weight": 289,
+ "weight": 291,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9725,7 +9734,7 @@
},
"x-appwrite": {
"method": "listTemplates",
- "weight": 312,
+ "weight": 314,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9827,7 +9836,7 @@
},
"x-appwrite": {
"method": "getTemplate",
- "weight": 313,
+ "weight": 315,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9889,7 +9898,7 @@
},
"x-appwrite": {
"method": "getUsage",
- "weight": 292,
+ "weight": 294,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9963,7 +9972,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 290,
+ "weight": 292,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10024,7 +10033,7 @@
},
"x-appwrite": {
"method": "update",
- "weight": 293,
+ "weight": 295,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10085,6 +10094,7 @@
"node-19.0",
"node-20.0",
"node-21.0",
+ "node-22",
"php-8.0",
"php-8.1",
"php-8.2",
@@ -10103,6 +10113,8 @@
"deno-1.24",
"deno-1.35",
"deno-1.40",
+ "deno-1.46",
+ "deno-2.0",
"dart-2.15",
"dart-2.16",
"dart-2.17",
@@ -10110,24 +10122,30 @@
"dart-3.0",
"dart-3.1",
"dart-3.3",
- "dotnet-3.1",
+ "dart-3.5",
"dotnet-6.0",
"dotnet-7.0",
+ "dotnet-8.0",
"java-8.0",
"java-11.0",
"java-17.0",
"java-18.0",
"java-21.0",
+ "java-22",
"swift-5.5",
"swift-5.8",
"swift-5.9",
+ "swift-5.10",
"kotlin-1.6",
"kotlin-1.8",
"kotlin-1.9",
+ "kotlin-2.0",
"cpp-17",
"cpp-20",
"bun-1.0",
- "go-1.23"
+ "bun-1.1",
+ "go-1.23",
+ "static-1"
],
"x-enum-name": null,
"x-enum-keys": []
@@ -10240,7 +10258,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 296,
+ "weight": 298,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10303,7 +10321,7 @@
},
"x-appwrite": {
"method": "listDeployments",
- "weight": 298,
+ "weight": 300,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10388,7 +10406,7 @@
},
"x-appwrite": {
"method": "createDeployment",
- "weight": 297,
+ "weight": 299,
"cookies": false,
"type": "upload",
"deprecated": false,
@@ -10486,7 +10504,7 @@
},
"x-appwrite": {
"method": "getDeployment",
- "weight": 299,
+ "weight": 301,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10557,7 +10575,7 @@
},
"x-appwrite": {
"method": "updateDeployment",
- "weight": 295,
+ "weight": 297,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10621,7 +10639,7 @@
},
"x-appwrite": {
"method": "deleteDeployment",
- "weight": 300,
+ "weight": 302,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10687,7 +10705,7 @@
},
"x-appwrite": {
"method": "createBuild",
- "weight": 301,
+ "weight": 303,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10774,7 +10792,7 @@
},
"x-appwrite": {
"method": "updateDeploymentBuild",
- "weight": 302,
+ "weight": 304,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10840,7 +10858,7 @@
},
"x-appwrite": {
"method": "getDeploymentDownload",
- "weight": 294,
+ "weight": 296,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -10915,7 +10933,7 @@
},
"x-appwrite": {
"method": "listExecutions",
- "weight": 304,
+ "weight": 306,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11003,7 +11021,7 @@
},
"x-appwrite": {
"method": "createExecution",
- "weight": 303,
+ "weight": 305,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11052,9 +11070,9 @@
"type": "object",
"properties": {
"body": {
- "type": "object",
+ "type": "string",
"description": "HTTP body of execution. Default value is empty string.",
- "x-example": "{}"
+ "x-example": ""
},
"async": {
"type": "boolean",
@@ -11120,7 +11138,7 @@
},
"x-appwrite": {
"method": "getExecution",
- "weight": 305,
+ "weight": 307,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11187,7 +11205,7 @@
},
"x-appwrite": {
"method": "deleteExecution",
- "weight": 306,
+ "weight": 308,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11260,7 +11278,7 @@
},
"x-appwrite": {
"method": "getFunctionUsage",
- "weight": 291,
+ "weight": 293,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11344,7 +11362,7 @@
},
"x-appwrite": {
"method": "listVariables",
- "weight": 308,
+ "weight": 310,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11405,7 +11423,7 @@
},
"x-appwrite": {
"method": "createVariable",
- "weight": 307,
+ "weight": 309,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11493,7 +11511,7 @@
},
"x-appwrite": {
"method": "getVariable",
- "weight": 309,
+ "weight": 311,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11564,7 +11582,7 @@
},
"x-appwrite": {
"method": "updateVariable",
- "weight": 310,
+ "weight": 312,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11652,7 +11670,7 @@
},
"x-appwrite": {
"method": "deleteVariable",
- "weight": 311,
+ "weight": 313,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11725,7 +11743,7 @@
},
"x-appwrite": {
"method": "query",
- "weight": 329,
+ "weight": 331,
"cookies": false,
"type": "graphql",
"deprecated": false,
@@ -11779,7 +11797,7 @@
},
"x-appwrite": {
"method": "mutation",
- "weight": 328,
+ "weight": 330,
"cookies": false,
"type": "graphql",
"deprecated": false,
@@ -11833,7 +11851,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 124,
+ "weight": 125,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11884,7 +11902,7 @@
},
"x-appwrite": {
"method": "getAntivirus",
- "weight": 146,
+ "weight": 147,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11935,7 +11953,7 @@
},
"x-appwrite": {
"method": "getCache",
- "weight": 127,
+ "weight": 128,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11986,7 +12004,7 @@
},
"x-appwrite": {
"method": "getCertificate",
- "weight": 133,
+ "weight": 134,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12048,7 +12066,7 @@
},
"x-appwrite": {
"method": "getDB",
- "weight": 126,
+ "weight": 127,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12099,7 +12117,7 @@
},
"x-appwrite": {
"method": "getPubSub",
- "weight": 129,
+ "weight": 130,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12150,7 +12168,7 @@
},
"x-appwrite": {
"method": "getQueue",
- "weight": 128,
+ "weight": 129,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12201,7 +12219,7 @@
},
"x-appwrite": {
"method": "getQueueBuilds",
- "weight": 135,
+ "weight": 136,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12265,7 +12283,7 @@
},
"x-appwrite": {
"method": "getQueueCertificates",
- "weight": 134,
+ "weight": 135,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12329,7 +12347,7 @@
},
"x-appwrite": {
"method": "getQueueDatabases",
- "weight": 136,
+ "weight": 137,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12404,7 +12422,7 @@
},
"x-appwrite": {
"method": "getQueueDeletes",
- "weight": 137,
+ "weight": 138,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12468,7 +12486,7 @@
},
"x-appwrite": {
"method": "getFailedJobs",
- "weight": 147,
+ "weight": 148,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12558,7 +12576,7 @@
},
"x-appwrite": {
"method": "getQueueFunctions",
- "weight": 141,
+ "weight": 142,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12622,7 +12640,7 @@
},
"x-appwrite": {
"method": "getQueueLogs",
- "weight": 132,
+ "weight": 133,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12686,7 +12704,7 @@
},
"x-appwrite": {
"method": "getQueueMails",
- "weight": 138,
+ "weight": 139,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12750,7 +12768,7 @@
},
"x-appwrite": {
"method": "getQueueMessaging",
- "weight": 139,
+ "weight": 140,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12814,7 +12832,7 @@
},
"x-appwrite": {
"method": "getQueueMigrations",
- "weight": 140,
+ "weight": 141,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12878,7 +12896,7 @@
},
"x-appwrite": {
"method": "getQueueUsage",
- "weight": 142,
+ "weight": 143,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12942,7 +12960,7 @@
},
"x-appwrite": {
"method": "getQueueUsageDump",
- "weight": 143,
+ "weight": 144,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13006,7 +13024,7 @@
},
"x-appwrite": {
"method": "getQueueWebhooks",
- "weight": 131,
+ "weight": 132,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13070,7 +13088,7 @@
},
"x-appwrite": {
"method": "getStorage",
- "weight": 145,
+ "weight": 146,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13121,7 +13139,7 @@
},
"x-appwrite": {
"method": "getStorageLocal",
- "weight": 144,
+ "weight": 145,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13172,7 +13190,7 @@
},
"x-appwrite": {
"method": "getTime",
- "weight": 130,
+ "weight": 131,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13223,7 +13241,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 116,
+ "weight": 117,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13277,7 +13295,7 @@
},
"x-appwrite": {
"method": "listCodes",
- "weight": 117,
+ "weight": 118,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13331,7 +13349,7 @@
},
"x-appwrite": {
"method": "listContinents",
- "weight": 121,
+ "weight": 122,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13385,7 +13403,7 @@
},
"x-appwrite": {
"method": "listCountries",
- "weight": 118,
+ "weight": 119,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13439,7 +13457,7 @@
},
"x-appwrite": {
"method": "listCountriesEU",
- "weight": 119,
+ "weight": 120,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13493,7 +13511,7 @@
},
"x-appwrite": {
"method": "listCountriesPhones",
- "weight": 120,
+ "weight": 121,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13547,7 +13565,7 @@
},
"x-appwrite": {
"method": "listCurrencies",
- "weight": 122,
+ "weight": 123,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13601,7 +13619,7 @@
},
"x-appwrite": {
"method": "listLanguages",
- "weight": 123,
+ "weight": 124,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13655,7 +13673,7 @@
},
"x-appwrite": {
"method": "listMessages",
- "weight": 388,
+ "weight": 390,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13733,7 +13751,7 @@
},
"x-appwrite": {
"method": "createEmail",
- "weight": 385,
+ "weight": 387,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13879,7 +13897,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 392,
+ "weight": 394,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14027,7 +14045,7 @@
},
"x-appwrite": {
"method": "createPush",
- "weight": 387,
+ "weight": 389,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14184,7 +14202,7 @@
},
"x-appwrite": {
"method": "updatePush",
- "weight": 394,
+ "weight": 396,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14343,7 +14361,7 @@
},
"x-appwrite": {
"method": "createSms",
- "weight": 386,
+ "weight": 388,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14454,7 +14472,7 @@
},
"x-appwrite": {
"method": "updateSms",
- "weight": 393,
+ "weight": 395,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14568,7 +14586,7 @@
},
"x-appwrite": {
"method": "getMessage",
- "weight": 391,
+ "weight": 393,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14623,7 +14641,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 395,
+ "weight": 397,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14687,7 +14705,7 @@
},
"x-appwrite": {
"method": "listMessageLogs",
- "weight": 389,
+ "weight": 391,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14764,7 +14782,7 @@
},
"x-appwrite": {
"method": "listTargets",
- "weight": 390,
+ "weight": 392,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14841,7 +14859,7 @@
},
"x-appwrite": {
"method": "listProviders",
- "weight": 360,
+ "weight": 362,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14919,7 +14937,7 @@
},
"x-appwrite": {
"method": "createApnsProvider",
- "weight": 359,
+ "weight": 361,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15026,7 +15044,7 @@
},
"x-appwrite": {
"method": "updateApnsProvider",
- "weight": 372,
+ "weight": 374,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15136,7 +15154,7 @@
},
"x-appwrite": {
"method": "createFcmProvider",
- "weight": 358,
+ "weight": 360,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15223,7 +15241,7 @@
},
"x-appwrite": {
"method": "updateFcmProvider",
- "weight": 371,
+ "weight": 373,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15313,7 +15331,7 @@
},
"x-appwrite": {
"method": "createMailgunProvider",
- "weight": 350,
+ "weight": 352,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15430,7 +15448,7 @@
},
"x-appwrite": {
"method": "updateMailgunProvider",
- "weight": 363,
+ "weight": 365,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15550,7 +15568,7 @@
},
"x-appwrite": {
"method": "createMsg91Provider",
- "weight": 353,
+ "weight": 355,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15647,7 +15665,7 @@
},
"x-appwrite": {
"method": "updateMsg91Provider",
- "weight": 366,
+ "weight": 368,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15747,7 +15765,7 @@
},
"x-appwrite": {
"method": "createSendgridProvider",
- "weight": 351,
+ "weight": 353,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15854,7 +15872,7 @@
},
"x-appwrite": {
"method": "updateSendgridProvider",
- "weight": 364,
+ "weight": 366,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15964,7 +15982,7 @@
},
"x-appwrite": {
"method": "createSmtpProvider",
- "weight": 352,
+ "weight": 354,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16109,7 +16127,7 @@
},
"x-appwrite": {
"method": "updateSmtpProvider",
- "weight": 365,
+ "weight": 367,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16256,7 +16274,7 @@
},
"x-appwrite": {
"method": "createTelesignProvider",
- "weight": 354,
+ "weight": 356,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16353,7 +16371,7 @@
},
"x-appwrite": {
"method": "updateTelesignProvider",
- "weight": 367,
+ "weight": 369,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16453,7 +16471,7 @@
},
"x-appwrite": {
"method": "createTextmagicProvider",
- "weight": 355,
+ "weight": 357,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16550,7 +16568,7 @@
},
"x-appwrite": {
"method": "updateTextmagicProvider",
- "weight": 368,
+ "weight": 370,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16650,7 +16668,7 @@
},
"x-appwrite": {
"method": "createTwilioProvider",
- "weight": 356,
+ "weight": 358,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16747,7 +16765,7 @@
},
"x-appwrite": {
"method": "updateTwilioProvider",
- "weight": 369,
+ "weight": 371,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16847,7 +16865,7 @@
},
"x-appwrite": {
"method": "createVonageProvider",
- "weight": 357,
+ "weight": 359,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16944,7 +16962,7 @@
},
"x-appwrite": {
"method": "updateVonageProvider",
- "weight": 370,
+ "weight": 372,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17044,7 +17062,7 @@
},
"x-appwrite": {
"method": "getProvider",
- "weight": 362,
+ "weight": 364,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17099,7 +17117,7 @@
},
"x-appwrite": {
"method": "deleteProvider",
- "weight": 373,
+ "weight": 375,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17163,7 +17181,7 @@
},
"x-appwrite": {
"method": "listProviderLogs",
- "weight": 361,
+ "weight": 363,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17240,7 +17258,7 @@
},
"x-appwrite": {
"method": "listSubscriberLogs",
- "weight": 382,
+ "weight": 384,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17317,7 +17335,7 @@
},
"x-appwrite": {
"method": "listTopics",
- "weight": 375,
+ "weight": 377,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17393,7 +17411,7 @@
},
"x-appwrite": {
"method": "createTopic",
- "weight": 374,
+ "weight": 376,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17478,7 +17496,7 @@
},
"x-appwrite": {
"method": "getTopic",
- "weight": 377,
+ "weight": 379,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17540,7 +17558,7 @@
},
"x-appwrite": {
"method": "updateTopic",
- "weight": 378,
+ "weight": 380,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17619,7 +17637,7 @@
},
"x-appwrite": {
"method": "deleteTopic",
- "weight": 379,
+ "weight": 381,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17683,7 +17701,7 @@
},
"x-appwrite": {
"method": "listTopicLogs",
- "weight": 376,
+ "weight": 378,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17760,7 +17778,7 @@
},
"x-appwrite": {
"method": "listSubscribers",
- "weight": 381,
+ "weight": 383,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17846,7 +17864,7 @@
},
"x-appwrite": {
"method": "createSubscriber",
- "weight": 380,
+ "weight": 382,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17938,7 +17956,7 @@
},
"x-appwrite": {
"method": "getSubscriber",
- "weight": 383,
+ "weight": 385,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18003,7 +18021,7 @@
},
"x-appwrite": {
"method": "deleteSubscriber",
- "weight": 384,
+ "weight": 386,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18080,7 +18098,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 337,
+ "weight": 339,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18109,7 +18127,7 @@
"parameters": [
{
"name": "queries",
- "description": "Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https:\/\/appwrite.io\/docs\/databases#querying-documents). Maximum of 100 queries are allowed, each 4096 characters long. You may filter on the following attributes: status, stage, source, resources, statusCounters, resourceData, errors",
+ "description": "Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https:\/\/appwrite.io\/docs\/databases#querying-documents). Maximum of 100 queries are allowed, each 4096 characters long. You may filter on the following attributes: status, stage, source, destination, resources, statusCounters, resourceData, errors",
"required": false,
"schema": {
"type": "array",
@@ -18156,7 +18174,7 @@
},
"x-appwrite": {
"method": "createAppwriteMigration",
- "weight": 332,
+ "weight": 334,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18246,7 +18264,7 @@
},
"x-appwrite": {
"method": "getAppwriteReport",
- "weight": 339,
+ "weight": 341,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18341,7 +18359,7 @@
},
"x-appwrite": {
"method": "createFirebaseMigration",
- "weight": 334,
+ "weight": 336,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18412,7 +18430,7 @@
},
"x-appwrite": {
"method": "deleteFirebaseAuth",
- "weight": 345,
+ "weight": 347,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18462,7 +18480,7 @@
},
"x-appwrite": {
"method": "createFirebaseOAuthMigration",
- "weight": 333,
+ "weight": 335,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18540,7 +18558,7 @@
},
"x-appwrite": {
"method": "listFirebaseProjects",
- "weight": 344,
+ "weight": 346,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18590,7 +18608,7 @@
},
"x-appwrite": {
"method": "getFirebaseReport",
- "weight": 340,
+ "weight": 342,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18664,7 +18682,7 @@
},
"x-appwrite": {
"method": "getFirebaseReportOAuth",
- "weight": 341,
+ "weight": 343,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18738,7 +18756,7 @@
},
"x-appwrite": {
"method": "createNHostMigration",
- "weight": 336,
+ "weight": 338,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18851,7 +18869,7 @@
},
"x-appwrite": {
"method": "getNHostReport",
- "weight": 347,
+ "weight": 349,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18986,7 +19004,7 @@
},
"x-appwrite": {
"method": "createSupabaseMigration",
- "weight": 335,
+ "weight": 337,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19093,7 +19111,7 @@
},
"x-appwrite": {
"method": "getSupabaseReport",
- "weight": 346,
+ "weight": 348,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19219,7 +19237,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 338,
+ "weight": 340,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19279,7 +19297,7 @@
},
"x-appwrite": {
"method": "retry",
- "weight": 348,
+ "weight": 350,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19332,7 +19350,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 349,
+ "weight": 351,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19394,7 +19412,7 @@
},
"x-appwrite": {
"method": "getUsage",
- "weight": 194,
+ "weight": 196,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19484,7 +19502,7 @@
},
"x-appwrite": {
"method": "listVariables",
- "weight": 196,
+ "weight": 198,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19532,7 +19550,7 @@
},
"x-appwrite": {
"method": "createVariable",
- "weight": 195,
+ "weight": 197,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19607,7 +19625,7 @@
},
"x-appwrite": {
"method": "getVariable",
- "weight": 197,
+ "weight": 199,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19667,7 +19685,7 @@
},
"x-appwrite": {
"method": "updateVariable",
- "weight": 198,
+ "weight": 200,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19744,7 +19762,7 @@
},
"x-appwrite": {
"method": "deleteVariable",
- "weight": 199,
+ "weight": 201,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19806,7 +19824,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 150,
+ "weight": 151,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19880,7 +19898,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 149,
+ "weight": 150,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20017,7 +20035,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 151,
+ "weight": 152,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20077,7 +20095,7 @@
},
"x-appwrite": {
"method": "update",
- "weight": 152,
+ "weight": 153,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20194,7 +20212,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 168,
+ "weight": 170,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20256,7 +20274,7 @@
},
"x-appwrite": {
"method": "updateApiStatus",
- "weight": 156,
+ "weight": 157,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20350,7 +20368,7 @@
},
"x-appwrite": {
"method": "updateApiStatusAll",
- "weight": 157,
+ "weight": 158,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20431,7 +20449,7 @@
},
"x-appwrite": {
"method": "updateAuthDuration",
- "weight": 161,
+ "weight": 163,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20512,7 +20530,7 @@
},
"x-appwrite": {
"method": "updateAuthLimit",
- "weight": 160,
+ "weight": 162,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20593,7 +20611,7 @@
},
"x-appwrite": {
"method": "updateAuthSessionsLimit",
- "weight": 166,
+ "weight": 168,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20652,6 +20670,99 @@
}
}
},
+ "\/projects\/{projectId}\/auth\/memberships-privacy": {
+ "patch": {
+ "summary": "Update project memberships privacy attributes",
+ "operationId": "projectsUpdateMembershipsPrivacy",
+ "tags": [
+ "projects"
+ ],
+ "description": "",
+ "responses": {
+ "200": {
+ "description": "Project",
+ "content": {
+ "application\/json": {
+ "schema": {
+ "$ref": "#\/components\/schemas\/project"
+ }
+ }
+ }
+ }
+ },
+ "x-appwrite": {
+ "method": "updateMembershipsPrivacy",
+ "weight": 161,
+ "cookies": false,
+ "type": "",
+ "deprecated": false,
+ "demo": "projects\/update-memberships-privacy.md",
+ "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master",
+ "rate-limit": 0,
+ "rate-time": 3600,
+ "rate-key": "url:{url},ip:{ip}",
+ "scope": "projects.write",
+ "platforms": [
+ "console"
+ ],
+ "packaging": false,
+ "offline-model": "",
+ "offline-key": "",
+ "offline-response-key": "$id",
+ "auth": {
+ "Project": []
+ }
+ },
+ "security": [
+ {
+ "Project": []
+ }
+ ],
+ "parameters": [
+ {
+ "name": "projectId",
+ "description": "Project unique ID.",
+ "required": true,
+ "schema": {
+ "type": "string",
+ "x-example": ""
+ },
+ "in": "path"
+ }
+ ],
+ "requestBody": {
+ "content": {
+ "application\/json": {
+ "schema": {
+ "type": "object",
+ "properties": {
+ "userName": {
+ "type": "boolean",
+ "description": "Set to true to show userName to members of a team.",
+ "x-example": false
+ },
+ "userEmail": {
+ "type": "boolean",
+ "description": "Set to true to show email to members of a team.",
+ "x-example": false
+ },
+ "mfa": {
+ "type": "boolean",
+ "description": "Set to true to show mfa to members of a team.",
+ "x-example": false
+ }
+ },
+ "required": [
+ "userName",
+ "userEmail",
+ "mfa"
+ ]
+ }
+ }
+ }
+ }
+ }
+ },
"\/projects\/{projectId}\/auth\/mock-numbers": {
"patch": {
"summary": "Update the mock numbers for the project",
@@ -20674,7 +20785,7 @@
},
"x-appwrite": {
"method": "updateMockNumbers",
- "weight": 167,
+ "weight": 169,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20758,7 +20869,7 @@
},
"x-appwrite": {
"method": "updateAuthPasswordDictionary",
- "weight": 164,
+ "weight": 166,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20839,7 +20950,7 @@
},
"x-appwrite": {
"method": "updateAuthPasswordHistory",
- "weight": 163,
+ "weight": 165,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20920,7 +21031,7 @@
},
"x-appwrite": {
"method": "updatePersonalDataCheck",
- "weight": 165,
+ "weight": 167,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21001,7 +21112,7 @@
},
"x-appwrite": {
"method": "updateSessionAlerts",
- "weight": 159,
+ "weight": 160,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21082,7 +21193,7 @@
},
"x-appwrite": {
"method": "updateAuthStatus",
- "weight": 162,
+ "weight": 164,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21184,7 +21295,7 @@
},
"x-appwrite": {
"method": "createJWT",
- "weight": 180,
+ "weight": 182,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21273,7 +21384,7 @@
},
"x-appwrite": {
"method": "listKeys",
- "weight": 176,
+ "weight": 178,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21282,7 +21393,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.read",
+ "scope": "keys.read",
"platforms": [
"console"
],
@@ -21333,7 +21444,7 @@
},
"x-appwrite": {
"method": "createKey",
- "weight": 175,
+ "weight": 177,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21342,7 +21453,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.write",
+ "scope": "keys.write",
"platforms": [
"console"
],
@@ -21428,7 +21539,7 @@
},
"x-appwrite": {
"method": "getKey",
- "weight": 177,
+ "weight": 179,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21437,7 +21548,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.read",
+ "scope": "keys.read",
"platforms": [
"console"
],
@@ -21498,7 +21609,7 @@
},
"x-appwrite": {
"method": "updateKey",
- "weight": 178,
+ "weight": 180,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21507,7 +21618,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.write",
+ "scope": "keys.write",
"platforms": [
"console"
],
@@ -21594,7 +21705,7 @@
},
"x-appwrite": {
"method": "deleteKey",
- "weight": 179,
+ "weight": 181,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21603,7 +21714,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.write",
+ "scope": "keys.write",
"platforms": [
"console"
],
@@ -21666,7 +21777,7 @@
},
"x-appwrite": {
"method": "updateOAuth2",
- "weight": 158,
+ "weight": 159,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21805,7 +21916,7 @@
},
"x-appwrite": {
"method": "listPlatforms",
- "weight": 182,
+ "weight": 184,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21814,7 +21925,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.read",
+ "scope": "platforms.read",
"platforms": [
"console"
],
@@ -21865,7 +21976,7 @@
},
"x-appwrite": {
"method": "createPlatform",
- "weight": 181,
+ "weight": 183,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21874,7 +21985,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.write",
+ "scope": "platforms.write",
"platforms": [
"console"
],
@@ -21986,7 +22097,7 @@
},
"x-appwrite": {
"method": "getPlatform",
- "weight": 183,
+ "weight": 185,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21995,7 +22106,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.read",
+ "scope": "platforms.read",
"platforms": [
"console"
],
@@ -22056,7 +22167,7 @@
},
"x-appwrite": {
"method": "updatePlatform",
- "weight": 184,
+ "weight": 186,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22065,7 +22176,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.write",
+ "scope": "platforms.write",
"platforms": [
"console"
],
@@ -22153,7 +22264,7 @@
},
"x-appwrite": {
"method": "deletePlatform",
- "weight": 185,
+ "weight": 187,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22162,7 +22273,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.write",
+ "scope": "platforms.write",
"platforms": [
"console"
],
@@ -22225,7 +22336,7 @@
},
"x-appwrite": {
"method": "updateServiceStatus",
- "weight": 154,
+ "weight": 155,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22327,7 +22438,7 @@
},
"x-appwrite": {
"method": "updateServiceStatusAll",
- "weight": 155,
+ "weight": 156,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22408,7 +22519,7 @@
},
"x-appwrite": {
"method": "updateSmtp",
- "weight": 186,
+ "weight": 188,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22528,7 +22639,7 @@
},
"x-appwrite": {
"method": "createSmtpTest",
- "weight": 187,
+ "weight": 189,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22620,7 +22731,8 @@
"description": "Does SMTP server use secure connection",
"x-example": "tls",
"enum": [
- "tls"
+ "tls",
+ "ssl"
],
"x-enum-name": "SMTPSecure",
"x-enum-keys": []
@@ -22660,7 +22772,7 @@
},
"x-appwrite": {
"method": "updateTeam",
- "weight": 153,
+ "weight": 154,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22741,7 +22853,7 @@
},
"x-appwrite": {
"method": "getEmailTemplate",
- "weight": 189,
+ "weight": 191,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22967,7 +23079,7 @@
},
"x-appwrite": {
"method": "updateEmailTemplate",
- "weight": 191,
+ "weight": 193,
"cookies": false,
"type": "",
"deprecated": false,
@@ -23233,7 +23345,7 @@
},
"x-appwrite": {
"method": "deleteEmailTemplate",
- "weight": 193,
+ "weight": 195,
"cookies": false,
"type": "",
"deprecated": false,
@@ -23461,7 +23573,7 @@
},
"x-appwrite": {
"method": "getSmsTemplate",
- "weight": 188,
+ "weight": 190,
"cookies": false,
"type": "",
"deprecated": false,
@@ -23684,7 +23796,7 @@
},
"x-appwrite": {
"method": "updateSmsTemplate",
- "weight": 190,
+ "weight": 192,
"cookies": false,
"type": "",
"deprecated": false,
@@ -23926,7 +24038,7 @@
},
"x-appwrite": {
"method": "deleteSmsTemplate",
- "weight": 192,
+ "weight": 194,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24151,7 +24263,7 @@
},
"x-appwrite": {
"method": "listWebhooks",
- "weight": 170,
+ "weight": 172,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24211,7 +24323,7 @@
},
"x-appwrite": {
"method": "createWebhook",
- "weight": 169,
+ "weight": 171,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24328,7 +24440,7 @@
},
"x-appwrite": {
"method": "getWebhook",
- "weight": 171,
+ "weight": 173,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24398,7 +24510,7 @@
},
"x-appwrite": {
"method": "updateWebhook",
- "weight": 172,
+ "weight": 174,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24516,7 +24628,7 @@
},
"x-appwrite": {
"method": "deleteWebhook",
- "weight": 174,
+ "weight": 176,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24588,7 +24700,7 @@
},
"x-appwrite": {
"method": "updateWebhookSignature",
- "weight": 173,
+ "weight": 175,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24660,7 +24772,7 @@
},
"x-appwrite": {
"method": "listRules",
- "weight": 315,
+ "weight": 317,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24734,7 +24846,7 @@
},
"x-appwrite": {
"method": "createRule",
- "weight": 314,
+ "weight": 316,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24820,7 +24932,7 @@
},
"x-appwrite": {
"method": "getRule",
- "weight": 316,
+ "weight": 318,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24873,7 +24985,7 @@
},
"x-appwrite": {
"method": "deleteRule",
- "weight": 317,
+ "weight": 319,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24935,7 +25047,7 @@
},
"x-appwrite": {
"method": "updateRuleVerification",
- "weight": 318,
+ "weight": 320,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24997,7 +25109,7 @@
},
"x-appwrite": {
"method": "listBuckets",
- "weight": 201,
+ "weight": 203,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25072,7 +25184,7 @@
},
"x-appwrite": {
"method": "createBucket",
- "weight": 200,
+ "weight": 202,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25201,7 +25313,7 @@
},
"x-appwrite": {
"method": "getBucket",
- "weight": 202,
+ "weight": 204,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25262,7 +25374,7 @@
},
"x-appwrite": {
"method": "updateBucket",
- "weight": 203,
+ "weight": 205,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25388,7 +25500,7 @@
},
"x-appwrite": {
"method": "deleteBucket",
- "weight": 204,
+ "weight": 206,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25451,7 +25563,7 @@
},
"x-appwrite": {
"method": "listFiles",
- "weight": 206,
+ "weight": 208,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25539,7 +25651,7 @@
},
"x-appwrite": {
"method": "createFile",
- "weight": 205,
+ "weight": 207,
"cookies": false,
"type": "upload",
"deprecated": false,
@@ -25639,7 +25751,7 @@
},
"x-appwrite": {
"method": "getFile",
- "weight": 207,
+ "weight": 209,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25713,7 +25825,7 @@
},
"x-appwrite": {
"method": "updateFile",
- "weight": 212,
+ "weight": 214,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25804,7 +25916,7 @@
},
"x-appwrite": {
"method": "deleteFile",
- "weight": 213,
+ "weight": 215,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25873,7 +25985,7 @@
},
"x-appwrite": {
"method": "getFileDownload",
- "weight": 209,
+ "weight": 211,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -25942,7 +26054,7 @@
},
"x-appwrite": {
"method": "getFilePreview",
- "weight": 208,
+ "weight": 210,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -26133,7 +26245,8 @@
"jpeg",
"gif",
"png",
- "webp"
+ "webp",
+ "avif"
],
"x-enum-name": "ImageFormat",
"x-enum-keys": [],
@@ -26159,7 +26272,7 @@
},
"x-appwrite": {
"method": "getFileView",
- "weight": 210,
+ "weight": 212,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -26235,7 +26348,7 @@
},
"x-appwrite": {
"method": "getUsage",
- "weight": 214,
+ "weight": 216,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26309,7 +26422,7 @@
},
"x-appwrite": {
"method": "getBucketUsage",
- "weight": 215,
+ "weight": 217,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26393,7 +26506,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 217,
+ "weight": 219,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26471,7 +26584,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 216,
+ "weight": 218,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26558,7 +26671,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 218,
+ "weight": 220,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26622,7 +26735,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 220,
+ "weight": 222,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26698,7 +26811,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 222,
+ "weight": 224,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26764,7 +26877,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 229,
+ "weight": 231,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26824,7 +26937,7 @@
"tags": [
"teams"
],
- "description": "Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint.",
+ "description": "Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint. Hide sensitive attributes from the response by toggling membership privacy in the Console.",
"responses": {
"200": {
"description": "Memberships List",
@@ -26839,7 +26952,7 @@
},
"x-appwrite": {
"method": "listMemberships",
- "weight": 224,
+ "weight": 226,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26927,7 +27040,7 @@
},
"x-appwrite": {
"method": "createMembership",
- "weight": 223,
+ "weight": 225,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27025,7 +27138,7 @@
"tags": [
"teams"
],
- "description": "Get a team member by the membership unique id. All team members have read access for this resource.",
+ "description": "Get a team member by the membership unique id. All team members have read access for this resource. Hide sensitive attributes from the response by toggling membership privacy in the Console.",
"responses": {
"200": {
"description": "Membership",
@@ -27040,7 +27153,7 @@
},
"x-appwrite": {
"method": "getMembership",
- "weight": 225,
+ "weight": 227,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27114,7 +27227,7 @@
},
"x-appwrite": {
"method": "updateMembership",
- "weight": 226,
+ "weight": 228,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27203,7 +27316,7 @@
},
"x-appwrite": {
"method": "deleteMembership",
- "weight": 228,
+ "weight": 230,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27279,7 +27392,7 @@
},
"x-appwrite": {
"method": "updateMembershipStatus",
- "weight": 227,
+ "weight": 229,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27378,7 +27491,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 219,
+ "weight": 221,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27440,7 +27553,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 221,
+ "weight": 223,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27523,7 +27636,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 239,
+ "weight": 241,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27598,7 +27711,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 230,
+ "weight": 232,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27688,7 +27801,7 @@
},
"x-appwrite": {
"method": "createArgon2User",
- "weight": 233,
+ "weight": 235,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27775,7 +27888,7 @@
},
"x-appwrite": {
"method": "createBcryptUser",
- "weight": 231,
+ "weight": 233,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27862,7 +27975,7 @@
},
"x-appwrite": {
"method": "listIdentities",
- "weight": 247,
+ "weight": 249,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27932,7 +28045,7 @@
},
"x-appwrite": {
"method": "deleteIdentity",
- "weight": 270,
+ "weight": 272,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27995,7 +28108,7 @@
},
"x-appwrite": {
"method": "createMD5User",
- "weight": 232,
+ "weight": 234,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28082,7 +28195,7 @@
},
"x-appwrite": {
"method": "createPHPassUser",
- "weight": 235,
+ "weight": 237,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28169,7 +28282,7 @@
},
"x-appwrite": {
"method": "createScryptUser",
- "weight": 236,
+ "weight": 238,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28286,7 +28399,7 @@
},
"x-appwrite": {
"method": "createScryptModifiedUser",
- "weight": 237,
+ "weight": 239,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28391,7 +28504,7 @@
},
"x-appwrite": {
"method": "createSHAUser",
- "weight": 234,
+ "weight": 236,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28498,7 +28611,7 @@
},
"x-appwrite": {
"method": "getUsage",
- "weight": 272,
+ "weight": 274,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28572,7 +28685,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 240,
+ "weight": 242,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28626,7 +28739,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 268,
+ "weight": 270,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28689,7 +28802,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 253,
+ "weight": 255,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28771,7 +28884,7 @@
},
"x-appwrite": {
"method": "createJWT",
- "weight": 271,
+ "weight": 273,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28855,7 +28968,7 @@
},
"x-appwrite": {
"method": "updateLabels",
- "weight": 249,
+ "weight": 251,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28940,7 +29053,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 245,
+ "weight": 247,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29016,7 +29129,7 @@
},
"x-appwrite": {
"method": "listMemberships",
- "weight": 244,
+ "weight": 246,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29079,7 +29192,7 @@
},
"x-appwrite": {
"method": "updateMfa",
- "weight": 258,
+ "weight": 260,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29161,7 +29274,7 @@
},
"x-appwrite": {
"method": "deleteMfaAuthenticator",
- "weight": 263,
+ "weight": 265,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29239,7 +29352,7 @@
},
"x-appwrite": {
"method": "listMfaFactors",
- "weight": 259,
+ "weight": 261,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29302,7 +29415,7 @@
},
"x-appwrite": {
"method": "getMfaRecoveryCodes",
- "weight": 260,
+ "weight": 262,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29363,7 +29476,7 @@
},
"x-appwrite": {
"method": "updateMfaRecoveryCodes",
- "weight": 262,
+ "weight": 264,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29424,7 +29537,7 @@
},
"x-appwrite": {
"method": "createMfaRecoveryCodes",
- "weight": 261,
+ "weight": 263,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29487,7 +29600,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 251,
+ "weight": 253,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29569,7 +29682,7 @@
},
"x-appwrite": {
"method": "updatePassword",
- "weight": 252,
+ "weight": 254,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29651,7 +29764,7 @@
},
"x-appwrite": {
"method": "updatePhone",
- "weight": 254,
+ "weight": 256,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29733,7 +29846,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 241,
+ "weight": 243,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29794,7 +29907,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 256,
+ "weight": 258,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29876,7 +29989,7 @@
},
"x-appwrite": {
"method": "listSessions",
- "weight": 243,
+ "weight": 245,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29937,7 +30050,7 @@
},
"x-appwrite": {
"method": "createSession",
- "weight": 264,
+ "weight": 266,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29991,7 +30104,7 @@
},
"x-appwrite": {
"method": "deleteSessions",
- "weight": 267,
+ "weight": 269,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30047,7 +30160,7 @@
},
"x-appwrite": {
"method": "deleteSession",
- "weight": 266,
+ "weight": 268,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30120,7 +30233,7 @@
},
"x-appwrite": {
"method": "updateStatus",
- "weight": 248,
+ "weight": 250,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30202,7 +30315,7 @@
},
"x-appwrite": {
"method": "listTargets",
- "weight": 246,
+ "weight": 248,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30277,7 +30390,7 @@
},
"x-appwrite": {
"method": "createTarget",
- "weight": 238,
+ "weight": 240,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30389,7 +30502,7 @@
},
"x-appwrite": {
"method": "getTarget",
- "weight": 242,
+ "weight": 244,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30461,7 +30574,7 @@
},
"x-appwrite": {
"method": "updateTarget",
- "weight": 257,
+ "weight": 259,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30552,7 +30665,7 @@
},
"x-appwrite": {
"method": "deleteTarget",
- "weight": 269,
+ "weight": 271,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30626,7 +30739,7 @@
},
"x-appwrite": {
"method": "createToken",
- "weight": 265,
+ "weight": 267,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30710,7 +30823,7 @@
},
"x-appwrite": {
"method": "updateEmailVerification",
- "weight": 255,
+ "weight": 257,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30792,7 +30905,7 @@
},
"x-appwrite": {
"method": "updatePhoneVerification",
- "weight": 250,
+ "weight": 252,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30874,7 +30987,7 @@
},
"x-appwrite": {
"method": "listRepositories",
- "weight": 277,
+ "weight": 279,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30945,7 +31058,7 @@
},
"x-appwrite": {
"method": "createRepository",
- "weight": 278,
+ "weight": 280,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31032,7 +31145,7 @@
},
"x-appwrite": {
"method": "getRepository",
- "weight": 279,
+ "weight": 281,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31104,7 +31217,7 @@
},
"x-appwrite": {
"method": "listRepositoryBranches",
- "weight": 280,
+ "weight": 282,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31176,7 +31289,7 @@
},
"x-appwrite": {
"method": "getRepositoryContents",
- "weight": 275,
+ "weight": 277,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31259,7 +31372,7 @@
},
"x-appwrite": {
"method": "createRepositoryDetection",
- "weight": 276,
+ "weight": 278,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31340,7 +31453,7 @@
},
"x-appwrite": {
"method": "updateExternalDeployments",
- "weight": 285,
+ "weight": 287,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31431,7 +31544,7 @@
},
"x-appwrite": {
"method": "listInstallations",
- "weight": 282,
+ "weight": 284,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31507,7 +31620,7 @@
},
"x-appwrite": {
"method": "getInstallation",
- "weight": 283,
+ "weight": 285,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31560,7 +31673,7 @@
},
"x-appwrite": {
"method": "deleteInstallation",
- "weight": 284,
+ "weight": 286,
"cookies": false,
"type": "",
"deprecated": false,
@@ -32946,6 +33059,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"size": {
"type": "integer",
"description": "Attribute size.",
@@ -32965,6 +33088,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"size"
]
},
@@ -33003,6 +33128,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"min": {
"type": "integer",
"description": "Minimum value to enforce for new documents.",
@@ -33030,7 +33165,9 @@
"type",
"status",
"error",
- "required"
+ "required",
+ "$createdAt",
+ "$updatedAt"
]
},
"attributeFloat": {
@@ -33068,6 +33205,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"min": {
"type": "number",
"description": "Minimum value to enforce for new documents.",
@@ -33095,7 +33242,9 @@
"type",
"status",
"error",
- "required"
+ "required",
+ "$createdAt",
+ "$updatedAt"
]
},
"attributeBoolean": {
@@ -33133,6 +33282,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"default": {
"type": "boolean",
"description": "Default value for attribute when not provided. Cannot be set when attribute is required.",
@@ -33145,7 +33304,9 @@
"type",
"status",
"error",
- "required"
+ "required",
+ "$createdAt",
+ "$updatedAt"
]
},
"attributeEmail": {
@@ -33183,6 +33344,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "String format.",
@@ -33201,6 +33372,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -33239,6 +33412,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"elements": {
"type": "array",
"description": "Array of elements in enumerated type.",
@@ -33265,6 +33448,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"elements",
"format"
]
@@ -33304,6 +33489,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "String format.",
@@ -33322,6 +33517,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -33360,6 +33557,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "String format.",
@@ -33378,6 +33585,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -33416,6 +33625,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "ISO 8601 format.",
@@ -33434,6 +33653,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -33472,6 +33693,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"relatedCollection": {
"type": "string",
"description": "The ID of the related collection.",
@@ -33509,6 +33740,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"relatedCollection",
"relationType",
"twoWay",
@@ -33557,6 +33790,16 @@
},
"x-example": [],
"nullable": true
+ },
+ "$createdAt": {
+ "type": "string",
+ "description": "Index creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Index update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
}
},
"required": [
@@ -33564,7 +33807,9 @@
"type",
"status",
"error",
- "attributes"
+ "attributes",
+ "$createdAt",
+ "$updatedAt"
]
},
"document": {
@@ -34716,12 +34961,12 @@
},
"userName": {
"type": "string",
- "description": "User name.",
+ "description": "User name. Hide this attribute by toggling membership privacy in the Console.",
"x-example": "John Doe"
},
"userEmail": {
"type": "string",
- "description": "User email address.",
+ "description": "User email address. Hide this attribute by toggling membership privacy in the Console.",
"x-example": "john@appwrite.io"
},
"teamId": {
@@ -34751,7 +34996,7 @@
},
"mfa": {
"type": "boolean",
- "description": "Multi factor authentication status, true if the user has MFA enabled or false otherwise.",
+ "description": "Multi factor authentication status, true if the user has MFA enabled or false otherwise. Hide this attribute by toggling membership privacy in the Console.",
"x-example": false
},
"roles": {
@@ -34916,7 +35161,7 @@
"specification": {
"type": "string",
"description": "Machine specification for builds and executions.",
- "x-example": "s-0.5vcpu-512mb"
+ "x-example": "s-1vcpu-512mb"
}
},
"required": [
@@ -35589,7 +35834,7 @@
"responseBody": {
"type": "string",
"description": "HTTP response body. This will return empty unless execution is created as synchronous.",
- "x-example": "Developers are awesome."
+ "x-example": ""
},
"responseHeaders": {
"type": "array",
@@ -35832,6 +36077,21 @@
"description": "Whether or not to send session alert emails to users.",
"x-example": true
},
+ "authMembershipsUserName": {
+ "type": "boolean",
+ "description": "Whether or not to show user names in the teams membership response.",
+ "x-example": true
+ },
+ "authMembershipsUserEmail": {
+ "type": "boolean",
+ "description": "Whether or not to show user emails in the teams membership response.",
+ "x-example": true
+ },
+ "authMembershipsMfa": {
+ "type": "boolean",
+ "description": "Whether or not to show user MFA status in the teams membership response.",
+ "x-example": true
+ },
"oAuthProviders": {
"type": "array",
"description": "List of Auth Providers.",
@@ -35912,6 +36172,17 @@
"description": "SMTP server secure protocol",
"x-example": "tls"
},
+ "pingCount": {
+ "type": "integer",
+ "description": "Number of times the ping was received for this project.",
+ "x-example": 1,
+ "format": "int32"
+ },
+ "pingedAt": {
+ "type": "string",
+ "description": "Last ping datetime in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"authEmailPassword": {
"type": "boolean",
"description": "Email\/Password auth method status",
@@ -36026,6 +36297,9 @@
"authPersonalDataCheck",
"authMockNumbers",
"authSessionAlerts",
+ "authMembershipsUserName",
+ "authMembershipsUserEmail",
+ "authMembershipsMfa",
"oAuthProviders",
"platforms",
"webhooks",
@@ -36039,6 +36313,8 @@
"smtpUsername",
"smtpPassword",
"smtpSecure",
+ "pingCount",
+ "pingedAt",
"authEmailPassword",
"authUsersAuthMagicURL",
"authEmailOtp",
@@ -36747,6 +37023,12 @@
"x-example": 0,
"format": "int32"
},
+ "storageTotal": {
+ "type": "integer",
+ "description": "Total aggregated number of total databases storage in bytes.",
+ "x-example": 0,
+ "format": "int32"
+ },
"databases": {
"type": "array",
"description": "Aggregated number of databases per period.",
@@ -36770,6 +37052,14 @@
"$ref": "#\/components\/schemas\/metric"
},
"x-example": []
+ },
+ "storage": {
+ "type": "array",
+ "description": "An array of the aggregated number of databases storage in bytes per period.",
+ "items": {
+ "$ref": "#\/components\/schemas\/metric"
+ },
+ "x-example": []
}
},
"required": [
@@ -36777,9 +37067,11 @@
"databasesTotal",
"collectionsTotal",
"documentsTotal",
+ "storageTotal",
"databases",
"collections",
- "documents"
+ "documents",
+ "storage"
]
},
"usageDatabase": {
@@ -36803,6 +37095,12 @@
"x-example": 0,
"format": "int32"
},
+ "storageTotal": {
+ "type": "integer",
+ "description": "Total aggregated number of total storage used in bytes.",
+ "x-example": 0,
+ "format": "int32"
+ },
"collections": {
"type": "array",
"description": "Aggregated number of collections per period.",
@@ -36818,14 +37116,24 @@
"$ref": "#\/components\/schemas\/metric"
},
"x-example": []
+ },
+ "storage": {
+ "type": "array",
+ "description": "Aggregated storage used in bytes per period.",
+ "items": {
+ "$ref": "#\/components\/schemas\/metric"
+ },
+ "x-example": []
}
},
"required": [
"range",
"collectionsTotal",
"documentsTotal",
+ "storageTotal",
"collections",
- "documents"
+ "documents",
+ "storage"
]
},
"usageCollection": {
@@ -37366,6 +37674,12 @@
"x-example": 0,
"format": "int32"
},
+ "databasesStorageTotal": {
+ "type": "integer",
+ "description": "Total aggregated sum of databases storage size (in bytes).",
+ "x-example": 0,
+ "format": "int32"
+ },
"usersTotal": {
"type": "integer",
"description": "Total aggregated number of users.",
@@ -37462,6 +37776,14 @@
},
"x-example": []
},
+ "databasesStorageBreakdown": {
+ "type": "array",
+ "description": "An array of the aggregated breakdown of storage usage by databases.",
+ "items": {
+ "$ref": "#\/components\/schemas\/metricBreakdown"
+ },
+ "x-example": []
+ },
"executionsMbSecondsBreakdown": {
"type": "array",
"description": "Aggregated breakdown in totals of execution mbSeconds by functions.",
@@ -37491,6 +37813,7 @@
"executionsTotal",
"documentsTotal",
"databasesTotal",
+ "databasesStorageTotal",
"usersTotal",
"filesStorageTotal",
"functionsStorageTotal",
@@ -37505,6 +37828,7 @@
"executions",
"executionsBreakdown",
"bucketsBreakdown",
+ "databasesStorageBreakdown",
"executionsMbSecondsBreakdown",
"buildsMbSecondsBreakdown",
"functionsStorageBreakdown"
@@ -37554,7 +37878,7 @@
"slug": {
"type": "string",
"description": "Size slug.",
- "x-example": "s-0.5vcpu-512mb"
+ "x-example": "s-1vcpu-512mb"
}
},
"required": [
@@ -38192,7 +38516,7 @@
"name": {
"type": "string",
"description": "Target Name.",
- "x-example": "Aegon apple token"
+ "x-example": "Apple iPhone 12"
},
"userId": {
"type": "string",
@@ -38214,6 +38538,11 @@
"type": "string",
"description": "The target identifier.",
"x-example": "token"
+ },
+ "expired": {
+ "type": "boolean",
+ "description": "Is the target expired.",
+ "x-example": false
}
},
"required": [
@@ -38223,7 +38552,8 @@
"name",
"userId",
"providerType",
- "identifier"
+ "identifier",
+ "expired"
]
},
"migration": {
@@ -38237,7 +38567,7 @@
},
"$createdAt": {
"type": "string",
- "description": "Variable creation date in ISO 8601 format.",
+ "description": "Migration creation date in ISO 8601 format.",
"x-example": "2020-10-15T06:38:00.000+00:00"
},
"$updatedAt": {
@@ -38260,9 +38590,14 @@
"description": "A string containing the type of source of the migration.",
"x-example": "Appwrite"
},
+ "destination": {
+ "type": "string",
+ "description": "A string containing the type of destination of the migration.",
+ "x-example": "Appwrite"
+ },
"resources": {
"type": "array",
- "description": "Resources to migration.",
+ "description": "Resources to migrate.",
"items": {
"type": "string"
},
@@ -38296,6 +38631,7 @@
"status",
"stage",
"source",
+ "destination",
"resources",
"statusCounters",
"resourceData",
diff --git a/app/config/specs/open-api3-latest-server.json b/app/config/specs/open-api3-latest-server.json
index 6bb83643ed..1504322456 100644
--- a/app/config/specs/open-api3-latest-server.json
+++ b/app/config/specs/open-api3-latest-server.json
@@ -43,7 +43,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 8,
+ "weight": 9,
"cookies": false,
"type": "",
"deprecated": false,
@@ -95,7 +95,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 7,
+ "weight": 8,
"cookies": false,
"type": "",
"deprecated": false,
@@ -182,7 +182,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 33,
+ "weight": 34,
"cookies": false,
"type": "",
"deprecated": false,
@@ -261,7 +261,7 @@
},
"x-appwrite": {
"method": "listIdentities",
- "weight": 56,
+ "weight": 57,
"cookies": false,
"type": "",
"deprecated": false,
@@ -323,7 +323,7 @@
},
"x-appwrite": {
"method": "deleteIdentity",
- "weight": 57,
+ "weight": 58,
"cookies": false,
"type": "",
"deprecated": false,
@@ -389,7 +389,7 @@
},
"x-appwrite": {
"method": "createJWT",
- "weight": 28,
+ "weight": 29,
"cookies": false,
"type": "",
"deprecated": false,
@@ -440,7 +440,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 30,
+ "weight": 31,
"cookies": false,
"type": "",
"deprecated": false,
@@ -509,7 +509,7 @@
},
"x-appwrite": {
"method": "updateMFA",
- "weight": 43,
+ "weight": 44,
"cookies": false,
"type": "",
"deprecated": false,
@@ -582,7 +582,7 @@
},
"x-appwrite": {
"method": "createMfaAuthenticator",
- "weight": 45,
+ "weight": 46,
"cookies": false,
"type": "",
"deprecated": false,
@@ -651,7 +651,7 @@
},
"x-appwrite": {
"method": "updateMfaAuthenticator",
- "weight": 46,
+ "weight": 47,
"cookies": false,
"type": "",
"deprecated": false,
@@ -732,7 +732,7 @@
},
"x-appwrite": {
"method": "deleteMfaAuthenticator",
- "weight": 50,
+ "weight": 51,
"cookies": false,
"type": "",
"deprecated": false,
@@ -803,7 +803,7 @@
},
"x-appwrite": {
"method": "createMfaChallenge",
- "weight": 51,
+ "weight": 52,
"cookies": false,
"type": "",
"deprecated": false,
@@ -879,7 +879,7 @@
},
"x-appwrite": {
"method": "updateMfaChallenge",
- "weight": 52,
+ "weight": 53,
"cookies": false,
"type": "",
"deprecated": false,
@@ -958,7 +958,7 @@
},
"x-appwrite": {
"method": "listMfaFactors",
- "weight": 44,
+ "weight": 45,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1012,7 +1012,7 @@
},
"x-appwrite": {
"method": "getMfaRecoveryCodes",
- "weight": 49,
+ "weight": 50,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1064,7 +1064,7 @@
},
"x-appwrite": {
"method": "createMfaRecoveryCodes",
- "weight": 47,
+ "weight": 48,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1116,7 +1116,7 @@
},
"x-appwrite": {
"method": "updateMfaRecoveryCodes",
- "weight": 48,
+ "weight": 49,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1170,7 +1170,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 31,
+ "weight": 32,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1243,7 +1243,7 @@
},
"x-appwrite": {
"method": "updatePassword",
- "weight": 32,
+ "weight": 33,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1321,7 +1321,7 @@
},
"x-appwrite": {
"method": "updatePhone",
- "weight": 34,
+ "weight": 35,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1400,7 +1400,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 29,
+ "weight": 30,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1452,7 +1452,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 35,
+ "weight": 36,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1525,7 +1525,7 @@
},
"x-appwrite": {
"method": "createRecovery",
- "weight": 37,
+ "weight": 38,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1605,7 +1605,7 @@
},
"x-appwrite": {
"method": "updateRecovery",
- "weight": 38,
+ "weight": 39,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1690,7 +1690,7 @@
},
"x-appwrite": {
"method": "listSessions",
- "weight": 10,
+ "weight": 11,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1735,7 +1735,7 @@
},
"x-appwrite": {
"method": "deleteSessions",
- "weight": 11,
+ "weight": 12,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1789,7 +1789,7 @@
},
"x-appwrite": {
"method": "createAnonymousSession",
- "weight": 16,
+ "weight": 17,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1840,7 +1840,7 @@
},
"x-appwrite": {
"method": "createEmailPasswordSession",
- "weight": 15,
+ "weight": 16,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1916,7 +1916,7 @@
},
"x-appwrite": {
"method": "updateMagicURLSession",
- "weight": 25,
+ "weight": 26,
"cookies": false,
"type": "",
"deprecated": true,
@@ -1992,7 +1992,7 @@
},
"x-appwrite": {
"method": "updatePhoneSession",
- "weight": 26,
+ "weight": 27,
"cookies": false,
"type": "",
"deprecated": true,
@@ -2068,7 +2068,7 @@
},
"x-appwrite": {
"method": "createSession",
- "weight": 17,
+ "weight": 18,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2144,7 +2144,7 @@
},
"x-appwrite": {
"method": "getSession",
- "weight": 12,
+ "weight": 13,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2208,7 +2208,7 @@
},
"x-appwrite": {
"method": "updateSession",
- "weight": 14,
+ "weight": 15,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2265,7 +2265,7 @@
},
"x-appwrite": {
"method": "deleteSession",
- "weight": 13,
+ "weight": 14,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2331,7 +2331,7 @@
},
"x-appwrite": {
"method": "updateStatus",
- "weight": 36,
+ "weight": 37,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2385,7 +2385,7 @@
},
"x-appwrite": {
"method": "createEmailToken",
- "weight": 24,
+ "weight": 25,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2451,7 +2451,7 @@
"tags": [
"account"
],
- "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour. If you are on a mobile device you can leave the URL parameter empty, so that the login completion will be handled by your Appwrite instance by default.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
+ "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
"responses": {
"201": {
"description": "Token",
@@ -2466,7 +2466,7 @@
},
"x-appwrite": {
"method": "createMagicURLToken",
- "weight": 23,
+ "weight": 24,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2548,7 +2548,7 @@
},
"x-appwrite": {
"method": "createOAuth2Token",
- "weight": 22,
+ "weight": 23,
"cookies": false,
"type": "webAuth",
"deprecated": false,
@@ -2691,7 +2691,7 @@
},
"x-appwrite": {
"method": "createPhoneToken",
- "weight": 27,
+ "weight": 28,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2770,7 +2770,7 @@
},
"x-appwrite": {
"method": "createVerification",
- "weight": 39,
+ "weight": 40,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2841,7 +2841,7 @@
},
"x-appwrite": {
"method": "updateVerification",
- "weight": 40,
+ "weight": 41,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2920,7 +2920,7 @@
},
"x-appwrite": {
"method": "createPhoneVerification",
- "weight": 41,
+ "weight": 42,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2975,7 +2975,7 @@
},
"x-appwrite": {
"method": "updatePhoneVerification",
- "weight": 42,
+ "weight": 43,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3047,7 +3047,7 @@
},
"x-appwrite": {
"method": "getBrowser",
- "weight": 59,
+ "weight": 60,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3177,7 +3177,7 @@
},
"x-appwrite": {
"method": "getCreditCard",
- "weight": 58,
+ "weight": 59,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3311,7 +3311,7 @@
},
"x-appwrite": {
"method": "getFavicon",
- "weight": 62,
+ "weight": 63,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3373,7 +3373,7 @@
},
"x-appwrite": {
"method": "getFlag",
- "weight": 60,
+ "weight": 61,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3865,7 +3865,7 @@
},
"x-appwrite": {
"method": "getImage",
- "weight": 61,
+ "weight": 62,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3951,7 +3951,7 @@
},
"x-appwrite": {
"method": "getInitials",
- "weight": 64,
+ "weight": 65,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4047,7 +4047,7 @@
},
"x-appwrite": {
"method": "getQR",
- "weight": 63,
+ "weight": 64,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4150,7 +4150,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 69,
+ "weight": 70,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4226,7 +4226,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 68,
+ "weight": 69,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4308,7 +4308,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 70,
+ "weight": 71,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4370,7 +4370,7 @@
},
"x-appwrite": {
"method": "update",
- "weight": 72,
+ "weight": 73,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4449,7 +4449,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 73,
+ "weight": 74,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4513,7 +4513,7 @@
},
"x-appwrite": {
"method": "listCollections",
- "weight": 75,
+ "weight": 76,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4599,7 +4599,7 @@
},
"x-appwrite": {
"method": "createCollection",
- "weight": 74,
+ "weight": 75,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4706,7 +4706,7 @@
},
"x-appwrite": {
"method": "getCollection",
- "weight": 76,
+ "weight": 77,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4778,7 +4778,7 @@
},
"x-appwrite": {
"method": "updateCollection",
- "weight": 78,
+ "weight": 79,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4880,7 +4880,7 @@
},
"x-appwrite": {
"method": "deleteCollection",
- "weight": 79,
+ "weight": 80,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4954,7 +4954,7 @@
},
"x-appwrite": {
"method": "listAttributes",
- "weight": 90,
+ "weight": 91,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5041,7 +5041,7 @@
},
"x-appwrite": {
"method": "createBooleanAttribute",
- "weight": 87,
+ "weight": 88,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5150,7 +5150,7 @@
},
"x-appwrite": {
"method": "updateBooleanAttribute",
- "weight": 99,
+ "weight": 100,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5264,7 +5264,7 @@
},
"x-appwrite": {
"method": "createDatetimeAttribute",
- "weight": 88,
+ "weight": 89,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5373,7 +5373,7 @@
},
"x-appwrite": {
"method": "updateDatetimeAttribute",
- "weight": 100,
+ "weight": 101,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5487,7 +5487,7 @@
},
"x-appwrite": {
"method": "createEmailAttribute",
- "weight": 81,
+ "weight": 82,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5596,7 +5596,7 @@
},
"x-appwrite": {
"method": "updateEmailAttribute",
- "weight": 93,
+ "weight": 94,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5710,7 +5710,7 @@
},
"x-appwrite": {
"method": "createEnumAttribute",
- "weight": 82,
+ "weight": 83,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5828,7 +5828,7 @@
},
"x-appwrite": {
"method": "updateEnumAttribute",
- "weight": 94,
+ "weight": 95,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5951,7 +5951,7 @@
},
"x-appwrite": {
"method": "createFloatAttribute",
- "weight": 86,
+ "weight": 87,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6070,7 +6070,7 @@
},
"x-appwrite": {
"method": "updateFloatAttribute",
- "weight": 98,
+ "weight": 99,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6196,7 +6196,7 @@
},
"x-appwrite": {
"method": "createIntegerAttribute",
- "weight": 85,
+ "weight": 86,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6315,7 +6315,7 @@
},
"x-appwrite": {
"method": "updateIntegerAttribute",
- "weight": 97,
+ "weight": 98,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6441,7 +6441,7 @@
},
"x-appwrite": {
"method": "createIpAttribute",
- "weight": 83,
+ "weight": 84,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6550,7 +6550,7 @@
},
"x-appwrite": {
"method": "updateIpAttribute",
- "weight": 95,
+ "weight": 96,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6664,7 +6664,7 @@
},
"x-appwrite": {
"method": "createRelationshipAttribute",
- "weight": 89,
+ "weight": 90,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6798,7 +6798,7 @@
},
"x-appwrite": {
"method": "createStringAttribute",
- "weight": 80,
+ "weight": 81,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6918,7 +6918,7 @@
},
"x-appwrite": {
"method": "updateStringAttribute",
- "weight": 92,
+ "weight": 93,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6997,7 +6997,7 @@
"size": {
"type": "integer",
"description": "Maximum size of the string attribute.",
- "x-example": null
+ "x-example": 1
},
"newKey": {
"type": "string",
@@ -7037,7 +7037,7 @@
},
"x-appwrite": {
"method": "createUrlAttribute",
- "weight": 84,
+ "weight": 85,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7146,7 +7146,7 @@
},
"x-appwrite": {
"method": "updateUrlAttribute",
- "weight": 96,
+ "weight": 97,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7291,7 +7291,7 @@
},
"x-appwrite": {
"method": "getAttribute",
- "weight": 91,
+ "weight": 92,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7365,7 +7365,7 @@
},
"x-appwrite": {
"method": "deleteAttribute",
- "weight": 102,
+ "weight": 103,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7448,7 +7448,7 @@
},
"x-appwrite": {
"method": "updateRelationshipAttribute",
- "weight": 101,
+ "weight": 102,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7559,7 +7559,7 @@
},
"x-appwrite": {
"method": "listDocuments",
- "weight": 108,
+ "weight": 109,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7648,7 +7648,7 @@
},
"x-appwrite": {
"method": "createDocument",
- "weight": 107,
+ "weight": 108,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7759,7 +7759,7 @@
},
"x-appwrite": {
"method": "getDocument",
- "weight": 109,
+ "weight": 110,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7858,7 +7858,7 @@
},
"x-appwrite": {
"method": "updateDocument",
- "weight": 111,
+ "weight": 112,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7961,7 +7961,7 @@
},
"x-appwrite": {
"method": "deleteDocument",
- "weight": 112,
+ "weight": 113,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8049,7 +8049,7 @@
},
"x-appwrite": {
"method": "listIndexes",
- "weight": 104,
+ "weight": 105,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8134,7 +8134,7 @@
},
"x-appwrite": {
"method": "createIndex",
- "weight": 103,
+ "weight": 104,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8257,7 +8257,7 @@
},
"x-appwrite": {
"method": "getIndex",
- "weight": 105,
+ "weight": 106,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8331,7 +8331,7 @@
},
"x-appwrite": {
"method": "deleteIndex",
- "weight": 106,
+ "weight": 107,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8414,7 +8414,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 287,
+ "weight": 289,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8490,7 +8490,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 286,
+ "weight": 288,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8545,6 +8545,7 @@
"node-19.0",
"node-20.0",
"node-21.0",
+ "node-22",
"php-8.0",
"php-8.1",
"php-8.2",
@@ -8563,6 +8564,8 @@
"deno-1.24",
"deno-1.35",
"deno-1.40",
+ "deno-1.46",
+ "deno-2.0",
"dart-2.15",
"dart-2.16",
"dart-2.17",
@@ -8570,24 +8573,30 @@
"dart-3.0",
"dart-3.1",
"dart-3.3",
- "dotnet-3.1",
+ "dart-3.5",
"dotnet-6.0",
"dotnet-7.0",
+ "dotnet-8.0",
"java-8.0",
"java-11.0",
"java-17.0",
"java-18.0",
"java-21.0",
+ "java-22",
"swift-5.5",
"swift-5.8",
"swift-5.9",
+ "swift-5.10",
"kotlin-1.6",
"kotlin-1.8",
"kotlin-1.9",
+ "kotlin-2.0",
"cpp-17",
"cpp-20",
"bun-1.0",
- "go-1.23"
+ "bun-1.1",
+ "go-1.23",
+ "static-1"
],
"x-enum-name": null,
"x-enum-keys": []
@@ -8730,7 +8739,7 @@
},
"x-appwrite": {
"method": "listRuntimes",
- "weight": 288,
+ "weight": 290,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8782,7 +8791,7 @@
},
"x-appwrite": {
"method": "listSpecifications",
- "weight": 289,
+ "weight": 291,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8835,7 +8844,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 290,
+ "weight": 292,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8897,7 +8906,7 @@
},
"x-appwrite": {
"method": "update",
- "weight": 293,
+ "weight": 295,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8959,6 +8968,7 @@
"node-19.0",
"node-20.0",
"node-21.0",
+ "node-22",
"php-8.0",
"php-8.1",
"php-8.2",
@@ -8977,6 +8987,8 @@
"deno-1.24",
"deno-1.35",
"deno-1.40",
+ "deno-1.46",
+ "deno-2.0",
"dart-2.15",
"dart-2.16",
"dart-2.17",
@@ -8984,24 +8996,30 @@
"dart-3.0",
"dart-3.1",
"dart-3.3",
- "dotnet-3.1",
+ "dart-3.5",
"dotnet-6.0",
"dotnet-7.0",
+ "dotnet-8.0",
"java-8.0",
"java-11.0",
"java-17.0",
"java-18.0",
"java-21.0",
+ "java-22",
"swift-5.5",
"swift-5.8",
"swift-5.9",
+ "swift-5.10",
"kotlin-1.6",
"kotlin-1.8",
"kotlin-1.9",
+ "kotlin-2.0",
"cpp-17",
"cpp-20",
"bun-1.0",
- "go-1.23"
+ "bun-1.1",
+ "go-1.23",
+ "static-1"
],
"x-enum-name": null,
"x-enum-keys": []
@@ -9114,7 +9132,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 296,
+ "weight": 298,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9178,7 +9196,7 @@
},
"x-appwrite": {
"method": "listDeployments",
- "weight": 298,
+ "weight": 300,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9264,7 +9282,7 @@
},
"x-appwrite": {
"method": "createDeployment",
- "weight": 297,
+ "weight": 299,
"cookies": false,
"type": "upload",
"deprecated": false,
@@ -9363,7 +9381,7 @@
},
"x-appwrite": {
"method": "getDeployment",
- "weight": 299,
+ "weight": 301,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9435,7 +9453,7 @@
},
"x-appwrite": {
"method": "updateDeployment",
- "weight": 295,
+ "weight": 297,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9500,7 +9518,7 @@
},
"x-appwrite": {
"method": "deleteDeployment",
- "weight": 300,
+ "weight": 302,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9567,7 +9585,7 @@
},
"x-appwrite": {
"method": "createBuild",
- "weight": 301,
+ "weight": 303,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9655,7 +9673,7 @@
},
"x-appwrite": {
"method": "updateDeploymentBuild",
- "weight": 302,
+ "weight": 304,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9722,7 +9740,7 @@
},
"x-appwrite": {
"method": "getDeploymentDownload",
- "weight": 294,
+ "weight": 296,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -9798,7 +9816,7 @@
},
"x-appwrite": {
"method": "listExecutions",
- "weight": 304,
+ "weight": 306,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9888,7 +9906,7 @@
},
"x-appwrite": {
"method": "createExecution",
- "weight": 303,
+ "weight": 305,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9939,9 +9957,9 @@
"type": "object",
"properties": {
"body": {
- "type": "object",
+ "type": "string",
"description": "HTTP body of execution. Default value is empty string.",
- "x-example": "{}"
+ "x-example": ""
},
"async": {
"type": "boolean",
@@ -10007,7 +10025,7 @@
},
"x-appwrite": {
"method": "getExecution",
- "weight": 305,
+ "weight": 307,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10076,7 +10094,7 @@
},
"x-appwrite": {
"method": "deleteExecution",
- "weight": 306,
+ "weight": 308,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10150,7 +10168,7 @@
},
"x-appwrite": {
"method": "listVariables",
- "weight": 308,
+ "weight": 310,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10212,7 +10230,7 @@
},
"x-appwrite": {
"method": "createVariable",
- "weight": 307,
+ "weight": 309,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10301,7 +10319,7 @@
},
"x-appwrite": {
"method": "getVariable",
- "weight": 309,
+ "weight": 311,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10373,7 +10391,7 @@
},
"x-appwrite": {
"method": "updateVariable",
- "weight": 310,
+ "weight": 312,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10462,7 +10480,7 @@
},
"x-appwrite": {
"method": "deleteVariable",
- "weight": 311,
+ "weight": 313,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10536,7 +10554,7 @@
},
"x-appwrite": {
"method": "query",
- "weight": 329,
+ "weight": 331,
"cookies": false,
"type": "graphql",
"deprecated": false,
@@ -10592,7 +10610,7 @@
},
"x-appwrite": {
"method": "mutation",
- "weight": 328,
+ "weight": 330,
"cookies": false,
"type": "graphql",
"deprecated": false,
@@ -10648,7 +10666,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 124,
+ "weight": 125,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10700,7 +10718,7 @@
},
"x-appwrite": {
"method": "getAntivirus",
- "weight": 146,
+ "weight": 147,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10752,7 +10770,7 @@
},
"x-appwrite": {
"method": "getCache",
- "weight": 127,
+ "weight": 128,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10804,7 +10822,7 @@
},
"x-appwrite": {
"method": "getCertificate",
- "weight": 133,
+ "weight": 134,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10867,7 +10885,7 @@
},
"x-appwrite": {
"method": "getDB",
- "weight": 126,
+ "weight": 127,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10919,7 +10937,7 @@
},
"x-appwrite": {
"method": "getPubSub",
- "weight": 129,
+ "weight": 130,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10971,7 +10989,7 @@
},
"x-appwrite": {
"method": "getQueue",
- "weight": 128,
+ "weight": 129,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11023,7 +11041,7 @@
},
"x-appwrite": {
"method": "getQueueBuilds",
- "weight": 135,
+ "weight": 136,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11088,7 +11106,7 @@
},
"x-appwrite": {
"method": "getQueueCertificates",
- "weight": 134,
+ "weight": 135,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11153,7 +11171,7 @@
},
"x-appwrite": {
"method": "getQueueDatabases",
- "weight": 136,
+ "weight": 137,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11229,7 +11247,7 @@
},
"x-appwrite": {
"method": "getQueueDeletes",
- "weight": 137,
+ "weight": 138,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11294,7 +11312,7 @@
},
"x-appwrite": {
"method": "getFailedJobs",
- "weight": 147,
+ "weight": 148,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11385,7 +11403,7 @@
},
"x-appwrite": {
"method": "getQueueFunctions",
- "weight": 141,
+ "weight": 142,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11450,7 +11468,7 @@
},
"x-appwrite": {
"method": "getQueueLogs",
- "weight": 132,
+ "weight": 133,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11515,7 +11533,7 @@
},
"x-appwrite": {
"method": "getQueueMails",
- "weight": 138,
+ "weight": 139,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11580,7 +11598,7 @@
},
"x-appwrite": {
"method": "getQueueMessaging",
- "weight": 139,
+ "weight": 140,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11645,7 +11663,7 @@
},
"x-appwrite": {
"method": "getQueueMigrations",
- "weight": 140,
+ "weight": 141,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11710,7 +11728,7 @@
},
"x-appwrite": {
"method": "getQueueUsage",
- "weight": 142,
+ "weight": 143,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11775,7 +11793,7 @@
},
"x-appwrite": {
"method": "getQueueUsageDump",
- "weight": 143,
+ "weight": 144,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11840,7 +11858,7 @@
},
"x-appwrite": {
"method": "getQueueWebhooks",
- "weight": 131,
+ "weight": 132,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11905,7 +11923,7 @@
},
"x-appwrite": {
"method": "getStorage",
- "weight": 145,
+ "weight": 146,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11957,7 +11975,7 @@
},
"x-appwrite": {
"method": "getStorageLocal",
- "weight": 144,
+ "weight": 145,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12009,7 +12027,7 @@
},
"x-appwrite": {
"method": "getTime",
- "weight": 130,
+ "weight": 131,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12061,7 +12079,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 116,
+ "weight": 117,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12117,7 +12135,7 @@
},
"x-appwrite": {
"method": "listCodes",
- "weight": 117,
+ "weight": 118,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12173,7 +12191,7 @@
},
"x-appwrite": {
"method": "listContinents",
- "weight": 121,
+ "weight": 122,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12229,7 +12247,7 @@
},
"x-appwrite": {
"method": "listCountries",
- "weight": 118,
+ "weight": 119,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12285,7 +12303,7 @@
},
"x-appwrite": {
"method": "listCountriesEU",
- "weight": 119,
+ "weight": 120,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12341,7 +12359,7 @@
},
"x-appwrite": {
"method": "listCountriesPhones",
- "weight": 120,
+ "weight": 121,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12397,7 +12415,7 @@
},
"x-appwrite": {
"method": "listCurrencies",
- "weight": 122,
+ "weight": 123,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12453,7 +12471,7 @@
},
"x-appwrite": {
"method": "listLanguages",
- "weight": 123,
+ "weight": 124,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12509,7 +12527,7 @@
},
"x-appwrite": {
"method": "listMessages",
- "weight": 388,
+ "weight": 390,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12588,7 +12606,7 @@
},
"x-appwrite": {
"method": "createEmail",
- "weight": 385,
+ "weight": 387,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12735,7 +12753,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 392,
+ "weight": 394,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12884,7 +12902,7 @@
},
"x-appwrite": {
"method": "createPush",
- "weight": 387,
+ "weight": 389,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13042,7 +13060,7 @@
},
"x-appwrite": {
"method": "updatePush",
- "weight": 394,
+ "weight": 396,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13202,7 +13220,7 @@
},
"x-appwrite": {
"method": "createSms",
- "weight": 386,
+ "weight": 388,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13314,7 +13332,7 @@
},
"x-appwrite": {
"method": "updateSms",
- "weight": 393,
+ "weight": 395,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13429,7 +13447,7 @@
},
"x-appwrite": {
"method": "getMessage",
- "weight": 391,
+ "weight": 393,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13485,7 +13503,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 395,
+ "weight": 397,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13550,7 +13568,7 @@
},
"x-appwrite": {
"method": "listMessageLogs",
- "weight": 389,
+ "weight": 391,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13628,7 +13646,7 @@
},
"x-appwrite": {
"method": "listTargets",
- "weight": 390,
+ "weight": 392,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13706,7 +13724,7 @@
},
"x-appwrite": {
"method": "listProviders",
- "weight": 360,
+ "weight": 362,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13785,7 +13803,7 @@
},
"x-appwrite": {
"method": "createApnsProvider",
- "weight": 359,
+ "weight": 361,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13893,7 +13911,7 @@
},
"x-appwrite": {
"method": "updateApnsProvider",
- "weight": 372,
+ "weight": 374,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14004,7 +14022,7 @@
},
"x-appwrite": {
"method": "createFcmProvider",
- "weight": 358,
+ "weight": 360,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14092,7 +14110,7 @@
},
"x-appwrite": {
"method": "updateFcmProvider",
- "weight": 371,
+ "weight": 373,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14183,7 +14201,7 @@
},
"x-appwrite": {
"method": "createMailgunProvider",
- "weight": 350,
+ "weight": 352,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14301,7 +14319,7 @@
},
"x-appwrite": {
"method": "updateMailgunProvider",
- "weight": 363,
+ "weight": 365,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14422,7 +14440,7 @@
},
"x-appwrite": {
"method": "createMsg91Provider",
- "weight": 353,
+ "weight": 355,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14520,7 +14538,7 @@
},
"x-appwrite": {
"method": "updateMsg91Provider",
- "weight": 366,
+ "weight": 368,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14621,7 +14639,7 @@
},
"x-appwrite": {
"method": "createSendgridProvider",
- "weight": 351,
+ "weight": 353,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14729,7 +14747,7 @@
},
"x-appwrite": {
"method": "updateSendgridProvider",
- "weight": 364,
+ "weight": 366,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14840,7 +14858,7 @@
},
"x-appwrite": {
"method": "createSmtpProvider",
- "weight": 352,
+ "weight": 354,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14986,7 +15004,7 @@
},
"x-appwrite": {
"method": "updateSmtpProvider",
- "weight": 365,
+ "weight": 367,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15134,7 +15152,7 @@
},
"x-appwrite": {
"method": "createTelesignProvider",
- "weight": 354,
+ "weight": 356,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15232,7 +15250,7 @@
},
"x-appwrite": {
"method": "updateTelesignProvider",
- "weight": 367,
+ "weight": 369,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15333,7 +15351,7 @@
},
"x-appwrite": {
"method": "createTextmagicProvider",
- "weight": 355,
+ "weight": 357,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15431,7 +15449,7 @@
},
"x-appwrite": {
"method": "updateTextmagicProvider",
- "weight": 368,
+ "weight": 370,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15532,7 +15550,7 @@
},
"x-appwrite": {
"method": "createTwilioProvider",
- "weight": 356,
+ "weight": 358,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15630,7 +15648,7 @@
},
"x-appwrite": {
"method": "updateTwilioProvider",
- "weight": 369,
+ "weight": 371,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15731,7 +15749,7 @@
},
"x-appwrite": {
"method": "createVonageProvider",
- "weight": 357,
+ "weight": 359,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15829,7 +15847,7 @@
},
"x-appwrite": {
"method": "updateVonageProvider",
- "weight": 370,
+ "weight": 372,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15930,7 +15948,7 @@
},
"x-appwrite": {
"method": "getProvider",
- "weight": 362,
+ "weight": 364,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15986,7 +16004,7 @@
},
"x-appwrite": {
"method": "deleteProvider",
- "weight": 373,
+ "weight": 375,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16051,7 +16069,7 @@
},
"x-appwrite": {
"method": "listProviderLogs",
- "weight": 361,
+ "weight": 363,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16129,7 +16147,7 @@
},
"x-appwrite": {
"method": "listSubscriberLogs",
- "weight": 382,
+ "weight": 384,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16207,7 +16225,7 @@
},
"x-appwrite": {
"method": "listTopics",
- "weight": 375,
+ "weight": 377,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16284,7 +16302,7 @@
},
"x-appwrite": {
"method": "createTopic",
- "weight": 374,
+ "weight": 376,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16370,7 +16388,7 @@
},
"x-appwrite": {
"method": "getTopic",
- "weight": 377,
+ "weight": 379,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16433,7 +16451,7 @@
},
"x-appwrite": {
"method": "updateTopic",
- "weight": 378,
+ "weight": 380,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16513,7 +16531,7 @@
},
"x-appwrite": {
"method": "deleteTopic",
- "weight": 379,
+ "weight": 381,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16578,7 +16596,7 @@
},
"x-appwrite": {
"method": "listTopicLogs",
- "weight": 376,
+ "weight": 378,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16656,7 +16674,7 @@
},
"x-appwrite": {
"method": "listSubscribers",
- "weight": 381,
+ "weight": 383,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16743,7 +16761,7 @@
},
"x-appwrite": {
"method": "createSubscriber",
- "weight": 380,
+ "weight": 382,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16837,7 +16855,7 @@
},
"x-appwrite": {
"method": "getSubscriber",
- "weight": 383,
+ "weight": 385,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16903,7 +16921,7 @@
},
"x-appwrite": {
"method": "deleteSubscriber",
- "weight": 384,
+ "weight": 386,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16982,7 +17000,7 @@
},
"x-appwrite": {
"method": "listBuckets",
- "weight": 201,
+ "weight": 203,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17058,7 +17076,7 @@
},
"x-appwrite": {
"method": "createBucket",
- "weight": 200,
+ "weight": 202,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17188,7 +17206,7 @@
},
"x-appwrite": {
"method": "getBucket",
- "weight": 202,
+ "weight": 204,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17250,7 +17268,7 @@
},
"x-appwrite": {
"method": "updateBucket",
- "weight": 203,
+ "weight": 205,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17377,7 +17395,7 @@
},
"x-appwrite": {
"method": "deleteBucket",
- "weight": 204,
+ "weight": 206,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17441,7 +17459,7 @@
},
"x-appwrite": {
"method": "listFiles",
- "weight": 206,
+ "weight": 208,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17531,7 +17549,7 @@
},
"x-appwrite": {
"method": "createFile",
- "weight": 205,
+ "weight": 207,
"cookies": false,
"type": "upload",
"deprecated": false,
@@ -17633,7 +17651,7 @@
},
"x-appwrite": {
"method": "getFile",
- "weight": 207,
+ "weight": 209,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17709,7 +17727,7 @@
},
"x-appwrite": {
"method": "updateFile",
- "weight": 212,
+ "weight": 214,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17802,7 +17820,7 @@
},
"x-appwrite": {
"method": "deleteFile",
- "weight": 213,
+ "weight": 215,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17873,7 +17891,7 @@
},
"x-appwrite": {
"method": "getFileDownload",
- "weight": 209,
+ "weight": 211,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -17944,7 +17962,7 @@
},
"x-appwrite": {
"method": "getFilePreview",
- "weight": 208,
+ "weight": 210,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -18137,7 +18155,8 @@
"jpeg",
"gif",
"png",
- "webp"
+ "webp",
+ "avif"
],
"x-enum-name": "ImageFormat",
"x-enum-keys": [],
@@ -18163,7 +18182,7 @@
},
"x-appwrite": {
"method": "getFileView",
- "weight": 210,
+ "weight": 212,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -18241,7 +18260,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 217,
+ "weight": 219,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18321,7 +18340,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 216,
+ "weight": 218,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18410,7 +18429,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 218,
+ "weight": 220,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18476,7 +18495,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 220,
+ "weight": 222,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18554,7 +18573,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 222,
+ "weight": 224,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18607,7 +18626,7 @@
"tags": [
"teams"
],
- "description": "Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint.",
+ "description": "Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint. Hide sensitive attributes from the response by toggling membership privacy in the Console.",
"responses": {
"200": {
"description": "Memberships List",
@@ -18622,7 +18641,7 @@
},
"x-appwrite": {
"method": "listMemberships",
- "weight": 224,
+ "weight": 226,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18712,7 +18731,7 @@
},
"x-appwrite": {
"method": "createMembership",
- "weight": 223,
+ "weight": 225,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18812,7 +18831,7 @@
"tags": [
"teams"
],
- "description": "Get a team member by the membership unique id. All team members have read access for this resource.",
+ "description": "Get a team member by the membership unique id. All team members have read access for this resource. Hide sensitive attributes from the response by toggling membership privacy in the Console.",
"responses": {
"200": {
"description": "Membership",
@@ -18827,7 +18846,7 @@
},
"x-appwrite": {
"method": "getMembership",
- "weight": 225,
+ "weight": 227,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18903,7 +18922,7 @@
},
"x-appwrite": {
"method": "updateMembership",
- "weight": 226,
+ "weight": 228,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18994,7 +19013,7 @@
},
"x-appwrite": {
"method": "deleteMembership",
- "weight": 228,
+ "weight": 230,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19072,7 +19091,7 @@
},
"x-appwrite": {
"method": "updateMembershipStatus",
- "weight": 227,
+ "weight": 229,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19173,7 +19192,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 219,
+ "weight": 221,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19237,7 +19256,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 221,
+ "weight": 223,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19322,7 +19341,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 239,
+ "weight": 241,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19398,7 +19417,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 230,
+ "weight": 232,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19489,7 +19508,7 @@
},
"x-appwrite": {
"method": "createArgon2User",
- "weight": 233,
+ "weight": 235,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19577,7 +19596,7 @@
},
"x-appwrite": {
"method": "createBcryptUser",
- "weight": 231,
+ "weight": 233,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19665,7 +19684,7 @@
},
"x-appwrite": {
"method": "listIdentities",
- "weight": 247,
+ "weight": 249,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19736,7 +19755,7 @@
},
"x-appwrite": {
"method": "deleteIdentity",
- "weight": 270,
+ "weight": 272,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19800,7 +19819,7 @@
},
"x-appwrite": {
"method": "createMD5User",
- "weight": 232,
+ "weight": 234,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19888,7 +19907,7 @@
},
"x-appwrite": {
"method": "createPHPassUser",
- "weight": 235,
+ "weight": 237,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19976,7 +19995,7 @@
},
"x-appwrite": {
"method": "createScryptUser",
- "weight": 236,
+ "weight": 238,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20094,7 +20113,7 @@
},
"x-appwrite": {
"method": "createScryptModifiedUser",
- "weight": 237,
+ "weight": 239,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20200,7 +20219,7 @@
},
"x-appwrite": {
"method": "createSHAUser",
- "weight": 234,
+ "weight": 236,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20308,7 +20327,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 240,
+ "weight": 242,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20363,7 +20382,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 268,
+ "weight": 270,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20427,7 +20446,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 253,
+ "weight": 255,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20510,7 +20529,7 @@
},
"x-appwrite": {
"method": "createJWT",
- "weight": 271,
+ "weight": 273,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20595,7 +20614,7 @@
},
"x-appwrite": {
"method": "updateLabels",
- "weight": 249,
+ "weight": 251,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20681,7 +20700,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 245,
+ "weight": 247,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20758,7 +20777,7 @@
},
"x-appwrite": {
"method": "listMemberships",
- "weight": 244,
+ "weight": 246,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20822,7 +20841,7 @@
},
"x-appwrite": {
"method": "updateMfa",
- "weight": 258,
+ "weight": 260,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20905,7 +20924,7 @@
},
"x-appwrite": {
"method": "deleteMfaAuthenticator",
- "weight": 263,
+ "weight": 265,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20984,7 +21003,7 @@
},
"x-appwrite": {
"method": "listMfaFactors",
- "weight": 259,
+ "weight": 261,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21048,7 +21067,7 @@
},
"x-appwrite": {
"method": "getMfaRecoveryCodes",
- "weight": 260,
+ "weight": 262,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21110,7 +21129,7 @@
},
"x-appwrite": {
"method": "updateMfaRecoveryCodes",
- "weight": 262,
+ "weight": 264,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21172,7 +21191,7 @@
},
"x-appwrite": {
"method": "createMfaRecoveryCodes",
- "weight": 261,
+ "weight": 263,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21236,7 +21255,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 251,
+ "weight": 253,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21319,7 +21338,7 @@
},
"x-appwrite": {
"method": "updatePassword",
- "weight": 252,
+ "weight": 254,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21402,7 +21421,7 @@
},
"x-appwrite": {
"method": "updatePhone",
- "weight": 254,
+ "weight": 256,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21485,7 +21504,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 241,
+ "weight": 243,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21547,7 +21566,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 256,
+ "weight": 258,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21630,7 +21649,7 @@
},
"x-appwrite": {
"method": "listSessions",
- "weight": 243,
+ "weight": 245,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21692,7 +21711,7 @@
},
"x-appwrite": {
"method": "createSession",
- "weight": 264,
+ "weight": 266,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21747,7 +21766,7 @@
},
"x-appwrite": {
"method": "deleteSessions",
- "weight": 267,
+ "weight": 269,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21804,7 +21823,7 @@
},
"x-appwrite": {
"method": "deleteSession",
- "weight": 266,
+ "weight": 268,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21878,7 +21897,7 @@
},
"x-appwrite": {
"method": "updateStatus",
- "weight": 248,
+ "weight": 250,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21961,7 +21980,7 @@
},
"x-appwrite": {
"method": "listTargets",
- "weight": 246,
+ "weight": 248,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22037,7 +22056,7 @@
},
"x-appwrite": {
"method": "createTarget",
- "weight": 238,
+ "weight": 240,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22150,7 +22169,7 @@
},
"x-appwrite": {
"method": "getTarget",
- "weight": 242,
+ "weight": 244,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22223,7 +22242,7 @@
},
"x-appwrite": {
"method": "updateTarget",
- "weight": 257,
+ "weight": 259,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22315,7 +22334,7 @@
},
"x-appwrite": {
"method": "deleteTarget",
- "weight": 269,
+ "weight": 271,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22390,7 +22409,7 @@
},
"x-appwrite": {
"method": "createToken",
- "weight": 265,
+ "weight": 267,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22475,7 +22494,7 @@
},
"x-appwrite": {
"method": "updateEmailVerification",
- "weight": 255,
+ "weight": 257,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22558,7 +22577,7 @@
},
"x-appwrite": {
"method": "updatePhoneVerification",
- "weight": 250,
+ "weight": 252,
"cookies": false,
"type": "",
"deprecated": false,
@@ -23677,6 +23696,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"size": {
"type": "integer",
"description": "Attribute size.",
@@ -23696,6 +23725,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"size"
]
},
@@ -23734,6 +23765,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"min": {
"type": "integer",
"description": "Minimum value to enforce for new documents.",
@@ -23761,7 +23802,9 @@
"type",
"status",
"error",
- "required"
+ "required",
+ "$createdAt",
+ "$updatedAt"
]
},
"attributeFloat": {
@@ -23799,6 +23842,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"min": {
"type": "number",
"description": "Minimum value to enforce for new documents.",
@@ -23826,7 +23879,9 @@
"type",
"status",
"error",
- "required"
+ "required",
+ "$createdAt",
+ "$updatedAt"
]
},
"attributeBoolean": {
@@ -23864,6 +23919,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"default": {
"type": "boolean",
"description": "Default value for attribute when not provided. Cannot be set when attribute is required.",
@@ -23876,7 +23941,9 @@
"type",
"status",
"error",
- "required"
+ "required",
+ "$createdAt",
+ "$updatedAt"
]
},
"attributeEmail": {
@@ -23914,6 +23981,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "String format.",
@@ -23932,6 +24009,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -23970,6 +24049,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"elements": {
"type": "array",
"description": "Array of elements in enumerated type.",
@@ -23996,6 +24085,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"elements",
"format"
]
@@ -24035,6 +24126,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "String format.",
@@ -24053,6 +24154,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -24091,6 +24194,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "String format.",
@@ -24109,6 +24222,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -24147,6 +24262,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "ISO 8601 format.",
@@ -24165,6 +24290,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -24203,6 +24330,16 @@
"x-example": false,
"nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"relatedCollection": {
"type": "string",
"description": "The ID of the related collection.",
@@ -24240,6 +24377,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"relatedCollection",
"relationType",
"twoWay",
@@ -24288,6 +24427,16 @@
},
"x-example": [],
"nullable": true
+ },
+ "$createdAt": {
+ "type": "string",
+ "description": "Index creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Index update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
}
},
"required": [
@@ -24295,7 +24444,9 @@
"type",
"status",
"error",
- "attributes"
+ "attributes",
+ "$createdAt",
+ "$updatedAt"
]
},
"document": {
@@ -25447,12 +25598,12 @@
},
"userName": {
"type": "string",
- "description": "User name.",
+ "description": "User name. Hide this attribute by toggling membership privacy in the Console.",
"x-example": "John Doe"
},
"userEmail": {
"type": "string",
- "description": "User email address.",
+ "description": "User email address. Hide this attribute by toggling membership privacy in the Console.",
"x-example": "john@appwrite.io"
},
"teamId": {
@@ -25482,7 +25633,7 @@
},
"mfa": {
"type": "boolean",
- "description": "Multi factor authentication status, true if the user has MFA enabled or false otherwise.",
+ "description": "Multi factor authentication status, true if the user has MFA enabled or false otherwise. Hide this attribute by toggling membership privacy in the Console.",
"x-example": false
},
"roles": {
@@ -25647,7 +25798,7 @@
"specification": {
"type": "string",
"description": "Machine specification for builds and executions.",
- "x-example": "s-0.5vcpu-512mb"
+ "x-example": "s-1vcpu-512mb"
}
},
"required": [
@@ -25966,7 +26117,7 @@
"responseBody": {
"type": "string",
"description": "HTTP response body. This will return empty unless execution is created as synchronous.",
- "x-example": "Developers are awesome."
+ "x-example": ""
},
"responseHeaders": {
"type": "array",
@@ -26459,7 +26610,7 @@
"slug": {
"type": "string",
"description": "Size slug.",
- "x-example": "s-0.5vcpu-512mb"
+ "x-example": "s-1vcpu-512mb"
}
},
"required": [
@@ -26907,7 +27058,7 @@
"name": {
"type": "string",
"description": "Target Name.",
- "x-example": "Aegon apple token"
+ "x-example": "Apple iPhone 12"
},
"userId": {
"type": "string",
@@ -26929,6 +27080,11 @@
"type": "string",
"description": "The target identifier.",
"x-example": "token"
+ },
+ "expired": {
+ "type": "boolean",
+ "description": "Is the target expired.",
+ "x-example": false
}
},
"required": [
@@ -26938,7 +27094,8 @@
"name",
"userId",
"providerType",
- "identifier"
+ "identifier",
+ "expired"
]
}
},
diff --git a/app/config/specs/swagger2-1.6.x-client.json b/app/config/specs/swagger2-1.6.x-client.json
index ce9ea857bb..b1b9ce8dca 100644
--- a/app/config/specs/swagger2-1.6.x-client.json
+++ b/app/config/specs/swagger2-1.6.x-client.json
@@ -87,7 +87,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 8,
+ "weight": 9,
"cookies": false,
"type": "",
"deprecated": false,
@@ -140,7 +140,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 7,
+ "weight": 8,
"cookies": false,
"type": "",
"deprecated": false,
@@ -233,7 +233,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 33,
+ "weight": 34,
"cookies": false,
"type": "",
"deprecated": false,
@@ -293,7 +293,7 @@
},
"\/account\/identities": {
"get": {
- "summary": "List Identities",
+ "summary": "List identities",
"operationId": "accountListIdentities",
"consumes": [
"application\/json"
@@ -315,7 +315,7 @@
},
"x-appwrite": {
"method": "listIdentities",
- "weight": 56,
+ "weight": 57,
"cookies": false,
"type": "",
"deprecated": false,
@@ -379,7 +379,7 @@
},
"x-appwrite": {
"method": "deleteIdentity",
- "weight": 57,
+ "weight": 58,
"cookies": false,
"type": "",
"deprecated": false,
@@ -444,7 +444,7 @@
},
"x-appwrite": {
"method": "createJWT",
- "weight": 28,
+ "weight": 29,
"cookies": false,
"type": "",
"deprecated": false,
@@ -497,7 +497,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 30,
+ "weight": 31,
"cookies": false,
"type": "",
"deprecated": false,
@@ -566,7 +566,7 @@
},
"x-appwrite": {
"method": "updateMFA",
- "weight": 43,
+ "weight": 44,
"cookies": false,
"type": "",
"deprecated": false,
@@ -619,7 +619,7 @@
},
"\/account\/mfa\/authenticators\/{type}": {
"post": {
- "summary": "Create Authenticator",
+ "summary": "Create authenticator",
"operationId": "accountCreateMfaAuthenticator",
"consumes": [
"application\/json"
@@ -641,7 +641,7 @@
},
"x-appwrite": {
"method": "createMfaAuthenticator",
- "weight": 45,
+ "weight": 46,
"cookies": false,
"type": "",
"deprecated": false,
@@ -687,7 +687,7 @@
]
},
"put": {
- "summary": "Verify Authenticator",
+ "summary": "Verify authenticator",
"operationId": "accountUpdateMfaAuthenticator",
"consumes": [
"application\/json"
@@ -709,7 +709,7 @@
},
"x-appwrite": {
"method": "updateMfaAuthenticator",
- "weight": 46,
+ "weight": 47,
"cookies": false,
"type": "",
"deprecated": false,
@@ -773,7 +773,7 @@
]
},
"delete": {
- "summary": "Delete Authenticator",
+ "summary": "Delete authenticator",
"operationId": "accountDeleteMfaAuthenticator",
"consumes": [
"application\/json"
@@ -790,7 +790,7 @@
},
"x-appwrite": {
"method": "deleteMfaAuthenticator",
- "weight": 50,
+ "weight": 51,
"cookies": false,
"type": "",
"deprecated": false,
@@ -838,7 +838,7 @@
},
"\/account\/mfa\/challenge": {
"post": {
- "summary": "Create MFA Challenge",
+ "summary": "Create MFA challenge",
"operationId": "accountCreateMfaChallenge",
"consumes": [
"application\/json"
@@ -860,7 +860,7 @@
},
"x-appwrite": {
"method": "createMfaChallenge",
- "weight": 51,
+ "weight": 52,
"cookies": false,
"type": "",
"deprecated": false,
@@ -917,7 +917,7 @@
]
},
"put": {
- "summary": "Create MFA Challenge (confirmation)",
+ "summary": "Create MFA challenge (confirmation)",
"operationId": "accountUpdateMfaChallenge",
"consumes": [
"application\/json"
@@ -934,7 +934,7 @@
},
"x-appwrite": {
"method": "updateMfaChallenge",
- "weight": 52,
+ "weight": 53,
"cookies": false,
"type": "",
"deprecated": false,
@@ -994,7 +994,7 @@
},
"\/account\/mfa\/factors": {
"get": {
- "summary": "List Factors",
+ "summary": "List factors",
"operationId": "accountListMfaFactors",
"consumes": [
"application\/json"
@@ -1016,7 +1016,7 @@
},
"x-appwrite": {
"method": "listMfaFactors",
- "weight": 44,
+ "weight": 45,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1049,7 +1049,7 @@
},
"\/account\/mfa\/recovery-codes": {
"get": {
- "summary": "Get MFA Recovery Codes",
+ "summary": "Get MFA recovery codes",
"operationId": "accountGetMfaRecoveryCodes",
"consumes": [
"application\/json"
@@ -1071,7 +1071,7 @@
},
"x-appwrite": {
"method": "getMfaRecoveryCodes",
- "weight": 49,
+ "weight": 50,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1102,7 +1102,7 @@
]
},
"post": {
- "summary": "Create MFA Recovery Codes",
+ "summary": "Create MFA recovery codes",
"operationId": "accountCreateMfaRecoveryCodes",
"consumes": [
"application\/json"
@@ -1124,7 +1124,7 @@
},
"x-appwrite": {
"method": "createMfaRecoveryCodes",
- "weight": 47,
+ "weight": 48,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1155,7 +1155,7 @@
]
},
"patch": {
- "summary": "Regenerate MFA Recovery Codes",
+ "summary": "Regenerate MFA recovery codes",
"operationId": "accountUpdateMfaRecoveryCodes",
"consumes": [
"application\/json"
@@ -1177,7 +1177,7 @@
},
"x-appwrite": {
"method": "updateMfaRecoveryCodes",
- "weight": 48,
+ "weight": 49,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1232,7 +1232,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 31,
+ "weight": 32,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1307,7 +1307,7 @@
},
"x-appwrite": {
"method": "updatePassword",
- "weight": 32,
+ "weight": 33,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1388,7 +1388,7 @@
},
"x-appwrite": {
"method": "updatePhone",
- "weight": 34,
+ "weight": 35,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1470,7 +1470,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 29,
+ "weight": 30,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1523,7 +1523,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 35,
+ "weight": 36,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1598,7 +1598,7 @@
},
"x-appwrite": {
"method": "createRecovery",
- "weight": 37,
+ "weight": 38,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1681,7 +1681,7 @@
},
"x-appwrite": {
"method": "updateRecovery",
- "weight": 38,
+ "weight": 39,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1770,7 +1770,7 @@
},
"x-appwrite": {
"method": "listSessions",
- "weight": 10,
+ "weight": 11,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1818,7 +1818,7 @@
},
"x-appwrite": {
"method": "deleteSessions",
- "weight": 11,
+ "weight": 12,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1873,7 +1873,7 @@
},
"x-appwrite": {
"method": "createAnonymousSession",
- "weight": 16,
+ "weight": 17,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1926,7 +1926,7 @@
},
"x-appwrite": {
"method": "createEmailPasswordSession",
- "weight": 15,
+ "weight": 16,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2006,7 +2006,7 @@
},
"x-appwrite": {
"method": "updateMagicURLSession",
- "weight": 25,
+ "weight": 26,
"cookies": false,
"type": "",
"deprecated": true,
@@ -2083,7 +2083,7 @@
},
"x-appwrite": {
"method": "createOAuth2Session",
- "weight": 18,
+ "weight": 19,
"cookies": false,
"type": "webAuth",
"deprecated": false,
@@ -2221,7 +2221,7 @@
},
"x-appwrite": {
"method": "updatePhoneSession",
- "weight": 26,
+ "weight": 27,
"cookies": false,
"type": "",
"deprecated": true,
@@ -2301,7 +2301,7 @@
},
"x-appwrite": {
"method": "createSession",
- "weight": 17,
+ "weight": 18,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2381,7 +2381,7 @@
},
"x-appwrite": {
"method": "getSession",
- "weight": 12,
+ "weight": 13,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2444,7 +2444,7 @@
},
"x-appwrite": {
"method": "updateSession",
- "weight": 14,
+ "weight": 15,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2502,7 +2502,7 @@
},
"x-appwrite": {
"method": "deleteSession",
- "weight": 13,
+ "weight": 14,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2567,7 +2567,7 @@
},
"x-appwrite": {
"method": "updateStatus",
- "weight": 36,
+ "weight": 37,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2622,7 +2622,7 @@
},
"x-appwrite": {
"method": "createPushTarget",
- "weight": 53,
+ "weight": 54,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2708,7 +2708,7 @@
},
"x-appwrite": {
"method": "updatePushTarget",
- "weight": 54,
+ "weight": 55,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2784,7 +2784,7 @@
},
"x-appwrite": {
"method": "deletePushTarget",
- "weight": 55,
+ "weight": 56,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2847,7 +2847,7 @@
},
"x-appwrite": {
"method": "createEmailToken",
- "weight": 24,
+ "weight": 25,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2933,7 +2933,7 @@
},
"x-appwrite": {
"method": "createMagicURLToken",
- "weight": 23,
+ "weight": 24,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3025,7 +3025,7 @@
},
"x-appwrite": {
"method": "createOAuth2Token",
- "weight": 22,
+ "weight": 23,
"cookies": false,
"type": "webAuth",
"deprecated": false,
@@ -3163,7 +3163,7 @@
},
"x-appwrite": {
"method": "createPhoneToken",
- "weight": 27,
+ "weight": 28,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3246,7 +3246,7 @@
},
"x-appwrite": {
"method": "createVerification",
- "weight": 39,
+ "weight": 40,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3319,7 +3319,7 @@
},
"x-appwrite": {
"method": "updateVerification",
- "weight": 40,
+ "weight": 41,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3401,7 +3401,7 @@
},
"x-appwrite": {
"method": "createPhoneVerification",
- "weight": 41,
+ "weight": 42,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3457,7 +3457,7 @@
},
"x-appwrite": {
"method": "updatePhoneVerification",
- "weight": 42,
+ "weight": 43,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3539,7 +3539,7 @@
},
"x-appwrite": {
"method": "getBrowser",
- "weight": 59,
+ "weight": 60,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3668,7 +3668,7 @@
},
"x-appwrite": {
"method": "getCreditCard",
- "weight": 58,
+ "weight": 59,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3801,7 +3801,7 @@
},
"x-appwrite": {
"method": "getFavicon",
- "weight": 62,
+ "weight": 63,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3868,7 +3868,7 @@
},
"x-appwrite": {
"method": "getFlag",
- "weight": 60,
+ "weight": 61,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4359,7 +4359,7 @@
},
"x-appwrite": {
"method": "getImage",
- "weight": 61,
+ "weight": 62,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4446,7 +4446,7 @@
},
"x-appwrite": {
"method": "getInitials",
- "weight": 64,
+ "weight": 65,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4541,7 +4541,7 @@
},
"x-appwrite": {
"method": "getQR",
- "weight": 63,
+ "weight": 64,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4636,7 +4636,7 @@
},
"x-appwrite": {
"method": "listDocuments",
- "weight": 108,
+ "weight": 109,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4720,7 +4720,7 @@
},
"x-appwrite": {
"method": "createDocument",
- "weight": 107,
+ "weight": 108,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4828,7 +4828,7 @@
},
"x-appwrite": {
"method": "getDocument",
- "weight": 109,
+ "weight": 110,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4920,7 +4920,7 @@
},
"x-appwrite": {
"method": "updateDocument",
- "weight": 111,
+ "weight": 112,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5019,7 +5019,7 @@
},
"x-appwrite": {
"method": "deleteDocument",
- "weight": 112,
+ "weight": 113,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5101,7 +5101,7 @@
},
"x-appwrite": {
"method": "listExecutions",
- "weight": 304,
+ "weight": 306,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5167,7 +5167,7 @@
"summary": "Create execution",
"operationId": "functionsCreateExecution",
"consumes": [
- "multipart\/form-data"
+ "application\/json"
],
"produces": [
"multipart\/form-data"
@@ -5186,7 +5186,7 @@
},
"x-appwrite": {
"method": "createExecution",
- "weight": 303,
+ "weight": 305,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5226,65 +5226,59 @@
"in": "path"
},
{
- "name": "body",
- "description": "HTTP body of execution. Default value is empty string.",
- "required": false,
- "type": "payload",
- "default": "",
- "in": "formData"
- },
- {
- "name": "async",
- "description": "Execute code in the background. Default value is false.",
- "required": false,
- "type": "boolean",
- "x-example": false,
- "default": false,
- "in": "formData"
- },
- {
- "name": "path",
- "description": "HTTP path of execution. Path can include query params. Default value is \/",
- "required": false,
- "type": "string",
- "x-example": "",
- "default": "\/",
- "in": "formData"
- },
- {
- "name": "method",
- "description": "HTTP method of execution. Default value is GET.",
- "required": false,
- "type": "string",
- "x-example": "GET",
- "enum": [
- "GET",
- "POST",
- "PUT",
- "PATCH",
- "DELETE",
- "OPTIONS"
- ],
- "x-enum-name": "ExecutionMethod",
- "x-enum-keys": [],
- "default": "POST",
- "in": "formData"
- },
- {
- "name": "headers",
- "description": "HTTP headers of execution. Defaults to empty.",
- "required": false,
- "type": "object",
- "default": [],
- "x-example": "{}",
- "in": "formData"
- },
- {
- "name": "scheduledAt",
- "description": "Scheduled execution time in [ISO 8601](https:\/\/www.iso.org\/iso-8601-date-and-time-format.html) format. DateTime value must be in future with precision in minutes.",
- "required": false,
- "type": "string",
- "in": "formData"
+ "name": "payload",
+ "in": "body",
+ "schema": {
+ "type": "object",
+ "properties": {
+ "body": {
+ "type": "string",
+ "description": "HTTP body of execution. Default value is empty string.",
+ "default": "",
+ "x-example": ""
+ },
+ "async": {
+ "type": "boolean",
+ "description": "Execute code in the background. Default value is false.",
+ "default": false,
+ "x-example": false
+ },
+ "path": {
+ "type": "string",
+ "description": "HTTP path of execution. Path can include query params. Default value is \/",
+ "default": "\/",
+ "x-example": ""
+ },
+ "method": {
+ "type": "string",
+ "description": "HTTP method of execution. Default value is GET.",
+ "default": "POST",
+ "x-example": "GET",
+ "enum": [
+ "GET",
+ "POST",
+ "PUT",
+ "PATCH",
+ "DELETE",
+ "OPTIONS"
+ ],
+ "x-enum-name": "ExecutionMethod",
+ "x-enum-keys": []
+ },
+ "headers": {
+ "type": "object",
+ "description": "HTTP headers of execution. Defaults to empty.",
+ "default": [],
+ "x-example": "{}"
+ },
+ "scheduledAt": {
+ "type": "string",
+ "description": "Scheduled execution time in [ISO 8601](https:\/\/www.iso.org\/iso-8601-date-and-time-format.html) format. DateTime value must be in future with precision in minutes.",
+ "default": null,
+ "x-example": null
+ }
+ }
+ }
}
]
}
@@ -5313,7 +5307,7 @@
},
"x-appwrite": {
"method": "getExecution",
- "weight": 305,
+ "weight": 307,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5387,7 +5381,7 @@
},
"x-appwrite": {
"method": "query",
- "weight": 329,
+ "weight": 331,
"cookies": false,
"type": "graphql",
"deprecated": false,
@@ -5463,7 +5457,7 @@
},
"x-appwrite": {
"method": "mutation",
- "weight": 328,
+ "weight": 330,
"cookies": false,
"type": "graphql",
"deprecated": false,
@@ -5539,7 +5533,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 116,
+ "weight": 117,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5573,7 +5567,7 @@
},
"\/locale\/codes": {
"get": {
- "summary": "List Locale Codes",
+ "summary": "List locale codes",
"operationId": "localeListCodes",
"consumes": [
"application\/json"
@@ -5595,7 +5589,7 @@
},
"x-appwrite": {
"method": "listCodes",
- "weight": 117,
+ "weight": 118,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5651,7 +5645,7 @@
},
"x-appwrite": {
"method": "listContinents",
- "weight": 121,
+ "weight": 122,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5707,7 +5701,7 @@
},
"x-appwrite": {
"method": "listCountries",
- "weight": 118,
+ "weight": 119,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5763,7 +5757,7 @@
},
"x-appwrite": {
"method": "listCountriesEU",
- "weight": 119,
+ "weight": 120,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5819,7 +5813,7 @@
},
"x-appwrite": {
"method": "listCountriesPhones",
- "weight": 120,
+ "weight": 121,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5875,7 +5869,7 @@
},
"x-appwrite": {
"method": "listCurrencies",
- "weight": 122,
+ "weight": 123,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5931,7 +5925,7 @@
},
"x-appwrite": {
"method": "listLanguages",
- "weight": 123,
+ "weight": 124,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5987,7 +5981,7 @@
},
"x-appwrite": {
"method": "createSubscriber",
- "weight": 380,
+ "weight": 382,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6076,7 +6070,7 @@
},
"x-appwrite": {
"method": "deleteSubscriber",
- "weight": 384,
+ "weight": 386,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6151,7 +6145,7 @@
},
"x-appwrite": {
"method": "listFiles",
- "weight": 206,
+ "weight": 208,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6236,7 +6230,7 @@
},
"x-appwrite": {
"method": "createFile",
- "weight": 205,
+ "weight": 207,
"cookies": false,
"type": "upload",
"deprecated": false,
@@ -6330,7 +6324,7 @@
},
"x-appwrite": {
"method": "getFile",
- "weight": 207,
+ "weight": 209,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6402,7 +6396,7 @@
},
"x-appwrite": {
"method": "updateFile",
- "weight": 212,
+ "weight": 214,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6476,7 +6470,7 @@
]
},
"delete": {
- "summary": "Delete File",
+ "summary": "Delete file",
"operationId": "storageDeleteFile",
"consumes": [
"application\/json"
@@ -6493,7 +6487,7 @@
},
"x-appwrite": {
"method": "deleteFile",
- "weight": 213,
+ "weight": 215,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6567,7 +6561,7 @@
},
"x-appwrite": {
"method": "getFileDownload",
- "weight": 209,
+ "weight": 211,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -6641,7 +6635,7 @@
},
"x-appwrite": {
"method": "getFilePreview",
- "weight": 208,
+ "weight": 210,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -6807,7 +6801,8 @@
"jpeg",
"gif",
"png",
- "webp"
+ "webp",
+ "avif"
],
"x-enum-name": "ImageFormat",
"x-enum-keys": [],
@@ -6841,7 +6836,7 @@
},
"x-appwrite": {
"method": "getFileView",
- "weight": 210,
+ "weight": 212,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -6915,7 +6910,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 217,
+ "weight": 219,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6992,7 +6987,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 216,
+ "weight": 218,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7086,7 +7081,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 218,
+ "weight": 220,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7150,7 +7145,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 220,
+ "weight": 222,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7227,7 +7222,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 222,
+ "weight": 224,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7282,7 +7277,7 @@
"tags": [
"teams"
],
- "description": "Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint.",
+ "description": "Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint. Hide sensitive attributes from the response by toggling membership privacy in the Console.",
"responses": {
"200": {
"description": "Memberships List",
@@ -7293,7 +7288,7 @@
},
"x-appwrite": {
"method": "listMemberships",
- "weight": 224,
+ "weight": 226,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7378,7 +7373,7 @@
},
"x-appwrite": {
"method": "createMembership",
- "weight": 223,
+ "weight": 225,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7484,7 +7479,7 @@
"tags": [
"teams"
],
- "description": "Get a team member by the membership unique id. All team members have read access for this resource.",
+ "description": "Get a team member by the membership unique id. All team members have read access for this resource. Hide sensitive attributes from the response by toggling membership privacy in the Console.",
"responses": {
"200": {
"description": "Membership",
@@ -7495,7 +7490,7 @@
},
"x-appwrite": {
"method": "getMembership",
- "weight": 225,
+ "weight": 227,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7567,7 +7562,7 @@
},
"x-appwrite": {
"method": "updateMembership",
- "weight": 226,
+ "weight": 228,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7655,7 +7650,7 @@
},
"x-appwrite": {
"method": "deleteMembership",
- "weight": 228,
+ "weight": 230,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7729,7 +7724,7 @@
},
"x-appwrite": {
"method": "updateMembershipStatus",
- "weight": 227,
+ "weight": 229,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7827,7 +7822,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 219,
+ "weight": 221,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7890,7 +7885,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 221,
+ "weight": 223,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9450,12 +9445,12 @@
},
"userName": {
"type": "string",
- "description": "User name.",
+ "description": "User name. Hide this attribute by toggling membership privacy in the Console.",
"x-example": "John Doe"
},
"userEmail": {
"type": "string",
- "description": "User email address.",
+ "description": "User email address. Hide this attribute by toggling membership privacy in the Console.",
"x-example": "john@appwrite.io"
},
"teamId": {
@@ -9485,7 +9480,7 @@
},
"mfa": {
"type": "boolean",
- "description": "Multi factor authentication status, true if the user has MFA enabled or false otherwise.",
+ "description": "Multi factor authentication status, true if the user has MFA enabled or false otherwise. Hide this attribute by toggling membership privacy in the Console.",
"x-example": false
},
"roles": {
@@ -9591,7 +9586,7 @@
"responseBody": {
"type": "string",
"description": "HTTP response body. This will return empty unless execution is created as synchronous.",
- "x-example": "Developers are awesome."
+ "x-example": ""
},
"responseHeaders": {
"type": "array",
@@ -10013,7 +10008,7 @@
"name": {
"type": "string",
"description": "Target Name.",
- "x-example": "Aegon apple token"
+ "x-example": "Apple iPhone 12"
},
"userId": {
"type": "string",
@@ -10035,6 +10030,11 @@
"type": "string",
"description": "The target identifier.",
"x-example": "token"
+ },
+ "expired": {
+ "type": "boolean",
+ "description": "Is the target expired.",
+ "x-example": false
}
},
"required": [
@@ -10044,7 +10044,8 @@
"name",
"userId",
"providerType",
- "identifier"
+ "identifier",
+ "expired"
]
}
},
diff --git a/app/config/specs/swagger2-1.6.x-console.json b/app/config/specs/swagger2-1.6.x-console.json
index 51935a5e01..9ce9d5f60d 100644
--- a/app/config/specs/swagger2-1.6.x-console.json
+++ b/app/config/specs/swagger2-1.6.x-console.json
@@ -99,7 +99,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 8,
+ "weight": 9,
"cookies": false,
"type": "",
"deprecated": false,
@@ -151,7 +151,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 7,
+ "weight": 8,
"cookies": false,
"type": "",
"deprecated": false,
@@ -237,7 +237,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 9,
+ "weight": 10,
"cookies": false,
"type": "",
"deprecated": false,
@@ -289,7 +289,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 33,
+ "weight": 34,
"cookies": false,
"type": "",
"deprecated": false,
@@ -348,7 +348,7 @@
},
"\/account\/identities": {
"get": {
- "summary": "List Identities",
+ "summary": "List identities",
"operationId": "accountListIdentities",
"consumes": [
"application\/json"
@@ -370,7 +370,7 @@
},
"x-appwrite": {
"method": "listIdentities",
- "weight": 56,
+ "weight": 57,
"cookies": false,
"type": "",
"deprecated": false,
@@ -433,7 +433,7 @@
},
"x-appwrite": {
"method": "deleteIdentity",
- "weight": 57,
+ "weight": 58,
"cookies": false,
"type": "",
"deprecated": false,
@@ -497,7 +497,7 @@
},
"x-appwrite": {
"method": "createJWT",
- "weight": 28,
+ "weight": 29,
"cookies": false,
"type": "",
"deprecated": false,
@@ -550,7 +550,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 30,
+ "weight": 31,
"cookies": false,
"type": "",
"deprecated": false,
@@ -618,7 +618,7 @@
},
"x-appwrite": {
"method": "updateMFA",
- "weight": 43,
+ "weight": 44,
"cookies": false,
"type": "",
"deprecated": false,
@@ -670,7 +670,7 @@
},
"\/account\/mfa\/authenticators\/{type}": {
"post": {
- "summary": "Create Authenticator",
+ "summary": "Create authenticator",
"operationId": "accountCreateMfaAuthenticator",
"consumes": [
"application\/json"
@@ -692,7 +692,7 @@
},
"x-appwrite": {
"method": "createMfaAuthenticator",
- "weight": 45,
+ "weight": 46,
"cookies": false,
"type": "",
"deprecated": false,
@@ -737,7 +737,7 @@
]
},
"put": {
- "summary": "Verify Authenticator",
+ "summary": "Verify authenticator",
"operationId": "accountUpdateMfaAuthenticator",
"consumes": [
"application\/json"
@@ -759,7 +759,7 @@
},
"x-appwrite": {
"method": "updateMfaAuthenticator",
- "weight": 46,
+ "weight": 47,
"cookies": false,
"type": "",
"deprecated": false,
@@ -822,7 +822,7 @@
]
},
"delete": {
- "summary": "Delete Authenticator",
+ "summary": "Delete authenticator",
"operationId": "accountDeleteMfaAuthenticator",
"consumes": [
"application\/json"
@@ -839,7 +839,7 @@
},
"x-appwrite": {
"method": "deleteMfaAuthenticator",
- "weight": 50,
+ "weight": 51,
"cookies": false,
"type": "",
"deprecated": false,
@@ -886,7 +886,7 @@
},
"\/account\/mfa\/challenge": {
"post": {
- "summary": "Create MFA Challenge",
+ "summary": "Create MFA challenge",
"operationId": "accountCreateMfaChallenge",
"consumes": [
"application\/json"
@@ -908,7 +908,7 @@
},
"x-appwrite": {
"method": "createMfaChallenge",
- "weight": 51,
+ "weight": 52,
"cookies": false,
"type": "",
"deprecated": false,
@@ -965,7 +965,7 @@
]
},
"put": {
- "summary": "Create MFA Challenge (confirmation)",
+ "summary": "Create MFA challenge (confirmation)",
"operationId": "accountUpdateMfaChallenge",
"consumes": [
"application\/json"
@@ -982,7 +982,7 @@
},
"x-appwrite": {
"method": "updateMfaChallenge",
- "weight": 52,
+ "weight": 53,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1041,7 +1041,7 @@
},
"\/account\/mfa\/factors": {
"get": {
- "summary": "List Factors",
+ "summary": "List factors",
"operationId": "accountListMfaFactors",
"consumes": [
"application\/json"
@@ -1063,7 +1063,7 @@
},
"x-appwrite": {
"method": "listMfaFactors",
- "weight": 44,
+ "weight": 45,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1095,7 +1095,7 @@
},
"\/account\/mfa\/recovery-codes": {
"get": {
- "summary": "Get MFA Recovery Codes",
+ "summary": "Get MFA recovery codes",
"operationId": "accountGetMfaRecoveryCodes",
"consumes": [
"application\/json"
@@ -1117,7 +1117,7 @@
},
"x-appwrite": {
"method": "getMfaRecoveryCodes",
- "weight": 49,
+ "weight": 50,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1147,7 +1147,7 @@
]
},
"post": {
- "summary": "Create MFA Recovery Codes",
+ "summary": "Create MFA recovery codes",
"operationId": "accountCreateMfaRecoveryCodes",
"consumes": [
"application\/json"
@@ -1169,7 +1169,7 @@
},
"x-appwrite": {
"method": "createMfaRecoveryCodes",
- "weight": 47,
+ "weight": 48,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1199,7 +1199,7 @@
]
},
"patch": {
- "summary": "Regenerate MFA Recovery Codes",
+ "summary": "Regenerate MFA recovery codes",
"operationId": "accountUpdateMfaRecoveryCodes",
"consumes": [
"application\/json"
@@ -1221,7 +1221,7 @@
},
"x-appwrite": {
"method": "updateMfaRecoveryCodes",
- "weight": 48,
+ "weight": 49,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1275,7 +1275,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 31,
+ "weight": 32,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1349,7 +1349,7 @@
},
"x-appwrite": {
"method": "updatePassword",
- "weight": 32,
+ "weight": 33,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1429,7 +1429,7 @@
},
"x-appwrite": {
"method": "updatePhone",
- "weight": 34,
+ "weight": 35,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1510,7 +1510,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 29,
+ "weight": 30,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1562,7 +1562,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 35,
+ "weight": 36,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1636,7 +1636,7 @@
},
"x-appwrite": {
"method": "createRecovery",
- "weight": 37,
+ "weight": 38,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1718,7 +1718,7 @@
},
"x-appwrite": {
"method": "updateRecovery",
- "weight": 38,
+ "weight": 39,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1806,7 +1806,7 @@
},
"x-appwrite": {
"method": "listSessions",
- "weight": 10,
+ "weight": 11,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1853,7 +1853,7 @@
},
"x-appwrite": {
"method": "deleteSessions",
- "weight": 11,
+ "weight": 12,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1907,7 +1907,7 @@
},
"x-appwrite": {
"method": "createAnonymousSession",
- "weight": 16,
+ "weight": 17,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1960,7 +1960,7 @@
},
"x-appwrite": {
"method": "createEmailPasswordSession",
- "weight": 15,
+ "weight": 16,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2040,7 +2040,7 @@
},
"x-appwrite": {
"method": "updateMagicURLSession",
- "weight": 25,
+ "weight": 26,
"cookies": false,
"type": "",
"deprecated": true,
@@ -2117,7 +2117,7 @@
},
"x-appwrite": {
"method": "createOAuth2Session",
- "weight": 18,
+ "weight": 19,
"cookies": false,
"type": "webAuth",
"deprecated": false,
@@ -2255,7 +2255,7 @@
},
"x-appwrite": {
"method": "updatePhoneSession",
- "weight": 26,
+ "weight": 27,
"cookies": false,
"type": "",
"deprecated": true,
@@ -2335,7 +2335,7 @@
},
"x-appwrite": {
"method": "createSession",
- "weight": 17,
+ "weight": 18,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2415,7 +2415,7 @@
},
"x-appwrite": {
"method": "getSession",
- "weight": 12,
+ "weight": 13,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2477,7 +2477,7 @@
},
"x-appwrite": {
"method": "updateSession",
- "weight": 14,
+ "weight": 15,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2534,7 +2534,7 @@
},
"x-appwrite": {
"method": "deleteSession",
- "weight": 13,
+ "weight": 14,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2598,7 +2598,7 @@
},
"x-appwrite": {
"method": "updateStatus",
- "weight": 36,
+ "weight": 37,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2652,7 +2652,7 @@
},
"x-appwrite": {
"method": "createPushTarget",
- "weight": 53,
+ "weight": 54,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2737,7 +2737,7 @@
},
"x-appwrite": {
"method": "updatePushTarget",
- "weight": 54,
+ "weight": 55,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2812,7 +2812,7 @@
},
"x-appwrite": {
"method": "deletePushTarget",
- "weight": 55,
+ "weight": 56,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2874,7 +2874,7 @@
},
"x-appwrite": {
"method": "createEmailToken",
- "weight": 24,
+ "weight": 25,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2960,7 +2960,7 @@
},
"x-appwrite": {
"method": "createMagicURLToken",
- "weight": 23,
+ "weight": 24,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3052,7 +3052,7 @@
},
"x-appwrite": {
"method": "createOAuth2Token",
- "weight": 22,
+ "weight": 23,
"cookies": false,
"type": "webAuth",
"deprecated": false,
@@ -3190,7 +3190,7 @@
},
"x-appwrite": {
"method": "createPhoneToken",
- "weight": 27,
+ "weight": 28,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3273,7 +3273,7 @@
},
"x-appwrite": {
"method": "createVerification",
- "weight": 39,
+ "weight": 40,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3345,7 +3345,7 @@
},
"x-appwrite": {
"method": "updateVerification",
- "weight": 40,
+ "weight": 41,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3426,7 +3426,7 @@
},
"x-appwrite": {
"method": "createPhoneVerification",
- "weight": 41,
+ "weight": 42,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3481,7 +3481,7 @@
},
"x-appwrite": {
"method": "updatePhoneVerification",
- "weight": 42,
+ "weight": 43,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3562,7 +3562,7 @@
},
"x-appwrite": {
"method": "getBrowser",
- "weight": 59,
+ "weight": 60,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3691,7 +3691,7 @@
},
"x-appwrite": {
"method": "getCreditCard",
- "weight": 58,
+ "weight": 59,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3824,7 +3824,7 @@
},
"x-appwrite": {
"method": "getFavicon",
- "weight": 62,
+ "weight": 63,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3891,7 +3891,7 @@
},
"x-appwrite": {
"method": "getFlag",
- "weight": 60,
+ "weight": 61,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4382,7 +4382,7 @@
},
"x-appwrite": {
"method": "getImage",
- "weight": 61,
+ "weight": 62,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4469,7 +4469,7 @@
},
"x-appwrite": {
"method": "getInitials",
- "weight": 64,
+ "weight": 65,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4564,7 +4564,7 @@
},
"x-appwrite": {
"method": "getQR",
- "weight": 63,
+ "weight": 64,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4637,7 +4637,7 @@
},
"\/console\/assistant": {
"post": {
- "summary": "Ask Query",
+ "summary": "Ask query",
"operationId": "assistantChat",
"consumes": [
"application\/json"
@@ -4659,7 +4659,7 @@
},
"x-appwrite": {
"method": "chat",
- "weight": 331,
+ "weight": 333,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4731,7 +4731,7 @@
},
"x-appwrite": {
"method": "variables",
- "weight": 330,
+ "weight": 332,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4783,7 +4783,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 69,
+ "weight": 70,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4857,7 +4857,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 68,
+ "weight": 69,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4943,7 +4943,7 @@
},
"x-appwrite": {
"method": "getUsage",
- "weight": 113,
+ "weight": 114,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5017,7 +5017,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 70,
+ "weight": 71,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5078,7 +5078,7 @@
},
"x-appwrite": {
"method": "update",
- "weight": 72,
+ "weight": 73,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5158,7 +5158,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 73,
+ "weight": 74,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5221,7 +5221,7 @@
},
"x-appwrite": {
"method": "listCollections",
- "weight": 75,
+ "weight": 76,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5303,7 +5303,7 @@
},
"x-appwrite": {
"method": "createCollection",
- "weight": 74,
+ "weight": 75,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5412,7 +5412,7 @@
},
"x-appwrite": {
"method": "getCollection",
- "weight": 76,
+ "weight": 77,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5481,7 +5481,7 @@
},
"x-appwrite": {
"method": "updateCollection",
- "weight": 78,
+ "weight": 79,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5584,7 +5584,7 @@
},
"x-appwrite": {
"method": "deleteCollection",
- "weight": 79,
+ "weight": 80,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5655,7 +5655,7 @@
},
"x-appwrite": {
"method": "listAttributes",
- "weight": 90,
+ "weight": 91,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5738,7 +5738,7 @@
},
"x-appwrite": {
"method": "createBooleanAttribute",
- "weight": 87,
+ "weight": 88,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5844,7 +5844,7 @@
},
"x-appwrite": {
"method": "updateBooleanAttribute",
- "weight": 99,
+ "weight": 100,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5954,7 +5954,7 @@
},
"x-appwrite": {
"method": "createDatetimeAttribute",
- "weight": 88,
+ "weight": 89,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6060,7 +6060,7 @@
},
"x-appwrite": {
"method": "updateDatetimeAttribute",
- "weight": 100,
+ "weight": 101,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6170,7 +6170,7 @@
},
"x-appwrite": {
"method": "createEmailAttribute",
- "weight": 81,
+ "weight": 82,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6276,7 +6276,7 @@
},
"x-appwrite": {
"method": "updateEmailAttribute",
- "weight": 93,
+ "weight": 94,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6386,7 +6386,7 @@
},
"x-appwrite": {
"method": "createEnumAttribute",
- "weight": 82,
+ "weight": 83,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6502,7 +6502,7 @@
},
"x-appwrite": {
"method": "updateEnumAttribute",
- "weight": 94,
+ "weight": 95,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6622,7 +6622,7 @@
},
"x-appwrite": {
"method": "createFloatAttribute",
- "weight": 86,
+ "weight": 87,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6740,7 +6740,7 @@
},
"x-appwrite": {
"method": "updateFloatAttribute",
- "weight": 98,
+ "weight": 99,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6864,7 +6864,7 @@
},
"x-appwrite": {
"method": "createIntegerAttribute",
- "weight": 85,
+ "weight": 86,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6982,7 +6982,7 @@
},
"x-appwrite": {
"method": "updateIntegerAttribute",
- "weight": 97,
+ "weight": 98,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7106,7 +7106,7 @@
},
"x-appwrite": {
"method": "createIpAttribute",
- "weight": 83,
+ "weight": 84,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7212,7 +7212,7 @@
},
"x-appwrite": {
"method": "updateIpAttribute",
- "weight": 95,
+ "weight": 96,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7322,7 +7322,7 @@
},
"x-appwrite": {
"method": "createRelationshipAttribute",
- "weight": 89,
+ "weight": 90,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7457,7 +7457,7 @@
},
"x-appwrite": {
"method": "createStringAttribute",
- "weight": 80,
+ "weight": 81,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7576,7 +7576,7 @@
},
"x-appwrite": {
"method": "updateStringAttribute",
- "weight": 92,
+ "weight": 93,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7650,7 +7650,7 @@
"type": "integer",
"description": "Maximum size of the string attribute.",
"default": null,
- "x-example": null
+ "x-example": 1
},
"newKey": {
"type": "string",
@@ -7692,7 +7692,7 @@
},
"x-appwrite": {
"method": "createUrlAttribute",
- "weight": 84,
+ "weight": 85,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7798,7 +7798,7 @@
},
"x-appwrite": {
"method": "updateUrlAttribute",
- "weight": 96,
+ "weight": 97,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7939,7 +7939,7 @@
},
"x-appwrite": {
"method": "getAttribute",
- "weight": 91,
+ "weight": 92,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8010,7 +8010,7 @@
},
"x-appwrite": {
"method": "deleteAttribute",
- "weight": 102,
+ "weight": 103,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8086,7 +8086,7 @@
},
"x-appwrite": {
"method": "updateRelationshipAttribute",
- "weight": 101,
+ "weight": 102,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8192,7 +8192,7 @@
},
"x-appwrite": {
"method": "listDocuments",
- "weight": 108,
+ "weight": 109,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8276,7 +8276,7 @@
},
"x-appwrite": {
"method": "createDocument",
- "weight": 107,
+ "weight": 108,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8384,7 +8384,7 @@
},
"x-appwrite": {
"method": "getDocument",
- "weight": 109,
+ "weight": 110,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8476,7 +8476,7 @@
},
"x-appwrite": {
"method": "updateDocument",
- "weight": 111,
+ "weight": 112,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8575,7 +8575,7 @@
},
"x-appwrite": {
"method": "deleteDocument",
- "weight": 112,
+ "weight": 113,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8657,7 +8657,7 @@
},
"x-appwrite": {
"method": "listDocumentLogs",
- "weight": 110,
+ "weight": 111,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8747,7 +8747,7 @@
},
"x-appwrite": {
"method": "listIndexes",
- "weight": 104,
+ "weight": 105,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8828,7 +8828,7 @@
},
"x-appwrite": {
"method": "createIndex",
- "weight": 103,
+ "weight": 104,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8950,7 +8950,7 @@
},
"x-appwrite": {
"method": "getIndex",
- "weight": 105,
+ "weight": 106,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9021,7 +9021,7 @@
},
"x-appwrite": {
"method": "deleteIndex",
- "weight": 106,
+ "weight": 107,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9099,7 +9099,7 @@
},
"x-appwrite": {
"method": "listCollectionLogs",
- "weight": 77,
+ "weight": 78,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9181,7 +9181,7 @@
},
"x-appwrite": {
"method": "getCollectionUsage",
- "weight": 115,
+ "weight": 116,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9271,7 +9271,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 71,
+ "weight": 72,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9345,7 +9345,7 @@
},
"x-appwrite": {
"method": "getDatabaseUsage",
- "weight": 114,
+ "weight": 115,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9427,7 +9427,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 287,
+ "weight": 289,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9501,7 +9501,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 286,
+ "weight": 288,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9559,6 +9559,7 @@
"node-19.0",
"node-20.0",
"node-21.0",
+ "node-22",
"php-8.0",
"php-8.1",
"php-8.2",
@@ -9577,6 +9578,8 @@
"deno-1.24",
"deno-1.35",
"deno-1.40",
+ "deno-1.46",
+ "deno-2.0",
"dart-2.15",
"dart-2.16",
"dart-2.17",
@@ -9584,24 +9587,30 @@
"dart-3.0",
"dart-3.1",
"dart-3.3",
- "dotnet-3.1",
+ "dart-3.5",
"dotnet-6.0",
"dotnet-7.0",
+ "dotnet-8.0",
"java-8.0",
"java-11.0",
"java-17.0",
"java-18.0",
"java-21.0",
+ "java-22",
"swift-5.5",
"swift-5.8",
"swift-5.9",
+ "swift-5.10",
"kotlin-1.6",
"kotlin-1.8",
"kotlin-1.9",
+ "kotlin-2.0",
"cpp-17",
"cpp-20",
"bun-1.0",
- "go-1.23"
+ "bun-1.1",
+ "go-1.23",
+ "static-1"
],
"x-enum-name": null,
"x-enum-keys": []
@@ -9726,7 +9735,7 @@
"specification": {
"type": "string",
"description": "Runtime specification for the function and builds.",
- "default": "s-0.5vcpu-512mb",
+ "default": "s-1vcpu-512mb",
"x-example": null
}
},
@@ -9764,7 +9773,7 @@
},
"x-appwrite": {
"method": "listRuntimes",
- "weight": 288,
+ "weight": 290,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9817,7 +9826,7 @@
},
"x-appwrite": {
"method": "listSpecifications",
- "weight": 289,
+ "weight": 291,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9871,7 +9880,7 @@
},
"x-appwrite": {
"method": "listTemplates",
- "weight": 312,
+ "weight": 314,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9969,7 +9978,7 @@
},
"x-appwrite": {
"method": "getTemplate",
- "weight": 313,
+ "weight": 315,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10031,7 +10040,7 @@
},
"x-appwrite": {
"method": "getUsage",
- "weight": 292,
+ "weight": 294,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10105,7 +10114,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 290,
+ "weight": 292,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10166,7 +10175,7 @@
},
"x-appwrite": {
"method": "update",
- "weight": 293,
+ "weight": 295,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10226,6 +10235,7 @@
"node-19.0",
"node-20.0",
"node-21.0",
+ "node-22",
"php-8.0",
"php-8.1",
"php-8.2",
@@ -10244,6 +10254,8 @@
"deno-1.24",
"deno-1.35",
"deno-1.40",
+ "deno-1.46",
+ "deno-2.0",
"dart-2.15",
"dart-2.16",
"dart-2.17",
@@ -10251,24 +10263,30 @@
"dart-3.0",
"dart-3.1",
"dart-3.3",
- "dotnet-3.1",
+ "dart-3.5",
"dotnet-6.0",
"dotnet-7.0",
+ "dotnet-8.0",
"java-8.0",
"java-11.0",
"java-17.0",
"java-18.0",
"java-21.0",
+ "java-22",
"swift-5.5",
"swift-5.8",
"swift-5.9",
+ "swift-5.10",
"kotlin-1.6",
"kotlin-1.8",
"kotlin-1.9",
+ "kotlin-2.0",
"cpp-17",
"cpp-20",
"bun-1.0",
- "go-1.23"
+ "bun-1.1",
+ "go-1.23",
+ "static-1"
],
"x-enum-name": null,
"x-enum-keys": []
@@ -10370,7 +10388,7 @@
"specification": {
"type": "string",
"description": "Runtime specification for the function and builds.",
- "default": "s-0.5vcpu-512mb",
+ "default": "s-1vcpu-512mb",
"x-example": null
}
},
@@ -10399,7 +10417,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 296,
+ "weight": 298,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10462,7 +10480,7 @@
},
"x-appwrite": {
"method": "listDeployments",
- "weight": 298,
+ "weight": 300,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10544,7 +10562,7 @@
},
"x-appwrite": {
"method": "createDeployment",
- "weight": 297,
+ "weight": 299,
"cookies": false,
"type": "upload",
"deprecated": false,
@@ -10638,7 +10656,7 @@
},
"x-appwrite": {
"method": "getDeployment",
- "weight": 299,
+ "weight": 301,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10707,7 +10725,7 @@
},
"x-appwrite": {
"method": "updateDeployment",
- "weight": 295,
+ "weight": 297,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10771,7 +10789,7 @@
},
"x-appwrite": {
"method": "deleteDeployment",
- "weight": 300,
+ "weight": 302,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10837,7 +10855,7 @@
},
"x-appwrite": {
"method": "createBuild",
- "weight": 301,
+ "weight": 303,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10921,7 +10939,7 @@
},
"x-appwrite": {
"method": "updateDeploymentBuild",
- "weight": 302,
+ "weight": 304,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10992,7 +11010,7 @@
},
"x-appwrite": {
"method": "getDeploymentDownload",
- "weight": 294,
+ "weight": 296,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -11065,7 +11083,7 @@
},
"x-appwrite": {
"method": "listExecutions",
- "weight": 304,
+ "weight": 306,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11131,7 +11149,7 @@
"summary": "Create execution",
"operationId": "functionsCreateExecution",
"consumes": [
- "multipart\/form-data"
+ "application\/json"
],
"produces": [
"multipart\/form-data"
@@ -11150,7 +11168,7 @@
},
"x-appwrite": {
"method": "createExecution",
- "weight": 303,
+ "weight": 305,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11190,65 +11208,59 @@
"in": "path"
},
{
- "name": "body",
- "description": "HTTP body of execution. Default value is empty string.",
- "required": false,
- "type": "payload",
- "default": "",
- "in": "formData"
- },
- {
- "name": "async",
- "description": "Execute code in the background. Default value is false.",
- "required": false,
- "type": "boolean",
- "x-example": false,
- "default": false,
- "in": "formData"
- },
- {
- "name": "path",
- "description": "HTTP path of execution. Path can include query params. Default value is \/",
- "required": false,
- "type": "string",
- "x-example": "",
- "default": "\/",
- "in": "formData"
- },
- {
- "name": "method",
- "description": "HTTP method of execution. Default value is GET.",
- "required": false,
- "type": "string",
- "x-example": "GET",
- "enum": [
- "GET",
- "POST",
- "PUT",
- "PATCH",
- "DELETE",
- "OPTIONS"
- ],
- "x-enum-name": "ExecutionMethod",
- "x-enum-keys": [],
- "default": "POST",
- "in": "formData"
- },
- {
- "name": "headers",
- "description": "HTTP headers of execution. Defaults to empty.",
- "required": false,
- "type": "object",
- "default": [],
- "x-example": "{}",
- "in": "formData"
- },
- {
- "name": "scheduledAt",
- "description": "Scheduled execution time in [ISO 8601](https:\/\/www.iso.org\/iso-8601-date-and-time-format.html) format. DateTime value must be in future with precision in minutes.",
- "required": false,
- "type": "string",
- "in": "formData"
+ "name": "payload",
+ "in": "body",
+ "schema": {
+ "type": "object",
+ "properties": {
+ "body": {
+ "type": "string",
+ "description": "HTTP body of execution. Default value is empty string.",
+ "default": "",
+ "x-example": ""
+ },
+ "async": {
+ "type": "boolean",
+ "description": "Execute code in the background. Default value is false.",
+ "default": false,
+ "x-example": false
+ },
+ "path": {
+ "type": "string",
+ "description": "HTTP path of execution. Path can include query params. Default value is \/",
+ "default": "\/",
+ "x-example": ""
+ },
+ "method": {
+ "type": "string",
+ "description": "HTTP method of execution. Default value is GET.",
+ "default": "POST",
+ "x-example": "GET",
+ "enum": [
+ "GET",
+ "POST",
+ "PUT",
+ "PATCH",
+ "DELETE",
+ "OPTIONS"
+ ],
+ "x-enum-name": "ExecutionMethod",
+ "x-enum-keys": []
+ },
+ "headers": {
+ "type": "object",
+ "description": "HTTP headers of execution. Defaults to empty.",
+ "default": [],
+ "x-example": "{}"
+ },
+ "scheduledAt": {
+ "type": "string",
+ "description": "Scheduled execution time in [ISO 8601](https:\/\/www.iso.org\/iso-8601-date-and-time-format.html) format. DateTime value must be in future with precision in minutes.",
+ "default": null,
+ "x-example": null
+ }
+ }
+ }
}
]
}
@@ -11277,7 +11289,7 @@
},
"x-appwrite": {
"method": "getExecution",
- "weight": 305,
+ "weight": 307,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11344,7 +11356,7 @@
},
"x-appwrite": {
"method": "deleteExecution",
- "weight": 306,
+ "weight": 308,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11415,7 +11427,7 @@
},
"x-appwrite": {
"method": "getFunctionUsage",
- "weight": 291,
+ "weight": 293,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11497,7 +11509,7 @@
},
"x-appwrite": {
"method": "listVariables",
- "weight": 308,
+ "weight": 310,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11558,7 +11570,7 @@
},
"x-appwrite": {
"method": "createVariable",
- "weight": 307,
+ "weight": 309,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11646,7 +11658,7 @@
},
"x-appwrite": {
"method": "getVariable",
- "weight": 309,
+ "weight": 311,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11715,7 +11727,7 @@
},
"x-appwrite": {
"method": "updateVariable",
- "weight": 310,
+ "weight": 312,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11803,7 +11815,7 @@
},
"x-appwrite": {
"method": "deleteVariable",
- "weight": 311,
+ "weight": 313,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11874,7 +11886,7 @@
},
"x-appwrite": {
"method": "query",
- "weight": 329,
+ "weight": 331,
"cookies": false,
"type": "graphql",
"deprecated": false,
@@ -11950,7 +11962,7 @@
},
"x-appwrite": {
"method": "mutation",
- "weight": 328,
+ "weight": 330,
"cookies": false,
"type": "graphql",
"deprecated": false,
@@ -12026,7 +12038,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 124,
+ "weight": 125,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12079,7 +12091,7 @@
},
"x-appwrite": {
"method": "getAntivirus",
- "weight": 146,
+ "weight": 147,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12132,7 +12144,7 @@
},
"x-appwrite": {
"method": "getCache",
- "weight": 127,
+ "weight": 128,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12185,7 +12197,7 @@
},
"x-appwrite": {
"method": "getCertificate",
- "weight": 133,
+ "weight": 134,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12247,7 +12259,7 @@
},
"x-appwrite": {
"method": "getDB",
- "weight": 126,
+ "weight": 127,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12300,7 +12312,7 @@
},
"x-appwrite": {
"method": "getPubSub",
- "weight": 129,
+ "weight": 130,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12353,7 +12365,7 @@
},
"x-appwrite": {
"method": "getQueue",
- "weight": 128,
+ "weight": 129,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12406,7 +12418,7 @@
},
"x-appwrite": {
"method": "getQueueBuilds",
- "weight": 135,
+ "weight": 136,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12470,7 +12482,7 @@
},
"x-appwrite": {
"method": "getQueueCertificates",
- "weight": 134,
+ "weight": 135,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12534,7 +12546,7 @@
},
"x-appwrite": {
"method": "getQueueDatabases",
- "weight": 136,
+ "weight": 137,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12607,7 +12619,7 @@
},
"x-appwrite": {
"method": "getQueueDeletes",
- "weight": 137,
+ "weight": 138,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12671,7 +12683,7 @@
},
"x-appwrite": {
"method": "getFailedJobs",
- "weight": 147,
+ "weight": 148,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12759,7 +12771,7 @@
},
"x-appwrite": {
"method": "getQueueFunctions",
- "weight": 141,
+ "weight": 142,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12823,7 +12835,7 @@
},
"x-appwrite": {
"method": "getQueueLogs",
- "weight": 132,
+ "weight": 133,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12887,7 +12899,7 @@
},
"x-appwrite": {
"method": "getQueueMails",
- "weight": 138,
+ "weight": 139,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12951,7 +12963,7 @@
},
"x-appwrite": {
"method": "getQueueMessaging",
- "weight": 139,
+ "weight": 140,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13015,7 +13027,7 @@
},
"x-appwrite": {
"method": "getQueueMigrations",
- "weight": 140,
+ "weight": 141,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13079,7 +13091,7 @@
},
"x-appwrite": {
"method": "getQueueUsage",
- "weight": 142,
+ "weight": 143,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13143,7 +13155,7 @@
},
"x-appwrite": {
"method": "getQueueUsageDump",
- "weight": 143,
+ "weight": 144,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13207,7 +13219,7 @@
},
"x-appwrite": {
"method": "getQueueWebhooks",
- "weight": 131,
+ "weight": 132,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13271,7 +13283,7 @@
},
"x-appwrite": {
"method": "getStorage",
- "weight": 145,
+ "weight": 146,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13324,7 +13336,7 @@
},
"x-appwrite": {
"method": "getStorageLocal",
- "weight": 144,
+ "weight": 145,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13377,7 +13389,7 @@
},
"x-appwrite": {
"method": "getTime",
- "weight": 130,
+ "weight": 131,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13430,7 +13442,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 116,
+ "weight": 117,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13464,7 +13476,7 @@
},
"\/locale\/codes": {
"get": {
- "summary": "List Locale Codes",
+ "summary": "List locale codes",
"operationId": "localeListCodes",
"consumes": [
"application\/json"
@@ -13486,7 +13498,7 @@
},
"x-appwrite": {
"method": "listCodes",
- "weight": 117,
+ "weight": 118,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13542,7 +13554,7 @@
},
"x-appwrite": {
"method": "listContinents",
- "weight": 121,
+ "weight": 122,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13598,7 +13610,7 @@
},
"x-appwrite": {
"method": "listCountries",
- "weight": 118,
+ "weight": 119,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13654,7 +13666,7 @@
},
"x-appwrite": {
"method": "listCountriesEU",
- "weight": 119,
+ "weight": 120,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13710,7 +13722,7 @@
},
"x-appwrite": {
"method": "listCountriesPhones",
- "weight": 120,
+ "weight": 121,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13766,7 +13778,7 @@
},
"x-appwrite": {
"method": "listCurrencies",
- "weight": 122,
+ "weight": 123,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13822,7 +13834,7 @@
},
"x-appwrite": {
"method": "listLanguages",
- "weight": 123,
+ "weight": 124,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13878,7 +13890,7 @@
},
"x-appwrite": {
"method": "listMessages",
- "weight": 388,
+ "weight": 390,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13955,7 +13967,7 @@
},
"x-appwrite": {
"method": "createEmail",
- "weight": 385,
+ "weight": 387,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14115,7 +14127,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 392,
+ "weight": 394,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14272,7 +14284,7 @@
},
"x-appwrite": {
"method": "createPush",
- "weight": 387,
+ "weight": 389,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14447,7 +14459,7 @@
},
"x-appwrite": {
"method": "updatePush",
- "weight": 394,
+ "weight": 396,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14619,7 +14631,7 @@
},
"x-appwrite": {
"method": "createSms",
- "weight": 386,
+ "weight": 388,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14739,7 +14751,7 @@
},
"x-appwrite": {
"method": "updateSms",
- "weight": 393,
+ "weight": 395,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14857,7 +14869,7 @@
},
"x-appwrite": {
"method": "getMessage",
- "weight": 391,
+ "weight": 393,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14916,7 +14928,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 395,
+ "weight": 397,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14980,7 +14992,7 @@
},
"x-appwrite": {
"method": "listMessageLogs",
- "weight": 389,
+ "weight": 391,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15056,7 +15068,7 @@
},
"x-appwrite": {
"method": "listTargets",
- "weight": 390,
+ "weight": 392,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15132,7 +15144,7 @@
},
"x-appwrite": {
"method": "listProviders",
- "weight": 360,
+ "weight": 362,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15209,7 +15221,7 @@
},
"x-appwrite": {
"method": "createApnsProvider",
- "weight": 359,
+ "weight": 361,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15326,7 +15338,7 @@
},
"x-appwrite": {
"method": "updateApnsProvider",
- "weight": 372,
+ "weight": 374,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15441,7 +15453,7 @@
},
"x-appwrite": {
"method": "createFcmProvider",
- "weight": 358,
+ "weight": 360,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15534,7 +15546,7 @@
},
"x-appwrite": {
"method": "updateFcmProvider",
- "weight": 371,
+ "weight": 373,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15625,7 +15637,7 @@
},
"x-appwrite": {
"method": "createMailgunProvider",
- "weight": 350,
+ "weight": 352,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15754,7 +15766,7 @@
},
"x-appwrite": {
"method": "updateMailgunProvider",
- "weight": 363,
+ "weight": 365,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15881,7 +15893,7 @@
},
"x-appwrite": {
"method": "createMsg91Provider",
- "weight": 353,
+ "weight": 355,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15986,7 +15998,7 @@
},
"x-appwrite": {
"method": "updateMsg91Provider",
- "weight": 366,
+ "weight": 368,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16089,7 +16101,7 @@
},
"x-appwrite": {
"method": "createSendgridProvider",
- "weight": 351,
+ "weight": 353,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16206,7 +16218,7 @@
},
"x-appwrite": {
"method": "updateSendgridProvider",
- "weight": 364,
+ "weight": 366,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16321,7 +16333,7 @@
},
"x-appwrite": {
"method": "createSmtpProvider",
- "weight": 352,
+ "weight": 354,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16482,7 +16494,7 @@
},
"x-appwrite": {
"method": "updateSmtpProvider",
- "weight": 365,
+ "weight": 367,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16640,7 +16652,7 @@
},
"x-appwrite": {
"method": "createTelesignProvider",
- "weight": 354,
+ "weight": 356,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16745,7 +16757,7 @@
},
"x-appwrite": {
"method": "updateTelesignProvider",
- "weight": 367,
+ "weight": 369,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16848,7 +16860,7 @@
},
"x-appwrite": {
"method": "createTextmagicProvider",
- "weight": 355,
+ "weight": 357,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16953,7 +16965,7 @@
},
"x-appwrite": {
"method": "updateTextmagicProvider",
- "weight": 368,
+ "weight": 370,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17056,7 +17068,7 @@
},
"x-appwrite": {
"method": "createTwilioProvider",
- "weight": 356,
+ "weight": 358,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17161,7 +17173,7 @@
},
"x-appwrite": {
"method": "updateTwilioProvider",
- "weight": 369,
+ "weight": 371,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17264,7 +17276,7 @@
},
"x-appwrite": {
"method": "createVonageProvider",
- "weight": 357,
+ "weight": 359,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17369,7 +17381,7 @@
},
"x-appwrite": {
"method": "updateVonageProvider",
- "weight": 370,
+ "weight": 372,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17472,7 +17484,7 @@
},
"x-appwrite": {
"method": "getProvider",
- "weight": 362,
+ "weight": 364,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17531,7 +17543,7 @@
},
"x-appwrite": {
"method": "deleteProvider",
- "weight": 373,
+ "weight": 375,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17595,7 +17607,7 @@
},
"x-appwrite": {
"method": "listProviderLogs",
- "weight": 361,
+ "weight": 363,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17671,7 +17683,7 @@
},
"x-appwrite": {
"method": "listSubscriberLogs",
- "weight": 382,
+ "weight": 384,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17747,7 +17759,7 @@
},
"x-appwrite": {
"method": "listTopics",
- "weight": 375,
+ "weight": 377,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17822,7 +17834,7 @@
},
"x-appwrite": {
"method": "createTopic",
- "weight": 374,
+ "weight": 376,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17914,7 +17926,7 @@
},
"x-appwrite": {
"method": "getTopic",
- "weight": 377,
+ "weight": 379,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17976,7 +17988,7 @@
},
"x-appwrite": {
"method": "updateTopic",
- "weight": 378,
+ "weight": 380,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18059,7 +18071,7 @@
},
"x-appwrite": {
"method": "deleteTopic",
- "weight": 379,
+ "weight": 381,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18123,7 +18135,7 @@
},
"x-appwrite": {
"method": "listTopicLogs",
- "weight": 376,
+ "weight": 378,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18199,7 +18211,7 @@
},
"x-appwrite": {
"method": "listSubscribers",
- "weight": 381,
+ "weight": 383,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18282,7 +18294,7 @@
},
"x-appwrite": {
"method": "createSubscriber",
- "weight": 380,
+ "weight": 382,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18374,7 +18386,7 @@
},
"x-appwrite": {
"method": "getSubscriber",
- "weight": 383,
+ "weight": 385,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18441,7 +18453,7 @@
},
"x-appwrite": {
"method": "deleteSubscriber",
- "weight": 384,
+ "weight": 386,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18494,7 +18506,7 @@
},
"\/migrations": {
"get": {
- "summary": "List Migrations",
+ "summary": "List migrations",
"operationId": "migrationsList",
"consumes": [
"application\/json"
@@ -18516,7 +18528,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 337,
+ "weight": 339,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18545,7 +18557,7 @@
"parameters": [
{
"name": "queries",
- "description": "Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https:\/\/appwrite.io\/docs\/databases#querying-documents). Maximum of 100 queries are allowed, each 4096 characters long. You may filter on the following attributes: status, stage, source, resources, statusCounters, resourceData, errors",
+ "description": "Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https:\/\/appwrite.io\/docs\/databases#querying-documents). Maximum of 100 queries are allowed, each 4096 characters long. You may filter on the following attributes: status, stage, source, destination, resources, statusCounters, resourceData, errors",
"required": false,
"type": "array",
"collectionFormat": "multi",
@@ -18569,7 +18581,7 @@
},
"\/migrations\/appwrite": {
"post": {
- "summary": "Migrate Appwrite Data",
+ "summary": "Migrate Appwrite data",
"operationId": "migrationsCreateAppwriteMigration",
"consumes": [
"application\/json"
@@ -18591,7 +18603,7 @@
},
"x-appwrite": {
"method": "createAppwriteMigration",
- "weight": 332,
+ "weight": 334,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18665,7 +18677,7 @@
},
"\/migrations\/appwrite\/report": {
"get": {
- "summary": "Generate a report on Appwrite Data",
+ "summary": "Generate a report on Appwrite data",
"operationId": "migrationsGetAppwriteReport",
"consumes": [
"application\/json"
@@ -18687,7 +18699,7 @@
},
"x-appwrite": {
"method": "getAppwriteReport",
- "weight": 339,
+ "weight": 341,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18755,7 +18767,7 @@
},
"\/migrations\/firebase": {
"post": {
- "summary": "Migrate Firebase Data (Service Account)",
+ "summary": "Migrate Firebase data (Service Account)",
"operationId": "migrationsCreateFirebaseMigration",
"consumes": [
"application\/json"
@@ -18777,7 +18789,7 @@
},
"x-appwrite": {
"method": "createFirebaseMigration",
- "weight": 334,
+ "weight": 336,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18837,7 +18849,7 @@
},
"\/migrations\/firebase\/deauthorize": {
"get": {
- "summary": "Revoke Appwrite's authorization to access Firebase Projects",
+ "summary": "Revoke Appwrite's authorization to access Firebase projects",
"operationId": "migrationsDeleteFirebaseAuth",
"consumes": [
"application\/json"
@@ -18859,7 +18871,7 @@
},
"x-appwrite": {
"method": "deleteFirebaseAuth",
- "weight": 345,
+ "weight": 347,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18889,7 +18901,7 @@
},
"\/migrations\/firebase\/oauth": {
"post": {
- "summary": "Migrate Firebase Data (OAuth)",
+ "summary": "Migrate Firebase data (OAuth)",
"operationId": "migrationsCreateFirebaseOAuthMigration",
"consumes": [
"application\/json"
@@ -18911,7 +18923,7 @@
},
"x-appwrite": {
"method": "createFirebaseOAuthMigration",
- "weight": 333,
+ "weight": 335,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18971,7 +18983,7 @@
},
"\/migrations\/firebase\/projects": {
"get": {
- "summary": "List Firebase Projects",
+ "summary": "List Firebase projects",
"operationId": "migrationsListFirebaseProjects",
"consumes": [
"application\/json"
@@ -18993,7 +19005,7 @@
},
"x-appwrite": {
"method": "listFirebaseProjects",
- "weight": 344,
+ "weight": 346,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19023,7 +19035,7 @@
},
"\/migrations\/firebase\/report": {
"get": {
- "summary": "Generate a report on Firebase Data",
+ "summary": "Generate a report on Firebase data",
"operationId": "migrationsGetFirebaseReport",
"consumes": [
"application\/json"
@@ -19045,7 +19057,7 @@
},
"x-appwrite": {
"method": "getFirebaseReport",
- "weight": 340,
+ "weight": 342,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19096,7 +19108,7 @@
},
"\/migrations\/firebase\/report\/oauth": {
"get": {
- "summary": "Generate a report on Firebase Data using OAuth",
+ "summary": "Generate a report on Firebase data using OAuth",
"operationId": "migrationsGetFirebaseReportOAuth",
"consumes": [
"application\/json"
@@ -19118,7 +19130,7 @@
},
"x-appwrite": {
"method": "getFirebaseReportOAuth",
- "weight": 341,
+ "weight": 343,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19169,7 +19181,7 @@
},
"\/migrations\/nhost": {
"post": {
- "summary": "Migrate NHost Data",
+ "summary": "Migrate NHost data",
"operationId": "migrationsCreateNHostMigration",
"consumes": [
"application\/json"
@@ -19191,7 +19203,7 @@
},
"x-appwrite": {
"method": "createNHostMigration",
- "weight": 336,
+ "weight": 338,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19314,7 +19326,7 @@
},
"x-appwrite": {
"method": "getNHostReport",
- "weight": 347,
+ "weight": 349,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19414,7 +19426,7 @@
},
"\/migrations\/supabase": {
"post": {
- "summary": "Migrate Supabase Data",
+ "summary": "Migrate Supabase data",
"operationId": "migrationsCreateSupabaseMigration",
"consumes": [
"application\/json"
@@ -19436,7 +19448,7 @@
},
"x-appwrite": {
"method": "createSupabaseMigration",
- "weight": 335,
+ "weight": 337,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19552,7 +19564,7 @@
},
"x-appwrite": {
"method": "getSupabaseReport",
- "weight": 346,
+ "weight": 348,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19645,7 +19657,7 @@
},
"\/migrations\/{migrationId}": {
"get": {
- "summary": "Get Migration",
+ "summary": "Get migration",
"operationId": "migrationsGet",
"consumes": [
"application\/json"
@@ -19667,7 +19679,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 338,
+ "weight": 340,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19705,7 +19717,7 @@
]
},
"patch": {
- "summary": "Retry Migration",
+ "summary": "Retry migration",
"operationId": "migrationsRetry",
"consumes": [
"application\/json"
@@ -19727,7 +19739,7 @@
},
"x-appwrite": {
"method": "retry",
- "weight": 348,
+ "weight": 350,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19765,7 +19777,7 @@
]
},
"delete": {
- "summary": "Delete Migration",
+ "summary": "Delete migration",
"operationId": "migrationsDelete",
"consumes": [
"application\/json"
@@ -19782,7 +19794,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 349,
+ "weight": 351,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19844,7 +19856,7 @@
},
"x-appwrite": {
"method": "getUsage",
- "weight": 194,
+ "weight": 196,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19908,7 +19920,7 @@
},
"\/project\/variables": {
"get": {
- "summary": "List Variables",
+ "summary": "List variables",
"operationId": "projectListVariables",
"consumes": [
"application\/json"
@@ -19930,7 +19942,7 @@
},
"x-appwrite": {
"method": "listVariables",
- "weight": 196,
+ "weight": 198,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19958,7 +19970,7 @@
]
},
"post": {
- "summary": "Create Variable",
+ "summary": "Create variable",
"operationId": "projectCreateVariable",
"consumes": [
"application\/json"
@@ -19980,7 +19992,7 @@
},
"x-appwrite": {
"method": "createVariable",
- "weight": 195,
+ "weight": 197,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20037,7 +20049,7 @@
},
"\/project\/variables\/{variableId}": {
"get": {
- "summary": "Get Variable",
+ "summary": "Get variable",
"operationId": "projectGetVariable",
"consumes": [
"application\/json"
@@ -20059,7 +20071,7 @@
},
"x-appwrite": {
"method": "getVariable",
- "weight": 197,
+ "weight": 199,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20097,7 +20109,7 @@
]
},
"put": {
- "summary": "Update Variable",
+ "summary": "Update variable",
"operationId": "projectUpdateVariable",
"consumes": [
"application\/json"
@@ -20119,7 +20131,7 @@
},
"x-appwrite": {
"method": "updateVariable",
- "weight": 198,
+ "weight": 200,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20181,7 +20193,7 @@
]
},
"delete": {
- "summary": "Delete Variable",
+ "summary": "Delete variable",
"operationId": "projectDeleteVariable",
"consumes": [
"application\/json"
@@ -20198,7 +20210,7 @@
},
"x-appwrite": {
"method": "deleteVariable",
- "weight": 199,
+ "weight": 201,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20260,7 +20272,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 150,
+ "weight": 151,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20333,7 +20345,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 149,
+ "weight": 150,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20485,7 +20497,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 151,
+ "weight": 152,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20545,7 +20557,7 @@
},
"x-appwrite": {
"method": "update",
- "weight": 152,
+ "weight": 153,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20672,7 +20684,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 168,
+ "weight": 170,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20734,7 +20746,7 @@
},
"x-appwrite": {
"method": "updateApiStatus",
- "weight": 156,
+ "weight": 157,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20828,7 +20840,7 @@
},
"x-appwrite": {
"method": "updateApiStatusAll",
- "weight": 157,
+ "weight": 158,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20908,7 +20920,7 @@
},
"x-appwrite": {
"method": "updateAuthDuration",
- "weight": 161,
+ "weight": 163,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20988,7 +21000,7 @@
},
"x-appwrite": {
"method": "updateAuthLimit",
- "weight": 160,
+ "weight": 162,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21068,7 +21080,7 @@
},
"x-appwrite": {
"method": "updateAuthSessionsLimit",
- "weight": 166,
+ "weight": 168,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21124,6 +21136,100 @@
]
}
},
+ "\/projects\/{projectId}\/auth\/memberships-privacy": {
+ "patch": {
+ "summary": "Update project memberships privacy attributes",
+ "operationId": "projectsUpdateMembershipsPrivacy",
+ "consumes": [
+ "application\/json"
+ ],
+ "produces": [
+ "application\/json"
+ ],
+ "tags": [
+ "projects"
+ ],
+ "description": "",
+ "responses": {
+ "200": {
+ "description": "Project",
+ "schema": {
+ "$ref": "#\/definitions\/project"
+ }
+ }
+ },
+ "x-appwrite": {
+ "method": "updateMembershipsPrivacy",
+ "weight": 161,
+ "cookies": false,
+ "type": "",
+ "deprecated": false,
+ "demo": "projects\/update-memberships-privacy.md",
+ "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master",
+ "rate-limit": 0,
+ "rate-time": 3600,
+ "rate-key": "url:{url},ip:{ip}",
+ "scope": "projects.write",
+ "platforms": [
+ "console"
+ ],
+ "packaging": false,
+ "offline-model": "",
+ "offline-key": "",
+ "offline-response-key": "$id",
+ "auth": {
+ "Project": []
+ }
+ },
+ "security": [
+ {
+ "Project": []
+ }
+ ],
+ "parameters": [
+ {
+ "name": "projectId",
+ "description": "Project unique ID.",
+ "required": true,
+ "type": "string",
+ "x-example": "",
+ "in": "path"
+ },
+ {
+ "name": "payload",
+ "in": "body",
+ "schema": {
+ "type": "object",
+ "properties": {
+ "userName": {
+ "type": "boolean",
+ "description": "Set to true to show userName to members of a team.",
+ "default": null,
+ "x-example": false
+ },
+ "userEmail": {
+ "type": "boolean",
+ "description": "Set to true to show email to members of a team.",
+ "default": null,
+ "x-example": false
+ },
+ "mfa": {
+ "type": "boolean",
+ "description": "Set to true to show mfa to members of a team.",
+ "default": null,
+ "x-example": false
+ }
+ },
+ "required": [
+ "userName",
+ "userEmail",
+ "mfa"
+ ]
+ }
+ }
+ ]
+ }
+ },
"\/projects\/{projectId}\/auth\/mock-numbers": {
"patch": {
"summary": "Update the mock numbers for the project",
@@ -21148,7 +21254,7 @@
},
"x-appwrite": {
"method": "updateMockNumbers",
- "weight": 167,
+ "weight": 169,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21231,7 +21337,7 @@
},
"x-appwrite": {
"method": "updateAuthPasswordDictionary",
- "weight": 164,
+ "weight": 166,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21311,7 +21417,7 @@
},
"x-appwrite": {
"method": "updateAuthPasswordHistory",
- "weight": 163,
+ "weight": 165,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21391,7 +21497,7 @@
},
"x-appwrite": {
"method": "updatePersonalDataCheck",
- "weight": 165,
+ "weight": 167,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21471,7 +21577,7 @@
},
"x-appwrite": {
"method": "updateSessionAlerts",
- "weight": 159,
+ "weight": 160,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21551,7 +21657,7 @@
},
"x-appwrite": {
"method": "updateAuthStatus",
- "weight": 162,
+ "weight": 164,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21650,7 +21756,7 @@
},
"x-appwrite": {
"method": "createJWT",
- "weight": 180,
+ "weight": 182,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21739,7 +21845,7 @@
},
"x-appwrite": {
"method": "listKeys",
- "weight": 176,
+ "weight": 178,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21748,7 +21854,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.read",
+ "scope": "keys.read",
"platforms": [
"console"
],
@@ -21799,7 +21905,7 @@
},
"x-appwrite": {
"method": "createKey",
- "weight": 175,
+ "weight": 177,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21808,7 +21914,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.write",
+ "scope": "keys.write",
"platforms": [
"console"
],
@@ -21895,7 +22001,7 @@
},
"x-appwrite": {
"method": "getKey",
- "weight": 177,
+ "weight": 179,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21904,7 +22010,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.read",
+ "scope": "keys.read",
"platforms": [
"console"
],
@@ -21963,7 +22069,7 @@
},
"x-appwrite": {
"method": "updateKey",
- "weight": 178,
+ "weight": 180,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21972,7 +22078,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.write",
+ "scope": "keys.write",
"platforms": [
"console"
],
@@ -22060,7 +22166,7 @@
},
"x-appwrite": {
"method": "deleteKey",
- "weight": 179,
+ "weight": 181,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22069,7 +22175,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.write",
+ "scope": "keys.write",
"platforms": [
"console"
],
@@ -22130,7 +22236,7 @@
},
"x-appwrite": {
"method": "updateOAuth2",
- "weight": 158,
+ "weight": 159,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22271,7 +22377,7 @@
},
"x-appwrite": {
"method": "listPlatforms",
- "weight": 182,
+ "weight": 184,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22280,7 +22386,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.read",
+ "scope": "platforms.read",
"platforms": [
"console"
],
@@ -22331,7 +22437,7 @@
},
"x-appwrite": {
"method": "createPlatform",
- "weight": 181,
+ "weight": 183,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22340,7 +22446,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.write",
+ "scope": "platforms.write",
"platforms": [
"console"
],
@@ -22455,7 +22561,7 @@
},
"x-appwrite": {
"method": "getPlatform",
- "weight": 183,
+ "weight": 185,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22464,7 +22570,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.read",
+ "scope": "platforms.read",
"platforms": [
"console"
],
@@ -22523,7 +22629,7 @@
},
"x-appwrite": {
"method": "updatePlatform",
- "weight": 184,
+ "weight": 186,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22532,7 +22638,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.write",
+ "scope": "platforms.write",
"platforms": [
"console"
],
@@ -22622,7 +22728,7 @@
},
"x-appwrite": {
"method": "deletePlatform",
- "weight": 185,
+ "weight": 187,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22631,7 +22737,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.write",
+ "scope": "platforms.write",
"platforms": [
"console"
],
@@ -22692,7 +22798,7 @@
},
"x-appwrite": {
"method": "updateServiceStatus",
- "weight": 154,
+ "weight": 155,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22794,7 +22900,7 @@
},
"x-appwrite": {
"method": "updateServiceStatusAll",
- "weight": 155,
+ "weight": 156,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22874,7 +22980,7 @@
},
"x-appwrite": {
"method": "updateSmtp",
- "weight": 186,
+ "weight": 188,
"cookies": false,
"type": "",
"deprecated": false,
@@ -23003,7 +23109,7 @@
},
"x-appwrite": {
"method": "createSmtpTest",
- "weight": 187,
+ "weight": 189,
"cookies": false,
"type": "",
"deprecated": false,
@@ -23101,7 +23207,8 @@
"default": "",
"x-example": "tls",
"enum": [
- "tls"
+ "tls",
+ "ssl"
],
"x-enum-name": "SMTPSecure",
"x-enum-keys": []
@@ -23142,7 +23249,7 @@
},
"x-appwrite": {
"method": "updateTeam",
- "weight": 153,
+ "weight": 154,
"cookies": false,
"type": "",
"deprecated": false,
@@ -23222,7 +23329,7 @@
},
"x-appwrite": {
"method": "getEmailTemplate",
- "weight": 189,
+ "weight": 191,
"cookies": false,
"type": "",
"deprecated": false,
@@ -23444,7 +23551,7 @@
},
"x-appwrite": {
"method": "updateEmailTemplate",
- "weight": 191,
+ "weight": 193,
"cookies": false,
"type": "",
"deprecated": false,
@@ -23709,7 +23816,7 @@
},
"x-appwrite": {
"method": "deleteEmailTemplate",
- "weight": 193,
+ "weight": 195,
"cookies": false,
"type": "",
"deprecated": false,
@@ -23933,7 +24040,7 @@
},
"x-appwrite": {
"method": "getSmsTemplate",
- "weight": 188,
+ "weight": 190,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24152,7 +24259,7 @@
},
"x-appwrite": {
"method": "updateSmsTemplate",
- "weight": 190,
+ "weight": 192,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24389,7 +24496,7 @@
},
"x-appwrite": {
"method": "deleteSmsTemplate",
- "weight": 192,
+ "weight": 194,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24610,7 +24717,7 @@
},
"x-appwrite": {
"method": "listWebhooks",
- "weight": 170,
+ "weight": 172,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24670,7 +24777,7 @@
},
"x-appwrite": {
"method": "createWebhook",
- "weight": 169,
+ "weight": 171,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24792,7 +24899,7 @@
},
"x-appwrite": {
"method": "getWebhook",
- "weight": 171,
+ "weight": 173,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24860,7 +24967,7 @@
},
"x-appwrite": {
"method": "updateWebhook",
- "weight": 172,
+ "weight": 174,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24983,7 +25090,7 @@
},
"x-appwrite": {
"method": "deleteWebhook",
- "weight": 174,
+ "weight": 176,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25053,7 +25160,7 @@
},
"x-appwrite": {
"method": "updateWebhookSignature",
- "weight": 173,
+ "weight": 175,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25101,7 +25208,7 @@
},
"\/proxy\/rules": {
"get": {
- "summary": "List Rules",
+ "summary": "List rules",
"operationId": "proxyListRules",
"consumes": [
"application\/json"
@@ -25123,7 +25230,7 @@
},
"x-appwrite": {
"method": "listRules",
- "weight": 315,
+ "weight": 317,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25174,7 +25281,7 @@
]
},
"post": {
- "summary": "Create Rule",
+ "summary": "Create rule",
"operationId": "proxyCreateRule",
"consumes": [
"application\/json"
@@ -25196,7 +25303,7 @@
},
"x-appwrite": {
"method": "createRule",
- "weight": 314,
+ "weight": 316,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25265,7 +25372,7 @@
},
"\/proxy\/rules\/{ruleId}": {
"get": {
- "summary": "Get Rule",
+ "summary": "Get rule",
"operationId": "proxyGetRule",
"consumes": [
"application\/json"
@@ -25287,7 +25394,7 @@
},
"x-appwrite": {
"method": "getRule",
- "weight": 316,
+ "weight": 318,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25325,7 +25432,7 @@
]
},
"delete": {
- "summary": "Delete Rule",
+ "summary": "Delete rule",
"operationId": "proxyDeleteRule",
"consumes": [
"application\/json"
@@ -25342,7 +25449,7 @@
},
"x-appwrite": {
"method": "deleteRule",
- "weight": 317,
+ "weight": 319,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25382,7 +25489,7 @@
},
"\/proxy\/rules\/{ruleId}\/verification": {
"patch": {
- "summary": "Update Rule Verification Status",
+ "summary": "Update rule verification status",
"operationId": "proxyUpdateRuleVerification",
"consumes": [
"application\/json"
@@ -25404,7 +25511,7 @@
},
"x-appwrite": {
"method": "updateRuleVerification",
- "weight": 318,
+ "weight": 320,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25466,7 +25573,7 @@
},
"x-appwrite": {
"method": "listBuckets",
- "weight": 201,
+ "weight": 203,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25540,7 +25647,7 @@
},
"x-appwrite": {
"method": "createBucket",
- "weight": 200,
+ "weight": 202,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25681,7 +25788,7 @@
},
"x-appwrite": {
"method": "getBucket",
- "weight": 202,
+ "weight": 204,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25742,7 +25849,7 @@
},
"x-appwrite": {
"method": "updateBucket",
- "weight": 203,
+ "weight": 205,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25877,7 +25984,7 @@
},
"x-appwrite": {
"method": "deleteBucket",
- "weight": 204,
+ "weight": 206,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25940,7 +26047,7 @@
},
"x-appwrite": {
"method": "listFiles",
- "weight": 206,
+ "weight": 208,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26025,7 +26132,7 @@
},
"x-appwrite": {
"method": "createFile",
- "weight": 205,
+ "weight": 207,
"cookies": false,
"type": "upload",
"deprecated": false,
@@ -26119,7 +26226,7 @@
},
"x-appwrite": {
"method": "getFile",
- "weight": 207,
+ "weight": 209,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26191,7 +26298,7 @@
},
"x-appwrite": {
"method": "updateFile",
- "weight": 212,
+ "weight": 214,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26265,7 +26372,7 @@
]
},
"delete": {
- "summary": "Delete File",
+ "summary": "Delete file",
"operationId": "storageDeleteFile",
"consumes": [
"application\/json"
@@ -26282,7 +26389,7 @@
},
"x-appwrite": {
"method": "deleteFile",
- "weight": 213,
+ "weight": 215,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26356,7 +26463,7 @@
},
"x-appwrite": {
"method": "getFileDownload",
- "weight": 209,
+ "weight": 211,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -26430,7 +26537,7 @@
},
"x-appwrite": {
"method": "getFilePreview",
- "weight": 208,
+ "weight": 210,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -26596,7 +26703,8 @@
"jpeg",
"gif",
"png",
- "webp"
+ "webp",
+ "avif"
],
"x-enum-name": "ImageFormat",
"x-enum-keys": [],
@@ -26630,7 +26738,7 @@
},
"x-appwrite": {
"method": "getFileView",
- "weight": 210,
+ "weight": 212,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -26704,7 +26812,7 @@
},
"x-appwrite": {
"method": "getUsage",
- "weight": 214,
+ "weight": 216,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26778,7 +26886,7 @@
},
"x-appwrite": {
"method": "getBucketUsage",
- "weight": 215,
+ "weight": 217,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26860,7 +26968,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 217,
+ "weight": 219,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26937,7 +27045,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 216,
+ "weight": 218,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27031,7 +27139,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 218,
+ "weight": 220,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27095,7 +27203,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 220,
+ "weight": 222,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27172,7 +27280,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 222,
+ "weight": 224,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27238,7 +27346,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 229,
+ "weight": 231,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27301,7 +27409,7 @@
"tags": [
"teams"
],
- "description": "Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint.",
+ "description": "Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint. Hide sensitive attributes from the response by toggling membership privacy in the Console.",
"responses": {
"200": {
"description": "Memberships List",
@@ -27312,7 +27420,7 @@
},
"x-appwrite": {
"method": "listMemberships",
- "weight": 224,
+ "weight": 226,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27397,7 +27505,7 @@
},
"x-appwrite": {
"method": "createMembership",
- "weight": 223,
+ "weight": 225,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27503,7 +27611,7 @@
"tags": [
"teams"
],
- "description": "Get a team member by the membership unique id. All team members have read access for this resource.",
+ "description": "Get a team member by the membership unique id. All team members have read access for this resource. Hide sensitive attributes from the response by toggling membership privacy in the Console.",
"responses": {
"200": {
"description": "Membership",
@@ -27514,7 +27622,7 @@
},
"x-appwrite": {
"method": "getMembership",
- "weight": 225,
+ "weight": 227,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27586,7 +27694,7 @@
},
"x-appwrite": {
"method": "updateMembership",
- "weight": 226,
+ "weight": 228,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27674,7 +27782,7 @@
},
"x-appwrite": {
"method": "deleteMembership",
- "weight": 228,
+ "weight": 230,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27748,7 +27856,7 @@
},
"x-appwrite": {
"method": "updateMembershipStatus",
- "weight": 227,
+ "weight": 229,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27845,7 +27953,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 219,
+ "weight": 221,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27907,7 +28015,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 221,
+ "weight": 223,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27989,7 +28097,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 239,
+ "weight": 241,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28063,7 +28171,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 230,
+ "weight": 232,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28160,7 +28268,7 @@
},
"x-appwrite": {
"method": "createArgon2User",
- "weight": 233,
+ "weight": 235,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28253,7 +28361,7 @@
},
"x-appwrite": {
"method": "createBcryptUser",
- "weight": 231,
+ "weight": 233,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28324,7 +28432,7 @@
},
"\/users\/identities": {
"get": {
- "summary": "List Identities",
+ "summary": "List identities",
"operationId": "usersListIdentities",
"consumes": [
"application\/json"
@@ -28346,7 +28454,7 @@
},
"x-appwrite": {
"method": "listIdentities",
- "weight": 247,
+ "weight": 249,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28417,7 +28525,7 @@
},
"x-appwrite": {
"method": "deleteIdentity",
- "weight": 270,
+ "weight": 272,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28480,7 +28588,7 @@
},
"x-appwrite": {
"method": "createMD5User",
- "weight": 232,
+ "weight": 234,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28573,7 +28681,7 @@
},
"x-appwrite": {
"method": "createPHPassUser",
- "weight": 235,
+ "weight": 237,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28666,7 +28774,7 @@
},
"x-appwrite": {
"method": "createScryptUser",
- "weight": 236,
+ "weight": 238,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28794,7 +28902,7 @@
},
"x-appwrite": {
"method": "createScryptModifiedUser",
- "weight": 237,
+ "weight": 239,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28908,7 +29016,7 @@
},
"x-appwrite": {
"method": "createSHAUser",
- "weight": 234,
+ "weight": 236,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29022,7 +29130,7 @@
},
"x-appwrite": {
"method": "getUsage",
- "weight": 272,
+ "weight": 274,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29096,7 +29204,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 240,
+ "weight": 242,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29152,7 +29260,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 268,
+ "weight": 270,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29215,7 +29323,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 253,
+ "weight": 255,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29296,7 +29404,7 @@
},
"x-appwrite": {
"method": "createJWT",
- "weight": 271,
+ "weight": 273,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29380,7 +29488,7 @@
},
"x-appwrite": {
"method": "updateLabels",
- "weight": 249,
+ "weight": 251,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29464,7 +29572,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 245,
+ "weight": 247,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29539,7 +29647,7 @@
},
"x-appwrite": {
"method": "listMemberships",
- "weight": 244,
+ "weight": 246,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29602,7 +29710,7 @@
},
"x-appwrite": {
"method": "updateMfa",
- "weight": 258,
+ "weight": 260,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29661,7 +29769,7 @@
},
"\/users\/{userId}\/mfa\/authenticators\/{type}": {
"delete": {
- "summary": "Delete Authenticator",
+ "summary": "Delete authenticator",
"operationId": "usersDeleteMfaAuthenticator",
"consumes": [
"application\/json"
@@ -29683,7 +29791,7 @@
},
"x-appwrite": {
"method": "deleteMfaAuthenticator",
- "weight": 263,
+ "weight": 265,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29737,7 +29845,7 @@
},
"\/users\/{userId}\/mfa\/factors": {
"get": {
- "summary": "List Factors",
+ "summary": "List factors",
"operationId": "usersListMfaFactors",
"consumes": [
"application\/json"
@@ -29759,7 +29867,7 @@
},
"x-appwrite": {
"method": "listMfaFactors",
- "weight": 259,
+ "weight": 261,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29800,7 +29908,7 @@
},
"\/users\/{userId}\/mfa\/recovery-codes": {
"get": {
- "summary": "Get MFA Recovery Codes",
+ "summary": "Get MFA recovery codes",
"operationId": "usersGetMfaRecoveryCodes",
"consumes": [
"application\/json"
@@ -29822,7 +29930,7 @@
},
"x-appwrite": {
"method": "getMfaRecoveryCodes",
- "weight": 260,
+ "weight": 262,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29861,7 +29969,7 @@
]
},
"put": {
- "summary": "Regenerate MFA Recovery Codes",
+ "summary": "Regenerate MFA recovery codes",
"operationId": "usersUpdateMfaRecoveryCodes",
"consumes": [
"application\/json"
@@ -29883,7 +29991,7 @@
},
"x-appwrite": {
"method": "updateMfaRecoveryCodes",
- "weight": 262,
+ "weight": 264,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29922,7 +30030,7 @@
]
},
"patch": {
- "summary": "Create MFA Recovery Codes",
+ "summary": "Create MFA recovery codes",
"operationId": "usersCreateMfaRecoveryCodes",
"consumes": [
"application\/json"
@@ -29944,7 +30052,7 @@
},
"x-appwrite": {
"method": "createMfaRecoveryCodes",
- "weight": 261,
+ "weight": 263,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30007,7 +30115,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 251,
+ "weight": 253,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30088,7 +30196,7 @@
},
"x-appwrite": {
"method": "updatePassword",
- "weight": 252,
+ "weight": 254,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30169,7 +30277,7 @@
},
"x-appwrite": {
"method": "updatePhone",
- "weight": 254,
+ "weight": 256,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30250,7 +30358,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 241,
+ "weight": 243,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30311,7 +30419,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 256,
+ "weight": 258,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30392,7 +30500,7 @@
},
"x-appwrite": {
"method": "listSessions",
- "weight": 243,
+ "weight": 245,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30453,7 +30561,7 @@
},
"x-appwrite": {
"method": "createSession",
- "weight": 264,
+ "weight": 266,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30509,7 +30617,7 @@
},
"x-appwrite": {
"method": "deleteSessions",
- "weight": 267,
+ "weight": 269,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30567,7 +30675,7 @@
},
"x-appwrite": {
"method": "deleteSession",
- "weight": 266,
+ "weight": 268,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30638,7 +30746,7 @@
},
"x-appwrite": {
"method": "updateStatus",
- "weight": 248,
+ "weight": 250,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30697,7 +30805,7 @@
},
"\/users\/{userId}\/targets": {
"get": {
- "summary": "List User Targets",
+ "summary": "List user targets",
"operationId": "usersListTargets",
"consumes": [
"application\/json"
@@ -30719,7 +30827,7 @@
},
"x-appwrite": {
"method": "listTargets",
- "weight": 246,
+ "weight": 248,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30771,7 +30879,7 @@
]
},
"post": {
- "summary": "Create User Target",
+ "summary": "Create user target",
"operationId": "usersCreateTarget",
"consumes": [
"application\/json"
@@ -30793,7 +30901,7 @@
},
"x-appwrite": {
"method": "createTarget",
- "weight": 238,
+ "weight": 240,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30886,7 +30994,7 @@
},
"\/users\/{userId}\/targets\/{targetId}": {
"get": {
- "summary": "Get User Target",
+ "summary": "Get user target",
"operationId": "usersGetTarget",
"consumes": [
"application\/json"
@@ -30908,7 +31016,7 @@
},
"x-appwrite": {
"method": "getTarget",
- "weight": 242,
+ "weight": 244,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30956,7 +31064,7 @@
]
},
"patch": {
- "summary": "Update User target",
+ "summary": "Update user target",
"operationId": "usersUpdateTarget",
"consumes": [
"application\/json"
@@ -30978,7 +31086,7 @@
},
"x-appwrite": {
"method": "updateTarget",
- "weight": 257,
+ "weight": 259,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31072,7 +31180,7 @@
},
"x-appwrite": {
"method": "deleteTarget",
- "weight": 269,
+ "weight": 271,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31144,7 +31252,7 @@
},
"x-appwrite": {
"method": "createToken",
- "weight": 265,
+ "weight": 267,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31228,7 +31336,7 @@
},
"x-appwrite": {
"method": "updateEmailVerification",
- "weight": 255,
+ "weight": 257,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31309,7 +31417,7 @@
},
"x-appwrite": {
"method": "updatePhoneVerification",
- "weight": 250,
+ "weight": 252,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31368,7 +31476,7 @@
},
"\/vcs\/github\/installations\/{installationId}\/providerRepositories": {
"get": {
- "summary": "List Repositories",
+ "summary": "List repositories",
"operationId": "vcsListRepositories",
"consumes": [
"application\/json"
@@ -31390,7 +31498,7 @@
},
"x-appwrite": {
"method": "listRepositories",
- "weight": 277,
+ "weight": 279,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31459,7 +31567,7 @@
},
"x-appwrite": {
"method": "createRepository",
- "weight": 278,
+ "weight": 280,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31546,7 +31654,7 @@
},
"x-appwrite": {
"method": "getRepository",
- "weight": 279,
+ "weight": 281,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31594,7 +31702,7 @@
},
"\/vcs\/github\/installations\/{installationId}\/providerRepositories\/{providerRepositoryId}\/branches": {
"get": {
- "summary": "List Repository Branches",
+ "summary": "List repository branches",
"operationId": "vcsListRepositoryBranches",
"consumes": [
"application\/json"
@@ -31616,7 +31724,7 @@
},
"x-appwrite": {
"method": "listRepositoryBranches",
- "weight": 280,
+ "weight": 282,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31686,7 +31794,7 @@
},
"x-appwrite": {
"method": "getRepositoryContents",
- "weight": 275,
+ "weight": 277,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31765,7 +31873,7 @@
},
"x-appwrite": {
"method": "createRepositoryDetection",
- "weight": 276,
+ "weight": 278,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31845,7 +31953,7 @@
},
"x-appwrite": {
"method": "updateExternalDeployments",
- "weight": 285,
+ "weight": 287,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31933,7 +32041,7 @@
},
"x-appwrite": {
"method": "listInstallations",
- "weight": 282,
+ "weight": 284,
"cookies": false,
"type": "",
"deprecated": false,
@@ -32008,7 +32116,7 @@
},
"x-appwrite": {
"method": "getInstallation",
- "weight": 283,
+ "weight": 285,
"cookies": false,
"type": "",
"deprecated": false,
@@ -32046,7 +32154,7 @@
]
},
"delete": {
- "summary": "Delete Installation",
+ "summary": "Delete installation",
"operationId": "vcsDeleteInstallation",
"consumes": [
"application\/json"
@@ -32063,7 +32171,7 @@
},
"x-appwrite": {
"method": "deleteInstallation",
- "weight": 284,
+ "weight": 286,
"cookies": false,
"type": "",
"deprecated": false,
@@ -33456,6 +33564,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"size": {
"type": "integer",
"description": "Attribute size.",
@@ -33475,6 +33593,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"size"
]
},
@@ -33513,6 +33633,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"min": {
"type": "integer",
"description": "Minimum value to enforce for new documents.",
@@ -33540,7 +33670,9 @@
"type",
"status",
"error",
- "required"
+ "required",
+ "$createdAt",
+ "$updatedAt"
]
},
"attributeFloat": {
@@ -33578,6 +33710,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"min": {
"type": "number",
"description": "Minimum value to enforce for new documents.",
@@ -33605,7 +33747,9 @@
"type",
"status",
"error",
- "required"
+ "required",
+ "$createdAt",
+ "$updatedAt"
]
},
"attributeBoolean": {
@@ -33643,6 +33787,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"default": {
"type": "boolean",
"description": "Default value for attribute when not provided. Cannot be set when attribute is required.",
@@ -33655,7 +33809,9 @@
"type",
"status",
"error",
- "required"
+ "required",
+ "$createdAt",
+ "$updatedAt"
]
},
"attributeEmail": {
@@ -33693,6 +33849,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "String format.",
@@ -33711,6 +33877,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -33749,6 +33917,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"elements": {
"type": "array",
"description": "Array of elements in enumerated type.",
@@ -33775,6 +33953,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"elements",
"format"
]
@@ -33814,6 +33994,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "String format.",
@@ -33832,6 +34022,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -33870,6 +34062,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "String format.",
@@ -33888,6 +34090,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -33926,6 +34130,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "ISO 8601 format.",
@@ -33944,6 +34158,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -33982,6 +34198,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"relatedCollection": {
"type": "string",
"description": "The ID of the related collection.",
@@ -34019,6 +34245,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"relatedCollection",
"relationType",
"twoWay",
@@ -34067,6 +34295,16 @@
},
"x-example": [],
"x-nullable": true
+ },
+ "$createdAt": {
+ "type": "string",
+ "description": "Index creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Index update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
}
},
"required": [
@@ -34074,7 +34312,9 @@
"type",
"status",
"error",
- "attributes"
+ "attributes",
+ "$createdAt",
+ "$updatedAt"
]
},
"document": {
@@ -35229,12 +35469,12 @@
},
"userName": {
"type": "string",
- "description": "User name.",
+ "description": "User name. Hide this attribute by toggling membership privacy in the Console.",
"x-example": "John Doe"
},
"userEmail": {
"type": "string",
- "description": "User email address.",
+ "description": "User email address. Hide this attribute by toggling membership privacy in the Console.",
"x-example": "john@appwrite.io"
},
"teamId": {
@@ -35264,7 +35504,7 @@
},
"mfa": {
"type": "boolean",
- "description": "Multi factor authentication status, true if the user has MFA enabled or false otherwise.",
+ "description": "Multi factor authentication status, true if the user has MFA enabled or false otherwise. Hide this attribute by toggling membership privacy in the Console.",
"x-example": false
},
"roles": {
@@ -35430,7 +35670,7 @@
"specification": {
"type": "string",
"description": "Machine specification for builds and executions.",
- "x-example": "s-0.5vcpu-512mb"
+ "x-example": "s-1vcpu-512mb"
}
},
"required": [
@@ -36106,7 +36346,7 @@
"responseBody": {
"type": "string",
"description": "HTTP response body. This will return empty unless execution is created as synchronous.",
- "x-example": "Developers are awesome."
+ "x-example": ""
},
"responseHeaders": {
"type": "array",
@@ -36351,6 +36591,21 @@
"description": "Whether or not to send session alert emails to users.",
"x-example": true
},
+ "authMembershipsUserName": {
+ "type": "boolean",
+ "description": "Whether or not to show user names in the teams membership response.",
+ "x-example": true
+ },
+ "authMembershipsUserEmail": {
+ "type": "boolean",
+ "description": "Whether or not to show user emails in the teams membership response.",
+ "x-example": true
+ },
+ "authMembershipsMfa": {
+ "type": "boolean",
+ "description": "Whether or not to show user MFA status in the teams membership response.",
+ "x-example": true
+ },
"oAuthProviders": {
"type": "array",
"description": "List of Auth Providers.",
@@ -36435,6 +36690,17 @@
"description": "SMTP server secure protocol",
"x-example": "tls"
},
+ "pingCount": {
+ "type": "integer",
+ "description": "Number of times the ping was received for this project.",
+ "x-example": 1,
+ "format": "int32"
+ },
+ "pingedAt": {
+ "type": "string",
+ "description": "Last ping datetime in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"authEmailPassword": {
"type": "boolean",
"description": "Email\/Password auth method status",
@@ -36549,6 +36815,9 @@
"authPersonalDataCheck",
"authMockNumbers",
"authSessionAlerts",
+ "authMembershipsUserName",
+ "authMembershipsUserEmail",
+ "authMembershipsMfa",
"oAuthProviders",
"platforms",
"webhooks",
@@ -36562,6 +36831,8 @@
"smtpUsername",
"smtpPassword",
"smtpSecure",
+ "pingCount",
+ "pingedAt",
"authEmailPassword",
"authUsersAuthMagicURL",
"authEmailOtp",
@@ -37270,6 +37541,12 @@
"x-example": 0,
"format": "int32"
},
+ "storageTotal": {
+ "type": "integer",
+ "description": "Total aggregated number of total databases storage in bytes.",
+ "x-example": 0,
+ "format": "int32"
+ },
"databases": {
"type": "array",
"description": "Aggregated number of databases per period.",
@@ -37296,6 +37573,15 @@
"$ref": "#\/definitions\/metric"
},
"x-example": []
+ },
+ "storage": {
+ "type": "array",
+ "description": "An array of the aggregated number of databases storage in bytes per period.",
+ "items": {
+ "type": "object",
+ "$ref": "#\/definitions\/metric"
+ },
+ "x-example": []
}
},
"required": [
@@ -37303,9 +37589,11 @@
"databasesTotal",
"collectionsTotal",
"documentsTotal",
+ "storageTotal",
"databases",
"collections",
- "documents"
+ "documents",
+ "storage"
]
},
"usageDatabase": {
@@ -37329,6 +37617,12 @@
"x-example": 0,
"format": "int32"
},
+ "storageTotal": {
+ "type": "integer",
+ "description": "Total aggregated number of total storage used in bytes.",
+ "x-example": 0,
+ "format": "int32"
+ },
"collections": {
"type": "array",
"description": "Aggregated number of collections per period.",
@@ -37346,14 +37640,25 @@
"$ref": "#\/definitions\/metric"
},
"x-example": []
+ },
+ "storage": {
+ "type": "array",
+ "description": "Aggregated storage used in bytes per period.",
+ "items": {
+ "type": "object",
+ "$ref": "#\/definitions\/metric"
+ },
+ "x-example": []
}
},
"required": [
"range",
"collectionsTotal",
"documentsTotal",
+ "storageTotal",
"collections",
- "documents"
+ "documents",
+ "storage"
]
},
"usageCollection": {
@@ -37921,6 +38226,12 @@
"x-example": 0,
"format": "int32"
},
+ "databasesStorageTotal": {
+ "type": "integer",
+ "description": "Total aggregated sum of databases storage size (in bytes).",
+ "x-example": 0,
+ "format": "int32"
+ },
"usersTotal": {
"type": "integer",
"description": "Total aggregated number of users.",
@@ -38023,6 +38334,15 @@
},
"x-example": []
},
+ "databasesStorageBreakdown": {
+ "type": "array",
+ "description": "An array of the aggregated breakdown of storage usage by databases.",
+ "items": {
+ "type": "object",
+ "$ref": "#\/definitions\/metricBreakdown"
+ },
+ "x-example": []
+ },
"executionsMbSecondsBreakdown": {
"type": "array",
"description": "Aggregated breakdown in totals of execution mbSeconds by functions.",
@@ -38055,6 +38375,7 @@
"executionsTotal",
"documentsTotal",
"databasesTotal",
+ "databasesStorageTotal",
"usersTotal",
"filesStorageTotal",
"functionsStorageTotal",
@@ -38069,6 +38390,7 @@
"executions",
"executionsBreakdown",
"bucketsBreakdown",
+ "databasesStorageBreakdown",
"executionsMbSecondsBreakdown",
"buildsMbSecondsBreakdown",
"functionsStorageBreakdown"
@@ -38118,7 +38440,7 @@
"slug": {
"type": "string",
"description": "Size slug.",
- "x-example": "s-0.5vcpu-512mb"
+ "x-example": "s-1vcpu-512mb"
}
},
"required": [
@@ -38759,7 +39081,7 @@
"name": {
"type": "string",
"description": "Target Name.",
- "x-example": "Aegon apple token"
+ "x-example": "Apple iPhone 12"
},
"userId": {
"type": "string",
@@ -38781,6 +39103,11 @@
"type": "string",
"description": "The target identifier.",
"x-example": "token"
+ },
+ "expired": {
+ "type": "boolean",
+ "description": "Is the target expired.",
+ "x-example": false
}
},
"required": [
@@ -38790,7 +39117,8 @@
"name",
"userId",
"providerType",
- "identifier"
+ "identifier",
+ "expired"
]
},
"migration": {
@@ -38804,7 +39132,7 @@
},
"$createdAt": {
"type": "string",
- "description": "Variable creation date in ISO 8601 format.",
+ "description": "Migration creation date in ISO 8601 format.",
"x-example": "2020-10-15T06:38:00.000+00:00"
},
"$updatedAt": {
@@ -38827,9 +39155,14 @@
"description": "A string containing the type of source of the migration.",
"x-example": "Appwrite"
},
+ "destination": {
+ "type": "string",
+ "description": "A string containing the type of destination of the migration.",
+ "x-example": "Appwrite"
+ },
"resources": {
"type": "array",
- "description": "Resources to migration.",
+ "description": "Resources to migrate.",
"items": {
"type": "string"
},
@@ -38865,6 +39198,7 @@
"status",
"stage",
"source",
+ "destination",
"resources",
"statusCounters",
"resourceData",
diff --git a/app/config/specs/swagger2-1.6.x-server.json b/app/config/specs/swagger2-1.6.x-server.json
index af6274226f..2c8e80c65e 100644
--- a/app/config/specs/swagger2-1.6.x-server.json
+++ b/app/config/specs/swagger2-1.6.x-server.json
@@ -102,7 +102,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 8,
+ "weight": 9,
"cookies": false,
"type": "",
"deprecated": false,
@@ -156,7 +156,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 7,
+ "weight": 8,
"cookies": false,
"type": "",
"deprecated": false,
@@ -249,7 +249,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 33,
+ "weight": 34,
"cookies": false,
"type": "",
"deprecated": false,
@@ -310,7 +310,7 @@
},
"\/account\/identities": {
"get": {
- "summary": "List Identities",
+ "summary": "List identities",
"operationId": "accountListIdentities",
"consumes": [
"application\/json"
@@ -332,7 +332,7 @@
},
"x-appwrite": {
"method": "listIdentities",
- "weight": 56,
+ "weight": 57,
"cookies": false,
"type": "",
"deprecated": false,
@@ -397,7 +397,7 @@
},
"x-appwrite": {
"method": "deleteIdentity",
- "weight": 57,
+ "weight": 58,
"cookies": false,
"type": "",
"deprecated": false,
@@ -463,7 +463,7 @@
},
"x-appwrite": {
"method": "createJWT",
- "weight": 28,
+ "weight": 29,
"cookies": false,
"type": "",
"deprecated": false,
@@ -516,7 +516,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 30,
+ "weight": 31,
"cookies": false,
"type": "",
"deprecated": false,
@@ -586,7 +586,7 @@
},
"x-appwrite": {
"method": "updateMFA",
- "weight": 43,
+ "weight": 44,
"cookies": false,
"type": "",
"deprecated": false,
@@ -640,7 +640,7 @@
},
"\/account\/mfa\/authenticators\/{type}": {
"post": {
- "summary": "Create Authenticator",
+ "summary": "Create authenticator",
"operationId": "accountCreateMfaAuthenticator",
"consumes": [
"application\/json"
@@ -662,7 +662,7 @@
},
"x-appwrite": {
"method": "createMfaAuthenticator",
- "weight": 45,
+ "weight": 46,
"cookies": false,
"type": "",
"deprecated": false,
@@ -709,7 +709,7 @@
]
},
"put": {
- "summary": "Verify Authenticator",
+ "summary": "Verify authenticator",
"operationId": "accountUpdateMfaAuthenticator",
"consumes": [
"application\/json"
@@ -731,7 +731,7 @@
},
"x-appwrite": {
"method": "updateMfaAuthenticator",
- "weight": 46,
+ "weight": 47,
"cookies": false,
"type": "",
"deprecated": false,
@@ -796,7 +796,7 @@
]
},
"delete": {
- "summary": "Delete Authenticator",
+ "summary": "Delete authenticator",
"operationId": "accountDeleteMfaAuthenticator",
"consumes": [
"application\/json"
@@ -813,7 +813,7 @@
},
"x-appwrite": {
"method": "deleteMfaAuthenticator",
- "weight": 50,
+ "weight": 51,
"cookies": false,
"type": "",
"deprecated": false,
@@ -862,7 +862,7 @@
},
"\/account\/mfa\/challenge": {
"post": {
- "summary": "Create MFA Challenge",
+ "summary": "Create MFA challenge",
"operationId": "accountCreateMfaChallenge",
"consumes": [
"application\/json"
@@ -884,7 +884,7 @@
},
"x-appwrite": {
"method": "createMfaChallenge",
- "weight": 51,
+ "weight": 52,
"cookies": false,
"type": "",
"deprecated": false,
@@ -941,7 +941,7 @@
]
},
"put": {
- "summary": "Create MFA Challenge (confirmation)",
+ "summary": "Create MFA challenge (confirmation)",
"operationId": "accountUpdateMfaChallenge",
"consumes": [
"application\/json"
@@ -958,7 +958,7 @@
},
"x-appwrite": {
"method": "updateMfaChallenge",
- "weight": 52,
+ "weight": 53,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1019,7 +1019,7 @@
},
"\/account\/mfa\/factors": {
"get": {
- "summary": "List Factors",
+ "summary": "List factors",
"operationId": "accountListMfaFactors",
"consumes": [
"application\/json"
@@ -1041,7 +1041,7 @@
},
"x-appwrite": {
"method": "listMfaFactors",
- "weight": 44,
+ "weight": 45,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1075,7 +1075,7 @@
},
"\/account\/mfa\/recovery-codes": {
"get": {
- "summary": "Get MFA Recovery Codes",
+ "summary": "Get MFA recovery codes",
"operationId": "accountGetMfaRecoveryCodes",
"consumes": [
"application\/json"
@@ -1097,7 +1097,7 @@
},
"x-appwrite": {
"method": "getMfaRecoveryCodes",
- "weight": 49,
+ "weight": 50,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1129,7 +1129,7 @@
]
},
"post": {
- "summary": "Create MFA Recovery Codes",
+ "summary": "Create MFA recovery codes",
"operationId": "accountCreateMfaRecoveryCodes",
"consumes": [
"application\/json"
@@ -1151,7 +1151,7 @@
},
"x-appwrite": {
"method": "createMfaRecoveryCodes",
- "weight": 47,
+ "weight": 48,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1183,7 +1183,7 @@
]
},
"patch": {
- "summary": "Regenerate MFA Recovery Codes",
+ "summary": "Regenerate MFA recovery codes",
"operationId": "accountUpdateMfaRecoveryCodes",
"consumes": [
"application\/json"
@@ -1205,7 +1205,7 @@
},
"x-appwrite": {
"method": "updateMfaRecoveryCodes",
- "weight": 48,
+ "weight": 49,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1261,7 +1261,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 31,
+ "weight": 32,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1337,7 +1337,7 @@
},
"x-appwrite": {
"method": "updatePassword",
- "weight": 32,
+ "weight": 33,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1419,7 +1419,7 @@
},
"x-appwrite": {
"method": "updatePhone",
- "weight": 34,
+ "weight": 35,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1502,7 +1502,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 29,
+ "weight": 30,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1556,7 +1556,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 35,
+ "weight": 36,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1632,7 +1632,7 @@
},
"x-appwrite": {
"method": "createRecovery",
- "weight": 37,
+ "weight": 38,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1716,7 +1716,7 @@
},
"x-appwrite": {
"method": "updateRecovery",
- "weight": 38,
+ "weight": 39,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1806,7 +1806,7 @@
},
"x-appwrite": {
"method": "listSessions",
- "weight": 10,
+ "weight": 11,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1855,7 +1855,7 @@
},
"x-appwrite": {
"method": "deleteSessions",
- "weight": 11,
+ "weight": 12,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1911,7 +1911,7 @@
},
"x-appwrite": {
"method": "createAnonymousSession",
- "weight": 16,
+ "weight": 17,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1964,7 +1964,7 @@
},
"x-appwrite": {
"method": "createEmailPasswordSession",
- "weight": 15,
+ "weight": 16,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2044,7 +2044,7 @@
},
"x-appwrite": {
"method": "updateMagicURLSession",
- "weight": 25,
+ "weight": 26,
"cookies": false,
"type": "",
"deprecated": true,
@@ -2124,7 +2124,7 @@
},
"x-appwrite": {
"method": "updatePhoneSession",
- "weight": 26,
+ "weight": 27,
"cookies": false,
"type": "",
"deprecated": true,
@@ -2204,7 +2204,7 @@
},
"x-appwrite": {
"method": "createSession",
- "weight": 17,
+ "weight": 18,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2284,7 +2284,7 @@
},
"x-appwrite": {
"method": "getSession",
- "weight": 12,
+ "weight": 13,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2348,7 +2348,7 @@
},
"x-appwrite": {
"method": "updateSession",
- "weight": 14,
+ "weight": 15,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2407,7 +2407,7 @@
},
"x-appwrite": {
"method": "deleteSession",
- "weight": 13,
+ "weight": 14,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2473,7 +2473,7 @@
},
"x-appwrite": {
"method": "updateStatus",
- "weight": 36,
+ "weight": 37,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2529,7 +2529,7 @@
},
"x-appwrite": {
"method": "createEmailToken",
- "weight": 24,
+ "weight": 25,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2615,7 +2615,7 @@
},
"x-appwrite": {
"method": "createMagicURLToken",
- "weight": 23,
+ "weight": 24,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2707,7 +2707,7 @@
},
"x-appwrite": {
"method": "createOAuth2Token",
- "weight": 22,
+ "weight": 23,
"cookies": false,
"type": "webAuth",
"deprecated": false,
@@ -2845,7 +2845,7 @@
},
"x-appwrite": {
"method": "createPhoneToken",
- "weight": 27,
+ "weight": 28,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2928,7 +2928,7 @@
},
"x-appwrite": {
"method": "createVerification",
- "weight": 39,
+ "weight": 40,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3002,7 +3002,7 @@
},
"x-appwrite": {
"method": "updateVerification",
- "weight": 40,
+ "weight": 41,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3085,7 +3085,7 @@
},
"x-appwrite": {
"method": "createPhoneVerification",
- "weight": 41,
+ "weight": 42,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3142,7 +3142,7 @@
},
"x-appwrite": {
"method": "updatePhoneVerification",
- "weight": 42,
+ "weight": 43,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3225,7 +3225,7 @@
},
"x-appwrite": {
"method": "getBrowser",
- "weight": 59,
+ "weight": 60,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3356,7 +3356,7 @@
},
"x-appwrite": {
"method": "getCreditCard",
- "weight": 58,
+ "weight": 59,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3491,7 +3491,7 @@
},
"x-appwrite": {
"method": "getFavicon",
- "weight": 62,
+ "weight": 63,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3560,7 +3560,7 @@
},
"x-appwrite": {
"method": "getFlag",
- "weight": 60,
+ "weight": 61,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4053,7 +4053,7 @@
},
"x-appwrite": {
"method": "getImage",
- "weight": 61,
+ "weight": 62,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4142,7 +4142,7 @@
},
"x-appwrite": {
"method": "getInitials",
- "weight": 64,
+ "weight": 65,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4239,7 +4239,7 @@
},
"x-appwrite": {
"method": "getQR",
- "weight": 63,
+ "weight": 64,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4336,7 +4336,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 69,
+ "weight": 70,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4411,7 +4411,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 68,
+ "weight": 69,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4498,7 +4498,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 70,
+ "weight": 71,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4560,7 +4560,7 @@
},
"x-appwrite": {
"method": "update",
- "weight": 72,
+ "weight": 73,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4641,7 +4641,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 73,
+ "weight": 74,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4705,7 +4705,7 @@
},
"x-appwrite": {
"method": "listCollections",
- "weight": 75,
+ "weight": 76,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4788,7 +4788,7 @@
},
"x-appwrite": {
"method": "createCollection",
- "weight": 74,
+ "weight": 75,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4898,7 +4898,7 @@
},
"x-appwrite": {
"method": "getCollection",
- "weight": 76,
+ "weight": 77,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4968,7 +4968,7 @@
},
"x-appwrite": {
"method": "updateCollection",
- "weight": 78,
+ "weight": 79,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5072,7 +5072,7 @@
},
"x-appwrite": {
"method": "deleteCollection",
- "weight": 79,
+ "weight": 80,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5144,7 +5144,7 @@
},
"x-appwrite": {
"method": "listAttributes",
- "weight": 90,
+ "weight": 91,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5228,7 +5228,7 @@
},
"x-appwrite": {
"method": "createBooleanAttribute",
- "weight": 87,
+ "weight": 88,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5335,7 +5335,7 @@
},
"x-appwrite": {
"method": "updateBooleanAttribute",
- "weight": 99,
+ "weight": 100,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5446,7 +5446,7 @@
},
"x-appwrite": {
"method": "createDatetimeAttribute",
- "weight": 88,
+ "weight": 89,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5553,7 +5553,7 @@
},
"x-appwrite": {
"method": "updateDatetimeAttribute",
- "weight": 100,
+ "weight": 101,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5664,7 +5664,7 @@
},
"x-appwrite": {
"method": "createEmailAttribute",
- "weight": 81,
+ "weight": 82,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5771,7 +5771,7 @@
},
"x-appwrite": {
"method": "updateEmailAttribute",
- "weight": 93,
+ "weight": 94,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5882,7 +5882,7 @@
},
"x-appwrite": {
"method": "createEnumAttribute",
- "weight": 82,
+ "weight": 83,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5999,7 +5999,7 @@
},
"x-appwrite": {
"method": "updateEnumAttribute",
- "weight": 94,
+ "weight": 95,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6120,7 +6120,7 @@
},
"x-appwrite": {
"method": "createFloatAttribute",
- "weight": 86,
+ "weight": 87,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6239,7 +6239,7 @@
},
"x-appwrite": {
"method": "updateFloatAttribute",
- "weight": 98,
+ "weight": 99,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6364,7 +6364,7 @@
},
"x-appwrite": {
"method": "createIntegerAttribute",
- "weight": 85,
+ "weight": 86,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6483,7 +6483,7 @@
},
"x-appwrite": {
"method": "updateIntegerAttribute",
- "weight": 97,
+ "weight": 98,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6608,7 +6608,7 @@
},
"x-appwrite": {
"method": "createIpAttribute",
- "weight": 83,
+ "weight": 84,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6715,7 +6715,7 @@
},
"x-appwrite": {
"method": "updateIpAttribute",
- "weight": 95,
+ "weight": 96,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6826,7 +6826,7 @@
},
"x-appwrite": {
"method": "createRelationshipAttribute",
- "weight": 89,
+ "weight": 90,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6962,7 +6962,7 @@
},
"x-appwrite": {
"method": "createStringAttribute",
- "weight": 80,
+ "weight": 81,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7082,7 +7082,7 @@
},
"x-appwrite": {
"method": "updateStringAttribute",
- "weight": 92,
+ "weight": 93,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7157,7 +7157,7 @@
"type": "integer",
"description": "Maximum size of the string attribute.",
"default": null,
- "x-example": null
+ "x-example": 1
},
"newKey": {
"type": "string",
@@ -7199,7 +7199,7 @@
},
"x-appwrite": {
"method": "createUrlAttribute",
- "weight": 84,
+ "weight": 85,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7306,7 +7306,7 @@
},
"x-appwrite": {
"method": "updateUrlAttribute",
- "weight": 96,
+ "weight": 97,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7448,7 +7448,7 @@
},
"x-appwrite": {
"method": "getAttribute",
- "weight": 91,
+ "weight": 92,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7520,7 +7520,7 @@
},
"x-appwrite": {
"method": "deleteAttribute",
- "weight": 102,
+ "weight": 103,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7597,7 +7597,7 @@
},
"x-appwrite": {
"method": "updateRelationshipAttribute",
- "weight": 101,
+ "weight": 102,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7704,7 +7704,7 @@
},
"x-appwrite": {
"method": "listDocuments",
- "weight": 108,
+ "weight": 109,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7790,7 +7790,7 @@
},
"x-appwrite": {
"method": "createDocument",
- "weight": 107,
+ "weight": 108,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7900,7 +7900,7 @@
},
"x-appwrite": {
"method": "getDocument",
- "weight": 109,
+ "weight": 110,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7994,7 +7994,7 @@
},
"x-appwrite": {
"method": "updateDocument",
- "weight": 111,
+ "weight": 112,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8095,7 +8095,7 @@
},
"x-appwrite": {
"method": "deleteDocument",
- "weight": 112,
+ "weight": 113,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8179,7 +8179,7 @@
},
"x-appwrite": {
"method": "listIndexes",
- "weight": 104,
+ "weight": 105,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8261,7 +8261,7 @@
},
"x-appwrite": {
"method": "createIndex",
- "weight": 103,
+ "weight": 104,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8384,7 +8384,7 @@
},
"x-appwrite": {
"method": "getIndex",
- "weight": 105,
+ "weight": 106,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8456,7 +8456,7 @@
},
"x-appwrite": {
"method": "deleteIndex",
- "weight": 106,
+ "weight": 107,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8535,7 +8535,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 287,
+ "weight": 289,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8610,7 +8610,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 286,
+ "weight": 288,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8669,6 +8669,7 @@
"node-19.0",
"node-20.0",
"node-21.0",
+ "node-22",
"php-8.0",
"php-8.1",
"php-8.2",
@@ -8687,6 +8688,8 @@
"deno-1.24",
"deno-1.35",
"deno-1.40",
+ "deno-1.46",
+ "deno-2.0",
"dart-2.15",
"dart-2.16",
"dart-2.17",
@@ -8694,24 +8697,30 @@
"dart-3.0",
"dart-3.1",
"dart-3.3",
- "dotnet-3.1",
+ "dart-3.5",
"dotnet-6.0",
"dotnet-7.0",
+ "dotnet-8.0",
"java-8.0",
"java-11.0",
"java-17.0",
"java-18.0",
"java-21.0",
+ "java-22",
"swift-5.5",
"swift-5.8",
"swift-5.9",
+ "swift-5.10",
"kotlin-1.6",
"kotlin-1.8",
"kotlin-1.9",
+ "kotlin-2.0",
"cpp-17",
"cpp-20",
"bun-1.0",
- "go-1.23"
+ "bun-1.1",
+ "go-1.23",
+ "static-1"
],
"x-enum-name": null,
"x-enum-keys": []
@@ -8836,7 +8845,7 @@
"specification": {
"type": "string",
"description": "Runtime specification for the function and builds.",
- "default": "s-0.5vcpu-512mb",
+ "default": "s-1vcpu-512mb",
"x-example": null
}
},
@@ -8874,7 +8883,7 @@
},
"x-appwrite": {
"method": "listRuntimes",
- "weight": 288,
+ "weight": 290,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8928,7 +8937,7 @@
},
"x-appwrite": {
"method": "listSpecifications",
- "weight": 289,
+ "weight": 291,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8983,7 +8992,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 290,
+ "weight": 292,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9045,7 +9054,7 @@
},
"x-appwrite": {
"method": "update",
- "weight": 293,
+ "weight": 295,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9106,6 +9115,7 @@
"node-19.0",
"node-20.0",
"node-21.0",
+ "node-22",
"php-8.0",
"php-8.1",
"php-8.2",
@@ -9124,6 +9134,8 @@
"deno-1.24",
"deno-1.35",
"deno-1.40",
+ "deno-1.46",
+ "deno-2.0",
"dart-2.15",
"dart-2.16",
"dart-2.17",
@@ -9131,24 +9143,30 @@
"dart-3.0",
"dart-3.1",
"dart-3.3",
- "dotnet-3.1",
+ "dart-3.5",
"dotnet-6.0",
"dotnet-7.0",
+ "dotnet-8.0",
"java-8.0",
"java-11.0",
"java-17.0",
"java-18.0",
"java-21.0",
+ "java-22",
"swift-5.5",
"swift-5.8",
"swift-5.9",
+ "swift-5.10",
"kotlin-1.6",
"kotlin-1.8",
"kotlin-1.9",
+ "kotlin-2.0",
"cpp-17",
"cpp-20",
"bun-1.0",
- "go-1.23"
+ "bun-1.1",
+ "go-1.23",
+ "static-1"
],
"x-enum-name": null,
"x-enum-keys": []
@@ -9250,7 +9268,7 @@
"specification": {
"type": "string",
"description": "Runtime specification for the function and builds.",
- "default": "s-0.5vcpu-512mb",
+ "default": "s-1vcpu-512mb",
"x-example": null
}
},
@@ -9279,7 +9297,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 296,
+ "weight": 298,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9343,7 +9361,7 @@
},
"x-appwrite": {
"method": "listDeployments",
- "weight": 298,
+ "weight": 300,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9426,7 +9444,7 @@
},
"x-appwrite": {
"method": "createDeployment",
- "weight": 297,
+ "weight": 299,
"cookies": false,
"type": "upload",
"deprecated": false,
@@ -9521,7 +9539,7 @@
},
"x-appwrite": {
"method": "getDeployment",
- "weight": 299,
+ "weight": 301,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9591,7 +9609,7 @@
},
"x-appwrite": {
"method": "updateDeployment",
- "weight": 295,
+ "weight": 297,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9656,7 +9674,7 @@
},
"x-appwrite": {
"method": "deleteDeployment",
- "weight": 300,
+ "weight": 302,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9723,7 +9741,7 @@
},
"x-appwrite": {
"method": "createBuild",
- "weight": 301,
+ "weight": 303,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9808,7 +9826,7 @@
},
"x-appwrite": {
"method": "updateDeploymentBuild",
- "weight": 302,
+ "weight": 304,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9880,7 +9898,7 @@
},
"x-appwrite": {
"method": "getDeploymentDownload",
- "weight": 294,
+ "weight": 296,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -9954,7 +9972,7 @@
},
"x-appwrite": {
"method": "listExecutions",
- "weight": 304,
+ "weight": 306,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10022,7 +10040,7 @@
"summary": "Create execution",
"operationId": "functionsCreateExecution",
"consumes": [
- "multipart\/form-data"
+ "application\/json"
],
"produces": [
"multipart\/form-data"
@@ -10041,7 +10059,7 @@
},
"x-appwrite": {
"method": "createExecution",
- "weight": 303,
+ "weight": 305,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10083,65 +10101,59 @@
"in": "path"
},
{
- "name": "body",
- "description": "HTTP body of execution. Default value is empty string.",
- "required": false,
- "type": "payload",
- "default": "",
- "in": "formData"
- },
- {
- "name": "async",
- "description": "Execute code in the background. Default value is false.",
- "required": false,
- "type": "boolean",
- "x-example": false,
- "default": false,
- "in": "formData"
- },
- {
- "name": "path",
- "description": "HTTP path of execution. Path can include query params. Default value is \/",
- "required": false,
- "type": "string",
- "x-example": "",
- "default": "\/",
- "in": "formData"
- },
- {
- "name": "method",
- "description": "HTTP method of execution. Default value is GET.",
- "required": false,
- "type": "string",
- "x-example": "GET",
- "enum": [
- "GET",
- "POST",
- "PUT",
- "PATCH",
- "DELETE",
- "OPTIONS"
- ],
- "x-enum-name": "ExecutionMethod",
- "x-enum-keys": [],
- "default": "POST",
- "in": "formData"
- },
- {
- "name": "headers",
- "description": "HTTP headers of execution. Defaults to empty.",
- "required": false,
- "type": "object",
- "default": [],
- "x-example": "{}",
- "in": "formData"
- },
- {
- "name": "scheduledAt",
- "description": "Scheduled execution time in [ISO 8601](https:\/\/www.iso.org\/iso-8601-date-and-time-format.html) format. DateTime value must be in future with precision in minutes.",
- "required": false,
- "type": "string",
- "in": "formData"
+ "name": "payload",
+ "in": "body",
+ "schema": {
+ "type": "object",
+ "properties": {
+ "body": {
+ "type": "string",
+ "description": "HTTP body of execution. Default value is empty string.",
+ "default": "",
+ "x-example": ""
+ },
+ "async": {
+ "type": "boolean",
+ "description": "Execute code in the background. Default value is false.",
+ "default": false,
+ "x-example": false
+ },
+ "path": {
+ "type": "string",
+ "description": "HTTP path of execution. Path can include query params. Default value is \/",
+ "default": "\/",
+ "x-example": ""
+ },
+ "method": {
+ "type": "string",
+ "description": "HTTP method of execution. Default value is GET.",
+ "default": "POST",
+ "x-example": "GET",
+ "enum": [
+ "GET",
+ "POST",
+ "PUT",
+ "PATCH",
+ "DELETE",
+ "OPTIONS"
+ ],
+ "x-enum-name": "ExecutionMethod",
+ "x-enum-keys": []
+ },
+ "headers": {
+ "type": "object",
+ "description": "HTTP headers of execution. Defaults to empty.",
+ "default": [],
+ "x-example": "{}"
+ },
+ "scheduledAt": {
+ "type": "string",
+ "description": "Scheduled execution time in [ISO 8601](https:\/\/www.iso.org\/iso-8601-date-and-time-format.html) format. DateTime value must be in future with precision in minutes.",
+ "default": null,
+ "x-example": null
+ }
+ }
+ }
}
]
}
@@ -10170,7 +10182,7 @@
},
"x-appwrite": {
"method": "getExecution",
- "weight": 305,
+ "weight": 307,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10239,7 +10251,7 @@
},
"x-appwrite": {
"method": "deleteExecution",
- "weight": 306,
+ "weight": 308,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10311,7 +10323,7 @@
},
"x-appwrite": {
"method": "listVariables",
- "weight": 308,
+ "weight": 310,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10373,7 +10385,7 @@
},
"x-appwrite": {
"method": "createVariable",
- "weight": 307,
+ "weight": 309,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10462,7 +10474,7 @@
},
"x-appwrite": {
"method": "getVariable",
- "weight": 309,
+ "weight": 311,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10532,7 +10544,7 @@
},
"x-appwrite": {
"method": "updateVariable",
- "weight": 310,
+ "weight": 312,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10621,7 +10633,7 @@
},
"x-appwrite": {
"method": "deleteVariable",
- "weight": 311,
+ "weight": 313,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10693,7 +10705,7 @@
},
"x-appwrite": {
"method": "query",
- "weight": 329,
+ "weight": 331,
"cookies": false,
"type": "graphql",
"deprecated": false,
@@ -10771,7 +10783,7 @@
},
"x-appwrite": {
"method": "mutation",
- "weight": 328,
+ "weight": 330,
"cookies": false,
"type": "graphql",
"deprecated": false,
@@ -10849,7 +10861,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 124,
+ "weight": 125,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10903,7 +10915,7 @@
},
"x-appwrite": {
"method": "getAntivirus",
- "weight": 146,
+ "weight": 147,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10957,7 +10969,7 @@
},
"x-appwrite": {
"method": "getCache",
- "weight": 127,
+ "weight": 128,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11011,7 +11023,7 @@
},
"x-appwrite": {
"method": "getCertificate",
- "weight": 133,
+ "weight": 134,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11074,7 +11086,7 @@
},
"x-appwrite": {
"method": "getDB",
- "weight": 126,
+ "weight": 127,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11128,7 +11140,7 @@
},
"x-appwrite": {
"method": "getPubSub",
- "weight": 129,
+ "weight": 130,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11182,7 +11194,7 @@
},
"x-appwrite": {
"method": "getQueue",
- "weight": 128,
+ "weight": 129,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11236,7 +11248,7 @@
},
"x-appwrite": {
"method": "getQueueBuilds",
- "weight": 135,
+ "weight": 136,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11301,7 +11313,7 @@
},
"x-appwrite": {
"method": "getQueueCertificates",
- "weight": 134,
+ "weight": 135,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11366,7 +11378,7 @@
},
"x-appwrite": {
"method": "getQueueDatabases",
- "weight": 136,
+ "weight": 137,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11440,7 +11452,7 @@
},
"x-appwrite": {
"method": "getQueueDeletes",
- "weight": 137,
+ "weight": 138,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11505,7 +11517,7 @@
},
"x-appwrite": {
"method": "getFailedJobs",
- "weight": 147,
+ "weight": 148,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11594,7 +11606,7 @@
},
"x-appwrite": {
"method": "getQueueFunctions",
- "weight": 141,
+ "weight": 142,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11659,7 +11671,7 @@
},
"x-appwrite": {
"method": "getQueueLogs",
- "weight": 132,
+ "weight": 133,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11724,7 +11736,7 @@
},
"x-appwrite": {
"method": "getQueueMails",
- "weight": 138,
+ "weight": 139,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11789,7 +11801,7 @@
},
"x-appwrite": {
"method": "getQueueMessaging",
- "weight": 139,
+ "weight": 140,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11854,7 +11866,7 @@
},
"x-appwrite": {
"method": "getQueueMigrations",
- "weight": 140,
+ "weight": 141,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11919,7 +11931,7 @@
},
"x-appwrite": {
"method": "getQueueUsage",
- "weight": 142,
+ "weight": 143,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11984,7 +11996,7 @@
},
"x-appwrite": {
"method": "getQueueUsageDump",
- "weight": 143,
+ "weight": 144,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12049,7 +12061,7 @@
},
"x-appwrite": {
"method": "getQueueWebhooks",
- "weight": 131,
+ "weight": 132,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12114,7 +12126,7 @@
},
"x-appwrite": {
"method": "getStorage",
- "weight": 145,
+ "weight": 146,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12168,7 +12180,7 @@
},
"x-appwrite": {
"method": "getStorageLocal",
- "weight": 144,
+ "weight": 145,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12222,7 +12234,7 @@
},
"x-appwrite": {
"method": "getTime",
- "weight": 130,
+ "weight": 131,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12276,7 +12288,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 116,
+ "weight": 117,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12312,7 +12324,7 @@
},
"\/locale\/codes": {
"get": {
- "summary": "List Locale Codes",
+ "summary": "List locale codes",
"operationId": "localeListCodes",
"consumes": [
"application\/json"
@@ -12334,7 +12346,7 @@
},
"x-appwrite": {
"method": "listCodes",
- "weight": 117,
+ "weight": 118,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12392,7 +12404,7 @@
},
"x-appwrite": {
"method": "listContinents",
- "weight": 121,
+ "weight": 122,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12450,7 +12462,7 @@
},
"x-appwrite": {
"method": "listCountries",
- "weight": 118,
+ "weight": 119,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12508,7 +12520,7 @@
},
"x-appwrite": {
"method": "listCountriesEU",
- "weight": 119,
+ "weight": 120,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12566,7 +12578,7 @@
},
"x-appwrite": {
"method": "listCountriesPhones",
- "weight": 120,
+ "weight": 121,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12624,7 +12636,7 @@
},
"x-appwrite": {
"method": "listCurrencies",
- "weight": 122,
+ "weight": 123,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12682,7 +12694,7 @@
},
"x-appwrite": {
"method": "listLanguages",
- "weight": 123,
+ "weight": 124,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12740,7 +12752,7 @@
},
"x-appwrite": {
"method": "listMessages",
- "weight": 388,
+ "weight": 390,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12818,7 +12830,7 @@
},
"x-appwrite": {
"method": "createEmail",
- "weight": 385,
+ "weight": 387,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12979,7 +12991,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 392,
+ "weight": 394,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13137,7 +13149,7 @@
},
"x-appwrite": {
"method": "createPush",
- "weight": 387,
+ "weight": 389,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13313,7 +13325,7 @@
},
"x-appwrite": {
"method": "updatePush",
- "weight": 394,
+ "weight": 396,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13486,7 +13498,7 @@
},
"x-appwrite": {
"method": "createSms",
- "weight": 386,
+ "weight": 388,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13607,7 +13619,7 @@
},
"x-appwrite": {
"method": "updateSms",
- "weight": 393,
+ "weight": 395,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13726,7 +13738,7 @@
},
"x-appwrite": {
"method": "getMessage",
- "weight": 391,
+ "weight": 393,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13786,7 +13798,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 395,
+ "weight": 397,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13851,7 +13863,7 @@
},
"x-appwrite": {
"method": "listMessageLogs",
- "weight": 389,
+ "weight": 391,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13928,7 +13940,7 @@
},
"x-appwrite": {
"method": "listTargets",
- "weight": 390,
+ "weight": 392,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14005,7 +14017,7 @@
},
"x-appwrite": {
"method": "listProviders",
- "weight": 360,
+ "weight": 362,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14083,7 +14095,7 @@
},
"x-appwrite": {
"method": "createApnsProvider",
- "weight": 359,
+ "weight": 361,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14201,7 +14213,7 @@
},
"x-appwrite": {
"method": "updateApnsProvider",
- "weight": 372,
+ "weight": 374,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14317,7 +14329,7 @@
},
"x-appwrite": {
"method": "createFcmProvider",
- "weight": 358,
+ "weight": 360,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14411,7 +14423,7 @@
},
"x-appwrite": {
"method": "updateFcmProvider",
- "weight": 371,
+ "weight": 373,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14503,7 +14515,7 @@
},
"x-appwrite": {
"method": "createMailgunProvider",
- "weight": 350,
+ "weight": 352,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14633,7 +14645,7 @@
},
"x-appwrite": {
"method": "updateMailgunProvider",
- "weight": 363,
+ "weight": 365,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14761,7 +14773,7 @@
},
"x-appwrite": {
"method": "createMsg91Provider",
- "weight": 353,
+ "weight": 355,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14867,7 +14879,7 @@
},
"x-appwrite": {
"method": "updateMsg91Provider",
- "weight": 366,
+ "weight": 368,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14971,7 +14983,7 @@
},
"x-appwrite": {
"method": "createSendgridProvider",
- "weight": 351,
+ "weight": 353,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15089,7 +15101,7 @@
},
"x-appwrite": {
"method": "updateSendgridProvider",
- "weight": 364,
+ "weight": 366,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15205,7 +15217,7 @@
},
"x-appwrite": {
"method": "createSmtpProvider",
- "weight": 352,
+ "weight": 354,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15367,7 +15379,7 @@
},
"x-appwrite": {
"method": "updateSmtpProvider",
- "weight": 365,
+ "weight": 367,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15526,7 +15538,7 @@
},
"x-appwrite": {
"method": "createTelesignProvider",
- "weight": 354,
+ "weight": 356,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15632,7 +15644,7 @@
},
"x-appwrite": {
"method": "updateTelesignProvider",
- "weight": 367,
+ "weight": 369,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15736,7 +15748,7 @@
},
"x-appwrite": {
"method": "createTextmagicProvider",
- "weight": 355,
+ "weight": 357,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15842,7 +15854,7 @@
},
"x-appwrite": {
"method": "updateTextmagicProvider",
- "weight": 368,
+ "weight": 370,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15946,7 +15958,7 @@
},
"x-appwrite": {
"method": "createTwilioProvider",
- "weight": 356,
+ "weight": 358,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16052,7 +16064,7 @@
},
"x-appwrite": {
"method": "updateTwilioProvider",
- "weight": 369,
+ "weight": 371,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16156,7 +16168,7 @@
},
"x-appwrite": {
"method": "createVonageProvider",
- "weight": 357,
+ "weight": 359,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16262,7 +16274,7 @@
},
"x-appwrite": {
"method": "updateVonageProvider",
- "weight": 370,
+ "weight": 372,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16366,7 +16378,7 @@
},
"x-appwrite": {
"method": "getProvider",
- "weight": 362,
+ "weight": 364,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16426,7 +16438,7 @@
},
"x-appwrite": {
"method": "deleteProvider",
- "weight": 373,
+ "weight": 375,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16491,7 +16503,7 @@
},
"x-appwrite": {
"method": "listProviderLogs",
- "weight": 361,
+ "weight": 363,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16568,7 +16580,7 @@
},
"x-appwrite": {
"method": "listSubscriberLogs",
- "weight": 382,
+ "weight": 384,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16645,7 +16657,7 @@
},
"x-appwrite": {
"method": "listTopics",
- "weight": 375,
+ "weight": 377,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16721,7 +16733,7 @@
},
"x-appwrite": {
"method": "createTopic",
- "weight": 374,
+ "weight": 376,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16814,7 +16826,7 @@
},
"x-appwrite": {
"method": "getTopic",
- "weight": 377,
+ "weight": 379,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16877,7 +16889,7 @@
},
"x-appwrite": {
"method": "updateTopic",
- "weight": 378,
+ "weight": 380,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16961,7 +16973,7 @@
},
"x-appwrite": {
"method": "deleteTopic",
- "weight": 379,
+ "weight": 381,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17026,7 +17038,7 @@
},
"x-appwrite": {
"method": "listTopicLogs",
- "weight": 376,
+ "weight": 378,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17103,7 +17115,7 @@
},
"x-appwrite": {
"method": "listSubscribers",
- "weight": 381,
+ "weight": 383,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17187,7 +17199,7 @@
},
"x-appwrite": {
"method": "createSubscriber",
- "weight": 380,
+ "weight": 382,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17281,7 +17293,7 @@
},
"x-appwrite": {
"method": "getSubscriber",
- "weight": 383,
+ "weight": 385,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17349,7 +17361,7 @@
},
"x-appwrite": {
"method": "deleteSubscriber",
- "weight": 384,
+ "weight": 386,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17426,7 +17438,7 @@
},
"x-appwrite": {
"method": "listBuckets",
- "weight": 201,
+ "weight": 203,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17501,7 +17513,7 @@
},
"x-appwrite": {
"method": "createBucket",
- "weight": 200,
+ "weight": 202,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17643,7 +17655,7 @@
},
"x-appwrite": {
"method": "getBucket",
- "weight": 202,
+ "weight": 204,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17705,7 +17717,7 @@
},
"x-appwrite": {
"method": "updateBucket",
- "weight": 203,
+ "weight": 205,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17841,7 +17853,7 @@
},
"x-appwrite": {
"method": "deleteBucket",
- "weight": 204,
+ "weight": 206,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17905,7 +17917,7 @@
},
"x-appwrite": {
"method": "listFiles",
- "weight": 206,
+ "weight": 208,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17992,7 +18004,7 @@
},
"x-appwrite": {
"method": "createFile",
- "weight": 205,
+ "weight": 207,
"cookies": false,
"type": "upload",
"deprecated": false,
@@ -18088,7 +18100,7 @@
},
"x-appwrite": {
"method": "getFile",
- "weight": 207,
+ "weight": 209,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18162,7 +18174,7 @@
},
"x-appwrite": {
"method": "updateFile",
- "weight": 212,
+ "weight": 214,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18238,7 +18250,7 @@
]
},
"delete": {
- "summary": "Delete File",
+ "summary": "Delete file",
"operationId": "storageDeleteFile",
"consumes": [
"application\/json"
@@ -18255,7 +18267,7 @@
},
"x-appwrite": {
"method": "deleteFile",
- "weight": 213,
+ "weight": 215,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18331,7 +18343,7 @@
},
"x-appwrite": {
"method": "getFileDownload",
- "weight": 209,
+ "weight": 211,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -18407,7 +18419,7 @@
},
"x-appwrite": {
"method": "getFilePreview",
- "weight": 208,
+ "weight": 210,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -18575,7 +18587,8 @@
"jpeg",
"gif",
"png",
- "webp"
+ "webp",
+ "avif"
],
"x-enum-name": "ImageFormat",
"x-enum-keys": [],
@@ -18609,7 +18622,7 @@
},
"x-appwrite": {
"method": "getFileView",
- "weight": 210,
+ "weight": 212,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -18685,7 +18698,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 217,
+ "weight": 219,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18764,7 +18777,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 216,
+ "weight": 218,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18860,7 +18873,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 218,
+ "weight": 220,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18926,7 +18939,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 220,
+ "weight": 222,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19005,7 +19018,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 222,
+ "weight": 224,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19062,7 +19075,7 @@
"tags": [
"teams"
],
- "description": "Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint.",
+ "description": "Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint. Hide sensitive attributes from the response by toggling membership privacy in the Console.",
"responses": {
"200": {
"description": "Memberships List",
@@ -19073,7 +19086,7 @@
},
"x-appwrite": {
"method": "listMemberships",
- "weight": 224,
+ "weight": 226,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19160,7 +19173,7 @@
},
"x-appwrite": {
"method": "createMembership",
- "weight": 223,
+ "weight": 225,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19268,7 +19281,7 @@
"tags": [
"teams"
],
- "description": "Get a team member by the membership unique id. All team members have read access for this resource.",
+ "description": "Get a team member by the membership unique id. All team members have read access for this resource. Hide sensitive attributes from the response by toggling membership privacy in the Console.",
"responses": {
"200": {
"description": "Membership",
@@ -19279,7 +19292,7 @@
},
"x-appwrite": {
"method": "getMembership",
- "weight": 225,
+ "weight": 227,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19353,7 +19366,7 @@
},
"x-appwrite": {
"method": "updateMembership",
- "weight": 226,
+ "weight": 228,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19443,7 +19456,7 @@
},
"x-appwrite": {
"method": "deleteMembership",
- "weight": 228,
+ "weight": 230,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19519,7 +19532,7 @@
},
"x-appwrite": {
"method": "updateMembershipStatus",
- "weight": 227,
+ "weight": 229,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19618,7 +19631,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 219,
+ "weight": 221,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19682,7 +19695,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 221,
+ "weight": 223,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19766,7 +19779,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 239,
+ "weight": 241,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19841,7 +19854,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 230,
+ "weight": 232,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19939,7 +19952,7 @@
},
"x-appwrite": {
"method": "createArgon2User",
- "weight": 233,
+ "weight": 235,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20033,7 +20046,7 @@
},
"x-appwrite": {
"method": "createBcryptUser",
- "weight": 231,
+ "weight": 233,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20105,7 +20118,7 @@
},
"\/users\/identities": {
"get": {
- "summary": "List Identities",
+ "summary": "List identities",
"operationId": "usersListIdentities",
"consumes": [
"application\/json"
@@ -20127,7 +20140,7 @@
},
"x-appwrite": {
"method": "listIdentities",
- "weight": 247,
+ "weight": 249,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20199,7 +20212,7 @@
},
"x-appwrite": {
"method": "deleteIdentity",
- "weight": 270,
+ "weight": 272,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20263,7 +20276,7 @@
},
"x-appwrite": {
"method": "createMD5User",
- "weight": 232,
+ "weight": 234,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20357,7 +20370,7 @@
},
"x-appwrite": {
"method": "createPHPassUser",
- "weight": 235,
+ "weight": 237,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20451,7 +20464,7 @@
},
"x-appwrite": {
"method": "createScryptUser",
- "weight": 236,
+ "weight": 238,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20580,7 +20593,7 @@
},
"x-appwrite": {
"method": "createScryptModifiedUser",
- "weight": 237,
+ "weight": 239,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20695,7 +20708,7 @@
},
"x-appwrite": {
"method": "createSHAUser",
- "weight": 234,
+ "weight": 236,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20810,7 +20823,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 240,
+ "weight": 242,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20867,7 +20880,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 268,
+ "weight": 270,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20931,7 +20944,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 253,
+ "weight": 255,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21013,7 +21026,7 @@
},
"x-appwrite": {
"method": "createJWT",
- "weight": 271,
+ "weight": 273,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21098,7 +21111,7 @@
},
"x-appwrite": {
"method": "updateLabels",
- "weight": 249,
+ "weight": 251,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21183,7 +21196,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 245,
+ "weight": 247,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21259,7 +21272,7 @@
},
"x-appwrite": {
"method": "listMemberships",
- "weight": 244,
+ "weight": 246,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21323,7 +21336,7 @@
},
"x-appwrite": {
"method": "updateMfa",
- "weight": 258,
+ "weight": 260,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21383,7 +21396,7 @@
},
"\/users\/{userId}\/mfa\/authenticators\/{type}": {
"delete": {
- "summary": "Delete Authenticator",
+ "summary": "Delete authenticator",
"operationId": "usersDeleteMfaAuthenticator",
"consumes": [
"application\/json"
@@ -21405,7 +21418,7 @@
},
"x-appwrite": {
"method": "deleteMfaAuthenticator",
- "weight": 263,
+ "weight": 265,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21460,7 +21473,7 @@
},
"\/users\/{userId}\/mfa\/factors": {
"get": {
- "summary": "List Factors",
+ "summary": "List factors",
"operationId": "usersListMfaFactors",
"consumes": [
"application\/json"
@@ -21482,7 +21495,7 @@
},
"x-appwrite": {
"method": "listMfaFactors",
- "weight": 259,
+ "weight": 261,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21524,7 +21537,7 @@
},
"\/users\/{userId}\/mfa\/recovery-codes": {
"get": {
- "summary": "Get MFA Recovery Codes",
+ "summary": "Get MFA recovery codes",
"operationId": "usersGetMfaRecoveryCodes",
"consumes": [
"application\/json"
@@ -21546,7 +21559,7 @@
},
"x-appwrite": {
"method": "getMfaRecoveryCodes",
- "weight": 260,
+ "weight": 262,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21586,7 +21599,7 @@
]
},
"put": {
- "summary": "Regenerate MFA Recovery Codes",
+ "summary": "Regenerate MFA recovery codes",
"operationId": "usersUpdateMfaRecoveryCodes",
"consumes": [
"application\/json"
@@ -21608,7 +21621,7 @@
},
"x-appwrite": {
"method": "updateMfaRecoveryCodes",
- "weight": 262,
+ "weight": 264,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21648,7 +21661,7 @@
]
},
"patch": {
- "summary": "Create MFA Recovery Codes",
+ "summary": "Create MFA recovery codes",
"operationId": "usersCreateMfaRecoveryCodes",
"consumes": [
"application\/json"
@@ -21670,7 +21683,7 @@
},
"x-appwrite": {
"method": "createMfaRecoveryCodes",
- "weight": 261,
+ "weight": 263,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21734,7 +21747,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 251,
+ "weight": 253,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21816,7 +21829,7 @@
},
"x-appwrite": {
"method": "updatePassword",
- "weight": 252,
+ "weight": 254,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21898,7 +21911,7 @@
},
"x-appwrite": {
"method": "updatePhone",
- "weight": 254,
+ "weight": 256,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21980,7 +21993,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 241,
+ "weight": 243,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22042,7 +22055,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 256,
+ "weight": 258,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22124,7 +22137,7 @@
},
"x-appwrite": {
"method": "listSessions",
- "weight": 243,
+ "weight": 245,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22186,7 +22199,7 @@
},
"x-appwrite": {
"method": "createSession",
- "weight": 264,
+ "weight": 266,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22243,7 +22256,7 @@
},
"x-appwrite": {
"method": "deleteSessions",
- "weight": 267,
+ "weight": 269,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22302,7 +22315,7 @@
},
"x-appwrite": {
"method": "deleteSession",
- "weight": 266,
+ "weight": 268,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22374,7 +22387,7 @@
},
"x-appwrite": {
"method": "updateStatus",
- "weight": 248,
+ "weight": 250,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22434,7 +22447,7 @@
},
"\/users\/{userId}\/targets": {
"get": {
- "summary": "List User Targets",
+ "summary": "List user targets",
"operationId": "usersListTargets",
"consumes": [
"application\/json"
@@ -22456,7 +22469,7 @@
},
"x-appwrite": {
"method": "listTargets",
- "weight": 246,
+ "weight": 248,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22509,7 +22522,7 @@
]
},
"post": {
- "summary": "Create User Target",
+ "summary": "Create user target",
"operationId": "usersCreateTarget",
"consumes": [
"application\/json"
@@ -22531,7 +22544,7 @@
},
"x-appwrite": {
"method": "createTarget",
- "weight": 238,
+ "weight": 240,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22625,7 +22638,7 @@
},
"\/users\/{userId}\/targets\/{targetId}": {
"get": {
- "summary": "Get User Target",
+ "summary": "Get user target",
"operationId": "usersGetTarget",
"consumes": [
"application\/json"
@@ -22647,7 +22660,7 @@
},
"x-appwrite": {
"method": "getTarget",
- "weight": 242,
+ "weight": 244,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22696,7 +22709,7 @@
]
},
"patch": {
- "summary": "Update User target",
+ "summary": "Update user target",
"operationId": "usersUpdateTarget",
"consumes": [
"application\/json"
@@ -22718,7 +22731,7 @@
},
"x-appwrite": {
"method": "updateTarget",
- "weight": 257,
+ "weight": 259,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22813,7 +22826,7 @@
},
"x-appwrite": {
"method": "deleteTarget",
- "weight": 269,
+ "weight": 271,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22886,7 +22899,7 @@
},
"x-appwrite": {
"method": "createToken",
- "weight": 265,
+ "weight": 267,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22971,7 +22984,7 @@
},
"x-appwrite": {
"method": "updateEmailVerification",
- "weight": 255,
+ "weight": 257,
"cookies": false,
"type": "",
"deprecated": false,
@@ -23053,7 +23066,7 @@
},
"x-appwrite": {
"method": "updatePhoneVerification",
- "weight": 250,
+ "weight": 252,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24166,6 +24179,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"size": {
"type": "integer",
"description": "Attribute size.",
@@ -24185,6 +24208,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"size"
]
},
@@ -24223,6 +24248,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"min": {
"type": "integer",
"description": "Minimum value to enforce for new documents.",
@@ -24250,7 +24285,9 @@
"type",
"status",
"error",
- "required"
+ "required",
+ "$createdAt",
+ "$updatedAt"
]
},
"attributeFloat": {
@@ -24288,6 +24325,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"min": {
"type": "number",
"description": "Minimum value to enforce for new documents.",
@@ -24315,7 +24362,9 @@
"type",
"status",
"error",
- "required"
+ "required",
+ "$createdAt",
+ "$updatedAt"
]
},
"attributeBoolean": {
@@ -24353,6 +24402,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"default": {
"type": "boolean",
"description": "Default value for attribute when not provided. Cannot be set when attribute is required.",
@@ -24365,7 +24424,9 @@
"type",
"status",
"error",
- "required"
+ "required",
+ "$createdAt",
+ "$updatedAt"
]
},
"attributeEmail": {
@@ -24403,6 +24464,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "String format.",
@@ -24421,6 +24492,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -24459,6 +24532,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"elements": {
"type": "array",
"description": "Array of elements in enumerated type.",
@@ -24485,6 +24568,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"elements",
"format"
]
@@ -24524,6 +24609,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "String format.",
@@ -24542,6 +24637,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -24580,6 +24677,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "String format.",
@@ -24598,6 +24705,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -24636,6 +24745,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "ISO 8601 format.",
@@ -24654,6 +24773,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -24692,6 +24813,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"relatedCollection": {
"type": "string",
"description": "The ID of the related collection.",
@@ -24729,6 +24860,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"relatedCollection",
"relationType",
"twoWay",
@@ -24777,6 +24910,16 @@
},
"x-example": [],
"x-nullable": true
+ },
+ "$createdAt": {
+ "type": "string",
+ "description": "Index creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Index update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
}
},
"required": [
@@ -24784,7 +24927,9 @@
"type",
"status",
"error",
- "attributes"
+ "attributes",
+ "$createdAt",
+ "$updatedAt"
]
},
"document": {
@@ -25939,12 +26084,12 @@
},
"userName": {
"type": "string",
- "description": "User name.",
+ "description": "User name. Hide this attribute by toggling membership privacy in the Console.",
"x-example": "John Doe"
},
"userEmail": {
"type": "string",
- "description": "User email address.",
+ "description": "User email address. Hide this attribute by toggling membership privacy in the Console.",
"x-example": "john@appwrite.io"
},
"teamId": {
@@ -25974,7 +26119,7 @@
},
"mfa": {
"type": "boolean",
- "description": "Multi factor authentication status, true if the user has MFA enabled or false otherwise.",
+ "description": "Multi factor authentication status, true if the user has MFA enabled or false otherwise. Hide this attribute by toggling membership privacy in the Console.",
"x-example": false
},
"roles": {
@@ -26140,7 +26285,7 @@
"specification": {
"type": "string",
"description": "Machine specification for builds and executions.",
- "x-example": "s-0.5vcpu-512mb"
+ "x-example": "s-1vcpu-512mb"
}
},
"required": [
@@ -26460,7 +26605,7 @@
"responseBody": {
"type": "string",
"description": "HTTP response body. This will return empty unless execution is created as synchronous.",
- "x-example": "Developers are awesome."
+ "x-example": ""
},
"responseHeaders": {
"type": "array",
@@ -26954,7 +27099,7 @@
"slug": {
"type": "string",
"description": "Size slug.",
- "x-example": "s-0.5vcpu-512mb"
+ "x-example": "s-1vcpu-512mb"
}
},
"required": [
@@ -27405,7 +27550,7 @@
"name": {
"type": "string",
"description": "Target Name.",
- "x-example": "Aegon apple token"
+ "x-example": "Apple iPhone 12"
},
"userId": {
"type": "string",
@@ -27427,6 +27572,11 @@
"type": "string",
"description": "The target identifier.",
"x-example": "token"
+ },
+ "expired": {
+ "type": "boolean",
+ "description": "Is the target expired.",
+ "x-example": false
}
},
"required": [
@@ -27436,7 +27586,8 @@
"name",
"userId",
"providerType",
- "identifier"
+ "identifier",
+ "expired"
]
}
},
diff --git a/app/config/specs/swagger2-latest-client.json b/app/config/specs/swagger2-latest-client.json
index a35e496d66..3ac70ffe28 100644
--- a/app/config/specs/swagger2-latest-client.json
+++ b/app/config/specs/swagger2-latest-client.json
@@ -87,7 +87,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 8,
+ "weight": 9,
"cookies": false,
"type": "",
"deprecated": false,
@@ -140,7 +140,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 7,
+ "weight": 8,
"cookies": false,
"type": "",
"deprecated": false,
@@ -233,7 +233,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 33,
+ "weight": 34,
"cookies": false,
"type": "",
"deprecated": false,
@@ -315,7 +315,7 @@
},
"x-appwrite": {
"method": "listIdentities",
- "weight": 56,
+ "weight": 57,
"cookies": false,
"type": "",
"deprecated": false,
@@ -379,7 +379,7 @@
},
"x-appwrite": {
"method": "deleteIdentity",
- "weight": 57,
+ "weight": 58,
"cookies": false,
"type": "",
"deprecated": false,
@@ -444,7 +444,7 @@
},
"x-appwrite": {
"method": "createJWT",
- "weight": 28,
+ "weight": 29,
"cookies": false,
"type": "",
"deprecated": false,
@@ -497,7 +497,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 30,
+ "weight": 31,
"cookies": false,
"type": "",
"deprecated": false,
@@ -566,7 +566,7 @@
},
"x-appwrite": {
"method": "updateMFA",
- "weight": 43,
+ "weight": 44,
"cookies": false,
"type": "",
"deprecated": false,
@@ -641,7 +641,7 @@
},
"x-appwrite": {
"method": "createMfaAuthenticator",
- "weight": 45,
+ "weight": 46,
"cookies": false,
"type": "",
"deprecated": false,
@@ -709,7 +709,7 @@
},
"x-appwrite": {
"method": "updateMfaAuthenticator",
- "weight": 46,
+ "weight": 47,
"cookies": false,
"type": "",
"deprecated": false,
@@ -790,7 +790,7 @@
},
"x-appwrite": {
"method": "deleteMfaAuthenticator",
- "weight": 50,
+ "weight": 51,
"cookies": false,
"type": "",
"deprecated": false,
@@ -860,7 +860,7 @@
},
"x-appwrite": {
"method": "createMfaChallenge",
- "weight": 51,
+ "weight": 52,
"cookies": false,
"type": "",
"deprecated": false,
@@ -934,7 +934,7 @@
},
"x-appwrite": {
"method": "updateMfaChallenge",
- "weight": 52,
+ "weight": 53,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1016,7 +1016,7 @@
},
"x-appwrite": {
"method": "listMfaFactors",
- "weight": 44,
+ "weight": 45,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1071,7 +1071,7 @@
},
"x-appwrite": {
"method": "getMfaRecoveryCodes",
- "weight": 49,
+ "weight": 50,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1124,7 +1124,7 @@
},
"x-appwrite": {
"method": "createMfaRecoveryCodes",
- "weight": 47,
+ "weight": 48,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1177,7 +1177,7 @@
},
"x-appwrite": {
"method": "updateMfaRecoveryCodes",
- "weight": 48,
+ "weight": 49,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1232,7 +1232,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 31,
+ "weight": 32,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1307,7 +1307,7 @@
},
"x-appwrite": {
"method": "updatePassword",
- "weight": 32,
+ "weight": 33,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1388,7 +1388,7 @@
},
"x-appwrite": {
"method": "updatePhone",
- "weight": 34,
+ "weight": 35,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1470,7 +1470,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 29,
+ "weight": 30,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1523,7 +1523,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 35,
+ "weight": 36,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1598,7 +1598,7 @@
},
"x-appwrite": {
"method": "createRecovery",
- "weight": 37,
+ "weight": 38,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1681,7 +1681,7 @@
},
"x-appwrite": {
"method": "updateRecovery",
- "weight": 38,
+ "weight": 39,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1770,7 +1770,7 @@
},
"x-appwrite": {
"method": "listSessions",
- "weight": 10,
+ "weight": 11,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1818,7 +1818,7 @@
},
"x-appwrite": {
"method": "deleteSessions",
- "weight": 11,
+ "weight": 12,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1873,7 +1873,7 @@
},
"x-appwrite": {
"method": "createAnonymousSession",
- "weight": 16,
+ "weight": 17,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1926,7 +1926,7 @@
},
"x-appwrite": {
"method": "createEmailPasswordSession",
- "weight": 15,
+ "weight": 16,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2006,7 +2006,7 @@
},
"x-appwrite": {
"method": "updateMagicURLSession",
- "weight": 25,
+ "weight": 26,
"cookies": false,
"type": "",
"deprecated": true,
@@ -2083,7 +2083,7 @@
},
"x-appwrite": {
"method": "createOAuth2Session",
- "weight": 18,
+ "weight": 19,
"cookies": false,
"type": "webAuth",
"deprecated": false,
@@ -2221,7 +2221,7 @@
},
"x-appwrite": {
"method": "updatePhoneSession",
- "weight": 26,
+ "weight": 27,
"cookies": false,
"type": "",
"deprecated": true,
@@ -2301,7 +2301,7 @@
},
"x-appwrite": {
"method": "createSession",
- "weight": 17,
+ "weight": 18,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2381,7 +2381,7 @@
},
"x-appwrite": {
"method": "getSession",
- "weight": 12,
+ "weight": 13,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2444,7 +2444,7 @@
},
"x-appwrite": {
"method": "updateSession",
- "weight": 14,
+ "weight": 15,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2502,7 +2502,7 @@
},
"x-appwrite": {
"method": "deleteSession",
- "weight": 13,
+ "weight": 14,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2567,7 +2567,7 @@
},
"x-appwrite": {
"method": "updateStatus",
- "weight": 36,
+ "weight": 37,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2622,7 +2622,7 @@
},
"x-appwrite": {
"method": "createPushTarget",
- "weight": 53,
+ "weight": 54,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2708,7 +2708,7 @@
},
"x-appwrite": {
"method": "updatePushTarget",
- "weight": 54,
+ "weight": 55,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2784,7 +2784,7 @@
},
"x-appwrite": {
"method": "deletePushTarget",
- "weight": 55,
+ "weight": 56,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2847,7 +2847,7 @@
},
"x-appwrite": {
"method": "createEmailToken",
- "weight": 24,
+ "weight": 25,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2922,7 +2922,7 @@
"tags": [
"account"
],
- "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour. If you are on a mobile device you can leave the URL parameter empty, so that the login completion will be handled by your Appwrite instance by default.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
+ "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
"responses": {
"201": {
"description": "Token",
@@ -2933,7 +2933,7 @@
},
"x-appwrite": {
"method": "createMagicURLToken",
- "weight": 23,
+ "weight": 24,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3025,7 +3025,7 @@
},
"x-appwrite": {
"method": "createOAuth2Token",
- "weight": 22,
+ "weight": 23,
"cookies": false,
"type": "webAuth",
"deprecated": false,
@@ -3163,7 +3163,7 @@
},
"x-appwrite": {
"method": "createPhoneToken",
- "weight": 27,
+ "weight": 28,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3246,7 +3246,7 @@
},
"x-appwrite": {
"method": "createVerification",
- "weight": 39,
+ "weight": 40,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3319,7 +3319,7 @@
},
"x-appwrite": {
"method": "updateVerification",
- "weight": 40,
+ "weight": 41,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3401,7 +3401,7 @@
},
"x-appwrite": {
"method": "createPhoneVerification",
- "weight": 41,
+ "weight": 42,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3457,7 +3457,7 @@
},
"x-appwrite": {
"method": "updatePhoneVerification",
- "weight": 42,
+ "weight": 43,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3539,7 +3539,7 @@
},
"x-appwrite": {
"method": "getBrowser",
- "weight": 59,
+ "weight": 60,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3668,7 +3668,7 @@
},
"x-appwrite": {
"method": "getCreditCard",
- "weight": 58,
+ "weight": 59,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3801,7 +3801,7 @@
},
"x-appwrite": {
"method": "getFavicon",
- "weight": 62,
+ "weight": 63,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3868,7 +3868,7 @@
},
"x-appwrite": {
"method": "getFlag",
- "weight": 60,
+ "weight": 61,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4359,7 +4359,7 @@
},
"x-appwrite": {
"method": "getImage",
- "weight": 61,
+ "weight": 62,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4446,7 +4446,7 @@
},
"x-appwrite": {
"method": "getInitials",
- "weight": 64,
+ "weight": 65,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4541,7 +4541,7 @@
},
"x-appwrite": {
"method": "getQR",
- "weight": 63,
+ "weight": 64,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4636,7 +4636,7 @@
},
"x-appwrite": {
"method": "listDocuments",
- "weight": 108,
+ "weight": 109,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4720,7 +4720,7 @@
},
"x-appwrite": {
"method": "createDocument",
- "weight": 107,
+ "weight": 108,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4828,7 +4828,7 @@
},
"x-appwrite": {
"method": "getDocument",
- "weight": 109,
+ "weight": 110,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4920,7 +4920,7 @@
},
"x-appwrite": {
"method": "updateDocument",
- "weight": 111,
+ "weight": 112,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5019,7 +5019,7 @@
},
"x-appwrite": {
"method": "deleteDocument",
- "weight": 112,
+ "weight": 113,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5101,7 +5101,7 @@
},
"x-appwrite": {
"method": "listExecutions",
- "weight": 304,
+ "weight": 306,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5186,7 +5186,7 @@
},
"x-appwrite": {
"method": "createExecution",
- "weight": 303,
+ "weight": 305,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5232,10 +5232,10 @@
"type": "object",
"properties": {
"body": {
- "type": "object",
+ "type": "string",
"description": "HTTP body of execution. Default value is empty string.",
"default": "",
- "x-example": "{}"
+ "x-example": ""
},
"async": {
"type": "boolean",
@@ -5307,7 +5307,7 @@
},
"x-appwrite": {
"method": "getExecution",
- "weight": 305,
+ "weight": 307,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5381,7 +5381,7 @@
},
"x-appwrite": {
"method": "query",
- "weight": 329,
+ "weight": 331,
"cookies": false,
"type": "graphql",
"deprecated": false,
@@ -5457,7 +5457,7 @@
},
"x-appwrite": {
"method": "mutation",
- "weight": 328,
+ "weight": 330,
"cookies": false,
"type": "graphql",
"deprecated": false,
@@ -5533,7 +5533,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 116,
+ "weight": 117,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5589,7 +5589,7 @@
},
"x-appwrite": {
"method": "listCodes",
- "weight": 117,
+ "weight": 118,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5645,7 +5645,7 @@
},
"x-appwrite": {
"method": "listContinents",
- "weight": 121,
+ "weight": 122,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5701,7 +5701,7 @@
},
"x-appwrite": {
"method": "listCountries",
- "weight": 118,
+ "weight": 119,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5757,7 +5757,7 @@
},
"x-appwrite": {
"method": "listCountriesEU",
- "weight": 119,
+ "weight": 120,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5813,7 +5813,7 @@
},
"x-appwrite": {
"method": "listCountriesPhones",
- "weight": 120,
+ "weight": 121,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5869,7 +5869,7 @@
},
"x-appwrite": {
"method": "listCurrencies",
- "weight": 122,
+ "weight": 123,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5925,7 +5925,7 @@
},
"x-appwrite": {
"method": "listLanguages",
- "weight": 123,
+ "weight": 124,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5981,7 +5981,7 @@
},
"x-appwrite": {
"method": "createSubscriber",
- "weight": 380,
+ "weight": 382,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6070,7 +6070,7 @@
},
"x-appwrite": {
"method": "deleteSubscriber",
- "weight": 384,
+ "weight": 386,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6145,7 +6145,7 @@
},
"x-appwrite": {
"method": "listFiles",
- "weight": 206,
+ "weight": 208,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6230,7 +6230,7 @@
},
"x-appwrite": {
"method": "createFile",
- "weight": 205,
+ "weight": 207,
"cookies": false,
"type": "upload",
"deprecated": false,
@@ -6324,7 +6324,7 @@
},
"x-appwrite": {
"method": "getFile",
- "weight": 207,
+ "weight": 209,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6396,7 +6396,7 @@
},
"x-appwrite": {
"method": "updateFile",
- "weight": 212,
+ "weight": 214,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6487,7 +6487,7 @@
},
"x-appwrite": {
"method": "deleteFile",
- "weight": 213,
+ "weight": 215,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6561,7 +6561,7 @@
},
"x-appwrite": {
"method": "getFileDownload",
- "weight": 209,
+ "weight": 211,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -6635,7 +6635,7 @@
},
"x-appwrite": {
"method": "getFilePreview",
- "weight": 208,
+ "weight": 210,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -6801,7 +6801,8 @@
"jpeg",
"gif",
"png",
- "webp"
+ "webp",
+ "avif"
],
"x-enum-name": "ImageFormat",
"x-enum-keys": [],
@@ -6835,7 +6836,7 @@
},
"x-appwrite": {
"method": "getFileView",
- "weight": 210,
+ "weight": 212,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -6909,7 +6910,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 217,
+ "weight": 219,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6986,7 +6987,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 216,
+ "weight": 218,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7080,7 +7081,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 218,
+ "weight": 220,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7144,7 +7145,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 220,
+ "weight": 222,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7221,7 +7222,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 222,
+ "weight": 224,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7276,7 +7277,7 @@
"tags": [
"teams"
],
- "description": "Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint.",
+ "description": "Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint. Hide sensitive attributes from the response by toggling membership privacy in the Console.",
"responses": {
"200": {
"description": "Memberships List",
@@ -7287,7 +7288,7 @@
},
"x-appwrite": {
"method": "listMemberships",
- "weight": 224,
+ "weight": 226,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7372,7 +7373,7 @@
},
"x-appwrite": {
"method": "createMembership",
- "weight": 223,
+ "weight": 225,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7478,7 +7479,7 @@
"tags": [
"teams"
],
- "description": "Get a team member by the membership unique id. All team members have read access for this resource.",
+ "description": "Get a team member by the membership unique id. All team members have read access for this resource. Hide sensitive attributes from the response by toggling membership privacy in the Console.",
"responses": {
"200": {
"description": "Membership",
@@ -7489,7 +7490,7 @@
},
"x-appwrite": {
"method": "getMembership",
- "weight": 225,
+ "weight": 227,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7561,7 +7562,7 @@
},
"x-appwrite": {
"method": "updateMembership",
- "weight": 226,
+ "weight": 228,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7649,7 +7650,7 @@
},
"x-appwrite": {
"method": "deleteMembership",
- "weight": 228,
+ "weight": 230,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7723,7 +7724,7 @@
},
"x-appwrite": {
"method": "updateMembershipStatus",
- "weight": 227,
+ "weight": 229,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7821,7 +7822,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 219,
+ "weight": 221,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7884,7 +7885,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 221,
+ "weight": 223,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9444,12 +9445,12 @@
},
"userName": {
"type": "string",
- "description": "User name.",
+ "description": "User name. Hide this attribute by toggling membership privacy in the Console.",
"x-example": "John Doe"
},
"userEmail": {
"type": "string",
- "description": "User email address.",
+ "description": "User email address. Hide this attribute by toggling membership privacy in the Console.",
"x-example": "john@appwrite.io"
},
"teamId": {
@@ -9479,7 +9480,7 @@
},
"mfa": {
"type": "boolean",
- "description": "Multi factor authentication status, true if the user has MFA enabled or false otherwise.",
+ "description": "Multi factor authentication status, true if the user has MFA enabled or false otherwise. Hide this attribute by toggling membership privacy in the Console.",
"x-example": false
},
"roles": {
@@ -9585,7 +9586,7 @@
"responseBody": {
"type": "string",
"description": "HTTP response body. This will return empty unless execution is created as synchronous.",
- "x-example": "Developers are awesome."
+ "x-example": ""
},
"responseHeaders": {
"type": "array",
@@ -10007,7 +10008,7 @@
"name": {
"type": "string",
"description": "Target Name.",
- "x-example": "Aegon apple token"
+ "x-example": "Apple iPhone 12"
},
"userId": {
"type": "string",
@@ -10029,6 +10030,11 @@
"type": "string",
"description": "The target identifier.",
"x-example": "token"
+ },
+ "expired": {
+ "type": "boolean",
+ "description": "Is the target expired.",
+ "x-example": false
}
},
"required": [
@@ -10038,7 +10044,8 @@
"name",
"userId",
"providerType",
- "identifier"
+ "identifier",
+ "expired"
]
}
},
diff --git a/app/config/specs/swagger2-latest-console.json b/app/config/specs/swagger2-latest-console.json
index 963f55eae1..25c0c289b3 100644
--- a/app/config/specs/swagger2-latest-console.json
+++ b/app/config/specs/swagger2-latest-console.json
@@ -99,7 +99,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 8,
+ "weight": 9,
"cookies": false,
"type": "",
"deprecated": false,
@@ -151,7 +151,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 7,
+ "weight": 8,
"cookies": false,
"type": "",
"deprecated": false,
@@ -237,7 +237,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 9,
+ "weight": 10,
"cookies": false,
"type": "",
"deprecated": false,
@@ -289,7 +289,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 33,
+ "weight": 34,
"cookies": false,
"type": "",
"deprecated": false,
@@ -370,7 +370,7 @@
},
"x-appwrite": {
"method": "listIdentities",
- "weight": 56,
+ "weight": 57,
"cookies": false,
"type": "",
"deprecated": false,
@@ -433,7 +433,7 @@
},
"x-appwrite": {
"method": "deleteIdentity",
- "weight": 57,
+ "weight": 58,
"cookies": false,
"type": "",
"deprecated": false,
@@ -497,7 +497,7 @@
},
"x-appwrite": {
"method": "createJWT",
- "weight": 28,
+ "weight": 29,
"cookies": false,
"type": "",
"deprecated": false,
@@ -550,7 +550,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 30,
+ "weight": 31,
"cookies": false,
"type": "",
"deprecated": false,
@@ -618,7 +618,7 @@
},
"x-appwrite": {
"method": "updateMFA",
- "weight": 43,
+ "weight": 44,
"cookies": false,
"type": "",
"deprecated": false,
@@ -692,7 +692,7 @@
},
"x-appwrite": {
"method": "createMfaAuthenticator",
- "weight": 45,
+ "weight": 46,
"cookies": false,
"type": "",
"deprecated": false,
@@ -759,7 +759,7 @@
},
"x-appwrite": {
"method": "updateMfaAuthenticator",
- "weight": 46,
+ "weight": 47,
"cookies": false,
"type": "",
"deprecated": false,
@@ -839,7 +839,7 @@
},
"x-appwrite": {
"method": "deleteMfaAuthenticator",
- "weight": 50,
+ "weight": 51,
"cookies": false,
"type": "",
"deprecated": false,
@@ -908,7 +908,7 @@
},
"x-appwrite": {
"method": "createMfaChallenge",
- "weight": 51,
+ "weight": 52,
"cookies": false,
"type": "",
"deprecated": false,
@@ -982,7 +982,7 @@
},
"x-appwrite": {
"method": "updateMfaChallenge",
- "weight": 52,
+ "weight": 53,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1063,7 +1063,7 @@
},
"x-appwrite": {
"method": "listMfaFactors",
- "weight": 44,
+ "weight": 45,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1117,7 +1117,7 @@
},
"x-appwrite": {
"method": "getMfaRecoveryCodes",
- "weight": 49,
+ "weight": 50,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1169,7 +1169,7 @@
},
"x-appwrite": {
"method": "createMfaRecoveryCodes",
- "weight": 47,
+ "weight": 48,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1221,7 +1221,7 @@
},
"x-appwrite": {
"method": "updateMfaRecoveryCodes",
- "weight": 48,
+ "weight": 49,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1275,7 +1275,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 31,
+ "weight": 32,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1349,7 +1349,7 @@
},
"x-appwrite": {
"method": "updatePassword",
- "weight": 32,
+ "weight": 33,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1429,7 +1429,7 @@
},
"x-appwrite": {
"method": "updatePhone",
- "weight": 34,
+ "weight": 35,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1510,7 +1510,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 29,
+ "weight": 30,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1562,7 +1562,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 35,
+ "weight": 36,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1636,7 +1636,7 @@
},
"x-appwrite": {
"method": "createRecovery",
- "weight": 37,
+ "weight": 38,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1718,7 +1718,7 @@
},
"x-appwrite": {
"method": "updateRecovery",
- "weight": 38,
+ "weight": 39,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1806,7 +1806,7 @@
},
"x-appwrite": {
"method": "listSessions",
- "weight": 10,
+ "weight": 11,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1853,7 +1853,7 @@
},
"x-appwrite": {
"method": "deleteSessions",
- "weight": 11,
+ "weight": 12,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1907,7 +1907,7 @@
},
"x-appwrite": {
"method": "createAnonymousSession",
- "weight": 16,
+ "weight": 17,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1960,7 +1960,7 @@
},
"x-appwrite": {
"method": "createEmailPasswordSession",
- "weight": 15,
+ "weight": 16,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2040,7 +2040,7 @@
},
"x-appwrite": {
"method": "updateMagicURLSession",
- "weight": 25,
+ "weight": 26,
"cookies": false,
"type": "",
"deprecated": true,
@@ -2117,7 +2117,7 @@
},
"x-appwrite": {
"method": "createOAuth2Session",
- "weight": 18,
+ "weight": 19,
"cookies": false,
"type": "webAuth",
"deprecated": false,
@@ -2255,7 +2255,7 @@
},
"x-appwrite": {
"method": "updatePhoneSession",
- "weight": 26,
+ "weight": 27,
"cookies": false,
"type": "",
"deprecated": true,
@@ -2335,7 +2335,7 @@
},
"x-appwrite": {
"method": "createSession",
- "weight": 17,
+ "weight": 18,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2415,7 +2415,7 @@
},
"x-appwrite": {
"method": "getSession",
- "weight": 12,
+ "weight": 13,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2477,7 +2477,7 @@
},
"x-appwrite": {
"method": "updateSession",
- "weight": 14,
+ "weight": 15,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2534,7 +2534,7 @@
},
"x-appwrite": {
"method": "deleteSession",
- "weight": 13,
+ "weight": 14,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2598,7 +2598,7 @@
},
"x-appwrite": {
"method": "updateStatus",
- "weight": 36,
+ "weight": 37,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2652,7 +2652,7 @@
},
"x-appwrite": {
"method": "createPushTarget",
- "weight": 53,
+ "weight": 54,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2737,7 +2737,7 @@
},
"x-appwrite": {
"method": "updatePushTarget",
- "weight": 54,
+ "weight": 55,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2812,7 +2812,7 @@
},
"x-appwrite": {
"method": "deletePushTarget",
- "weight": 55,
+ "weight": 56,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2874,7 +2874,7 @@
},
"x-appwrite": {
"method": "createEmailToken",
- "weight": 24,
+ "weight": 25,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2949,7 +2949,7 @@
"tags": [
"account"
],
- "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour. If you are on a mobile device you can leave the URL parameter empty, so that the login completion will be handled by your Appwrite instance by default.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
+ "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
"responses": {
"201": {
"description": "Token",
@@ -2960,7 +2960,7 @@
},
"x-appwrite": {
"method": "createMagicURLToken",
- "weight": 23,
+ "weight": 24,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3052,7 +3052,7 @@
},
"x-appwrite": {
"method": "createOAuth2Token",
- "weight": 22,
+ "weight": 23,
"cookies": false,
"type": "webAuth",
"deprecated": false,
@@ -3190,7 +3190,7 @@
},
"x-appwrite": {
"method": "createPhoneToken",
- "weight": 27,
+ "weight": 28,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3273,7 +3273,7 @@
},
"x-appwrite": {
"method": "createVerification",
- "weight": 39,
+ "weight": 40,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3345,7 +3345,7 @@
},
"x-appwrite": {
"method": "updateVerification",
- "weight": 40,
+ "weight": 41,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3426,7 +3426,7 @@
},
"x-appwrite": {
"method": "createPhoneVerification",
- "weight": 41,
+ "weight": 42,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3481,7 +3481,7 @@
},
"x-appwrite": {
"method": "updatePhoneVerification",
- "weight": 42,
+ "weight": 43,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3562,7 +3562,7 @@
},
"x-appwrite": {
"method": "getBrowser",
- "weight": 59,
+ "weight": 60,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3691,7 +3691,7 @@
},
"x-appwrite": {
"method": "getCreditCard",
- "weight": 58,
+ "weight": 59,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3824,7 +3824,7 @@
},
"x-appwrite": {
"method": "getFavicon",
- "weight": 62,
+ "weight": 63,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3891,7 +3891,7 @@
},
"x-appwrite": {
"method": "getFlag",
- "weight": 60,
+ "weight": 61,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4382,7 +4382,7 @@
},
"x-appwrite": {
"method": "getImage",
- "weight": 61,
+ "weight": 62,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4469,7 +4469,7 @@
},
"x-appwrite": {
"method": "getInitials",
- "weight": 64,
+ "weight": 65,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4564,7 +4564,7 @@
},
"x-appwrite": {
"method": "getQR",
- "weight": 63,
+ "weight": 64,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4659,7 +4659,7 @@
},
"x-appwrite": {
"method": "chat",
- "weight": 331,
+ "weight": 333,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4731,7 +4731,7 @@
},
"x-appwrite": {
"method": "variables",
- "weight": 330,
+ "weight": 332,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4783,7 +4783,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 69,
+ "weight": 70,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4857,7 +4857,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 68,
+ "weight": 69,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4943,7 +4943,7 @@
},
"x-appwrite": {
"method": "getUsage",
- "weight": 113,
+ "weight": 114,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5017,7 +5017,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 70,
+ "weight": 71,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5078,7 +5078,7 @@
},
"x-appwrite": {
"method": "update",
- "weight": 72,
+ "weight": 73,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5158,7 +5158,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 73,
+ "weight": 74,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5221,7 +5221,7 @@
},
"x-appwrite": {
"method": "listCollections",
- "weight": 75,
+ "weight": 76,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5303,7 +5303,7 @@
},
"x-appwrite": {
"method": "createCollection",
- "weight": 74,
+ "weight": 75,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5412,7 +5412,7 @@
},
"x-appwrite": {
"method": "getCollection",
- "weight": 76,
+ "weight": 77,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5481,7 +5481,7 @@
},
"x-appwrite": {
"method": "updateCollection",
- "weight": 78,
+ "weight": 79,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5584,7 +5584,7 @@
},
"x-appwrite": {
"method": "deleteCollection",
- "weight": 79,
+ "weight": 80,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5655,7 +5655,7 @@
},
"x-appwrite": {
"method": "listAttributes",
- "weight": 90,
+ "weight": 91,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5738,7 +5738,7 @@
},
"x-appwrite": {
"method": "createBooleanAttribute",
- "weight": 87,
+ "weight": 88,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5844,7 +5844,7 @@
},
"x-appwrite": {
"method": "updateBooleanAttribute",
- "weight": 99,
+ "weight": 100,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5954,7 +5954,7 @@
},
"x-appwrite": {
"method": "createDatetimeAttribute",
- "weight": 88,
+ "weight": 89,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6060,7 +6060,7 @@
},
"x-appwrite": {
"method": "updateDatetimeAttribute",
- "weight": 100,
+ "weight": 101,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6170,7 +6170,7 @@
},
"x-appwrite": {
"method": "createEmailAttribute",
- "weight": 81,
+ "weight": 82,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6276,7 +6276,7 @@
},
"x-appwrite": {
"method": "updateEmailAttribute",
- "weight": 93,
+ "weight": 94,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6386,7 +6386,7 @@
},
"x-appwrite": {
"method": "createEnumAttribute",
- "weight": 82,
+ "weight": 83,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6502,7 +6502,7 @@
},
"x-appwrite": {
"method": "updateEnumAttribute",
- "weight": 94,
+ "weight": 95,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6622,7 +6622,7 @@
},
"x-appwrite": {
"method": "createFloatAttribute",
- "weight": 86,
+ "weight": 87,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6740,7 +6740,7 @@
},
"x-appwrite": {
"method": "updateFloatAttribute",
- "weight": 98,
+ "weight": 99,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6864,7 +6864,7 @@
},
"x-appwrite": {
"method": "createIntegerAttribute",
- "weight": 85,
+ "weight": 86,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6982,7 +6982,7 @@
},
"x-appwrite": {
"method": "updateIntegerAttribute",
- "weight": 97,
+ "weight": 98,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7106,7 +7106,7 @@
},
"x-appwrite": {
"method": "createIpAttribute",
- "weight": 83,
+ "weight": 84,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7212,7 +7212,7 @@
},
"x-appwrite": {
"method": "updateIpAttribute",
- "weight": 95,
+ "weight": 96,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7322,7 +7322,7 @@
},
"x-appwrite": {
"method": "createRelationshipAttribute",
- "weight": 89,
+ "weight": 90,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7457,7 +7457,7 @@
},
"x-appwrite": {
"method": "createStringAttribute",
- "weight": 80,
+ "weight": 81,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7576,7 +7576,7 @@
},
"x-appwrite": {
"method": "updateStringAttribute",
- "weight": 92,
+ "weight": 93,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7650,7 +7650,7 @@
"type": "integer",
"description": "Maximum size of the string attribute.",
"default": null,
- "x-example": null
+ "x-example": 1
},
"newKey": {
"type": "string",
@@ -7692,7 +7692,7 @@
},
"x-appwrite": {
"method": "createUrlAttribute",
- "weight": 84,
+ "weight": 85,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7798,7 +7798,7 @@
},
"x-appwrite": {
"method": "updateUrlAttribute",
- "weight": 96,
+ "weight": 97,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7939,7 +7939,7 @@
},
"x-appwrite": {
"method": "getAttribute",
- "weight": 91,
+ "weight": 92,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8010,7 +8010,7 @@
},
"x-appwrite": {
"method": "deleteAttribute",
- "weight": 102,
+ "weight": 103,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8086,7 +8086,7 @@
},
"x-appwrite": {
"method": "updateRelationshipAttribute",
- "weight": 101,
+ "weight": 102,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8192,7 +8192,7 @@
},
"x-appwrite": {
"method": "listDocuments",
- "weight": 108,
+ "weight": 109,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8276,7 +8276,7 @@
},
"x-appwrite": {
"method": "createDocument",
- "weight": 107,
+ "weight": 108,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8384,7 +8384,7 @@
},
"x-appwrite": {
"method": "getDocument",
- "weight": 109,
+ "weight": 110,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8476,7 +8476,7 @@
},
"x-appwrite": {
"method": "updateDocument",
- "weight": 111,
+ "weight": 112,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8575,7 +8575,7 @@
},
"x-appwrite": {
"method": "deleteDocument",
- "weight": 112,
+ "weight": 113,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8657,7 +8657,7 @@
},
"x-appwrite": {
"method": "listDocumentLogs",
- "weight": 110,
+ "weight": 111,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8747,7 +8747,7 @@
},
"x-appwrite": {
"method": "listIndexes",
- "weight": 104,
+ "weight": 105,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8828,7 +8828,7 @@
},
"x-appwrite": {
"method": "createIndex",
- "weight": 103,
+ "weight": 104,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8950,7 +8950,7 @@
},
"x-appwrite": {
"method": "getIndex",
- "weight": 105,
+ "weight": 106,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9021,7 +9021,7 @@
},
"x-appwrite": {
"method": "deleteIndex",
- "weight": 106,
+ "weight": 107,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9099,7 +9099,7 @@
},
"x-appwrite": {
"method": "listCollectionLogs",
- "weight": 77,
+ "weight": 78,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9181,7 +9181,7 @@
},
"x-appwrite": {
"method": "getCollectionUsage",
- "weight": 115,
+ "weight": 116,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9271,7 +9271,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 71,
+ "weight": 72,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9345,7 +9345,7 @@
},
"x-appwrite": {
"method": "getDatabaseUsage",
- "weight": 114,
+ "weight": 115,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9427,7 +9427,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 287,
+ "weight": 289,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9501,7 +9501,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 286,
+ "weight": 288,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9559,6 +9559,7 @@
"node-19.0",
"node-20.0",
"node-21.0",
+ "node-22",
"php-8.0",
"php-8.1",
"php-8.2",
@@ -9577,6 +9578,8 @@
"deno-1.24",
"deno-1.35",
"deno-1.40",
+ "deno-1.46",
+ "deno-2.0",
"dart-2.15",
"dart-2.16",
"dart-2.17",
@@ -9584,24 +9587,30 @@
"dart-3.0",
"dart-3.1",
"dart-3.3",
- "dotnet-3.1",
+ "dart-3.5",
"dotnet-6.0",
"dotnet-7.0",
+ "dotnet-8.0",
"java-8.0",
"java-11.0",
"java-17.0",
"java-18.0",
"java-21.0",
+ "java-22",
"swift-5.5",
"swift-5.8",
"swift-5.9",
+ "swift-5.10",
"kotlin-1.6",
"kotlin-1.8",
"kotlin-1.9",
+ "kotlin-2.0",
"cpp-17",
"cpp-20",
"bun-1.0",
- "go-1.23"
+ "bun-1.1",
+ "go-1.23",
+ "static-1"
],
"x-enum-name": null,
"x-enum-keys": []
@@ -9726,7 +9735,7 @@
"specification": {
"type": "string",
"description": "Runtime specification for the function and builds.",
- "default": "s-0.5vcpu-512mb",
+ "default": "s-1vcpu-512mb",
"x-example": null
}
},
@@ -9764,7 +9773,7 @@
},
"x-appwrite": {
"method": "listRuntimes",
- "weight": 288,
+ "weight": 290,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9817,7 +9826,7 @@
},
"x-appwrite": {
"method": "listSpecifications",
- "weight": 289,
+ "weight": 291,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9871,7 +9880,7 @@
},
"x-appwrite": {
"method": "listTemplates",
- "weight": 312,
+ "weight": 314,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9969,7 +9978,7 @@
},
"x-appwrite": {
"method": "getTemplate",
- "weight": 313,
+ "weight": 315,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10031,7 +10040,7 @@
},
"x-appwrite": {
"method": "getUsage",
- "weight": 292,
+ "weight": 294,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10105,7 +10114,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 290,
+ "weight": 292,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10166,7 +10175,7 @@
},
"x-appwrite": {
"method": "update",
- "weight": 293,
+ "weight": 295,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10226,6 +10235,7 @@
"node-19.0",
"node-20.0",
"node-21.0",
+ "node-22",
"php-8.0",
"php-8.1",
"php-8.2",
@@ -10244,6 +10254,8 @@
"deno-1.24",
"deno-1.35",
"deno-1.40",
+ "deno-1.46",
+ "deno-2.0",
"dart-2.15",
"dart-2.16",
"dart-2.17",
@@ -10251,24 +10263,30 @@
"dart-3.0",
"dart-3.1",
"dart-3.3",
- "dotnet-3.1",
+ "dart-3.5",
"dotnet-6.0",
"dotnet-7.0",
+ "dotnet-8.0",
"java-8.0",
"java-11.0",
"java-17.0",
"java-18.0",
"java-21.0",
+ "java-22",
"swift-5.5",
"swift-5.8",
"swift-5.9",
+ "swift-5.10",
"kotlin-1.6",
"kotlin-1.8",
"kotlin-1.9",
+ "kotlin-2.0",
"cpp-17",
"cpp-20",
"bun-1.0",
- "go-1.23"
+ "bun-1.1",
+ "go-1.23",
+ "static-1"
],
"x-enum-name": null,
"x-enum-keys": []
@@ -10370,7 +10388,7 @@
"specification": {
"type": "string",
"description": "Runtime specification for the function and builds.",
- "default": "s-0.5vcpu-512mb",
+ "default": "s-1vcpu-512mb",
"x-example": null
}
},
@@ -10399,7 +10417,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 296,
+ "weight": 298,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10462,7 +10480,7 @@
},
"x-appwrite": {
"method": "listDeployments",
- "weight": 298,
+ "weight": 300,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10544,7 +10562,7 @@
},
"x-appwrite": {
"method": "createDeployment",
- "weight": 297,
+ "weight": 299,
"cookies": false,
"type": "upload",
"deprecated": false,
@@ -10638,7 +10656,7 @@
},
"x-appwrite": {
"method": "getDeployment",
- "weight": 299,
+ "weight": 301,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10707,7 +10725,7 @@
},
"x-appwrite": {
"method": "updateDeployment",
- "weight": 295,
+ "weight": 297,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10771,7 +10789,7 @@
},
"x-appwrite": {
"method": "deleteDeployment",
- "weight": 300,
+ "weight": 302,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10837,7 +10855,7 @@
},
"x-appwrite": {
"method": "createBuild",
- "weight": 301,
+ "weight": 303,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10921,7 +10939,7 @@
},
"x-appwrite": {
"method": "updateDeploymentBuild",
- "weight": 302,
+ "weight": 304,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10992,7 +11010,7 @@
},
"x-appwrite": {
"method": "getDeploymentDownload",
- "weight": 294,
+ "weight": 296,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -11065,7 +11083,7 @@
},
"x-appwrite": {
"method": "listExecutions",
- "weight": 304,
+ "weight": 306,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11150,7 +11168,7 @@
},
"x-appwrite": {
"method": "createExecution",
- "weight": 303,
+ "weight": 305,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11196,10 +11214,10 @@
"type": "object",
"properties": {
"body": {
- "type": "object",
+ "type": "string",
"description": "HTTP body of execution. Default value is empty string.",
"default": "",
- "x-example": "{}"
+ "x-example": ""
},
"async": {
"type": "boolean",
@@ -11271,7 +11289,7 @@
},
"x-appwrite": {
"method": "getExecution",
- "weight": 305,
+ "weight": 307,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11338,7 +11356,7 @@
},
"x-appwrite": {
"method": "deleteExecution",
- "weight": 306,
+ "weight": 308,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11409,7 +11427,7 @@
},
"x-appwrite": {
"method": "getFunctionUsage",
- "weight": 291,
+ "weight": 293,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11491,7 +11509,7 @@
},
"x-appwrite": {
"method": "listVariables",
- "weight": 308,
+ "weight": 310,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11552,7 +11570,7 @@
},
"x-appwrite": {
"method": "createVariable",
- "weight": 307,
+ "weight": 309,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11640,7 +11658,7 @@
},
"x-appwrite": {
"method": "getVariable",
- "weight": 309,
+ "weight": 311,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11709,7 +11727,7 @@
},
"x-appwrite": {
"method": "updateVariable",
- "weight": 310,
+ "weight": 312,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11797,7 +11815,7 @@
},
"x-appwrite": {
"method": "deleteVariable",
- "weight": 311,
+ "weight": 313,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11868,7 +11886,7 @@
},
"x-appwrite": {
"method": "query",
- "weight": 329,
+ "weight": 331,
"cookies": false,
"type": "graphql",
"deprecated": false,
@@ -11944,7 +11962,7 @@
},
"x-appwrite": {
"method": "mutation",
- "weight": 328,
+ "weight": 330,
"cookies": false,
"type": "graphql",
"deprecated": false,
@@ -12020,7 +12038,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 124,
+ "weight": 125,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12073,7 +12091,7 @@
},
"x-appwrite": {
"method": "getAntivirus",
- "weight": 146,
+ "weight": 147,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12126,7 +12144,7 @@
},
"x-appwrite": {
"method": "getCache",
- "weight": 127,
+ "weight": 128,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12179,7 +12197,7 @@
},
"x-appwrite": {
"method": "getCertificate",
- "weight": 133,
+ "weight": 134,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12241,7 +12259,7 @@
},
"x-appwrite": {
"method": "getDB",
- "weight": 126,
+ "weight": 127,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12294,7 +12312,7 @@
},
"x-appwrite": {
"method": "getPubSub",
- "weight": 129,
+ "weight": 130,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12347,7 +12365,7 @@
},
"x-appwrite": {
"method": "getQueue",
- "weight": 128,
+ "weight": 129,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12400,7 +12418,7 @@
},
"x-appwrite": {
"method": "getQueueBuilds",
- "weight": 135,
+ "weight": 136,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12464,7 +12482,7 @@
},
"x-appwrite": {
"method": "getQueueCertificates",
- "weight": 134,
+ "weight": 135,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12528,7 +12546,7 @@
},
"x-appwrite": {
"method": "getQueueDatabases",
- "weight": 136,
+ "weight": 137,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12601,7 +12619,7 @@
},
"x-appwrite": {
"method": "getQueueDeletes",
- "weight": 137,
+ "weight": 138,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12665,7 +12683,7 @@
},
"x-appwrite": {
"method": "getFailedJobs",
- "weight": 147,
+ "weight": 148,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12753,7 +12771,7 @@
},
"x-appwrite": {
"method": "getQueueFunctions",
- "weight": 141,
+ "weight": 142,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12817,7 +12835,7 @@
},
"x-appwrite": {
"method": "getQueueLogs",
- "weight": 132,
+ "weight": 133,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12881,7 +12899,7 @@
},
"x-appwrite": {
"method": "getQueueMails",
- "weight": 138,
+ "weight": 139,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12945,7 +12963,7 @@
},
"x-appwrite": {
"method": "getQueueMessaging",
- "weight": 139,
+ "weight": 140,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13009,7 +13027,7 @@
},
"x-appwrite": {
"method": "getQueueMigrations",
- "weight": 140,
+ "weight": 141,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13073,7 +13091,7 @@
},
"x-appwrite": {
"method": "getQueueUsage",
- "weight": 142,
+ "weight": 143,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13137,7 +13155,7 @@
},
"x-appwrite": {
"method": "getQueueUsageDump",
- "weight": 143,
+ "weight": 144,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13201,7 +13219,7 @@
},
"x-appwrite": {
"method": "getQueueWebhooks",
- "weight": 131,
+ "weight": 132,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13265,7 +13283,7 @@
},
"x-appwrite": {
"method": "getStorage",
- "weight": 145,
+ "weight": 146,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13318,7 +13336,7 @@
},
"x-appwrite": {
"method": "getStorageLocal",
- "weight": 144,
+ "weight": 145,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13371,7 +13389,7 @@
},
"x-appwrite": {
"method": "getTime",
- "weight": 130,
+ "weight": 131,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13424,7 +13442,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 116,
+ "weight": 117,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13480,7 +13498,7 @@
},
"x-appwrite": {
"method": "listCodes",
- "weight": 117,
+ "weight": 118,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13536,7 +13554,7 @@
},
"x-appwrite": {
"method": "listContinents",
- "weight": 121,
+ "weight": 122,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13592,7 +13610,7 @@
},
"x-appwrite": {
"method": "listCountries",
- "weight": 118,
+ "weight": 119,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13648,7 +13666,7 @@
},
"x-appwrite": {
"method": "listCountriesEU",
- "weight": 119,
+ "weight": 120,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13704,7 +13722,7 @@
},
"x-appwrite": {
"method": "listCountriesPhones",
- "weight": 120,
+ "weight": 121,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13760,7 +13778,7 @@
},
"x-appwrite": {
"method": "listCurrencies",
- "weight": 122,
+ "weight": 123,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13816,7 +13834,7 @@
},
"x-appwrite": {
"method": "listLanguages",
- "weight": 123,
+ "weight": 124,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13872,7 +13890,7 @@
},
"x-appwrite": {
"method": "listMessages",
- "weight": 388,
+ "weight": 390,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13949,7 +13967,7 @@
},
"x-appwrite": {
"method": "createEmail",
- "weight": 385,
+ "weight": 387,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14109,7 +14127,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 392,
+ "weight": 394,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14266,7 +14284,7 @@
},
"x-appwrite": {
"method": "createPush",
- "weight": 387,
+ "weight": 389,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14441,7 +14459,7 @@
},
"x-appwrite": {
"method": "updatePush",
- "weight": 394,
+ "weight": 396,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14613,7 +14631,7 @@
},
"x-appwrite": {
"method": "createSms",
- "weight": 386,
+ "weight": 388,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14733,7 +14751,7 @@
},
"x-appwrite": {
"method": "updateSms",
- "weight": 393,
+ "weight": 395,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14851,7 +14869,7 @@
},
"x-appwrite": {
"method": "getMessage",
- "weight": 391,
+ "weight": 393,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14910,7 +14928,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 395,
+ "weight": 397,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14974,7 +14992,7 @@
},
"x-appwrite": {
"method": "listMessageLogs",
- "weight": 389,
+ "weight": 391,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15050,7 +15068,7 @@
},
"x-appwrite": {
"method": "listTargets",
- "weight": 390,
+ "weight": 392,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15126,7 +15144,7 @@
},
"x-appwrite": {
"method": "listProviders",
- "weight": 360,
+ "weight": 362,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15203,7 +15221,7 @@
},
"x-appwrite": {
"method": "createApnsProvider",
- "weight": 359,
+ "weight": 361,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15320,7 +15338,7 @@
},
"x-appwrite": {
"method": "updateApnsProvider",
- "weight": 372,
+ "weight": 374,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15435,7 +15453,7 @@
},
"x-appwrite": {
"method": "createFcmProvider",
- "weight": 358,
+ "weight": 360,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15528,7 +15546,7 @@
},
"x-appwrite": {
"method": "updateFcmProvider",
- "weight": 371,
+ "weight": 373,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15619,7 +15637,7 @@
},
"x-appwrite": {
"method": "createMailgunProvider",
- "weight": 350,
+ "weight": 352,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15748,7 +15766,7 @@
},
"x-appwrite": {
"method": "updateMailgunProvider",
- "weight": 363,
+ "weight": 365,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15875,7 +15893,7 @@
},
"x-appwrite": {
"method": "createMsg91Provider",
- "weight": 353,
+ "weight": 355,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15980,7 +15998,7 @@
},
"x-appwrite": {
"method": "updateMsg91Provider",
- "weight": 366,
+ "weight": 368,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16083,7 +16101,7 @@
},
"x-appwrite": {
"method": "createSendgridProvider",
- "weight": 351,
+ "weight": 353,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16200,7 +16218,7 @@
},
"x-appwrite": {
"method": "updateSendgridProvider",
- "weight": 364,
+ "weight": 366,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16315,7 +16333,7 @@
},
"x-appwrite": {
"method": "createSmtpProvider",
- "weight": 352,
+ "weight": 354,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16476,7 +16494,7 @@
},
"x-appwrite": {
"method": "updateSmtpProvider",
- "weight": 365,
+ "weight": 367,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16634,7 +16652,7 @@
},
"x-appwrite": {
"method": "createTelesignProvider",
- "weight": 354,
+ "weight": 356,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16739,7 +16757,7 @@
},
"x-appwrite": {
"method": "updateTelesignProvider",
- "weight": 367,
+ "weight": 369,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16842,7 +16860,7 @@
},
"x-appwrite": {
"method": "createTextmagicProvider",
- "weight": 355,
+ "weight": 357,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16947,7 +16965,7 @@
},
"x-appwrite": {
"method": "updateTextmagicProvider",
- "weight": 368,
+ "weight": 370,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17050,7 +17068,7 @@
},
"x-appwrite": {
"method": "createTwilioProvider",
- "weight": 356,
+ "weight": 358,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17155,7 +17173,7 @@
},
"x-appwrite": {
"method": "updateTwilioProvider",
- "weight": 369,
+ "weight": 371,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17258,7 +17276,7 @@
},
"x-appwrite": {
"method": "createVonageProvider",
- "weight": 357,
+ "weight": 359,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17363,7 +17381,7 @@
},
"x-appwrite": {
"method": "updateVonageProvider",
- "weight": 370,
+ "weight": 372,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17466,7 +17484,7 @@
},
"x-appwrite": {
"method": "getProvider",
- "weight": 362,
+ "weight": 364,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17525,7 +17543,7 @@
},
"x-appwrite": {
"method": "deleteProvider",
- "weight": 373,
+ "weight": 375,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17589,7 +17607,7 @@
},
"x-appwrite": {
"method": "listProviderLogs",
- "weight": 361,
+ "weight": 363,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17665,7 +17683,7 @@
},
"x-appwrite": {
"method": "listSubscriberLogs",
- "weight": 382,
+ "weight": 384,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17741,7 +17759,7 @@
},
"x-appwrite": {
"method": "listTopics",
- "weight": 375,
+ "weight": 377,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17816,7 +17834,7 @@
},
"x-appwrite": {
"method": "createTopic",
- "weight": 374,
+ "weight": 376,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17908,7 +17926,7 @@
},
"x-appwrite": {
"method": "getTopic",
- "weight": 377,
+ "weight": 379,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17970,7 +17988,7 @@
},
"x-appwrite": {
"method": "updateTopic",
- "weight": 378,
+ "weight": 380,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18053,7 +18071,7 @@
},
"x-appwrite": {
"method": "deleteTopic",
- "weight": 379,
+ "weight": 381,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18117,7 +18135,7 @@
},
"x-appwrite": {
"method": "listTopicLogs",
- "weight": 376,
+ "weight": 378,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18193,7 +18211,7 @@
},
"x-appwrite": {
"method": "listSubscribers",
- "weight": 381,
+ "weight": 383,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18276,7 +18294,7 @@
},
"x-appwrite": {
"method": "createSubscriber",
- "weight": 380,
+ "weight": 382,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18368,7 +18386,7 @@
},
"x-appwrite": {
"method": "getSubscriber",
- "weight": 383,
+ "weight": 385,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18435,7 +18453,7 @@
},
"x-appwrite": {
"method": "deleteSubscriber",
- "weight": 384,
+ "weight": 386,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18510,7 +18528,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 337,
+ "weight": 339,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18539,7 +18557,7 @@
"parameters": [
{
"name": "queries",
- "description": "Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https:\/\/appwrite.io\/docs\/databases#querying-documents). Maximum of 100 queries are allowed, each 4096 characters long. You may filter on the following attributes: status, stage, source, resources, statusCounters, resourceData, errors",
+ "description": "Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https:\/\/appwrite.io\/docs\/databases#querying-documents). Maximum of 100 queries are allowed, each 4096 characters long. You may filter on the following attributes: status, stage, source, destination, resources, statusCounters, resourceData, errors",
"required": false,
"type": "array",
"collectionFormat": "multi",
@@ -18585,7 +18603,7 @@
},
"x-appwrite": {
"method": "createAppwriteMigration",
- "weight": 332,
+ "weight": 334,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18681,7 +18699,7 @@
},
"x-appwrite": {
"method": "getAppwriteReport",
- "weight": 339,
+ "weight": 341,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18771,7 +18789,7 @@
},
"x-appwrite": {
"method": "createFirebaseMigration",
- "weight": 334,
+ "weight": 336,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18853,7 +18871,7 @@
},
"x-appwrite": {
"method": "deleteFirebaseAuth",
- "weight": 345,
+ "weight": 347,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18905,7 +18923,7 @@
},
"x-appwrite": {
"method": "createFirebaseOAuthMigration",
- "weight": 333,
+ "weight": 335,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18987,7 +19005,7 @@
},
"x-appwrite": {
"method": "listFirebaseProjects",
- "weight": 344,
+ "weight": 346,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19039,7 +19057,7 @@
},
"x-appwrite": {
"method": "getFirebaseReport",
- "weight": 340,
+ "weight": 342,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19112,7 +19130,7 @@
},
"x-appwrite": {
"method": "getFirebaseReportOAuth",
- "weight": 341,
+ "weight": 343,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19185,7 +19203,7 @@
},
"x-appwrite": {
"method": "createNHostMigration",
- "weight": 336,
+ "weight": 338,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19308,7 +19326,7 @@
},
"x-appwrite": {
"method": "getNHostReport",
- "weight": 347,
+ "weight": 349,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19430,7 +19448,7 @@
},
"x-appwrite": {
"method": "createSupabaseMigration",
- "weight": 335,
+ "weight": 337,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19546,7 +19564,7 @@
},
"x-appwrite": {
"method": "getSupabaseReport",
- "weight": 346,
+ "weight": 348,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19661,7 +19679,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 338,
+ "weight": 340,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19721,7 +19739,7 @@
},
"x-appwrite": {
"method": "retry",
- "weight": 348,
+ "weight": 350,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19776,7 +19794,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 349,
+ "weight": 351,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19838,7 +19856,7 @@
},
"x-appwrite": {
"method": "getUsage",
- "weight": 194,
+ "weight": 196,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19924,7 +19942,7 @@
},
"x-appwrite": {
"method": "listVariables",
- "weight": 196,
+ "weight": 198,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19974,7 +19992,7 @@
},
"x-appwrite": {
"method": "createVariable",
- "weight": 195,
+ "weight": 197,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20053,7 +20071,7 @@
},
"x-appwrite": {
"method": "getVariable",
- "weight": 197,
+ "weight": 199,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20113,7 +20131,7 @@
},
"x-appwrite": {
"method": "updateVariable",
- "weight": 198,
+ "weight": 200,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20192,7 +20210,7 @@
},
"x-appwrite": {
"method": "deleteVariable",
- "weight": 199,
+ "weight": 201,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20254,7 +20272,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 150,
+ "weight": 151,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20327,7 +20345,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 149,
+ "weight": 150,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20479,7 +20497,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 151,
+ "weight": 152,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20539,7 +20557,7 @@
},
"x-appwrite": {
"method": "update",
- "weight": 152,
+ "weight": 153,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20666,7 +20684,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 168,
+ "weight": 170,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20728,7 +20746,7 @@
},
"x-appwrite": {
"method": "updateApiStatus",
- "weight": 156,
+ "weight": 157,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20822,7 +20840,7 @@
},
"x-appwrite": {
"method": "updateApiStatusAll",
- "weight": 157,
+ "weight": 158,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20902,7 +20920,7 @@
},
"x-appwrite": {
"method": "updateAuthDuration",
- "weight": 161,
+ "weight": 163,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20982,7 +21000,7 @@
},
"x-appwrite": {
"method": "updateAuthLimit",
- "weight": 160,
+ "weight": 162,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21062,7 +21080,7 @@
},
"x-appwrite": {
"method": "updateAuthSessionsLimit",
- "weight": 166,
+ "weight": 168,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21118,6 +21136,100 @@
]
}
},
+ "\/projects\/{projectId}\/auth\/memberships-privacy": {
+ "patch": {
+ "summary": "Update project memberships privacy attributes",
+ "operationId": "projectsUpdateMembershipsPrivacy",
+ "consumes": [
+ "application\/json"
+ ],
+ "produces": [
+ "application\/json"
+ ],
+ "tags": [
+ "projects"
+ ],
+ "description": "",
+ "responses": {
+ "200": {
+ "description": "Project",
+ "schema": {
+ "$ref": "#\/definitions\/project"
+ }
+ }
+ },
+ "x-appwrite": {
+ "method": "updateMembershipsPrivacy",
+ "weight": 161,
+ "cookies": false,
+ "type": "",
+ "deprecated": false,
+ "demo": "projects\/update-memberships-privacy.md",
+ "edit": "https:\/\/github.com\/appwrite\/appwrite\/edit\/master",
+ "rate-limit": 0,
+ "rate-time": 3600,
+ "rate-key": "url:{url},ip:{ip}",
+ "scope": "projects.write",
+ "platforms": [
+ "console"
+ ],
+ "packaging": false,
+ "offline-model": "",
+ "offline-key": "",
+ "offline-response-key": "$id",
+ "auth": {
+ "Project": []
+ }
+ },
+ "security": [
+ {
+ "Project": []
+ }
+ ],
+ "parameters": [
+ {
+ "name": "projectId",
+ "description": "Project unique ID.",
+ "required": true,
+ "type": "string",
+ "x-example": "",
+ "in": "path"
+ },
+ {
+ "name": "payload",
+ "in": "body",
+ "schema": {
+ "type": "object",
+ "properties": {
+ "userName": {
+ "type": "boolean",
+ "description": "Set to true to show userName to members of a team.",
+ "default": null,
+ "x-example": false
+ },
+ "userEmail": {
+ "type": "boolean",
+ "description": "Set to true to show email to members of a team.",
+ "default": null,
+ "x-example": false
+ },
+ "mfa": {
+ "type": "boolean",
+ "description": "Set to true to show mfa to members of a team.",
+ "default": null,
+ "x-example": false
+ }
+ },
+ "required": [
+ "userName",
+ "userEmail",
+ "mfa"
+ ]
+ }
+ }
+ ]
+ }
+ },
"\/projects\/{projectId}\/auth\/mock-numbers": {
"patch": {
"summary": "Update the mock numbers for the project",
@@ -21142,7 +21254,7 @@
},
"x-appwrite": {
"method": "updateMockNumbers",
- "weight": 167,
+ "weight": 169,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21225,7 +21337,7 @@
},
"x-appwrite": {
"method": "updateAuthPasswordDictionary",
- "weight": 164,
+ "weight": 166,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21305,7 +21417,7 @@
},
"x-appwrite": {
"method": "updateAuthPasswordHistory",
- "weight": 163,
+ "weight": 165,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21385,7 +21497,7 @@
},
"x-appwrite": {
"method": "updatePersonalDataCheck",
- "weight": 165,
+ "weight": 167,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21465,7 +21577,7 @@
},
"x-appwrite": {
"method": "updateSessionAlerts",
- "weight": 159,
+ "weight": 160,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21545,7 +21657,7 @@
},
"x-appwrite": {
"method": "updateAuthStatus",
- "weight": 162,
+ "weight": 164,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21644,7 +21756,7 @@
},
"x-appwrite": {
"method": "createJWT",
- "weight": 180,
+ "weight": 182,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21733,7 +21845,7 @@
},
"x-appwrite": {
"method": "listKeys",
- "weight": 176,
+ "weight": 178,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21742,7 +21854,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.read",
+ "scope": "keys.read",
"platforms": [
"console"
],
@@ -21793,7 +21905,7 @@
},
"x-appwrite": {
"method": "createKey",
- "weight": 175,
+ "weight": 177,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21802,7 +21914,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.write",
+ "scope": "keys.write",
"platforms": [
"console"
],
@@ -21889,7 +22001,7 @@
},
"x-appwrite": {
"method": "getKey",
- "weight": 177,
+ "weight": 179,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21898,7 +22010,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.read",
+ "scope": "keys.read",
"platforms": [
"console"
],
@@ -21957,7 +22069,7 @@
},
"x-appwrite": {
"method": "updateKey",
- "weight": 178,
+ "weight": 180,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21966,7 +22078,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.write",
+ "scope": "keys.write",
"platforms": [
"console"
],
@@ -22054,7 +22166,7 @@
},
"x-appwrite": {
"method": "deleteKey",
- "weight": 179,
+ "weight": 181,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22063,7 +22175,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.write",
+ "scope": "keys.write",
"platforms": [
"console"
],
@@ -22124,7 +22236,7 @@
},
"x-appwrite": {
"method": "updateOAuth2",
- "weight": 158,
+ "weight": 159,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22265,7 +22377,7 @@
},
"x-appwrite": {
"method": "listPlatforms",
- "weight": 182,
+ "weight": 184,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22274,7 +22386,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.read",
+ "scope": "platforms.read",
"platforms": [
"console"
],
@@ -22325,7 +22437,7 @@
},
"x-appwrite": {
"method": "createPlatform",
- "weight": 181,
+ "weight": 183,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22334,7 +22446,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.write",
+ "scope": "platforms.write",
"platforms": [
"console"
],
@@ -22449,7 +22561,7 @@
},
"x-appwrite": {
"method": "getPlatform",
- "weight": 183,
+ "weight": 185,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22458,7 +22570,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.read",
+ "scope": "platforms.read",
"platforms": [
"console"
],
@@ -22517,7 +22629,7 @@
},
"x-appwrite": {
"method": "updatePlatform",
- "weight": 184,
+ "weight": 186,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22526,7 +22638,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.write",
+ "scope": "platforms.write",
"platforms": [
"console"
],
@@ -22616,7 +22728,7 @@
},
"x-appwrite": {
"method": "deletePlatform",
- "weight": 185,
+ "weight": 187,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22625,7 +22737,7 @@
"rate-limit": 0,
"rate-time": 3600,
"rate-key": "url:{url},ip:{ip}",
- "scope": "projects.write",
+ "scope": "platforms.write",
"platforms": [
"console"
],
@@ -22686,7 +22798,7 @@
},
"x-appwrite": {
"method": "updateServiceStatus",
- "weight": 154,
+ "weight": 155,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22788,7 +22900,7 @@
},
"x-appwrite": {
"method": "updateServiceStatusAll",
- "weight": 155,
+ "weight": 156,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22868,7 +22980,7 @@
},
"x-appwrite": {
"method": "updateSmtp",
- "weight": 186,
+ "weight": 188,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22997,7 +23109,7 @@
},
"x-appwrite": {
"method": "createSmtpTest",
- "weight": 187,
+ "weight": 189,
"cookies": false,
"type": "",
"deprecated": false,
@@ -23095,7 +23207,8 @@
"default": "",
"x-example": "tls",
"enum": [
- "tls"
+ "tls",
+ "ssl"
],
"x-enum-name": "SMTPSecure",
"x-enum-keys": []
@@ -23136,7 +23249,7 @@
},
"x-appwrite": {
"method": "updateTeam",
- "weight": 153,
+ "weight": 154,
"cookies": false,
"type": "",
"deprecated": false,
@@ -23216,7 +23329,7 @@
},
"x-appwrite": {
"method": "getEmailTemplate",
- "weight": 189,
+ "weight": 191,
"cookies": false,
"type": "",
"deprecated": false,
@@ -23438,7 +23551,7 @@
},
"x-appwrite": {
"method": "updateEmailTemplate",
- "weight": 191,
+ "weight": 193,
"cookies": false,
"type": "",
"deprecated": false,
@@ -23703,7 +23816,7 @@
},
"x-appwrite": {
"method": "deleteEmailTemplate",
- "weight": 193,
+ "weight": 195,
"cookies": false,
"type": "",
"deprecated": false,
@@ -23927,7 +24040,7 @@
},
"x-appwrite": {
"method": "getSmsTemplate",
- "weight": 188,
+ "weight": 190,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24146,7 +24259,7 @@
},
"x-appwrite": {
"method": "updateSmsTemplate",
- "weight": 190,
+ "weight": 192,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24383,7 +24496,7 @@
},
"x-appwrite": {
"method": "deleteSmsTemplate",
- "weight": 192,
+ "weight": 194,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24604,7 +24717,7 @@
},
"x-appwrite": {
"method": "listWebhooks",
- "weight": 170,
+ "weight": 172,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24664,7 +24777,7 @@
},
"x-appwrite": {
"method": "createWebhook",
- "weight": 169,
+ "weight": 171,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24786,7 +24899,7 @@
},
"x-appwrite": {
"method": "getWebhook",
- "weight": 171,
+ "weight": 173,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24854,7 +24967,7 @@
},
"x-appwrite": {
"method": "updateWebhook",
- "weight": 172,
+ "weight": 174,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24977,7 +25090,7 @@
},
"x-appwrite": {
"method": "deleteWebhook",
- "weight": 174,
+ "weight": 176,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25047,7 +25160,7 @@
},
"x-appwrite": {
"method": "updateWebhookSignature",
- "weight": 173,
+ "weight": 175,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25117,7 +25230,7 @@
},
"x-appwrite": {
"method": "listRules",
- "weight": 315,
+ "weight": 317,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25190,7 +25303,7 @@
},
"x-appwrite": {
"method": "createRule",
- "weight": 314,
+ "weight": 316,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25281,7 +25394,7 @@
},
"x-appwrite": {
"method": "getRule",
- "weight": 316,
+ "weight": 318,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25336,7 +25449,7 @@
},
"x-appwrite": {
"method": "deleteRule",
- "weight": 317,
+ "weight": 319,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25398,7 +25511,7 @@
},
"x-appwrite": {
"method": "updateRuleVerification",
- "weight": 318,
+ "weight": 320,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25460,7 +25573,7 @@
},
"x-appwrite": {
"method": "listBuckets",
- "weight": 201,
+ "weight": 203,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25534,7 +25647,7 @@
},
"x-appwrite": {
"method": "createBucket",
- "weight": 200,
+ "weight": 202,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25675,7 +25788,7 @@
},
"x-appwrite": {
"method": "getBucket",
- "weight": 202,
+ "weight": 204,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25736,7 +25849,7 @@
},
"x-appwrite": {
"method": "updateBucket",
- "weight": 203,
+ "weight": 205,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25871,7 +25984,7 @@
},
"x-appwrite": {
"method": "deleteBucket",
- "weight": 204,
+ "weight": 206,
"cookies": false,
"type": "",
"deprecated": false,
@@ -25934,7 +26047,7 @@
},
"x-appwrite": {
"method": "listFiles",
- "weight": 206,
+ "weight": 208,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26019,7 +26132,7 @@
},
"x-appwrite": {
"method": "createFile",
- "weight": 205,
+ "weight": 207,
"cookies": false,
"type": "upload",
"deprecated": false,
@@ -26113,7 +26226,7 @@
},
"x-appwrite": {
"method": "getFile",
- "weight": 207,
+ "weight": 209,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26185,7 +26298,7 @@
},
"x-appwrite": {
"method": "updateFile",
- "weight": 212,
+ "weight": 214,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26276,7 +26389,7 @@
},
"x-appwrite": {
"method": "deleteFile",
- "weight": 213,
+ "weight": 215,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26350,7 +26463,7 @@
},
"x-appwrite": {
"method": "getFileDownload",
- "weight": 209,
+ "weight": 211,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -26424,7 +26537,7 @@
},
"x-appwrite": {
"method": "getFilePreview",
- "weight": 208,
+ "weight": 210,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -26590,7 +26703,8 @@
"jpeg",
"gif",
"png",
- "webp"
+ "webp",
+ "avif"
],
"x-enum-name": "ImageFormat",
"x-enum-keys": [],
@@ -26624,7 +26738,7 @@
},
"x-appwrite": {
"method": "getFileView",
- "weight": 210,
+ "weight": 212,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -26698,7 +26812,7 @@
},
"x-appwrite": {
"method": "getUsage",
- "weight": 214,
+ "weight": 216,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26772,7 +26886,7 @@
},
"x-appwrite": {
"method": "getBucketUsage",
- "weight": 215,
+ "weight": 217,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26854,7 +26968,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 217,
+ "weight": 219,
"cookies": false,
"type": "",
"deprecated": false,
@@ -26931,7 +27045,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 216,
+ "weight": 218,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27025,7 +27139,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 218,
+ "weight": 220,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27089,7 +27203,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 220,
+ "weight": 222,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27166,7 +27280,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 222,
+ "weight": 224,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27232,7 +27346,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 229,
+ "weight": 231,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27295,7 +27409,7 @@
"tags": [
"teams"
],
- "description": "Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint.",
+ "description": "Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint. Hide sensitive attributes from the response by toggling membership privacy in the Console.",
"responses": {
"200": {
"description": "Memberships List",
@@ -27306,7 +27420,7 @@
},
"x-appwrite": {
"method": "listMemberships",
- "weight": 224,
+ "weight": 226,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27391,7 +27505,7 @@
},
"x-appwrite": {
"method": "createMembership",
- "weight": 223,
+ "weight": 225,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27497,7 +27611,7 @@
"tags": [
"teams"
],
- "description": "Get a team member by the membership unique id. All team members have read access for this resource.",
+ "description": "Get a team member by the membership unique id. All team members have read access for this resource. Hide sensitive attributes from the response by toggling membership privacy in the Console.",
"responses": {
"200": {
"description": "Membership",
@@ -27508,7 +27622,7 @@
},
"x-appwrite": {
"method": "getMembership",
- "weight": 225,
+ "weight": 227,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27580,7 +27694,7 @@
},
"x-appwrite": {
"method": "updateMembership",
- "weight": 226,
+ "weight": 228,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27668,7 +27782,7 @@
},
"x-appwrite": {
"method": "deleteMembership",
- "weight": 228,
+ "weight": 230,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27742,7 +27856,7 @@
},
"x-appwrite": {
"method": "updateMembershipStatus",
- "weight": 227,
+ "weight": 229,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27839,7 +27953,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 219,
+ "weight": 221,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27901,7 +28015,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 221,
+ "weight": 223,
"cookies": false,
"type": "",
"deprecated": false,
@@ -27983,7 +28097,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 239,
+ "weight": 241,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28057,7 +28171,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 230,
+ "weight": 232,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28154,7 +28268,7 @@
},
"x-appwrite": {
"method": "createArgon2User",
- "weight": 233,
+ "weight": 235,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28247,7 +28361,7 @@
},
"x-appwrite": {
"method": "createBcryptUser",
- "weight": 231,
+ "weight": 233,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28340,7 +28454,7 @@
},
"x-appwrite": {
"method": "listIdentities",
- "weight": 247,
+ "weight": 249,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28411,7 +28525,7 @@
},
"x-appwrite": {
"method": "deleteIdentity",
- "weight": 270,
+ "weight": 272,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28474,7 +28588,7 @@
},
"x-appwrite": {
"method": "createMD5User",
- "weight": 232,
+ "weight": 234,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28567,7 +28681,7 @@
},
"x-appwrite": {
"method": "createPHPassUser",
- "weight": 235,
+ "weight": 237,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28660,7 +28774,7 @@
},
"x-appwrite": {
"method": "createScryptUser",
- "weight": 236,
+ "weight": 238,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28788,7 +28902,7 @@
},
"x-appwrite": {
"method": "createScryptModifiedUser",
- "weight": 237,
+ "weight": 239,
"cookies": false,
"type": "",
"deprecated": false,
@@ -28902,7 +29016,7 @@
},
"x-appwrite": {
"method": "createSHAUser",
- "weight": 234,
+ "weight": 236,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29016,7 +29130,7 @@
},
"x-appwrite": {
"method": "getUsage",
- "weight": 272,
+ "weight": 274,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29090,7 +29204,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 240,
+ "weight": 242,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29146,7 +29260,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 268,
+ "weight": 270,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29209,7 +29323,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 253,
+ "weight": 255,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29290,7 +29404,7 @@
},
"x-appwrite": {
"method": "createJWT",
- "weight": 271,
+ "weight": 273,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29374,7 +29488,7 @@
},
"x-appwrite": {
"method": "updateLabels",
- "weight": 249,
+ "weight": 251,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29458,7 +29572,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 245,
+ "weight": 247,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29533,7 +29647,7 @@
},
"x-appwrite": {
"method": "listMemberships",
- "weight": 244,
+ "weight": 246,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29596,7 +29710,7 @@
},
"x-appwrite": {
"method": "updateMfa",
- "weight": 258,
+ "weight": 260,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29677,7 +29791,7 @@
},
"x-appwrite": {
"method": "deleteMfaAuthenticator",
- "weight": 263,
+ "weight": 265,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29753,7 +29867,7 @@
},
"x-appwrite": {
"method": "listMfaFactors",
- "weight": 259,
+ "weight": 261,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29816,7 +29930,7 @@
},
"x-appwrite": {
"method": "getMfaRecoveryCodes",
- "weight": 260,
+ "weight": 262,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29877,7 +29991,7 @@
},
"x-appwrite": {
"method": "updateMfaRecoveryCodes",
- "weight": 262,
+ "weight": 264,
"cookies": false,
"type": "",
"deprecated": false,
@@ -29938,7 +30052,7 @@
},
"x-appwrite": {
"method": "createMfaRecoveryCodes",
- "weight": 261,
+ "weight": 263,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30001,7 +30115,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 251,
+ "weight": 253,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30082,7 +30196,7 @@
},
"x-appwrite": {
"method": "updatePassword",
- "weight": 252,
+ "weight": 254,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30163,7 +30277,7 @@
},
"x-appwrite": {
"method": "updatePhone",
- "weight": 254,
+ "weight": 256,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30244,7 +30358,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 241,
+ "weight": 243,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30305,7 +30419,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 256,
+ "weight": 258,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30386,7 +30500,7 @@
},
"x-appwrite": {
"method": "listSessions",
- "weight": 243,
+ "weight": 245,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30447,7 +30561,7 @@
},
"x-appwrite": {
"method": "createSession",
- "weight": 264,
+ "weight": 266,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30503,7 +30617,7 @@
},
"x-appwrite": {
"method": "deleteSessions",
- "weight": 267,
+ "weight": 269,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30561,7 +30675,7 @@
},
"x-appwrite": {
"method": "deleteSession",
- "weight": 266,
+ "weight": 268,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30632,7 +30746,7 @@
},
"x-appwrite": {
"method": "updateStatus",
- "weight": 248,
+ "weight": 250,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30713,7 +30827,7 @@
},
"x-appwrite": {
"method": "listTargets",
- "weight": 246,
+ "weight": 248,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30787,7 +30901,7 @@
},
"x-appwrite": {
"method": "createTarget",
- "weight": 238,
+ "weight": 240,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30902,7 +31016,7 @@
},
"x-appwrite": {
"method": "getTarget",
- "weight": 242,
+ "weight": 244,
"cookies": false,
"type": "",
"deprecated": false,
@@ -30972,7 +31086,7 @@
},
"x-appwrite": {
"method": "updateTarget",
- "weight": 257,
+ "weight": 259,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31066,7 +31180,7 @@
},
"x-appwrite": {
"method": "deleteTarget",
- "weight": 269,
+ "weight": 271,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31138,7 +31252,7 @@
},
"x-appwrite": {
"method": "createToken",
- "weight": 265,
+ "weight": 267,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31222,7 +31336,7 @@
},
"x-appwrite": {
"method": "updateEmailVerification",
- "weight": 255,
+ "weight": 257,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31303,7 +31417,7 @@
},
"x-appwrite": {
"method": "updatePhoneVerification",
- "weight": 250,
+ "weight": 252,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31384,7 +31498,7 @@
},
"x-appwrite": {
"method": "listRepositories",
- "weight": 277,
+ "weight": 279,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31453,7 +31567,7 @@
},
"x-appwrite": {
"method": "createRepository",
- "weight": 278,
+ "weight": 280,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31540,7 +31654,7 @@
},
"x-appwrite": {
"method": "getRepository",
- "weight": 279,
+ "weight": 281,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31610,7 +31724,7 @@
},
"x-appwrite": {
"method": "listRepositoryBranches",
- "weight": 280,
+ "weight": 282,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31680,7 +31794,7 @@
},
"x-appwrite": {
"method": "getRepositoryContents",
- "weight": 275,
+ "weight": 277,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31759,7 +31873,7 @@
},
"x-appwrite": {
"method": "createRepositoryDetection",
- "weight": 276,
+ "weight": 278,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31839,7 +31953,7 @@
},
"x-appwrite": {
"method": "updateExternalDeployments",
- "weight": 285,
+ "weight": 287,
"cookies": false,
"type": "",
"deprecated": false,
@@ -31927,7 +32041,7 @@
},
"x-appwrite": {
"method": "listInstallations",
- "weight": 282,
+ "weight": 284,
"cookies": false,
"type": "",
"deprecated": false,
@@ -32002,7 +32116,7 @@
},
"x-appwrite": {
"method": "getInstallation",
- "weight": 283,
+ "weight": 285,
"cookies": false,
"type": "",
"deprecated": false,
@@ -32057,7 +32171,7 @@
},
"x-appwrite": {
"method": "deleteInstallation",
- "weight": 284,
+ "weight": 286,
"cookies": false,
"type": "",
"deprecated": false,
@@ -33450,6 +33564,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"size": {
"type": "integer",
"description": "Attribute size.",
@@ -33469,6 +33593,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"size"
]
},
@@ -33507,6 +33633,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"min": {
"type": "integer",
"description": "Minimum value to enforce for new documents.",
@@ -33534,7 +33670,9 @@
"type",
"status",
"error",
- "required"
+ "required",
+ "$createdAt",
+ "$updatedAt"
]
},
"attributeFloat": {
@@ -33572,6 +33710,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"min": {
"type": "number",
"description": "Minimum value to enforce for new documents.",
@@ -33599,7 +33747,9 @@
"type",
"status",
"error",
- "required"
+ "required",
+ "$createdAt",
+ "$updatedAt"
]
},
"attributeBoolean": {
@@ -33637,6 +33787,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"default": {
"type": "boolean",
"description": "Default value for attribute when not provided. Cannot be set when attribute is required.",
@@ -33649,7 +33809,9 @@
"type",
"status",
"error",
- "required"
+ "required",
+ "$createdAt",
+ "$updatedAt"
]
},
"attributeEmail": {
@@ -33687,6 +33849,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "String format.",
@@ -33705,6 +33877,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -33743,6 +33917,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"elements": {
"type": "array",
"description": "Array of elements in enumerated type.",
@@ -33769,6 +33953,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"elements",
"format"
]
@@ -33808,6 +33994,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "String format.",
@@ -33826,6 +34022,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -33864,6 +34062,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "String format.",
@@ -33882,6 +34090,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -33920,6 +34130,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "ISO 8601 format.",
@@ -33938,6 +34158,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -33976,6 +34198,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"relatedCollection": {
"type": "string",
"description": "The ID of the related collection.",
@@ -34013,6 +34245,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"relatedCollection",
"relationType",
"twoWay",
@@ -34061,6 +34295,16 @@
},
"x-example": [],
"x-nullable": true
+ },
+ "$createdAt": {
+ "type": "string",
+ "description": "Index creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Index update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
}
},
"required": [
@@ -34068,7 +34312,9 @@
"type",
"status",
"error",
- "attributes"
+ "attributes",
+ "$createdAt",
+ "$updatedAt"
]
},
"document": {
@@ -35223,12 +35469,12 @@
},
"userName": {
"type": "string",
- "description": "User name.",
+ "description": "User name. Hide this attribute by toggling membership privacy in the Console.",
"x-example": "John Doe"
},
"userEmail": {
"type": "string",
- "description": "User email address.",
+ "description": "User email address. Hide this attribute by toggling membership privacy in the Console.",
"x-example": "john@appwrite.io"
},
"teamId": {
@@ -35258,7 +35504,7 @@
},
"mfa": {
"type": "boolean",
- "description": "Multi factor authentication status, true if the user has MFA enabled or false otherwise.",
+ "description": "Multi factor authentication status, true if the user has MFA enabled or false otherwise. Hide this attribute by toggling membership privacy in the Console.",
"x-example": false
},
"roles": {
@@ -35424,7 +35670,7 @@
"specification": {
"type": "string",
"description": "Machine specification for builds and executions.",
- "x-example": "s-0.5vcpu-512mb"
+ "x-example": "s-1vcpu-512mb"
}
},
"required": [
@@ -36100,7 +36346,7 @@
"responseBody": {
"type": "string",
"description": "HTTP response body. This will return empty unless execution is created as synchronous.",
- "x-example": "Developers are awesome."
+ "x-example": ""
},
"responseHeaders": {
"type": "array",
@@ -36345,6 +36591,21 @@
"description": "Whether or not to send session alert emails to users.",
"x-example": true
},
+ "authMembershipsUserName": {
+ "type": "boolean",
+ "description": "Whether or not to show user names in the teams membership response.",
+ "x-example": true
+ },
+ "authMembershipsUserEmail": {
+ "type": "boolean",
+ "description": "Whether or not to show user emails in the teams membership response.",
+ "x-example": true
+ },
+ "authMembershipsMfa": {
+ "type": "boolean",
+ "description": "Whether or not to show user MFA status in the teams membership response.",
+ "x-example": true
+ },
"oAuthProviders": {
"type": "array",
"description": "List of Auth Providers.",
@@ -36429,6 +36690,17 @@
"description": "SMTP server secure protocol",
"x-example": "tls"
},
+ "pingCount": {
+ "type": "integer",
+ "description": "Number of times the ping was received for this project.",
+ "x-example": 1,
+ "format": "int32"
+ },
+ "pingedAt": {
+ "type": "string",
+ "description": "Last ping datetime in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"authEmailPassword": {
"type": "boolean",
"description": "Email\/Password auth method status",
@@ -36543,6 +36815,9 @@
"authPersonalDataCheck",
"authMockNumbers",
"authSessionAlerts",
+ "authMembershipsUserName",
+ "authMembershipsUserEmail",
+ "authMembershipsMfa",
"oAuthProviders",
"platforms",
"webhooks",
@@ -36556,6 +36831,8 @@
"smtpUsername",
"smtpPassword",
"smtpSecure",
+ "pingCount",
+ "pingedAt",
"authEmailPassword",
"authUsersAuthMagicURL",
"authEmailOtp",
@@ -37264,6 +37541,12 @@
"x-example": 0,
"format": "int32"
},
+ "storageTotal": {
+ "type": "integer",
+ "description": "Total aggregated number of total databases storage in bytes.",
+ "x-example": 0,
+ "format": "int32"
+ },
"databases": {
"type": "array",
"description": "Aggregated number of databases per period.",
@@ -37290,6 +37573,15 @@
"$ref": "#\/definitions\/metric"
},
"x-example": []
+ },
+ "storage": {
+ "type": "array",
+ "description": "An array of the aggregated number of databases storage in bytes per period.",
+ "items": {
+ "type": "object",
+ "$ref": "#\/definitions\/metric"
+ },
+ "x-example": []
}
},
"required": [
@@ -37297,9 +37589,11 @@
"databasesTotal",
"collectionsTotal",
"documentsTotal",
+ "storageTotal",
"databases",
"collections",
- "documents"
+ "documents",
+ "storage"
]
},
"usageDatabase": {
@@ -37323,6 +37617,12 @@
"x-example": 0,
"format": "int32"
},
+ "storageTotal": {
+ "type": "integer",
+ "description": "Total aggregated number of total storage used in bytes.",
+ "x-example": 0,
+ "format": "int32"
+ },
"collections": {
"type": "array",
"description": "Aggregated number of collections per period.",
@@ -37340,14 +37640,25 @@
"$ref": "#\/definitions\/metric"
},
"x-example": []
+ },
+ "storage": {
+ "type": "array",
+ "description": "Aggregated storage used in bytes per period.",
+ "items": {
+ "type": "object",
+ "$ref": "#\/definitions\/metric"
+ },
+ "x-example": []
}
},
"required": [
"range",
"collectionsTotal",
"documentsTotal",
+ "storageTotal",
"collections",
- "documents"
+ "documents",
+ "storage"
]
},
"usageCollection": {
@@ -37915,6 +38226,12 @@
"x-example": 0,
"format": "int32"
},
+ "databasesStorageTotal": {
+ "type": "integer",
+ "description": "Total aggregated sum of databases storage size (in bytes).",
+ "x-example": 0,
+ "format": "int32"
+ },
"usersTotal": {
"type": "integer",
"description": "Total aggregated number of users.",
@@ -38017,6 +38334,15 @@
},
"x-example": []
},
+ "databasesStorageBreakdown": {
+ "type": "array",
+ "description": "An array of the aggregated breakdown of storage usage by databases.",
+ "items": {
+ "type": "object",
+ "$ref": "#\/definitions\/metricBreakdown"
+ },
+ "x-example": []
+ },
"executionsMbSecondsBreakdown": {
"type": "array",
"description": "Aggregated breakdown in totals of execution mbSeconds by functions.",
@@ -38049,6 +38375,7 @@
"executionsTotal",
"documentsTotal",
"databasesTotal",
+ "databasesStorageTotal",
"usersTotal",
"filesStorageTotal",
"functionsStorageTotal",
@@ -38063,6 +38390,7 @@
"executions",
"executionsBreakdown",
"bucketsBreakdown",
+ "databasesStorageBreakdown",
"executionsMbSecondsBreakdown",
"buildsMbSecondsBreakdown",
"functionsStorageBreakdown"
@@ -38112,7 +38440,7 @@
"slug": {
"type": "string",
"description": "Size slug.",
- "x-example": "s-0.5vcpu-512mb"
+ "x-example": "s-1vcpu-512mb"
}
},
"required": [
@@ -38753,7 +39081,7 @@
"name": {
"type": "string",
"description": "Target Name.",
- "x-example": "Aegon apple token"
+ "x-example": "Apple iPhone 12"
},
"userId": {
"type": "string",
@@ -38775,6 +39103,11 @@
"type": "string",
"description": "The target identifier.",
"x-example": "token"
+ },
+ "expired": {
+ "type": "boolean",
+ "description": "Is the target expired.",
+ "x-example": false
}
},
"required": [
@@ -38784,7 +39117,8 @@
"name",
"userId",
"providerType",
- "identifier"
+ "identifier",
+ "expired"
]
},
"migration": {
@@ -38798,7 +39132,7 @@
},
"$createdAt": {
"type": "string",
- "description": "Variable creation date in ISO 8601 format.",
+ "description": "Migration creation date in ISO 8601 format.",
"x-example": "2020-10-15T06:38:00.000+00:00"
},
"$updatedAt": {
@@ -38821,9 +39155,14 @@
"description": "A string containing the type of source of the migration.",
"x-example": "Appwrite"
},
+ "destination": {
+ "type": "string",
+ "description": "A string containing the type of destination of the migration.",
+ "x-example": "Appwrite"
+ },
"resources": {
"type": "array",
- "description": "Resources to migration.",
+ "description": "Resources to migrate.",
"items": {
"type": "string"
},
@@ -38859,6 +39198,7 @@
"status",
"stage",
"source",
+ "destination",
"resources",
"statusCounters",
"resourceData",
diff --git a/app/config/specs/swagger2-latest-server.json b/app/config/specs/swagger2-latest-server.json
index 705dc5a54b..68bcf268fb 100644
--- a/app/config/specs/swagger2-latest-server.json
+++ b/app/config/specs/swagger2-latest-server.json
@@ -102,7 +102,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 8,
+ "weight": 9,
"cookies": false,
"type": "",
"deprecated": false,
@@ -156,7 +156,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 7,
+ "weight": 8,
"cookies": false,
"type": "",
"deprecated": false,
@@ -249,7 +249,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 33,
+ "weight": 34,
"cookies": false,
"type": "",
"deprecated": false,
@@ -332,7 +332,7 @@
},
"x-appwrite": {
"method": "listIdentities",
- "weight": 56,
+ "weight": 57,
"cookies": false,
"type": "",
"deprecated": false,
@@ -397,7 +397,7 @@
},
"x-appwrite": {
"method": "deleteIdentity",
- "weight": 57,
+ "weight": 58,
"cookies": false,
"type": "",
"deprecated": false,
@@ -463,7 +463,7 @@
},
"x-appwrite": {
"method": "createJWT",
- "weight": 28,
+ "weight": 29,
"cookies": false,
"type": "",
"deprecated": false,
@@ -516,7 +516,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 30,
+ "weight": 31,
"cookies": false,
"type": "",
"deprecated": false,
@@ -586,7 +586,7 @@
},
"x-appwrite": {
"method": "updateMFA",
- "weight": 43,
+ "weight": 44,
"cookies": false,
"type": "",
"deprecated": false,
@@ -662,7 +662,7 @@
},
"x-appwrite": {
"method": "createMfaAuthenticator",
- "weight": 45,
+ "weight": 46,
"cookies": false,
"type": "",
"deprecated": false,
@@ -731,7 +731,7 @@
},
"x-appwrite": {
"method": "updateMfaAuthenticator",
- "weight": 46,
+ "weight": 47,
"cookies": false,
"type": "",
"deprecated": false,
@@ -813,7 +813,7 @@
},
"x-appwrite": {
"method": "deleteMfaAuthenticator",
- "weight": 50,
+ "weight": 51,
"cookies": false,
"type": "",
"deprecated": false,
@@ -884,7 +884,7 @@
},
"x-appwrite": {
"method": "createMfaChallenge",
- "weight": 51,
+ "weight": 52,
"cookies": false,
"type": "",
"deprecated": false,
@@ -958,7 +958,7 @@
},
"x-appwrite": {
"method": "updateMfaChallenge",
- "weight": 52,
+ "weight": 53,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1041,7 +1041,7 @@
},
"x-appwrite": {
"method": "listMfaFactors",
- "weight": 44,
+ "weight": 45,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1097,7 +1097,7 @@
},
"x-appwrite": {
"method": "getMfaRecoveryCodes",
- "weight": 49,
+ "weight": 50,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1151,7 +1151,7 @@
},
"x-appwrite": {
"method": "createMfaRecoveryCodes",
- "weight": 47,
+ "weight": 48,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1205,7 +1205,7 @@
},
"x-appwrite": {
"method": "updateMfaRecoveryCodes",
- "weight": 48,
+ "weight": 49,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1261,7 +1261,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 31,
+ "weight": 32,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1337,7 +1337,7 @@
},
"x-appwrite": {
"method": "updatePassword",
- "weight": 32,
+ "weight": 33,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1419,7 +1419,7 @@
},
"x-appwrite": {
"method": "updatePhone",
- "weight": 34,
+ "weight": 35,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1502,7 +1502,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 29,
+ "weight": 30,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1556,7 +1556,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 35,
+ "weight": 36,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1632,7 +1632,7 @@
},
"x-appwrite": {
"method": "createRecovery",
- "weight": 37,
+ "weight": 38,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1716,7 +1716,7 @@
},
"x-appwrite": {
"method": "updateRecovery",
- "weight": 38,
+ "weight": 39,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1806,7 +1806,7 @@
},
"x-appwrite": {
"method": "listSessions",
- "weight": 10,
+ "weight": 11,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1855,7 +1855,7 @@
},
"x-appwrite": {
"method": "deleteSessions",
- "weight": 11,
+ "weight": 12,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1911,7 +1911,7 @@
},
"x-appwrite": {
"method": "createAnonymousSession",
- "weight": 16,
+ "weight": 17,
"cookies": false,
"type": "",
"deprecated": false,
@@ -1964,7 +1964,7 @@
},
"x-appwrite": {
"method": "createEmailPasswordSession",
- "weight": 15,
+ "weight": 16,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2044,7 +2044,7 @@
},
"x-appwrite": {
"method": "updateMagicURLSession",
- "weight": 25,
+ "weight": 26,
"cookies": false,
"type": "",
"deprecated": true,
@@ -2124,7 +2124,7 @@
},
"x-appwrite": {
"method": "updatePhoneSession",
- "weight": 26,
+ "weight": 27,
"cookies": false,
"type": "",
"deprecated": true,
@@ -2204,7 +2204,7 @@
},
"x-appwrite": {
"method": "createSession",
- "weight": 17,
+ "weight": 18,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2284,7 +2284,7 @@
},
"x-appwrite": {
"method": "getSession",
- "weight": 12,
+ "weight": 13,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2348,7 +2348,7 @@
},
"x-appwrite": {
"method": "updateSession",
- "weight": 14,
+ "weight": 15,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2407,7 +2407,7 @@
},
"x-appwrite": {
"method": "deleteSession",
- "weight": 13,
+ "weight": 14,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2473,7 +2473,7 @@
},
"x-appwrite": {
"method": "updateStatus",
- "weight": 36,
+ "weight": 37,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2529,7 +2529,7 @@
},
"x-appwrite": {
"method": "createEmailToken",
- "weight": 24,
+ "weight": 25,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2604,7 +2604,7 @@
"tags": [
"account"
],
- "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour. If you are on a mobile device you can leave the URL parameter empty, so that the login completion will be handled by your Appwrite instance by default.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
+ "description": "Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST \/v1\/account\/sessions\/token](https:\/\/appwrite.io\/docs\/references\/cloud\/client-web\/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour.\n\nA user is limited to 10 active sessions at a time by default. [Learn more about session limits](https:\/\/appwrite.io\/docs\/authentication-security#limits).\n",
"responses": {
"201": {
"description": "Token",
@@ -2615,7 +2615,7 @@
},
"x-appwrite": {
"method": "createMagicURLToken",
- "weight": 23,
+ "weight": 24,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2707,7 +2707,7 @@
},
"x-appwrite": {
"method": "createOAuth2Token",
- "weight": 22,
+ "weight": 23,
"cookies": false,
"type": "webAuth",
"deprecated": false,
@@ -2845,7 +2845,7 @@
},
"x-appwrite": {
"method": "createPhoneToken",
- "weight": 27,
+ "weight": 28,
"cookies": false,
"type": "",
"deprecated": false,
@@ -2928,7 +2928,7 @@
},
"x-appwrite": {
"method": "createVerification",
- "weight": 39,
+ "weight": 40,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3002,7 +3002,7 @@
},
"x-appwrite": {
"method": "updateVerification",
- "weight": 40,
+ "weight": 41,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3085,7 +3085,7 @@
},
"x-appwrite": {
"method": "createPhoneVerification",
- "weight": 41,
+ "weight": 42,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3142,7 +3142,7 @@
},
"x-appwrite": {
"method": "updatePhoneVerification",
- "weight": 42,
+ "weight": 43,
"cookies": false,
"type": "",
"deprecated": false,
@@ -3225,7 +3225,7 @@
},
"x-appwrite": {
"method": "getBrowser",
- "weight": 59,
+ "weight": 60,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3356,7 +3356,7 @@
},
"x-appwrite": {
"method": "getCreditCard",
- "weight": 58,
+ "weight": 59,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3491,7 +3491,7 @@
},
"x-appwrite": {
"method": "getFavicon",
- "weight": 62,
+ "weight": 63,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -3560,7 +3560,7 @@
},
"x-appwrite": {
"method": "getFlag",
- "weight": 60,
+ "weight": 61,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4053,7 +4053,7 @@
},
"x-appwrite": {
"method": "getImage",
- "weight": 61,
+ "weight": 62,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4142,7 +4142,7 @@
},
"x-appwrite": {
"method": "getInitials",
- "weight": 64,
+ "weight": 65,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4239,7 +4239,7 @@
},
"x-appwrite": {
"method": "getQR",
- "weight": 63,
+ "weight": 64,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -4336,7 +4336,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 69,
+ "weight": 70,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4411,7 +4411,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 68,
+ "weight": 69,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4498,7 +4498,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 70,
+ "weight": 71,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4560,7 +4560,7 @@
},
"x-appwrite": {
"method": "update",
- "weight": 72,
+ "weight": 73,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4641,7 +4641,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 73,
+ "weight": 74,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4705,7 +4705,7 @@
},
"x-appwrite": {
"method": "listCollections",
- "weight": 75,
+ "weight": 76,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4788,7 +4788,7 @@
},
"x-appwrite": {
"method": "createCollection",
- "weight": 74,
+ "weight": 75,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4898,7 +4898,7 @@
},
"x-appwrite": {
"method": "getCollection",
- "weight": 76,
+ "weight": 77,
"cookies": false,
"type": "",
"deprecated": false,
@@ -4968,7 +4968,7 @@
},
"x-appwrite": {
"method": "updateCollection",
- "weight": 78,
+ "weight": 79,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5072,7 +5072,7 @@
},
"x-appwrite": {
"method": "deleteCollection",
- "weight": 79,
+ "weight": 80,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5144,7 +5144,7 @@
},
"x-appwrite": {
"method": "listAttributes",
- "weight": 90,
+ "weight": 91,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5228,7 +5228,7 @@
},
"x-appwrite": {
"method": "createBooleanAttribute",
- "weight": 87,
+ "weight": 88,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5335,7 +5335,7 @@
},
"x-appwrite": {
"method": "updateBooleanAttribute",
- "weight": 99,
+ "weight": 100,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5446,7 +5446,7 @@
},
"x-appwrite": {
"method": "createDatetimeAttribute",
- "weight": 88,
+ "weight": 89,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5553,7 +5553,7 @@
},
"x-appwrite": {
"method": "updateDatetimeAttribute",
- "weight": 100,
+ "weight": 101,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5664,7 +5664,7 @@
},
"x-appwrite": {
"method": "createEmailAttribute",
- "weight": 81,
+ "weight": 82,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5771,7 +5771,7 @@
},
"x-appwrite": {
"method": "updateEmailAttribute",
- "weight": 93,
+ "weight": 94,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5882,7 +5882,7 @@
},
"x-appwrite": {
"method": "createEnumAttribute",
- "weight": 82,
+ "weight": 83,
"cookies": false,
"type": "",
"deprecated": false,
@@ -5999,7 +5999,7 @@
},
"x-appwrite": {
"method": "updateEnumAttribute",
- "weight": 94,
+ "weight": 95,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6120,7 +6120,7 @@
},
"x-appwrite": {
"method": "createFloatAttribute",
- "weight": 86,
+ "weight": 87,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6239,7 +6239,7 @@
},
"x-appwrite": {
"method": "updateFloatAttribute",
- "weight": 98,
+ "weight": 99,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6364,7 +6364,7 @@
},
"x-appwrite": {
"method": "createIntegerAttribute",
- "weight": 85,
+ "weight": 86,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6483,7 +6483,7 @@
},
"x-appwrite": {
"method": "updateIntegerAttribute",
- "weight": 97,
+ "weight": 98,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6608,7 +6608,7 @@
},
"x-appwrite": {
"method": "createIpAttribute",
- "weight": 83,
+ "weight": 84,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6715,7 +6715,7 @@
},
"x-appwrite": {
"method": "updateIpAttribute",
- "weight": 95,
+ "weight": 96,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6826,7 +6826,7 @@
},
"x-appwrite": {
"method": "createRelationshipAttribute",
- "weight": 89,
+ "weight": 90,
"cookies": false,
"type": "",
"deprecated": false,
@@ -6962,7 +6962,7 @@
},
"x-appwrite": {
"method": "createStringAttribute",
- "weight": 80,
+ "weight": 81,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7082,7 +7082,7 @@
},
"x-appwrite": {
"method": "updateStringAttribute",
- "weight": 92,
+ "weight": 93,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7157,7 +7157,7 @@
"type": "integer",
"description": "Maximum size of the string attribute.",
"default": null,
- "x-example": null
+ "x-example": 1
},
"newKey": {
"type": "string",
@@ -7199,7 +7199,7 @@
},
"x-appwrite": {
"method": "createUrlAttribute",
- "weight": 84,
+ "weight": 85,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7306,7 +7306,7 @@
},
"x-appwrite": {
"method": "updateUrlAttribute",
- "weight": 96,
+ "weight": 97,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7448,7 +7448,7 @@
},
"x-appwrite": {
"method": "getAttribute",
- "weight": 91,
+ "weight": 92,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7520,7 +7520,7 @@
},
"x-appwrite": {
"method": "deleteAttribute",
- "weight": 102,
+ "weight": 103,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7597,7 +7597,7 @@
},
"x-appwrite": {
"method": "updateRelationshipAttribute",
- "weight": 101,
+ "weight": 102,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7704,7 +7704,7 @@
},
"x-appwrite": {
"method": "listDocuments",
- "weight": 108,
+ "weight": 109,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7790,7 +7790,7 @@
},
"x-appwrite": {
"method": "createDocument",
- "weight": 107,
+ "weight": 108,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7900,7 +7900,7 @@
},
"x-appwrite": {
"method": "getDocument",
- "weight": 109,
+ "weight": 110,
"cookies": false,
"type": "",
"deprecated": false,
@@ -7994,7 +7994,7 @@
},
"x-appwrite": {
"method": "updateDocument",
- "weight": 111,
+ "weight": 112,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8095,7 +8095,7 @@
},
"x-appwrite": {
"method": "deleteDocument",
- "weight": 112,
+ "weight": 113,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8179,7 +8179,7 @@
},
"x-appwrite": {
"method": "listIndexes",
- "weight": 104,
+ "weight": 105,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8261,7 +8261,7 @@
},
"x-appwrite": {
"method": "createIndex",
- "weight": 103,
+ "weight": 104,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8384,7 +8384,7 @@
},
"x-appwrite": {
"method": "getIndex",
- "weight": 105,
+ "weight": 106,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8456,7 +8456,7 @@
},
"x-appwrite": {
"method": "deleteIndex",
- "weight": 106,
+ "weight": 107,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8535,7 +8535,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 287,
+ "weight": 289,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8610,7 +8610,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 286,
+ "weight": 288,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8669,6 +8669,7 @@
"node-19.0",
"node-20.0",
"node-21.0",
+ "node-22",
"php-8.0",
"php-8.1",
"php-8.2",
@@ -8687,6 +8688,8 @@
"deno-1.24",
"deno-1.35",
"deno-1.40",
+ "deno-1.46",
+ "deno-2.0",
"dart-2.15",
"dart-2.16",
"dart-2.17",
@@ -8694,24 +8697,30 @@
"dart-3.0",
"dart-3.1",
"dart-3.3",
- "dotnet-3.1",
+ "dart-3.5",
"dotnet-6.0",
"dotnet-7.0",
+ "dotnet-8.0",
"java-8.0",
"java-11.0",
"java-17.0",
"java-18.0",
"java-21.0",
+ "java-22",
"swift-5.5",
"swift-5.8",
"swift-5.9",
+ "swift-5.10",
"kotlin-1.6",
"kotlin-1.8",
"kotlin-1.9",
+ "kotlin-2.0",
"cpp-17",
"cpp-20",
"bun-1.0",
- "go-1.23"
+ "bun-1.1",
+ "go-1.23",
+ "static-1"
],
"x-enum-name": null,
"x-enum-keys": []
@@ -8836,7 +8845,7 @@
"specification": {
"type": "string",
"description": "Runtime specification for the function and builds.",
- "default": "s-0.5vcpu-512mb",
+ "default": "s-1vcpu-512mb",
"x-example": null
}
},
@@ -8874,7 +8883,7 @@
},
"x-appwrite": {
"method": "listRuntimes",
- "weight": 288,
+ "weight": 290,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8928,7 +8937,7 @@
},
"x-appwrite": {
"method": "listSpecifications",
- "weight": 289,
+ "weight": 291,
"cookies": false,
"type": "",
"deprecated": false,
@@ -8983,7 +8992,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 290,
+ "weight": 292,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9045,7 +9054,7 @@
},
"x-appwrite": {
"method": "update",
- "weight": 293,
+ "weight": 295,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9106,6 +9115,7 @@
"node-19.0",
"node-20.0",
"node-21.0",
+ "node-22",
"php-8.0",
"php-8.1",
"php-8.2",
@@ -9124,6 +9134,8 @@
"deno-1.24",
"deno-1.35",
"deno-1.40",
+ "deno-1.46",
+ "deno-2.0",
"dart-2.15",
"dart-2.16",
"dart-2.17",
@@ -9131,24 +9143,30 @@
"dart-3.0",
"dart-3.1",
"dart-3.3",
- "dotnet-3.1",
+ "dart-3.5",
"dotnet-6.0",
"dotnet-7.0",
+ "dotnet-8.0",
"java-8.0",
"java-11.0",
"java-17.0",
"java-18.0",
"java-21.0",
+ "java-22",
"swift-5.5",
"swift-5.8",
"swift-5.9",
+ "swift-5.10",
"kotlin-1.6",
"kotlin-1.8",
"kotlin-1.9",
+ "kotlin-2.0",
"cpp-17",
"cpp-20",
"bun-1.0",
- "go-1.23"
+ "bun-1.1",
+ "go-1.23",
+ "static-1"
],
"x-enum-name": null,
"x-enum-keys": []
@@ -9250,7 +9268,7 @@
"specification": {
"type": "string",
"description": "Runtime specification for the function and builds.",
- "default": "s-0.5vcpu-512mb",
+ "default": "s-1vcpu-512mb",
"x-example": null
}
},
@@ -9279,7 +9297,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 296,
+ "weight": 298,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9343,7 +9361,7 @@
},
"x-appwrite": {
"method": "listDeployments",
- "weight": 298,
+ "weight": 300,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9426,7 +9444,7 @@
},
"x-appwrite": {
"method": "createDeployment",
- "weight": 297,
+ "weight": 299,
"cookies": false,
"type": "upload",
"deprecated": false,
@@ -9521,7 +9539,7 @@
},
"x-appwrite": {
"method": "getDeployment",
- "weight": 299,
+ "weight": 301,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9591,7 +9609,7 @@
},
"x-appwrite": {
"method": "updateDeployment",
- "weight": 295,
+ "weight": 297,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9656,7 +9674,7 @@
},
"x-appwrite": {
"method": "deleteDeployment",
- "weight": 300,
+ "weight": 302,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9723,7 +9741,7 @@
},
"x-appwrite": {
"method": "createBuild",
- "weight": 301,
+ "weight": 303,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9808,7 +9826,7 @@
},
"x-appwrite": {
"method": "updateDeploymentBuild",
- "weight": 302,
+ "weight": 304,
"cookies": false,
"type": "",
"deprecated": false,
@@ -9880,7 +9898,7 @@
},
"x-appwrite": {
"method": "getDeploymentDownload",
- "weight": 294,
+ "weight": 296,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -9954,7 +9972,7 @@
},
"x-appwrite": {
"method": "listExecutions",
- "weight": 304,
+ "weight": 306,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10041,7 +10059,7 @@
},
"x-appwrite": {
"method": "createExecution",
- "weight": 303,
+ "weight": 305,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10089,10 +10107,10 @@
"type": "object",
"properties": {
"body": {
- "type": "object",
+ "type": "string",
"description": "HTTP body of execution. Default value is empty string.",
"default": "",
- "x-example": "{}"
+ "x-example": ""
},
"async": {
"type": "boolean",
@@ -10164,7 +10182,7 @@
},
"x-appwrite": {
"method": "getExecution",
- "weight": 305,
+ "weight": 307,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10233,7 +10251,7 @@
},
"x-appwrite": {
"method": "deleteExecution",
- "weight": 306,
+ "weight": 308,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10305,7 +10323,7 @@
},
"x-appwrite": {
"method": "listVariables",
- "weight": 308,
+ "weight": 310,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10367,7 +10385,7 @@
},
"x-appwrite": {
"method": "createVariable",
- "weight": 307,
+ "weight": 309,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10456,7 +10474,7 @@
},
"x-appwrite": {
"method": "getVariable",
- "weight": 309,
+ "weight": 311,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10526,7 +10544,7 @@
},
"x-appwrite": {
"method": "updateVariable",
- "weight": 310,
+ "weight": 312,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10615,7 +10633,7 @@
},
"x-appwrite": {
"method": "deleteVariable",
- "weight": 311,
+ "weight": 313,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10687,7 +10705,7 @@
},
"x-appwrite": {
"method": "query",
- "weight": 329,
+ "weight": 331,
"cookies": false,
"type": "graphql",
"deprecated": false,
@@ -10765,7 +10783,7 @@
},
"x-appwrite": {
"method": "mutation",
- "weight": 328,
+ "weight": 330,
"cookies": false,
"type": "graphql",
"deprecated": false,
@@ -10843,7 +10861,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 124,
+ "weight": 125,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10897,7 +10915,7 @@
},
"x-appwrite": {
"method": "getAntivirus",
- "weight": 146,
+ "weight": 147,
"cookies": false,
"type": "",
"deprecated": false,
@@ -10951,7 +10969,7 @@
},
"x-appwrite": {
"method": "getCache",
- "weight": 127,
+ "weight": 128,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11005,7 +11023,7 @@
},
"x-appwrite": {
"method": "getCertificate",
- "weight": 133,
+ "weight": 134,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11068,7 +11086,7 @@
},
"x-appwrite": {
"method": "getDB",
- "weight": 126,
+ "weight": 127,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11122,7 +11140,7 @@
},
"x-appwrite": {
"method": "getPubSub",
- "weight": 129,
+ "weight": 130,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11176,7 +11194,7 @@
},
"x-appwrite": {
"method": "getQueue",
- "weight": 128,
+ "weight": 129,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11230,7 +11248,7 @@
},
"x-appwrite": {
"method": "getQueueBuilds",
- "weight": 135,
+ "weight": 136,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11295,7 +11313,7 @@
},
"x-appwrite": {
"method": "getQueueCertificates",
- "weight": 134,
+ "weight": 135,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11360,7 +11378,7 @@
},
"x-appwrite": {
"method": "getQueueDatabases",
- "weight": 136,
+ "weight": 137,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11434,7 +11452,7 @@
},
"x-appwrite": {
"method": "getQueueDeletes",
- "weight": 137,
+ "weight": 138,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11499,7 +11517,7 @@
},
"x-appwrite": {
"method": "getFailedJobs",
- "weight": 147,
+ "weight": 148,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11588,7 +11606,7 @@
},
"x-appwrite": {
"method": "getQueueFunctions",
- "weight": 141,
+ "weight": 142,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11653,7 +11671,7 @@
},
"x-appwrite": {
"method": "getQueueLogs",
- "weight": 132,
+ "weight": 133,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11718,7 +11736,7 @@
},
"x-appwrite": {
"method": "getQueueMails",
- "weight": 138,
+ "weight": 139,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11783,7 +11801,7 @@
},
"x-appwrite": {
"method": "getQueueMessaging",
- "weight": 139,
+ "weight": 140,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11848,7 +11866,7 @@
},
"x-appwrite": {
"method": "getQueueMigrations",
- "weight": 140,
+ "weight": 141,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11913,7 +11931,7 @@
},
"x-appwrite": {
"method": "getQueueUsage",
- "weight": 142,
+ "weight": 143,
"cookies": false,
"type": "",
"deprecated": false,
@@ -11978,7 +11996,7 @@
},
"x-appwrite": {
"method": "getQueueUsageDump",
- "weight": 143,
+ "weight": 144,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12043,7 +12061,7 @@
},
"x-appwrite": {
"method": "getQueueWebhooks",
- "weight": 131,
+ "weight": 132,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12108,7 +12126,7 @@
},
"x-appwrite": {
"method": "getStorage",
- "weight": 145,
+ "weight": 146,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12162,7 +12180,7 @@
},
"x-appwrite": {
"method": "getStorageLocal",
- "weight": 144,
+ "weight": 145,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12216,7 +12234,7 @@
},
"x-appwrite": {
"method": "getTime",
- "weight": 130,
+ "weight": 131,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12270,7 +12288,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 116,
+ "weight": 117,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12328,7 +12346,7 @@
},
"x-appwrite": {
"method": "listCodes",
- "weight": 117,
+ "weight": 118,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12386,7 +12404,7 @@
},
"x-appwrite": {
"method": "listContinents",
- "weight": 121,
+ "weight": 122,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12444,7 +12462,7 @@
},
"x-appwrite": {
"method": "listCountries",
- "weight": 118,
+ "weight": 119,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12502,7 +12520,7 @@
},
"x-appwrite": {
"method": "listCountriesEU",
- "weight": 119,
+ "weight": 120,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12560,7 +12578,7 @@
},
"x-appwrite": {
"method": "listCountriesPhones",
- "weight": 120,
+ "weight": 121,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12618,7 +12636,7 @@
},
"x-appwrite": {
"method": "listCurrencies",
- "weight": 122,
+ "weight": 123,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12676,7 +12694,7 @@
},
"x-appwrite": {
"method": "listLanguages",
- "weight": 123,
+ "weight": 124,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12734,7 +12752,7 @@
},
"x-appwrite": {
"method": "listMessages",
- "weight": 388,
+ "weight": 390,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12812,7 +12830,7 @@
},
"x-appwrite": {
"method": "createEmail",
- "weight": 385,
+ "weight": 387,
"cookies": false,
"type": "",
"deprecated": false,
@@ -12973,7 +12991,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 392,
+ "weight": 394,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13131,7 +13149,7 @@
},
"x-appwrite": {
"method": "createPush",
- "weight": 387,
+ "weight": 389,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13307,7 +13325,7 @@
},
"x-appwrite": {
"method": "updatePush",
- "weight": 394,
+ "weight": 396,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13480,7 +13498,7 @@
},
"x-appwrite": {
"method": "createSms",
- "weight": 386,
+ "weight": 388,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13601,7 +13619,7 @@
},
"x-appwrite": {
"method": "updateSms",
- "weight": 393,
+ "weight": 395,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13720,7 +13738,7 @@
},
"x-appwrite": {
"method": "getMessage",
- "weight": 391,
+ "weight": 393,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13780,7 +13798,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 395,
+ "weight": 397,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13845,7 +13863,7 @@
},
"x-appwrite": {
"method": "listMessageLogs",
- "weight": 389,
+ "weight": 391,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13922,7 +13940,7 @@
},
"x-appwrite": {
"method": "listTargets",
- "weight": 390,
+ "weight": 392,
"cookies": false,
"type": "",
"deprecated": false,
@@ -13999,7 +14017,7 @@
},
"x-appwrite": {
"method": "listProviders",
- "weight": 360,
+ "weight": 362,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14077,7 +14095,7 @@
},
"x-appwrite": {
"method": "createApnsProvider",
- "weight": 359,
+ "weight": 361,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14195,7 +14213,7 @@
},
"x-appwrite": {
"method": "updateApnsProvider",
- "weight": 372,
+ "weight": 374,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14311,7 +14329,7 @@
},
"x-appwrite": {
"method": "createFcmProvider",
- "weight": 358,
+ "weight": 360,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14405,7 +14423,7 @@
},
"x-appwrite": {
"method": "updateFcmProvider",
- "weight": 371,
+ "weight": 373,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14497,7 +14515,7 @@
},
"x-appwrite": {
"method": "createMailgunProvider",
- "weight": 350,
+ "weight": 352,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14627,7 +14645,7 @@
},
"x-appwrite": {
"method": "updateMailgunProvider",
- "weight": 363,
+ "weight": 365,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14755,7 +14773,7 @@
},
"x-appwrite": {
"method": "createMsg91Provider",
- "weight": 353,
+ "weight": 355,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14861,7 +14879,7 @@
},
"x-appwrite": {
"method": "updateMsg91Provider",
- "weight": 366,
+ "weight": 368,
"cookies": false,
"type": "",
"deprecated": false,
@@ -14965,7 +14983,7 @@
},
"x-appwrite": {
"method": "createSendgridProvider",
- "weight": 351,
+ "weight": 353,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15083,7 +15101,7 @@
},
"x-appwrite": {
"method": "updateSendgridProvider",
- "weight": 364,
+ "weight": 366,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15199,7 +15217,7 @@
},
"x-appwrite": {
"method": "createSmtpProvider",
- "weight": 352,
+ "weight": 354,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15361,7 +15379,7 @@
},
"x-appwrite": {
"method": "updateSmtpProvider",
- "weight": 365,
+ "weight": 367,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15520,7 +15538,7 @@
},
"x-appwrite": {
"method": "createTelesignProvider",
- "weight": 354,
+ "weight": 356,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15626,7 +15644,7 @@
},
"x-appwrite": {
"method": "updateTelesignProvider",
- "weight": 367,
+ "weight": 369,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15730,7 +15748,7 @@
},
"x-appwrite": {
"method": "createTextmagicProvider",
- "weight": 355,
+ "weight": 357,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15836,7 +15854,7 @@
},
"x-appwrite": {
"method": "updateTextmagicProvider",
- "weight": 368,
+ "weight": 370,
"cookies": false,
"type": "",
"deprecated": false,
@@ -15940,7 +15958,7 @@
},
"x-appwrite": {
"method": "createTwilioProvider",
- "weight": 356,
+ "weight": 358,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16046,7 +16064,7 @@
},
"x-appwrite": {
"method": "updateTwilioProvider",
- "weight": 369,
+ "weight": 371,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16150,7 +16168,7 @@
},
"x-appwrite": {
"method": "createVonageProvider",
- "weight": 357,
+ "weight": 359,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16256,7 +16274,7 @@
},
"x-appwrite": {
"method": "updateVonageProvider",
- "weight": 370,
+ "weight": 372,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16360,7 +16378,7 @@
},
"x-appwrite": {
"method": "getProvider",
- "weight": 362,
+ "weight": 364,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16420,7 +16438,7 @@
},
"x-appwrite": {
"method": "deleteProvider",
- "weight": 373,
+ "weight": 375,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16485,7 +16503,7 @@
},
"x-appwrite": {
"method": "listProviderLogs",
- "weight": 361,
+ "weight": 363,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16562,7 +16580,7 @@
},
"x-appwrite": {
"method": "listSubscriberLogs",
- "weight": 382,
+ "weight": 384,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16639,7 +16657,7 @@
},
"x-appwrite": {
"method": "listTopics",
- "weight": 375,
+ "weight": 377,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16715,7 +16733,7 @@
},
"x-appwrite": {
"method": "createTopic",
- "weight": 374,
+ "weight": 376,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16808,7 +16826,7 @@
},
"x-appwrite": {
"method": "getTopic",
- "weight": 377,
+ "weight": 379,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16871,7 +16889,7 @@
},
"x-appwrite": {
"method": "updateTopic",
- "weight": 378,
+ "weight": 380,
"cookies": false,
"type": "",
"deprecated": false,
@@ -16955,7 +16973,7 @@
},
"x-appwrite": {
"method": "deleteTopic",
- "weight": 379,
+ "weight": 381,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17020,7 +17038,7 @@
},
"x-appwrite": {
"method": "listTopicLogs",
- "weight": 376,
+ "weight": 378,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17097,7 +17115,7 @@
},
"x-appwrite": {
"method": "listSubscribers",
- "weight": 381,
+ "weight": 383,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17181,7 +17199,7 @@
},
"x-appwrite": {
"method": "createSubscriber",
- "weight": 380,
+ "weight": 382,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17275,7 +17293,7 @@
},
"x-appwrite": {
"method": "getSubscriber",
- "weight": 383,
+ "weight": 385,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17343,7 +17361,7 @@
},
"x-appwrite": {
"method": "deleteSubscriber",
- "weight": 384,
+ "weight": 386,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17420,7 +17438,7 @@
},
"x-appwrite": {
"method": "listBuckets",
- "weight": 201,
+ "weight": 203,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17495,7 +17513,7 @@
},
"x-appwrite": {
"method": "createBucket",
- "weight": 200,
+ "weight": 202,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17637,7 +17655,7 @@
},
"x-appwrite": {
"method": "getBucket",
- "weight": 202,
+ "weight": 204,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17699,7 +17717,7 @@
},
"x-appwrite": {
"method": "updateBucket",
- "weight": 203,
+ "weight": 205,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17835,7 +17853,7 @@
},
"x-appwrite": {
"method": "deleteBucket",
- "weight": 204,
+ "weight": 206,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17899,7 +17917,7 @@
},
"x-appwrite": {
"method": "listFiles",
- "weight": 206,
+ "weight": 208,
"cookies": false,
"type": "",
"deprecated": false,
@@ -17986,7 +18004,7 @@
},
"x-appwrite": {
"method": "createFile",
- "weight": 205,
+ "weight": 207,
"cookies": false,
"type": "upload",
"deprecated": false,
@@ -18082,7 +18100,7 @@
},
"x-appwrite": {
"method": "getFile",
- "weight": 207,
+ "weight": 209,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18156,7 +18174,7 @@
},
"x-appwrite": {
"method": "updateFile",
- "weight": 212,
+ "weight": 214,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18249,7 +18267,7 @@
},
"x-appwrite": {
"method": "deleteFile",
- "weight": 213,
+ "weight": 215,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18325,7 +18343,7 @@
},
"x-appwrite": {
"method": "getFileDownload",
- "weight": 209,
+ "weight": 211,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -18401,7 +18419,7 @@
},
"x-appwrite": {
"method": "getFilePreview",
- "weight": 208,
+ "weight": 210,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -18569,7 +18587,8 @@
"jpeg",
"gif",
"png",
- "webp"
+ "webp",
+ "avif"
],
"x-enum-name": "ImageFormat",
"x-enum-keys": [],
@@ -18603,7 +18622,7 @@
},
"x-appwrite": {
"method": "getFileView",
- "weight": 210,
+ "weight": 212,
"cookies": false,
"type": "location",
"deprecated": false,
@@ -18679,7 +18698,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 217,
+ "weight": 219,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18758,7 +18777,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 216,
+ "weight": 218,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18854,7 +18873,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 218,
+ "weight": 220,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18920,7 +18939,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 220,
+ "weight": 222,
"cookies": false,
"type": "",
"deprecated": false,
@@ -18999,7 +19018,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 222,
+ "weight": 224,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19056,7 +19075,7 @@
"tags": [
"teams"
],
- "description": "Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint.",
+ "description": "Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint. Hide sensitive attributes from the response by toggling membership privacy in the Console.",
"responses": {
"200": {
"description": "Memberships List",
@@ -19067,7 +19086,7 @@
},
"x-appwrite": {
"method": "listMemberships",
- "weight": 224,
+ "weight": 226,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19154,7 +19173,7 @@
},
"x-appwrite": {
"method": "createMembership",
- "weight": 223,
+ "weight": 225,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19262,7 +19281,7 @@
"tags": [
"teams"
],
- "description": "Get a team member by the membership unique id. All team members have read access for this resource.",
+ "description": "Get a team member by the membership unique id. All team members have read access for this resource. Hide sensitive attributes from the response by toggling membership privacy in the Console.",
"responses": {
"200": {
"description": "Membership",
@@ -19273,7 +19292,7 @@
},
"x-appwrite": {
"method": "getMembership",
- "weight": 225,
+ "weight": 227,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19347,7 +19366,7 @@
},
"x-appwrite": {
"method": "updateMembership",
- "weight": 226,
+ "weight": 228,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19437,7 +19456,7 @@
},
"x-appwrite": {
"method": "deleteMembership",
- "weight": 228,
+ "weight": 230,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19513,7 +19532,7 @@
},
"x-appwrite": {
"method": "updateMembershipStatus",
- "weight": 227,
+ "weight": 229,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19612,7 +19631,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 219,
+ "weight": 221,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19676,7 +19695,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 221,
+ "weight": 223,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19760,7 +19779,7 @@
},
"x-appwrite": {
"method": "list",
- "weight": 239,
+ "weight": 241,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19835,7 +19854,7 @@
},
"x-appwrite": {
"method": "create",
- "weight": 230,
+ "weight": 232,
"cookies": false,
"type": "",
"deprecated": false,
@@ -19933,7 +19952,7 @@
},
"x-appwrite": {
"method": "createArgon2User",
- "weight": 233,
+ "weight": 235,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20027,7 +20046,7 @@
},
"x-appwrite": {
"method": "createBcryptUser",
- "weight": 231,
+ "weight": 233,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20121,7 +20140,7 @@
},
"x-appwrite": {
"method": "listIdentities",
- "weight": 247,
+ "weight": 249,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20193,7 +20212,7 @@
},
"x-appwrite": {
"method": "deleteIdentity",
- "weight": 270,
+ "weight": 272,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20257,7 +20276,7 @@
},
"x-appwrite": {
"method": "createMD5User",
- "weight": 232,
+ "weight": 234,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20351,7 +20370,7 @@
},
"x-appwrite": {
"method": "createPHPassUser",
- "weight": 235,
+ "weight": 237,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20445,7 +20464,7 @@
},
"x-appwrite": {
"method": "createScryptUser",
- "weight": 236,
+ "weight": 238,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20574,7 +20593,7 @@
},
"x-appwrite": {
"method": "createScryptModifiedUser",
- "weight": 237,
+ "weight": 239,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20689,7 +20708,7 @@
},
"x-appwrite": {
"method": "createSHAUser",
- "weight": 234,
+ "weight": 236,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20804,7 +20823,7 @@
},
"x-appwrite": {
"method": "get",
- "weight": 240,
+ "weight": 242,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20861,7 +20880,7 @@
},
"x-appwrite": {
"method": "delete",
- "weight": 268,
+ "weight": 270,
"cookies": false,
"type": "",
"deprecated": false,
@@ -20925,7 +20944,7 @@
},
"x-appwrite": {
"method": "updateEmail",
- "weight": 253,
+ "weight": 255,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21007,7 +21026,7 @@
},
"x-appwrite": {
"method": "createJWT",
- "weight": 271,
+ "weight": 273,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21092,7 +21111,7 @@
},
"x-appwrite": {
"method": "updateLabels",
- "weight": 249,
+ "weight": 251,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21177,7 +21196,7 @@
},
"x-appwrite": {
"method": "listLogs",
- "weight": 245,
+ "weight": 247,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21253,7 +21272,7 @@
},
"x-appwrite": {
"method": "listMemberships",
- "weight": 244,
+ "weight": 246,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21317,7 +21336,7 @@
},
"x-appwrite": {
"method": "updateMfa",
- "weight": 258,
+ "weight": 260,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21399,7 +21418,7 @@
},
"x-appwrite": {
"method": "deleteMfaAuthenticator",
- "weight": 263,
+ "weight": 265,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21476,7 +21495,7 @@
},
"x-appwrite": {
"method": "listMfaFactors",
- "weight": 259,
+ "weight": 261,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21540,7 +21559,7 @@
},
"x-appwrite": {
"method": "getMfaRecoveryCodes",
- "weight": 260,
+ "weight": 262,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21602,7 +21621,7 @@
},
"x-appwrite": {
"method": "updateMfaRecoveryCodes",
- "weight": 262,
+ "weight": 264,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21664,7 +21683,7 @@
},
"x-appwrite": {
"method": "createMfaRecoveryCodes",
- "weight": 261,
+ "weight": 263,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21728,7 +21747,7 @@
},
"x-appwrite": {
"method": "updateName",
- "weight": 251,
+ "weight": 253,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21810,7 +21829,7 @@
},
"x-appwrite": {
"method": "updatePassword",
- "weight": 252,
+ "weight": 254,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21892,7 +21911,7 @@
},
"x-appwrite": {
"method": "updatePhone",
- "weight": 254,
+ "weight": 256,
"cookies": false,
"type": "",
"deprecated": false,
@@ -21974,7 +21993,7 @@
},
"x-appwrite": {
"method": "getPrefs",
- "weight": 241,
+ "weight": 243,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22036,7 +22055,7 @@
},
"x-appwrite": {
"method": "updatePrefs",
- "weight": 256,
+ "weight": 258,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22118,7 +22137,7 @@
},
"x-appwrite": {
"method": "listSessions",
- "weight": 243,
+ "weight": 245,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22180,7 +22199,7 @@
},
"x-appwrite": {
"method": "createSession",
- "weight": 264,
+ "weight": 266,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22237,7 +22256,7 @@
},
"x-appwrite": {
"method": "deleteSessions",
- "weight": 267,
+ "weight": 269,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22296,7 +22315,7 @@
},
"x-appwrite": {
"method": "deleteSession",
- "weight": 266,
+ "weight": 268,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22368,7 +22387,7 @@
},
"x-appwrite": {
"method": "updateStatus",
- "weight": 248,
+ "weight": 250,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22450,7 +22469,7 @@
},
"x-appwrite": {
"method": "listTargets",
- "weight": 246,
+ "weight": 248,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22525,7 +22544,7 @@
},
"x-appwrite": {
"method": "createTarget",
- "weight": 238,
+ "weight": 240,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22641,7 +22660,7 @@
},
"x-appwrite": {
"method": "getTarget",
- "weight": 242,
+ "weight": 244,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22712,7 +22731,7 @@
},
"x-appwrite": {
"method": "updateTarget",
- "weight": 257,
+ "weight": 259,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22807,7 +22826,7 @@
},
"x-appwrite": {
"method": "deleteTarget",
- "weight": 269,
+ "weight": 271,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22880,7 +22899,7 @@
},
"x-appwrite": {
"method": "createToken",
- "weight": 265,
+ "weight": 267,
"cookies": false,
"type": "",
"deprecated": false,
@@ -22965,7 +22984,7 @@
},
"x-appwrite": {
"method": "updateEmailVerification",
- "weight": 255,
+ "weight": 257,
"cookies": false,
"type": "",
"deprecated": false,
@@ -23047,7 +23066,7 @@
},
"x-appwrite": {
"method": "updatePhoneVerification",
- "weight": 250,
+ "weight": 252,
"cookies": false,
"type": "",
"deprecated": false,
@@ -24160,6 +24179,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"size": {
"type": "integer",
"description": "Attribute size.",
@@ -24179,6 +24208,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"size"
]
},
@@ -24217,6 +24248,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"min": {
"type": "integer",
"description": "Minimum value to enforce for new documents.",
@@ -24244,7 +24285,9 @@
"type",
"status",
"error",
- "required"
+ "required",
+ "$createdAt",
+ "$updatedAt"
]
},
"attributeFloat": {
@@ -24282,6 +24325,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"min": {
"type": "number",
"description": "Minimum value to enforce for new documents.",
@@ -24309,7 +24362,9 @@
"type",
"status",
"error",
- "required"
+ "required",
+ "$createdAt",
+ "$updatedAt"
]
},
"attributeBoolean": {
@@ -24347,6 +24402,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"default": {
"type": "boolean",
"description": "Default value for attribute when not provided. Cannot be set when attribute is required.",
@@ -24359,7 +24424,9 @@
"type",
"status",
"error",
- "required"
+ "required",
+ "$createdAt",
+ "$updatedAt"
]
},
"attributeEmail": {
@@ -24397,6 +24464,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "String format.",
@@ -24415,6 +24492,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -24453,6 +24532,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"elements": {
"type": "array",
"description": "Array of elements in enumerated type.",
@@ -24479,6 +24568,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"elements",
"format"
]
@@ -24518,6 +24609,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "String format.",
@@ -24536,6 +24637,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -24574,6 +24677,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "String format.",
@@ -24592,6 +24705,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -24630,6 +24745,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"format": {
"type": "string",
"description": "ISO 8601 format.",
@@ -24648,6 +24773,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"format"
]
},
@@ -24686,6 +24813,16 @@
"x-example": false,
"x-nullable": true
},
+ "$createdAt": {
+ "type": "string",
+ "description": "Attribute creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Attribute update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
"relatedCollection": {
"type": "string",
"description": "The ID of the related collection.",
@@ -24723,6 +24860,8 @@
"status",
"error",
"required",
+ "$createdAt",
+ "$updatedAt",
"relatedCollection",
"relationType",
"twoWay",
@@ -24771,6 +24910,16 @@
},
"x-example": [],
"x-nullable": true
+ },
+ "$createdAt": {
+ "type": "string",
+ "description": "Index creation date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
+ },
+ "$updatedAt": {
+ "type": "string",
+ "description": "Index update date in ISO 8601 format.",
+ "x-example": "2020-10-15T06:38:00.000+00:00"
}
},
"required": [
@@ -24778,7 +24927,9 @@
"type",
"status",
"error",
- "attributes"
+ "attributes",
+ "$createdAt",
+ "$updatedAt"
]
},
"document": {
@@ -25933,12 +26084,12 @@
},
"userName": {
"type": "string",
- "description": "User name.",
+ "description": "User name. Hide this attribute by toggling membership privacy in the Console.",
"x-example": "John Doe"
},
"userEmail": {
"type": "string",
- "description": "User email address.",
+ "description": "User email address. Hide this attribute by toggling membership privacy in the Console.",
"x-example": "john@appwrite.io"
},
"teamId": {
@@ -25968,7 +26119,7 @@
},
"mfa": {
"type": "boolean",
- "description": "Multi factor authentication status, true if the user has MFA enabled or false otherwise.",
+ "description": "Multi factor authentication status, true if the user has MFA enabled or false otherwise. Hide this attribute by toggling membership privacy in the Console.",
"x-example": false
},
"roles": {
@@ -26134,7 +26285,7 @@
"specification": {
"type": "string",
"description": "Machine specification for builds and executions.",
- "x-example": "s-0.5vcpu-512mb"
+ "x-example": "s-1vcpu-512mb"
}
},
"required": [
@@ -26454,7 +26605,7 @@
"responseBody": {
"type": "string",
"description": "HTTP response body. This will return empty unless execution is created as synchronous.",
- "x-example": "Developers are awesome."
+ "x-example": ""
},
"responseHeaders": {
"type": "array",
@@ -26948,7 +27099,7 @@
"slug": {
"type": "string",
"description": "Size slug.",
- "x-example": "s-0.5vcpu-512mb"
+ "x-example": "s-1vcpu-512mb"
}
},
"required": [
@@ -27399,7 +27550,7 @@
"name": {
"type": "string",
"description": "Target Name.",
- "x-example": "Aegon apple token"
+ "x-example": "Apple iPhone 12"
},
"userId": {
"type": "string",
@@ -27421,6 +27572,11 @@
"type": "string",
"description": "The target identifier.",
"x-example": "token"
+ },
+ "expired": {
+ "type": "boolean",
+ "description": "Is the target expired.",
+ "x-example": false
}
},
"required": [
@@ -27430,7 +27586,8 @@
"name",
"userId",
"providerType",
- "identifier"
+ "identifier",
+ "expired"
]
}
},
diff --git a/app/config/storage/mimes.php b/app/config/storage/mimes.php
index 5d315f45bc..26aaf8e1ff 100644
--- a/app/config/storage/mimes.php
+++ b/app/config/storage/mimes.php
@@ -6,6 +6,8 @@ return [
'image/gif',
'image/png',
'image/webp',
+ // 'image/heic',
+ 'image/avif',
// Video Files
'video/mp4',
@@ -31,6 +33,7 @@ return [
'audio/ogg', // Ogg Vorbis RFC 5334
'audio/vorbis', // Vorbis RFC 5215
'audio/vnd.wav', // wav RFC 2361
+ 'audio/x-wav', // php reads .wav as this - https://svn.apache.org/repos/asf/httpd/httpd/trunk/docs/conf/mime.types
'audio/aac', //AAC audio
'audio/x-hx-aac-adts', // AAC audio
diff --git a/app/config/storage/outputs.php b/app/config/storage/outputs.php
index 507a9ce667..cde2a9f38a 100644
--- a/app/config/storage/outputs.php
+++ b/app/config/storage/outputs.php
@@ -6,4 +6,7 @@ return [ // Accepted outputs files
'gif' => 'image/gif',
'png' => 'image/png',
'webp' => 'image/webp',
+ // 'heic' => 'image/heic',
+ // 'heics' => 'image/heic',
+ 'avif' => 'image/avif'
];
diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index 64441fee5c..76a3ef8b61 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -42,6 +42,7 @@ use Utopia\Database\Helpers\Role;
use Utopia\Database\Query;
use Utopia\Database\Validator\Authorization;
use Utopia\Database\Validator\Queries;
+use Utopia\Database\Validator\Query\Cursor;
use Utopia\Database\Validator\Query\Limit;
use Utopia\Database\Validator\Query\Offset;
use Utopia\Database\Validator\UID;
@@ -273,7 +274,6 @@ $createSession = function (string $userId, string $secret, Request $request, Res
App::post('/v1/account')
->desc('Create account')
->groups(['api', 'account', 'auth'])
- ->label('event', 'users.[userId].create')
->label('scope', 'sessions.write')
->label('auth.type', 'emailPassword')
->label('audits.event', 'user.create')
@@ -296,9 +296,8 @@ App::post('/v1/account')
->inject('user')
->inject('project')
->inject('dbForProject')
- ->inject('queueForEvents')
->inject('hooks')
- ->action(function (string $userId, string $email, string $password, string $name, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Event $queueForEvents, Hooks $hooks) {
+ ->action(function (string $userId, string $email, string $password, string $name, Request $request, Response $response, Document $user, Document $project, Database $dbForProject, Hooks $hooks) {
$email = \strtolower($email);
if ('console' === $project->getId()) {
@@ -331,7 +330,7 @@ App::post('/v1/account')
$identityWithMatchingEmail = $dbForProject->findOne('identities', [
Query::equal('providerEmail', [$email]),
]);
- if ($identityWithMatchingEmail !== false && !$identityWithMatchingEmail->isEmpty()) {
+ if (!$identityWithMatchingEmail->isEmpty()) {
throw new Exception(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
}
@@ -394,7 +393,7 @@ App::post('/v1/account')
$existingTarget = $dbForProject->findOne('targets', [
Query::equal('identifier', [$email]),
]);
- if ($existingTarget) {
+ if (!$existingTarget->isEmpty()) {
$user->setAttribute('targets', $existingTarget, Document::SET_TYPE_APPEND);
}
}
@@ -408,8 +407,6 @@ App::post('/v1/account')
Authorization::setRole(Role::user($user->getId())->toString());
Authorization::setRole(Role::users()->toString());
- $queueForEvents->setParam('userId', $user->getId());
-
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic($user, Response::MODEL_ACCOUNT);
@@ -441,7 +438,6 @@ App::get('/v1/account')
App::delete('/v1/account')
->desc('Delete account')
->groups(['api', 'account'])
- ->label('event', 'users.[userId].delete')
->label('scope', 'account')
->label('audits.event', 'user.delete')
->label('audits.resource', 'user/{response.$id}')
@@ -833,7 +829,7 @@ App::post('/v1/account/sessions/email')
Query::equal('email', [$email]),
]);
- if (!$profile || empty($profile->getAttribute('passwordUpdate')) || !Auth::passwordVerify($password, $profile->getAttribute('password'), $profile->getAttribute('hash'), $profile->getAttribute('hashOptions'))) {
+ if ($profile->isEmpty() || empty($profile->getAttribute('passwordUpdate')) || !Auth::passwordVerify($password, $profile->getAttribute('password'), $profile->getAttribute('hash'), $profile->getAttribute('hashOptions'))) {
throw new Exception(Exception::USER_INVALID_CREDENTIALS);
}
@@ -1373,7 +1369,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
Query::equal('providerEmail', [$email]),
Query::notEqual('userInternalId', $user->getInternalId()),
]);
- if (!empty($identityWithMatchingEmail)) {
+ if (!$identityWithMatchingEmail->isEmpty()) {
throw new Exception(Exception::USER_ALREADY_EXISTS);
}
@@ -1404,7 +1400,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
Query::equal('provider', [$provider]),
Query::equal('providerUid', [$oauth2ID]),
]);
- if ($session !== false && !$session->isEmpty()) {
+ if (!$session->isEmpty()) {
$user->setAttributes($dbForProject->getDocument('users', $session->getAttribute('userId'))->getArrayCopy());
}
}
@@ -1422,7 +1418,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
$userWithEmail = $dbForProject->findOne('users', [
Query::equal('email', [$email]),
]);
- if ($userWithEmail !== false && !$userWithEmail->isEmpty()) {
+ if (!$userWithEmail->isEmpty()) {
$user->setAttributes($userWithEmail->getArrayCopy());
}
@@ -1433,7 +1429,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
Query::equal('providerUid', [$oauth2ID]),
]);
- if ($identity !== false && !$identity->isEmpty()) {
+ if (!$identity->isEmpty()) {
$user = $dbForProject->getDocument('users', $identity->getAttribute('userId'));
}
}
@@ -1453,7 +1449,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
$identityWithMatchingEmail = $dbForProject->findOne('identities', [
Query::equal('providerEmail', [$email]),
]);
- if ($identityWithMatchingEmail !== false && !$identityWithMatchingEmail->isEmpty()) {
+ if (!$identityWithMatchingEmail->isEmpty()) {
throw new Exception(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
}
@@ -1498,6 +1494,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
'providerType' => MESSAGE_TYPE_EMAIL,
'identifier' => $email,
]));
+
} catch (Duplicate) {
$failureRedirect(Exception::USER_ALREADY_EXISTS);
}
@@ -1516,7 +1513,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
Query::equal('provider', [$provider]),
Query::equal('providerUid', [$oauth2ID]),
]);
- if ($identity === false || $identity->isEmpty()) {
+ if ($identity->isEmpty()) {
// Before creating the identity, check if the email is already associated with another user
$userId = $user->getId();
@@ -1800,7 +1797,7 @@ App::post('/v1/account/tokens/magic-url')
$isAppUser = Auth::isAppUser($roles);
$result = $dbForProject->findOne('users', [Query::equal('email', [$email])]);
- if ($result !== false && !$result->isEmpty()) {
+ if (!$result->isEmpty()) {
$user->setAttributes($result->getArrayCopy());
} else {
$limit = $project->getAttribute('auths', [])['limit'] ?? 0;
@@ -1817,7 +1814,7 @@ App::post('/v1/account/tokens/magic-url')
$identityWithMatchingEmail = $dbForProject->findOne('identities', [
Query::equal('providerEmail', [$email]),
]);
- if ($identityWithMatchingEmail !== false && !$identityWithMatchingEmail->isEmpty()) {
+ if (!$identityWithMatchingEmail->isEmpty()) {
throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
}
@@ -2041,7 +2038,7 @@ App::post('/v1/account/tokens/email')
$isAppUser = Auth::isAppUser($roles);
$result = $dbForProject->findOne('users', [Query::equal('email', [$email])]);
- if ($result !== false && !$result->isEmpty()) {
+ if (!$result->isEmpty()) {
$user->setAttributes($result->getArrayCopy());
} else {
$limit = $project->getAttribute('auths', [])['limit'] ?? 0;
@@ -2058,7 +2055,7 @@ App::post('/v1/account/tokens/email')
$identityWithMatchingEmail = $dbForProject->findOne('identities', [
Query::equal('providerEmail', [$email]),
]);
- if ($identityWithMatchingEmail !== false && !$identityWithMatchingEmail->isEmpty()) {
+ if (!$identityWithMatchingEmail->isEmpty()) {
throw new Exception(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
}
@@ -2328,7 +2325,7 @@ App::post('/v1/account/tokens/phone')
$isAppUser = Auth::isAppUser($roles);
$result = $dbForProject->findOne('users', [Query::equal('phone', [$phone])]);
- if ($result !== false && !$result->isEmpty()) {
+ if (!$result->isEmpty()) {
$user->setAttributes($result->getArrayCopy());
} else {
$limit = $project->getAttribute('auths', [])['limit'] ?? 0;
@@ -2385,7 +2382,7 @@ App::post('/v1/account/tokens/phone')
$existingTarget = $dbForProject->findOne('targets', [
Query::equal('identifier', [$phone]),
]);
- $user->setAttribute('targets', [...$user->getAttribute('targets', []), $existingTarget]);
+ $user->setAttribute('targets', [...$user->getAttribute('targets', []), $existingTarget->isEmpty() ? false : $existingTarget]);
}
$dbForProject->purgeCachedDocument('users', $user->getId());
}
@@ -2752,7 +2749,7 @@ App::patch('/v1/account/email')
Query::equal('providerEmail', [$email]),
Query::notEqual('userInternalId', $user->getInternalId()),
]);
- if ($identityWithMatchingEmail !== false && !$identityWithMatchingEmail->isEmpty()) {
+ if (!$identityWithMatchingEmail->isEmpty()) {
throw new Exception(Exception::GENERAL_BAD_REQUEST); /** Return a generic bad request to prevent exposing existing accounts */
}
@@ -2773,7 +2770,7 @@ App::patch('/v1/account/email')
Query::equal('identifier', [$email]),
]));
- if ($target instanceof Document && !$target->isEmpty()) {
+ if (!$target->isEmpty()) {
throw new Exception(Exception::USER_TARGET_ALREADY_EXISTS);
}
@@ -2839,7 +2836,7 @@ App::patch('/v1/account/phone')
Query::equal('identifier', [$phone]),
]));
- if ($target instanceof Document && !$target->isEmpty()) {
+ if (!$target->isEmpty()) {
throw new Exception(Exception::USER_TARGET_ALREADY_EXISTS);
}
@@ -2998,7 +2995,7 @@ App::post('/v1/account/recovery')
Query::equal('email', [$email]),
]);
- if (!$profile) {
+ if ($profile->isEmpty()) {
throw new Exception(Exception::USER_NOT_FOUND);
}
@@ -4314,7 +4311,7 @@ App::post('/v1/account/targets/push')
$device = $detector->getDevice();
- $sessionId = Auth::sessionVerify($user->getAttribute('sessions'), Auth::$secret);
+ $sessionId = Auth::sessionVerify($user->getAttribute('sessions', []), Auth::$secret);
$session = $dbForProject->getDocument('sessions', $sessionId);
try {
@@ -4383,7 +4380,9 @@ App::put('/v1/account/targets/:targetId/push')
}
if ($identifier) {
- $target->setAttribute('identifier', $identifier);
+ $target
+ ->setAttribute('identifier', $identifier)
+ ->setAttribute('expired', false);
}
$detector = new Detector($request->getUserAgent());
@@ -4486,6 +4485,12 @@ App::get('/v1/account/identities')
$cursor = reset($cursor);
if ($cursor) {
/** @var Query $cursor */
+
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
$identityId = $cursor->getValue();
$cursorDocument = $dbForProject->getDocument('identities', $identityId);
diff --git a/app/controllers/api/avatars.php b/app/controllers/api/avatars.php
index f6044dd624..dadd9da5e3 100644
--- a/app/controllers/api/avatars.php
+++ b/app/controllers/api/avatars.php
@@ -55,7 +55,7 @@ $avatarCallback = function (string $type, string $code, int $width, int $height,
$output = (empty($output)) ? $type : $output;
$data = $image->output($output, $quality);
$response
- ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + 60 * 60 * 24 * 30) . ' GMT')
+ ->addHeader('Cache-Control', 'private, max-age=2592000') // 30 days
->setContentType('image/png')
->file($data);
unset($image);
@@ -275,7 +275,7 @@ App::get('/v1/avatars/image')
$data = $image->output($output, $quality);
$response
- ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + 60 * 60 * 24 * 30) . ' GMT')
+ ->addHeader('Cache-Control', 'private, max-age=2592000') // 30 days
->setContentType('image/png')
->file($data);
unset($image);
@@ -409,7 +409,7 @@ App::get('/v1/avatars/favicon')
throw new Exception(Exception::AVATAR_ICON_NOT_FOUND, 'Favicon not found');
}
$response
- ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + 60 * 60 * 24 * 30) . ' GMT')
+ ->addHeader('Cache-Control', 'private, max-age=2592000') // 30 days
->setContentType('image/x-icon')
->file($data);
}
@@ -420,7 +420,7 @@ App::get('/v1/avatars/favicon')
$data = $image->output($output, $quality);
$response
- ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + 60 * 60 * 24 * 30) . ' GMT')
+ ->addHeader('Cache-Control', 'private, max-age=2592000') // 30 days
->setContentType('image/png')
->file($data);
unset($image);
@@ -461,7 +461,7 @@ App::get('/v1/avatars/qr')
$image->crop((int) $size, (int) $size);
$response
- ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + (60 * 60 * 24 * 45)) . ' GMT') // 45 days cache
+ ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
->setContentType('image/png')
->send($image->output('png', 9));
});
@@ -544,7 +544,7 @@ App::get('/v1/avatars/initials')
$image->compositeImage($punch, Imagick::COMPOSITE_COPYOPACITY, 0, 0);
$response
- ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + (60 * 60 * 24 * 45)) . ' GMT') // 45 days cache
+ ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
->setContentType('image/png')
->file($image->getImageBlob());
});
@@ -609,9 +609,9 @@ App::get('/v1/cards/cloud')
$isPlatinum = $user->getInternalId() % 100 === 0;
} else {
- $name = $mock === 'normal-long' ? 'Sir First Walter O\'Brien Junior' : 'Walter O\'Brien';
+ $name = $mock === 'normal-long' ? 'Sir First Walter O\'Brian Junior' : 'Walter O\'Brian';
$createdAt = new \DateTime('now');
- $githubName = $mock === 'normal-no-github' ? '' : ($mock === 'normal-long' ? 'sir-first-walterobrien-junior' : 'walterobrien');
+ $githubName = $mock === 'normal-no-github' ? '' : ($mock === 'normal-long' ? 'sir-first-walterobrian-junior' : 'walterobrian');
$isHero = $mock === 'hero';
$isContributor = $mock === 'contributor';
$isEmployee = \str_starts_with($mock, 'employee');
@@ -751,7 +751,7 @@ App::get('/v1/cards/cloud')
}
$response
- ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + (60 * 60 * 24 * 45)) . ' GMT') // 45 days cache
+ ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
->setContentType('image/png')
->file($baseImage->getImageBlob());
});
@@ -829,7 +829,7 @@ App::get('/v1/cards/cloud-back')
}
$response
- ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + (60 * 60 * 24 * 45)) . ' GMT') // 45 days cache
+ ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
->setContentType('image/png')
->file($baseImage->getImageBlob());
});
@@ -900,9 +900,9 @@ App::get('/v1/cards/cloud-og')
} else {
$bgVariation = \str_ends_with($mock, '-bg2') ? '2' : (\str_ends_with($mock, '-bg3') ? '3' : '1');
$cardVariation = \str_ends_with($mock, '-right') ? '2' : (\str_ends_with($mock, '-middle') ? '3' : '1');
- $name = \str_starts_with($mock, 'normal-long') ? 'Sir First Walter O\'Brien Junior' : 'Walter O\'Brien';
+ $name = \str_starts_with($mock, 'normal-long') ? 'Sir First Walter O\'Brian Junior' : 'Walter O\'Brian';
$createdAt = new \DateTime('now');
- $githubName = $mock === 'normal-no-github' ? '' : (\str_starts_with($mock, 'normal-long') ? 'sir-first-walterobrien-junior' : 'walterobrien');
+ $githubName = $mock === 'normal-no-github' ? '' : (\str_starts_with($mock, 'normal-long') ? 'sir-first-walterobrian-junior' : 'walterobrian');
$isHero = \str_starts_with($mock, 'hero');
$isContributor = \str_starts_with($mock, 'contributor');
$isEmployee = \str_starts_with($mock, 'employee');
@@ -1219,7 +1219,7 @@ App::get('/v1/cards/cloud-og')
}
$response
- ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + (60 * 60 * 24 * 45)) . ' GMT') // 45 days cache
+ ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
->setContentType('image/png')
->file($baseImage->getImageBlob());
});
diff --git a/app/controllers/api/databases.php b/app/controllers/api/databases.php
index a9bb58df4b..aad072c50a 100644
--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@@ -3,8 +3,8 @@
use Appwrite\Auth\Auth;
use Appwrite\Detector\Detector;
use Appwrite\Event\Database as EventDatabase;
-use Appwrite\Event\Delete;
use Appwrite\Event\Event;
+use Appwrite\Event\Usage;
use Appwrite\Extend\Exception;
use Appwrite\Network\Validator\Email;
use Appwrite\Utopia\Database\Validator\CustomId;
@@ -20,11 +20,11 @@ use Utopia\Audit\Audit;
use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\Document;
-use Utopia\Database\Exception as DatabaseException;
use Utopia\Database\Exception\Authorization as AuthorizationException;
use Utopia\Database\Exception\Conflict as ConflictException;
use Utopia\Database\Exception\Duplicate as DuplicateException;
use Utopia\Database\Exception\Limit as LimitException;
+use Utopia\Database\Exception\NotFound as NotFoundException;
use Utopia\Database\Exception\Query as QueryException;
use Utopia\Database\Exception\Restricted as RestrictedException;
use Utopia\Database\Exception\Structure as StructureException;
@@ -39,6 +39,7 @@ use Utopia\Database\Validator\Index as IndexValidator;
use Utopia\Database\Validator\Key;
use Utopia\Database\Validator\Permissions;
use Utopia\Database\Validator\Queries;
+use Utopia\Database\Validator\Query\Cursor;
use Utopia\Database\Validator\Query\Limit;
use Utopia\Database\Validator\Query\Offset;
use Utopia\Database\Validator\Structure;
@@ -151,7 +152,7 @@ function createAttribute(string $databaseId, string $collectionId, Document $att
} catch (DuplicateException) {
throw new Exception(Exception::ATTRIBUTE_ALREADY_EXISTS);
} catch (LimitException) {
- throw new Exception(Exception::ATTRIBUTE_LIMIT_EXCEEDED, 'Attribute limit exceeded');
+ throw new Exception(Exception::ATTRIBUTE_LIMIT_EXCEEDED);
} catch (\Throwable $e) {
$dbForProject->purgeCachedDocument('database_' . $db->getInternalId(), $collectionId);
$dbForProject->purgeCachedCollection('database_' . $db->getInternalId() . '_collection_' . $collection->getInternalId());
@@ -195,7 +196,7 @@ function createAttribute(string $databaseId, string $collectionId, Document $att
throw new Exception(Exception::ATTRIBUTE_ALREADY_EXISTS);
} catch (LimitException) {
$dbForProject->deleteDocument('attributes', $attribute->getId());
- throw new Exception(Exception::ATTRIBUTE_LIMIT_EXCEEDED, 'Attribute limit exceeded');
+ throw new Exception(Exception::ATTRIBUTE_LIMIT_EXCEEDED);
} catch (\Throwable $e) {
$dbForProject->purgeCachedDocument('database_' . $db->getInternalId(), $relatedCollection->getId());
$dbForProject->purgeCachedCollection('database_' . $db->getInternalId() . '_collection_' . $relatedCollection->getInternalId());
@@ -289,15 +290,9 @@ function updateAttribute(
$attribute->setAttribute('size', $size);
}
- $formatOptions = $attribute->getAttribute('formatOptions');
-
switch ($attribute->getAttribute('format')) {
case APP_DATABASE_ATTRIBUTE_INT_RANGE:
case APP_DATABASE_ATTRIBUTE_FLOAT_RANGE:
- if ($min === $formatOptions['min'] && $max === $formatOptions['max']) {
- break;
- }
-
if ($min > $max) {
throw new Exception(Exception::ATTRIBUTE_VALUE_INVALID, 'Minimum value must be lesser than maximum value');
}
@@ -350,13 +345,16 @@ function updateAttribute(
if ($type === Database::VAR_RELATIONSHIP) {
$primaryDocumentOptions = \array_merge($attribute->getAttribute('options', []), $options);
$attribute->setAttribute('options', $primaryDocumentOptions);
-
- $dbForProject->updateRelationship(
- collection: $collectionId,
- id: $key,
- newKey: $newKey,
- onDelete: $primaryDocumentOptions['onDelete'],
- );
+ try {
+ $dbForProject->updateRelationship(
+ collection: $collectionId,
+ id: $key,
+ newKey: $newKey,
+ onDelete: $primaryDocumentOptions['onDelete'],
+ );
+ } catch (NotFoundException) {
+ throw new Exception(Exception::ATTRIBUTE_NOT_FOUND);
+ }
if ($primaryDocumentOptions['twoWay']) {
$relatedCollection = $dbForProject->getDocument('database_' . $db->getInternalId(), $primaryDocumentOptions['relatedCollection']);
@@ -381,28 +379,42 @@ function updateAttribute(
size: $size,
required: $required,
default: $default,
- formatOptions: $options ?? null,
+ formatOptions: $options,
newKey: $newKey ?? null
);
} catch (TruncateException) {
throw new Exception(Exception::ATTRIBUTE_INVALID_RESIZE);
+ } catch (NotFoundException) {
+ throw new Exception(Exception::ATTRIBUTE_NOT_FOUND);
+ } catch (LimitException) {
+ throw new Exception(Exception::ATTRIBUTE_LIMIT_EXCEEDED);
}
}
if (!empty($newKey) && $key !== $newKey) {
- // Delete attribute and recreate since we can't modify IDs
- $original = clone $attribute;
-
- $dbForProject->deleteDocument('attributes', $attribute->getId());
+ $originalUid = $attribute->getId();
$attribute
->setAttribute('$id', ID::custom($db->getInternalId() . '_' . $collection->getInternalId() . '_' . $newKey))
->setAttribute('key', $newKey);
- try {
- $attribute = $dbForProject->createDocument('attributes', $attribute);
- } catch (DatabaseException|PDOException) {
- $attribute = $dbForProject->createDocument('attributes', $original);
+ $dbForProject->updateDocument('attributes', $originalUid, $attribute);
+
+ /**
+ * @var Document $index
+ */
+ foreach ($collection->getAttribute('indexes') as $index) {
+ /**
+ * @var string[] $attributes
+ */
+ $attributes = $index->getAttribute('attributes', []);
+ $found = \array_search($key, $attributes);
+
+ if ($found !== false) {
+ $attributes[$found] = $newKey;
+ $index->setAttribute('attributes', $attributes);
+ $dbForProject->updateDocument('indexes', $index->getId(), $index);
+ }
}
} else {
$attribute = $dbForProject->updateDocument('attributes', $db->getInternalId() . '_' . $collection->getInternalId() . '_' . $key, $attribute);
@@ -437,6 +449,7 @@ App::post('/v1/databases')
->groups(['api', 'database'])
->label('event', 'databases.[databaseId].create')
->label('scope', 'databases.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('audits.event', 'database.create')
->label('audits.resource', 'database/{response.$id}')
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -452,7 +465,8 @@ App::post('/v1/databases')
->inject('response')
->inject('dbForProject')
->inject('queueForEvents')
- ->action(function (string $databaseId, string $name, bool $enabled, Response $response, Database $dbForProject, Event $queueForEvents) {
+ ->inject('queueForUsage')
+ ->action(function (string $databaseId, string $name, bool $enabled, Response $response, Database $dbForProject, Event $queueForEvents, Usage $queueForUsage) {
$databaseId = $databaseId == 'unique()' ? ID::unique() : $databaseId;
@@ -502,6 +516,7 @@ App::post('/v1/databases')
}
$queueForEvents->setParam('databaseId', $database->getId());
+ $queueForUsage->addMetric(str_replace(['{databaseInternalId}'], [$database->getInternalId()], METRIC_DATABASE_ID_STORAGE), 1); // per database
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -512,6 +527,7 @@ App::get('/v1/databases')
->desc('List databases')
->groups(['api', 'database'])
->label('scope', 'databases.read')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'databases')
->label('sdk.method', 'list')
@@ -524,12 +540,7 @@ App::get('/v1/databases')
->inject('response')
->inject('dbForProject')
->action(function (array $queries, string $search, Response $response, Database $dbForProject) {
-
- try {
- $queries = Query::parseQueries($queries);
- } catch (QueryException $e) {
- throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
- }
+ $queries = Query::parseQueries($queries);
if (!empty($search)) {
$queries[] = Query::search('search', $search);
@@ -543,6 +554,13 @@ App::get('/v1/databases')
});
$cursor = reset($cursor);
if ($cursor) {
+ /** @var Query $cursor */
+
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
$databaseId = $cursor->getValue();
$cursorDocument = $dbForProject->getDocument('databases', $databaseId);
@@ -565,6 +583,7 @@ App::get('/v1/databases/:databaseId')
->desc('Get database')
->groups(['api', 'database'])
->label('scope', 'databases.read')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'databases')
->label('sdk.method', 'get')
@@ -590,6 +609,7 @@ App::get('/v1/databases/:databaseId/logs')
->desc('List database logs')
->groups(['api', 'database'])
->label('scope', 'databases.read')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
->label('sdk.namespace', 'databases')
->label('sdk.method', 'listLogs')
@@ -681,6 +701,7 @@ App::put('/v1/databases/:databaseId')
->desc('Update database')
->groups(['api', 'database', 'schema'])
->label('scope', 'databases.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('event', 'databases.[databaseId].update')
->label('audits.event', 'database.update')
->label('audits.resource', 'database/{response.$id}')
@@ -719,6 +740,7 @@ App::delete('/v1/databases/:databaseId')
->desc('Delete database')
->groups(['api', 'database', 'schema'])
->label('scope', 'databases.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('event', 'databases.[databaseId].delete')
->label('audits.event', 'database.delete')
->label('audits.resource', 'database/{request.databaseId}')
@@ -733,7 +755,8 @@ App::delete('/v1/databases/:databaseId')
->inject('dbForProject')
->inject('queueForDatabase')
->inject('queueForEvents')
- ->action(function (string $databaseId, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents) {
+ ->inject('queueForUsage')
+ ->action(function (string $databaseId, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents, Usage $queueForUsage) {
$database = $dbForProject->getDocument('databases', $databaseId);
@@ -756,6 +779,9 @@ App::delete('/v1/databases/:databaseId')
->setParam('databaseId', $database->getId())
->setPayload($response->output($database, Response::MODEL_DATABASE));
+ $queueForUsage
+ ->addMetric(METRIC_DATABASES_STORAGE, 1); // Global, deletion forces full recalculation
+
$response->noContent();
});
@@ -764,6 +790,7 @@ App::post('/v1/databases/:databaseId/collections')
->groups(['api', 'database'])
->label('event', 'databases.[databaseId].collections.[collectionId].create')
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('audits.event', 'collection.create')
->label('audits.resource', 'database/{request.databaseId}/collection/{response.$id}')
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -794,22 +821,21 @@ App::post('/v1/databases/:databaseId/collections')
$collectionId = $collectionId == 'unique()' ? ID::unique() : $collectionId;
// Map aggregate permissions into the multiple permissions they represent.
- $permissions = Permission::aggregate($permissions);
+ $permissions = Permission::aggregate($permissions) ?? [];
try {
- $dbForProject->createDocument('database_' . $database->getInternalId(), new Document([
+ $collection = $dbForProject->createDocument('database_' . $database->getInternalId(), new Document([
'$id' => $collectionId,
'databaseInternalId' => $database->getInternalId(),
'databaseId' => $databaseId,
- '$permissions' => $permissions ?? [],
+ '$permissions' => $permissions,
'documentSecurity' => $documentSecurity,
'enabled' => $enabled,
'name' => $name,
'search' => implode(' ', [$collectionId, $name]),
]));
- $collection = $dbForProject->getDocument('database_' . $database->getInternalId(), $collectionId);
- $dbForProject->createCollection('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), permissions: $permissions ?? [], documentSecurity: $documentSecurity);
+ $dbForProject->createCollection('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), permissions: $permissions, documentSecurity: $documentSecurity);
} catch (DuplicateException) {
throw new Exception(Exception::COLLECTION_ALREADY_EXISTS);
} catch (LimitException) {
@@ -827,10 +853,11 @@ App::post('/v1/databases/:databaseId/collections')
});
App::get('/v1/databases/:databaseId/collections')
- ->alias('/v1/database/collections', ['databaseId' => 'default'])
+ ->alias('/v1/database/collections')
->desc('List collections')
->groups(['api', 'database'])
->label('scope', 'collections.read')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'databases')
->label('sdk.method', 'listCollections')
@@ -852,11 +879,7 @@ App::get('/v1/databases/:databaseId/collections')
throw new Exception(Exception::DATABASE_NOT_FOUND);
}
- try {
- $queries = Query::parseQueries($queries);
- } catch (QueryException $e) {
- throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
- }
+ $queries = Query::parseQueries($queries);
if (!empty($search)) {
$queries[] = Query::search('search', $search);
@@ -871,6 +894,12 @@ App::get('/v1/databases/:databaseId/collections')
$cursor = reset($cursor);
if ($cursor) {
/** @var Query $cursor */
+
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
$collectionId = $cursor->getValue();
$cursorDocument = $dbForProject->getDocument('database_' . $database->getInternalId(), $collectionId);
@@ -890,10 +919,11 @@ App::get('/v1/databases/:databaseId/collections')
});
App::get('/v1/databases/:databaseId/collections/:collectionId')
- ->alias('/v1/database/collections/:collectionId', ['databaseId' => 'default'])
+ ->alias('/v1/database/collections/:collectionId')
->desc('Get collection')
->groups(['api', 'database'])
->label('scope', 'collections.read')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'databases')
->label('sdk.method', 'getCollection')
@@ -924,10 +954,11 @@ App::get('/v1/databases/:databaseId/collections/:collectionId')
});
App::get('/v1/databases/:databaseId/collections/:collectionId/logs')
- ->alias('/v1/database/collections/:collectionId/logs', ['databaseId' => 'default'])
+ ->alias('/v1/database/collections/:collectionId/logs')
->desc('List collection logs')
->groups(['api', 'database'])
->label('scope', 'collections.read')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
->label('sdk.namespace', 'databases')
->label('sdk.method', 'listCollectionLogs')
@@ -957,12 +988,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/logs')
throw new Exception(Exception::COLLECTION_NOT_FOUND);
}
- try {
- $queries = Query::parseQueries($queries);
- } catch (QueryException $e) {
- throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
- }
-
+ $queries = Query::parseQueries($queries);
$grouped = Query::groupByType($queries);
$limit = $grouped['limit'] ?? APP_LIMIT_COUNT;
$offset = $grouped['offset'] ?? 0;
@@ -1024,10 +1050,11 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/logs')
App::put('/v1/databases/:databaseId/collections/:collectionId')
- ->alias('/v1/database/collections/:collectionId', ['databaseId' => 'default'])
+ ->alias('/v1/database/collections/:collectionId')
->desc('Update collection')
->groups(['api', 'database', 'schema'])
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('event', 'databases.[databaseId].collections.[collectionId].update')
->label('audits.event', 'collection.update')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
@@ -1069,12 +1096,16 @@ App::put('/v1/databases/:databaseId/collections/:collectionId')
$enabled ??= $collection->getAttribute('enabled', true);
- $collection = $dbForProject->updateDocument('database_' . $database->getInternalId(), $collectionId, $collection
+ $collection = $dbForProject->updateDocument(
+ 'database_' . $database->getInternalId(),
+ $collectionId,
+ $collection
->setAttribute('name', $name)
->setAttribute('$permissions', $permissions)
->setAttribute('documentSecurity', $documentSecurity)
->setAttribute('enabled', $enabled)
- ->setAttribute('search', implode(' ', [$collectionId, $name])));
+ ->setAttribute('search', \implode(' ', [$collectionId, $name]))
+ );
$dbForProject->updateCollection('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $permissions, $documentSecurity);
@@ -1087,10 +1118,11 @@ App::put('/v1/databases/:databaseId/collections/:collectionId')
});
App::delete('/v1/databases/:databaseId/collections/:collectionId')
- ->alias('/v1/database/collections/:collectionId', ['databaseId' => 'default'])
+ ->alias('/v1/database/collections/:collectionId')
->desc('Delete collection')
->groups(['api', 'database', 'schema'])
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('event', 'databases.[databaseId].collections.[collectionId].delete')
->label('audits.event', 'collection.delete')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
@@ -1142,11 +1174,12 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId')
});
App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/string')
- ->alias('/v1/database/collections/:collectionId/attributes/string', ['databaseId' => 'default'])
+ ->alias('/v1/database/collections/:collectionId/attributes/string')
->desc('Create string attribute')
->groups(['api', 'database', 'schema'])
->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('audits.event', 'attribute.create')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -1192,18 +1225,18 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/string
'filters' => $filters,
]), $response, $dbForProject, $queueForDatabase, $queueForEvents);
-
$response
->setStatusCode(Response::STATUS_CODE_ACCEPTED)
->dynamic($attribute, Response::MODEL_ATTRIBUTE_STRING);
});
App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/email')
- ->alias('/v1/database/collections/:collectionId/attributes/email', ['databaseId' => 'default'])
+ ->alias('/v1/database/collections/:collectionId/attributes/email')
->desc('Create email attribute')
->groups(['api', 'database', 'schema'])
->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('audits.event', 'attribute.create')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
->label('sdk.namespace', 'databases')
@@ -1241,11 +1274,12 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/email'
});
App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/enum')
- ->alias('/v1/database/collections/:collectionId/attributes/enum', ['databaseId' => 'default'])
+ ->alias('/v1/database/collections/:collectionId/attributes/enum')
->desc('Create enum attribute')
->groups(['api', 'database', 'schema'])
->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('audits.event', 'attribute.create')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
->label('sdk.namespace', 'databases')
@@ -1288,11 +1322,12 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/enum')
});
App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/ip')
- ->alias('/v1/database/collections/:collectionId/attributes/ip', ['databaseId' => 'default'])
+ ->alias('/v1/database/collections/:collectionId/attributes/ip')
->desc('Create IP address attribute')
->groups(['api', 'database', 'schema'])
->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('audits.event', 'attribute.create')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
->label('sdk.namespace', 'databases')
@@ -1330,11 +1365,12 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/ip')
});
App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/url')
- ->alias('/v1/database/collections/:collectionId/attributes/url', ['databaseId' => 'default'])
+ ->alias('/v1/database/collections/:collectionId/attributes/url')
->desc('Create URL attribute')
->groups(['api', 'database', 'schema'])
->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('audits.event', 'attribute.create')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
->label('sdk.namespace', 'databases')
@@ -1372,11 +1408,12 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/url')
});
App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/integer')
- ->alias('/v1/database/collections/:collectionId/attributes/integer', ['databaseId' => 'default'])
+ ->alias('/v1/database/collections/:collectionId/attributes/integer')
->desc('Create integer attribute')
->groups(['api', 'database', 'schema'])
->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('audits.event', 'attribute.create')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
->label('sdk.namespace', 'databases')
@@ -1401,8 +1438,8 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/intege
->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?int $min, ?int $max, ?int $default, bool $array, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents) {
// Ensure attribute default is within range
- $min = (is_null($min)) ? PHP_INT_MIN : \intval($min);
- $max = (is_null($max)) ? PHP_INT_MAX : \intval($max);
+ $min = \is_null($min) ? PHP_INT_MIN : $min;
+ $max = \is_null($max) ? PHP_INT_MAX : $max;
if ($min > $max) {
throw new Exception(Exception::ATTRIBUTE_VALUE_INVALID, 'Minimum value must be lesser than maximum value');
@@ -1443,11 +1480,12 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/intege
});
App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/float')
- ->alias('/v1/database/collections/:collectionId/attributes/float', ['databaseId' => 'default'])
+ ->alias('/v1/database/collections/:collectionId/attributes/float')
->desc('Create float attribute')
->groups(['api', 'database', 'schema'])
->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('audits.event', 'attribute.create')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
->label('sdk.namespace', 'databases')
@@ -1472,21 +1510,16 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/float'
->action(function (string $databaseId, string $collectionId, string $key, ?bool $required, ?float $min, ?float $max, ?float $default, bool $array, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents) {
// Ensure attribute default is within range
- $min = (is_null($min)) ? -PHP_FLOAT_MAX : \floatval($min);
- $max = (is_null($max)) ? PHP_FLOAT_MAX : \floatval($max);
+ $min = \is_null($min) ? -PHP_FLOAT_MAX : $min;
+ $max = \is_null($max) ? PHP_FLOAT_MAX : $max;
if ($min > $max) {
throw new Exception(Exception::ATTRIBUTE_VALUE_INVALID, 'Minimum value must be lesser than maximum value');
}
- // Ensure default value is a float
- if (!is_null($default)) {
- $default = \floatval($default);
- }
-
$validator = new Range($min, $max, Database::VAR_FLOAT);
- if (!is_null($default) && !$validator->isValid($default)) {
+ if (!\is_null($default) && !$validator->isValid($default)) {
throw new Exception(Exception::ATTRIBUTE_VALUE_INVALID, $validator->getDescription());
}
@@ -1517,11 +1550,12 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/float'
});
App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/boolean')
- ->alias('/v1/database/collections/:collectionId/attributes/boolean', ['databaseId' => 'default'])
+ ->alias('/v1/database/collections/:collectionId/attributes/boolean')
->desc('Create boolean attribute')
->groups(['api', 'database', 'schema'])
->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('audits.event', 'attribute.create')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
->label('sdk.namespace', 'databases')
@@ -1558,11 +1592,12 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/boolea
});
App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/datetime')
- ->alias('/v1/database/collections/:collectionId/attributes/datetime', ['databaseId' => 'default'])
+ ->alias('/v1/database/collections/:collectionId/attributes/datetime')
->desc('Create datetime attribute')
->groups(['api', 'database'])
->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('audits.event', 'attribute.create')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
->label('sdk.namespace', 'databases')
@@ -1576,7 +1611,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/dateti
->param('collectionId', '', new UID(), 'Collection ID. You can create a new collection using the Database service [server integration](https://appwrite.io/docs/server/databases#databasesCreateCollection).')
->param('key', '', new Key(), 'Attribute Key.')
->param('required', null, new Boolean(), 'Is attribute required?')
- ->param('default', null, new DatetimeValidator(), 'Default value for the attribute in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format. Cannot be set when attribute is required.', true)
+ ->param('default', null, fn (Database $dbForProject) => new DatetimeValidator($dbForProject->getAdapter()->getMinDateTime(), $dbForProject->getAdapter()->getMaxDateTime()), 'Default value for the attribute in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format. Cannot be set when attribute is required.', true, ['dbForProject'])
->param('array', false, new Boolean(), 'Is attribute an array?', true)
->inject('response')
->inject('dbForProject')
@@ -1602,11 +1637,12 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/dateti
});
App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/relationship')
- ->alias('/v1/database/collections/:collectionId/attributes/relationship', ['databaseId' => 'default'])
+ ->alias('/v1/database/collections/:collectionId/attributes/relationship')
->desc('Create relationship attribute')
->groups(['api', 'database'])
->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('audits.event', 'attribute.create')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
->label('sdk.namespace', 'databases')
@@ -1730,10 +1766,11 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/relati
});
App::get('/v1/databases/:databaseId/collections/:collectionId/attributes')
- ->alias('/v1/database/collections/:collectionId/attributes', ['databaseId' => 'default'])
+ ->alias('/v1/database/collections/:collectionId/attributes')
->desc('List attributes')
->groups(['api', 'database'])
->label('scope', 'collections.read')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'databases')
->label('sdk.method', 'listAttributes')
@@ -1760,16 +1797,12 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/attributes')
throw new Exception(Exception::COLLECTION_NOT_FOUND);
}
- try {
- $queries = Query::parseQueries($queries);
- } catch (QueryException $e) {
- throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
- }
+ $queries = Query::parseQueries($queries);
\array_push(
$queries,
+ Query::equal('databaseInternalId', [$database->getInternalId()]),
Query::equal('collectionInternalId', [$collection->getInternalId()]),
- Query::equal('databaseInternalId', [$database->getInternalId()])
);
/**
@@ -1778,13 +1811,19 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/attributes')
$cursor = \array_filter($queries, function ($query) {
return \in_array($query->getMethod(), [Query::TYPE_CURSOR_AFTER, Query::TYPE_CURSOR_BEFORE]);
});
+
$cursor = \reset($cursor);
if ($cursor) {
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
$attributeId = $cursor->getValue();
$cursorDocument = Authorization::skip(fn () => $dbForProject->find('attributes', [
- Query::equal('collectionInternalId', [$collection->getInternalId()]),
Query::equal('databaseInternalId', [$database->getInternalId()]),
+ Query::equal('collectionInternalId', [$collection->getInternalId()]),
Query::equal('key', [$attributeId]),
Query::limit(1),
]));
@@ -1808,10 +1847,11 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/attributes')
});
App::get('/v1/databases/:databaseId/collections/:collectionId/attributes/:key')
- ->alias('/v1/database/collections/:collectionId/attributes/:key', ['databaseId' => 'default'])
+ ->alias('/v1/database/collections/:collectionId/attributes/:key')
->desc('Get attribute')
->groups(['api', 'database'])
->label('scope', 'collections.read')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'databases')
->label('sdk.method', 'getAttribute')
@@ -1886,6 +1926,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/strin
->desc('Update string attribute')
->groups(['api', 'database', 'schema'])
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
->label('audits.event', 'attribute.update')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
@@ -1900,7 +1941,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/strin
->param('key', '', new Key(), 'Attribute Key.')
->param('required', null, new Boolean(), 'Is attribute required?')
->param('default', null, new Nullable(new Text(0, 0)), 'Default value for attribute when not provided. Cannot be set when attribute is required.')
- ->param('size', null, new Integer(), 'Maximum size of the string attribute.', true)
+ ->param('size', null, new Range(1, APP_DATABASE_ATTRIBUTE_STRING_MAX_LENGTH, Range::TYPE_INTEGER), 'Maximum size of the string attribute.', true)
->param('newKey', null, new Key(), 'New attribute key.', true)
->inject('response')
->inject('dbForProject')
@@ -1929,6 +1970,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/email
->desc('Update email attribute')
->groups(['api', 'database', 'schema'])
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
->label('audits.event', 'attribute.update')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
@@ -1970,6 +2012,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/enum/
->desc('Update enum attribute')
->groups(['api', 'database', 'schema'])
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
->label('audits.event', 'attribute.update')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
@@ -2013,6 +2056,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/ip/:k
->desc('Update IP address attribute')
->groups(['api', 'database', 'schema'])
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
->label('audits.event', 'attribute.update')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
@@ -2054,6 +2098,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/url/:
->desc('Update URL attribute')
->groups(['api', 'database', 'schema'])
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
->label('audits.event', 'attribute.update')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
@@ -2095,6 +2140,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/integ
->desc('Update integer attribute')
->groups(['api', 'database', 'schema'])
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
->label('audits.event', 'attribute.update')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
@@ -2146,6 +2192,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/float
->desc('Update float attribute')
->groups(['api', 'database', 'schema'])
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
->label('audits.event', 'attribute.update')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
@@ -2197,6 +2244,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/boole
->desc('Update boolean attribute')
->groups(['api', 'database', 'schema'])
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
->label('audits.event', 'attribute.update')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
@@ -2237,6 +2285,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/datet
->desc('Update dateTime attribute')
->groups(['api', 'database', 'schema'])
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
->label('audits.event', 'attribute.update')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
@@ -2250,7 +2299,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/datet
->param('collectionId', '', new UID(), 'Collection ID. You can create a new collection using the Database service [server integration](https://appwrite.io/docs/server/databases#databasesCreateCollection).')
->param('key', '', new Key(), 'Attribute Key.')
->param('required', null, new Boolean(), 'Is attribute required?')
- ->param('default', null, new Nullable(new DatetimeValidator()), 'Default value for attribute when not provided. Cannot be set when attribute is required.')
+ ->param('default', null, fn (Database $dbForProject) => new Nullable(new DatetimeValidator($dbForProject->getAdapter()->getMinDateTime(), $dbForProject->getAdapter()->getMaxDateTime())), 'Default value for attribute when not provided. Cannot be set when attribute is required.', injections: ['dbForProject'])
->param('newKey', null, new Key(), 'New attribute key.', true)
->inject('response')
->inject('dbForProject')
@@ -2277,6 +2326,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/:key/
->desc('Update relationship attribute')
->groups(['api', 'database', 'schema'])
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
->label('audits.event', 'attribute.update')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
@@ -2330,10 +2380,11 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/:key/
});
App::delete('/v1/databases/:databaseId/collections/:collectionId/attributes/:key')
- ->alias('/v1/database/collections/:collectionId/attributes/:key', ['databaseId' => 'default'])
+ ->alias('/v1/database/collections/:collectionId/attributes/:key')
->desc('Delete attribute')
->groups(['api', 'database', 'schema'])
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
->label('audits.event', 'attribute.delete')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
@@ -2350,7 +2401,8 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/attributes/:key
->inject('dbForProject')
->inject('queueForDatabase')
->inject('queueForEvents')
- ->action(function (string $databaseId, string $collectionId, string $key, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents) {
+ ->inject('queueForUsage')
+ ->action(function (string $databaseId, string $collectionId, string $key, Response $response, Database $dbForProject, EventDatabase $queueForDatabase, Event $queueForEvents, Usage $queueForUsage) {
$db = Authorization::skip(fn () => $dbForProject->getDocument('databases', $databaseId));
@@ -2435,15 +2487,19 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/attributes/:key
->setContext('database', $db)
->setPayload($response->output($attribute, $model));
+ $queueForUsage
+ ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$db->getInternalId(), $collection->getInternalId()], METRIC_DATABASE_ID_COLLECTION_ID_STORAGE), 1); // per collection
+
$response->noContent();
});
App::post('/v1/databases/:databaseId/collections/:collectionId/indexes')
- ->alias('/v1/database/collections/:collectionId/indexes', ['databaseId' => 'default'])
+ ->alias('/v1/database/collections/:collectionId/indexes')
->desc('Create index')
->groups(['api', 'database'])
->label('event', 'databases.[databaseId].collections.[collectionId].indexes.[indexId].create')
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('audits.event', 'index.create')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -2498,7 +2554,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/indexes')
'required' => true,
'array' => false,
'default' => null,
- 'size' => 36
+ 'size' => Database::LENGTH_KEY
];
$oldAttributes[] = [
@@ -2536,7 +2592,6 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/indexes')
$attributeStatus = $oldAttributes[$attributeIndex]['status'];
$attributeType = $oldAttributes[$attributeIndex]['type'];
- $attributeSize = $oldAttributes[$attributeIndex]['size'];
$attributeArray = $oldAttributes[$attributeIndex]['array'] ?? false;
if ($attributeType === Database::VAR_RELATIONSHIP) {
@@ -2550,10 +2605,6 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/indexes')
$lengths[$i] = null;
- if ($attributeType === Database::VAR_STRING) {
- $lengths[$i] = $attributeSize; // set attribute size as index length only for strings
- }
-
if ($attributeArray === true) {
$lengths[$i] = Database::ARRAY_INDEX_LENGTH;
$orders[$i] = null;
@@ -2576,7 +2627,8 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/indexes')
$validator = new IndexValidator(
$collection->getAttribute('attributes'),
- $dbForProject->getAdapter()->getMaxIndexLength()
+ $dbForProject->getAdapter()->getMaxIndexLength(),
+ $dbForProject->getAdapter()->getInternalIndexesKeys(),
);
if (!$validator->isValid($index)) {
throw new Exception(Exception::INDEX_INVALID, $validator->getDescription());
@@ -2609,10 +2661,11 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/indexes')
});
App::get('/v1/databases/:databaseId/collections/:collectionId/indexes')
- ->alias('/v1/database/collections/:collectionId/indexes', ['databaseId' => 'default'])
+ ->alias('/v1/database/collections/:collectionId/indexes')
->desc('List indexes')
->groups(['api', 'database'])
->label('scope', 'collections.read')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'databases')
->label('sdk.method', 'listIndexes')
@@ -2639,13 +2692,13 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/indexes')
throw new Exception(Exception::COLLECTION_NOT_FOUND);
}
- try {
- $queries = Query::parseQueries($queries);
- } catch (QueryException $e) {
- throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
- }
+ $queries = Query::parseQueries($queries);
- \array_push($queries, Query::equal('collectionId', [$collectionId]), Query::equal('databaseId', [$databaseId]));
+ \array_push(
+ $queries,
+ Query::equal('databaseId', [$databaseId]),
+ Query::equal('collectionId', [$collectionId]),
+ );
/**
* Get cursor document if there was a cursor query, we use array_filter and reset for reference $cursor to $queries
@@ -2656,6 +2709,11 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/indexes')
$cursor = reset($cursor);
if ($cursor) {
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
$indexId = $cursor->getValue();
$cursorDocument = Authorization::skip(fn () => $dbForProject->find('indexes', [
Query::equal('collectionInternalId', [$collection->getInternalId()]),
@@ -2683,6 +2741,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/indexes/:key')
->desc('Get index')
->groups(['api', 'database'])
->label('scope', 'collections.read')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'databases')
->label('sdk.method', 'getIndex')
@@ -2722,6 +2781,7 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/indexes/:key')
->desc('Delete index')
->groups(['api', 'database'])
->label('scope', 'collections.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('event', 'databases.[databaseId].collections.[collectionId].indexes.[indexId].update')
->label('audits.event', 'index.delete')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
@@ -2787,6 +2847,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/documents')
->groups(['api', 'database'])
->label('event', 'databases.[databaseId].collections.[collectionId].documents.[documentId].create')
->label('scope', 'documents.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('audits.event', 'document.create')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}')
->label('abuse-key', 'ip:{ip},method:{method},url:{url},userId:{userId}')
@@ -2810,8 +2871,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/documents')
->inject('dbForProject')
->inject('user')
->inject('queueForEvents')
+ ->inject('queueForUsage')
->inject('mode')
- ->action(function (string $databaseId, string $documentId, string $collectionId, string|array $data, ?array $permissions, Response $response, Database $dbForProject, Document $user, Event $queueForEvents, string $mode) {
+ ->action(function (string $databaseId, string $documentId, string $collectionId, string|array $data, ?array $permissions, Response $response, Database $dbForProject, Document $user, Event $queueForEvents, Usage $queueForUsage, string $mode) {
$data = (\is_string($data)) ? \json_decode($data, true) : $data; // Cast to JSON array
@@ -2966,10 +3028,12 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/documents')
try {
$document = $dbForProject->createDocument('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $document);
- } catch (StructureException $exception) {
- throw new Exception(Exception::DOCUMENT_INVALID_STRUCTURE, $exception->getMessage());
- } catch (DuplicateException $exception) {
+ } catch (StructureException $e) {
+ throw new Exception(Exception::DOCUMENT_INVALID_STRUCTURE, $e->getMessage());
+ } catch (DuplicateException $e) {
throw new Exception(Exception::DOCUMENT_ALREADY_EXISTS);
+ } catch (NotFoundException $e) {
+ throw new Exception(Exception::COLLECTION_NOT_FOUND);
}
// Add $collectionId and $databaseId for all documents
@@ -3027,6 +3091,9 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/documents')
->setContext('database', $database)
->setPayload($response->getPayload(), sensitive: $relationships);
+
+ $queueForUsage
+ ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$database->getInternalId(), $collection->getInternalId()], METRIC_DATABASE_ID_COLLECTION_ID_STORAGE), 1); // per collection
});
App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
@@ -3034,6 +3101,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
->desc('List documents')
->groups(['api', 'database'])
->label('scope', 'documents.read')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
->label('sdk.namespace', 'databases')
->label('sdk.method', 'listDocuments')
@@ -3079,6 +3147,12 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
$cursor = \reset($cursor);
if ($cursor) {
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
+
$documentId = $cursor->getValue();
$cursorDocument = Authorization::skip(fn () => $dbForProject->getDocument('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $documentId));
@@ -3090,14 +3164,8 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
$cursor->setValue($cursorDocument);
}
- try {
- $documents = $dbForProject->find('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $queries);
- $total = $dbForProject->count('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $queries, APP_LIMIT_COUNT);
- } catch (AuthorizationException) {
- throw new Exception(Exception::USER_UNAUTHORIZED);
- } catch (QueryException $e) {
- throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
- }
+ $documents = $dbForProject->find('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $queries);
+ $total = $dbForProject->count('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $queries, APP_LIMIT_COUNT);
// Add $collectionId and $databaseId for all documents
$processDocument = (function (Document $collection, Document $document) use (&$processDocument, $dbForProject, $database): bool {
@@ -3189,6 +3257,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen
->desc('Get document')
->groups(['api', 'database'])
->label('scope', 'documents.read')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
->label('sdk.namespace', 'databases')
->label('sdk.method', 'getDocument')
@@ -3281,6 +3350,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen
->desc('List document logs')
->groups(['api', 'database'])
->label('scope', 'documents.read')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
->label('sdk.namespace', 'databases')
->label('sdk.method', 'listDocumentLogs')
@@ -3381,11 +3451,12 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen
});
App::patch('/v1/databases/:databaseId/collections/:collectionId/documents/:documentId')
- ->alias('/v1/database/collections/:collectionId/documents/:documentId', ['databaseId' => 'default'])
+ ->alias('/v1/database/collections/:collectionId/documents/:documentId')
->desc('Update document')
->groups(['api', 'database'])
->label('event', 'databases.[databaseId].collections.[collectionId].documents.[documentId].update')
->label('scope', 'documents.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('audits.event', 'document.update')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}/document/{response.$id}')
->label('abuse-key', 'ip:{ip},method:{method},url:{url},userId:{userId}')
@@ -3558,8 +3629,10 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/documents/:docum
throw new Exception(Exception::USER_UNAUTHORIZED);
} catch (DuplicateException) {
throw new Exception(Exception::DOCUMENT_ALREADY_EXISTS);
- } catch (StructureException $exception) {
- throw new Exception(Exception::DOCUMENT_INVALID_STRUCTURE, $exception->getMessage());
+ } catch (StructureException $e) {
+ throw new Exception(Exception::DOCUMENT_INVALID_STRUCTURE, $e->getMessage());
+ } catch (NotFoundException $e) {
+ throw new Exception(Exception::COLLECTION_NOT_FOUND);
}
// Add $collectionId and $databaseId for all documents
@@ -3621,6 +3694,7 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/documents/:docu
->desc('Delete document')
->groups(['api', 'database'])
->label('scope', 'documents.write')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('event', 'databases.[databaseId].collections.[collectionId].documents.[documentId].delete')
->label('audits.event', 'document.delete')
->label('audits.resource', 'database/{request.databaseId}/collection/{request.collectionId}/document/{request.documentId}')
@@ -3641,10 +3715,10 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/documents/:docu
->inject('requestTimestamp')
->inject('response')
->inject('dbForProject')
- ->inject('queueForDeletes')
->inject('queueForEvents')
+ ->inject('queueForUsage')
->inject('mode')
- ->action(function (string $databaseId, string $collectionId, string $documentId, ?\DateTime $requestTimestamp, Response $response, Database $dbForProject, Delete $queueForDeletes, Event $queueForEvents, string $mode) {
+ ->action(function (string $databaseId, string $collectionId, string $documentId, ?\DateTime $requestTimestamp, Response $response, Database $dbForProject, Event $queueForEvents, Usage $queueForUsage, string $mode) {
$database = Authorization::skip(fn () => $dbForProject->getDocument('databases', $databaseId));
$isAPIKey = Auth::isAppUser(Authorization::getRoles());
@@ -3667,12 +3741,16 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/documents/:docu
throw new Exception(Exception::DOCUMENT_NOT_FOUND);
}
- $dbForProject->withRequestTimestamp($requestTimestamp, function () use ($dbForProject, $database, $collection, $documentId) {
- $dbForProject->deleteDocument(
- 'database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(),
- $documentId
- );
- });
+ try {
+ $dbForProject->withRequestTimestamp($requestTimestamp, function () use ($dbForProject, $database, $collection, $documentId) {
+ $dbForProject->deleteDocument(
+ 'database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(),
+ $documentId
+ );
+ });
+ } catch (NotFoundException $e) {
+ throw new Exception(Exception::COLLECTION_NOT_FOUND);
+ }
// Add $collectionId and $databaseId for all documents
$processDocument = function (Document $collection, Document $document) use (&$processDocument, $dbForProject, $database) {
@@ -3717,10 +3795,6 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/documents/:docu
)
);
- $queueForDeletes
- ->setType(DELETE_TYPE_AUDIT)
- ->setDocument($document);
-
$queueForEvents
->setParam('databaseId', $databaseId)
->setParam('collectionId', $collection->getId())
@@ -3729,6 +3803,9 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/documents/:docu
->setContext('database', $database)
->setPayload($response->output($document, Response::MODEL_DOCUMENT), sensitive: $relationships);
+ $queueForUsage
+ ->addMetric(str_replace(['{databaseInternalId}', '{collectionInternalId}'], [$database->getInternalId(), $collection->getInternalId()], METRIC_DATABASE_ID_COLLECTION_ID_STORAGE), 1); // per collection
+
$response->noContent();
});
@@ -3736,6 +3813,7 @@ App::get('/v1/databases/usage')
->desc('Get databases usage stats')
->groups(['api', 'database', 'usage'])
->label('scope', 'collections.read')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
->label('sdk.namespace', 'databases')
->label('sdk.method', 'getUsage')
@@ -3754,6 +3832,7 @@ App::get('/v1/databases/usage')
METRIC_DATABASES,
METRIC_COLLECTIONS,
METRIC_DOCUMENTS,
+ METRIC_DATABASES_STORAGE
];
Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats) {
@@ -3804,9 +3883,11 @@ App::get('/v1/databases/usage')
'databasesTotal' => $usage[$metrics[0]]['total'],
'collectionsTotal' => $usage[$metrics[1]]['total'],
'documentsTotal' => $usage[$metrics[2]]['total'],
+ 'storageTotal' => $usage[$metrics[3]]['total'],
'databases' => $usage[$metrics[0]]['data'],
'collections' => $usage[$metrics[1]]['data'],
'documents' => $usage[$metrics[2]]['data'],
+ 'storage' => $usage[$metrics[3]]['data'],
]), Response::MODEL_USAGE_DATABASES);
});
@@ -3814,6 +3895,7 @@ App::get('/v1/databases/:databaseId/usage')
->desc('Get database usage stats')
->groups(['api', 'database', 'usage'])
->label('scope', 'collections.read')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
->label('sdk.namespace', 'databases')
->label('sdk.method', 'getDatabaseUsage')
@@ -3838,6 +3920,7 @@ App::get('/v1/databases/:databaseId/usage')
$metrics = [
str_replace('{databaseInternalId}', $database->getInternalId(), METRIC_DATABASE_ID_COLLECTIONS),
str_replace('{databaseInternalId}', $database->getInternalId(), METRIC_DATABASE_ID_DOCUMENTS),
+ str_replace('{databaseInternalId}', $database->getInternalId(), METRIC_DATABASE_ID_STORAGE)
];
Authorization::skip(function () use ($dbForProject, $days, $metrics, &$stats) {
@@ -3888,8 +3971,10 @@ App::get('/v1/databases/:databaseId/usage')
'range' => $range,
'collectionsTotal' => $usage[$metrics[0]]['total'],
'documentsTotal' => $usage[$metrics[1]]['total'],
+ 'storageTotal' => $usage[$metrics[2]]['total'],
'collections' => $usage[$metrics[0]]['data'],
'documents' => $usage[$metrics[1]]['data'],
+ 'storage' => $usage[$metrics[2]]['data'],
]), Response::MODEL_USAGE_DATABASE);
});
@@ -3898,6 +3983,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/usage')
->desc('Get collection usage stats')
->groups(['api', 'database', 'usage'])
->label('scope', 'collections.read')
+ ->label('resourceType', RESOURCE_TYPE_DATABASES)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
->label('sdk.namespace', 'databases')
->label('sdk.method', 'getCollectionUsage')
diff --git a/app/controllers/api/functions.php b/app/controllers/api/functions.php
index 9c3e6782b4..e38dba3f19 100644
--- a/app/controllers/api/functions.php
+++ b/app/controllers/api/functions.php
@@ -11,7 +11,6 @@ use Appwrite\Event\Validator\FunctionEvent;
use Appwrite\Extend\Exception;
use Appwrite\Extend\Exception as AppwriteException;
use Appwrite\Functions\Validator\Headers;
-use Appwrite\Functions\Validator\Payload;
use Appwrite\Functions\Validator\RuntimeSpecification;
use Appwrite\Messaging\Adapter\Realtime;
use Appwrite\Platform\Tasks\ScheduleExecutions;
@@ -38,6 +37,7 @@ use Utopia\Database\Helpers\Role;
use Utopia\Database\Query;
use Utopia\Database\Validator\Authorization;
use Utopia\Database\Validator\Datetime as DatetimeValidator;
+use Utopia\Database\Validator\Query\Cursor;
use Utopia\Database\Validator\Roles;
use Utopia\Database\Validator\UID;
use Utopia\Storage\Device;
@@ -138,6 +138,7 @@ App::post('/v1/functions')
->desc('Create function')
->label('scope', 'functions.write')
->label('event', 'functions.[functionId].create')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('audits.event', 'function.create')
->label('audits.resource', 'function/{response.$id}')
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -325,9 +326,10 @@ App::post('/v1/functions')
$functionsDomain = System::getEnv('_APP_DOMAIN_FUNCTIONS', '');
if (!empty($functionsDomain)) {
- $ruleId = ID::unique();
$routeSubdomain = ID::unique();
$domain = "{$routeSubdomain}.{$functionsDomain}";
+ // TODO: @christyjacob remove once we migrate the rules in 1.7.x
+ $ruleId = System::getEnv('_APP_RULES_FORMAT') === 'md5' ? md5($domain) : ID::unique();
$rule = Authorization::skip(
fn () => $dbForConsole->createDocument('rules', new Document([
@@ -400,6 +402,7 @@ App::get('/v1/functions')
->groups(['api', 'functions'])
->desc('List functions')
->label('scope', 'functions.read')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'functions')
->label('sdk.method', 'list')
@@ -432,6 +435,12 @@ App::get('/v1/functions')
$cursor = reset($cursor);
if ($cursor) {
/** @var Query $cursor */
+
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
$functionId = $cursor->getValue();
$cursorDocument = $dbForProject->getDocument('functions', $functionId);
@@ -454,6 +463,7 @@ App::get('/v1/functions/runtimes')
->groups(['api', 'functions'])
->desc('List runtimes')
->label('scope', 'functions.read')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'functions')
->label('sdk.method', 'listRuntimes')
@@ -487,6 +497,7 @@ App::get('/v1/functions/specifications')
->groups(['api', 'functions'])
->desc('List available function runtime specifications')
->label('scope', 'functions.read')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('sdk.auth', [APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_ADMIN])
->label('sdk.namespace', 'functions')
->label('sdk.method', 'listSpecifications')
@@ -523,6 +534,7 @@ App::get('/v1/functions/:functionId')
->groups(['api', 'functions'])
->desc('Get function')
->label('scope', 'functions.read')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'functions')
->label('sdk.method', 'get')
@@ -547,6 +559,7 @@ App::get('/v1/functions/:functionId/usage')
->desc('Get function usage')
->groups(['api', 'functions', 'usage'])
->label('scope', 'functions.read')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
->label('sdk.namespace', 'functions')
->label('sdk.method', 'getFunctionUsage')
@@ -651,6 +664,7 @@ App::get('/v1/functions/usage')
->desc('Get functions usage')
->groups(['api', 'functions'])
->label('scope', 'functions.read')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
->label('sdk.namespace', 'functions')
->label('sdk.method', 'getUsage')
@@ -750,6 +764,7 @@ App::put('/v1/functions/:functionId')
->groups(['api', 'functions'])
->desc('Update function')
->label('scope', 'functions.write')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('event', 'functions.[functionId].update')
->label('audits.event', 'function.update')
->label('audits.resource', 'function/{response.$id}')
@@ -952,6 +967,7 @@ App::get('/v1/functions/:functionId/deployments/:deploymentId/download')
->groups(['api', 'functions'])
->desc('Download deployment')
->label('scope', 'functions.read')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('sdk.auth', [APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
->label('sdk.namespace', 'functions')
->label('sdk.method', 'getDeploymentDownload')
@@ -988,7 +1004,7 @@ App::get('/v1/functions/:functionId/deployments/:deploymentId/download')
$response
->setContentType('application/gzip')
- ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + (60 * 60 * 24 * 45)) . ' GMT') // 45 days cache
+ ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
->addHeader('X-Peak', \memory_get_peak_usage())
->addHeader('Content-Disposition', 'attachment; filename="' . $deploymentId . '.tar.gz"');
@@ -1037,6 +1053,7 @@ App::patch('/v1/functions/:functionId/deployments/:deploymentId')
->groups(['api', 'functions'])
->desc('Update deployment')
->label('scope', 'functions.write')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('event', 'functions.[functionId].deployments.[deploymentId].update')
->label('audits.event', 'deployment.update')
->label('audits.resource', 'function/{request.functionId}')
@@ -1099,6 +1116,7 @@ App::delete('/v1/functions/:functionId')
->groups(['api', 'functions'])
->desc('Delete function')
->label('scope', 'functions.write')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('event', 'functions.[functionId].delete')
->label('audits.event', 'function.delete')
->label('audits.resource', 'function/{request.functionId}')
@@ -1146,6 +1164,7 @@ App::post('/v1/functions/:functionId/deployments')
->groups(['api', 'functions'])
->desc('Create deployment')
->label('scope', 'functions.write')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('event', 'functions.[functionId].deployments.[deploymentId].create')
->label('audits.event', 'deployment.create')
->label('audits.resource', 'function/{request.functionId}')
@@ -1365,6 +1384,7 @@ App::get('/v1/functions/:functionId/deployments')
->groups(['api', 'functions'])
->desc('List deployments')
->label('scope', 'functions.read')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'functions')
->label('sdk.method', 'listDeployments')
@@ -1408,6 +1428,12 @@ App::get('/v1/functions/:functionId/deployments')
$cursor = reset($cursor);
if ($cursor) {
/** @var Query $cursor */
+
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
$deploymentId = $cursor->getValue();
$cursorDocument = $dbForProject->getDocument('deployments', $deploymentId);
@@ -1442,6 +1468,7 @@ App::get('/v1/functions/:functionId/deployments/:deploymentId')
->groups(['api', 'functions'])
->desc('Get deployment')
->label('scope', 'functions.read')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'functions')
->label('sdk.method', 'getDeployment')
@@ -1485,6 +1512,7 @@ App::delete('/v1/functions/:functionId/deployments/:deploymentId')
->groups(['api', 'functions'])
->desc('Delete deployment')
->label('scope', 'functions.write')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('event', 'functions.[functionId].deployments.[deploymentId].delete')
->label('audits.event', 'deployment.delete')
->label('audits.resource', 'function/{request.functionId}')
@@ -1550,6 +1578,7 @@ App::post('/v1/functions/:functionId/deployments/:deploymentId/build')
->groups(['api', 'functions'])
->desc('Rebuild deployment')
->label('scope', 'functions.write')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('event', 'functions.[functionId].deployments.[deploymentId].update')
->label('audits.event', 'deployment.update')
->label('audits.resource', 'function/{request.functionId}')
@@ -1618,6 +1647,7 @@ App::patch('/v1/functions/:functionId/deployments/:deploymentId/build')
->groups(['api', 'functions'])
->desc('Cancel deployment')
->label('scope', 'functions.write')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('audits.event', 'deployment.update')
->label('audits.resource', 'function/{request.functionId}')
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -1707,7 +1737,9 @@ App::post('/v1/functions/:functionId/executions')
->groups(['api', 'functions'])
->desc('Create execution')
->label('scope', 'execution.write')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('event', 'functions.[functionId].executions.[executionId].create')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
->label('sdk.namespace', 'functions')
->label('sdk.method', 'createExecution')
@@ -1717,12 +1749,12 @@ App::post('/v1/functions/:functionId/executions')
->label('sdk.response.model', Response::MODEL_EXECUTION)
->label('sdk.request.type', Response::CONTENT_TYPE_JSON)
->param('functionId', '', new UID(), 'Function ID.')
- ->param('body', '', new Payload(10485760, 0), 'HTTP body of execution. Default value is empty string.', true)
+ ->param('body', '', new Text(10485760, 0), 'HTTP body of execution. Default value is empty string.', true)
->param('async', false, new Boolean(true), 'Execute code in the background. Default value is false.', true)
->param('path', '/', new Text(2048), 'HTTP path of execution. Path can include query params. Default value is /', true)
->param('method', 'POST', new Whitelist(['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'], true), 'HTTP method of execution. Default value is GET.', true)
->param('headers', [], new AnyOf([new Assoc(), new Text(65535)], AnyOf::TYPE_MIXED), 'HTTP headers of execution. Defaults to empty.', true)
- ->param('scheduledAt', null, new DatetimeValidator(true, DateTimeValidator::PRECISION_MINUTES, 60), 'Scheduled execution time in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format. DateTime value must be in future with precision in minutes.', true)
+ ->param('scheduledAt', null, new DatetimeValidator(requireDateInFuture: true, precision: DateTimeValidator::PRECISION_MINUTES, offset: 60), 'Scheduled execution time in [ISO 8601](https://www.iso.org/iso-8601-date-and-time-format.html) format. DateTime value must be in future with precision in minutes.', true)
->inject('response')
->inject('request')
->inject('project')
@@ -2109,6 +2141,7 @@ App::get('/v1/functions/:functionId/executions')
->groups(['api', 'functions'])
->desc('List executions')
->label('scope', 'execution.read')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
->label('sdk.namespace', 'functions')
->label('sdk.method', 'listExecutions')
@@ -2154,6 +2187,12 @@ App::get('/v1/functions/:functionId/executions')
$cursor = reset($cursor);
if ($cursor) {
/** @var Query $cursor */
+
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
$executionId = $cursor->getValue();
$cursorDocument = $dbForProject->getDocument('executions', $executionId);
@@ -2190,6 +2229,7 @@ App::get('/v1/functions/:functionId/executions/:executionId')
->groups(['api', 'functions'])
->desc('Get execution')
->label('scope', 'execution.read')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
->label('sdk.namespace', 'functions')
->label('sdk.method', 'getExecution')
@@ -2237,6 +2277,7 @@ App::delete('/v1/functions/:functionId/executions/:executionId')
->groups(['api', 'functions'])
->desc('Delete execution')
->label('scope', 'execution.write')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('event', 'functions.[functionId].executions.[executionId].delete')
->label('audits.event', 'executions.delete')
->label('audits.resource', 'function/{request.functionId}')
@@ -2284,7 +2325,7 @@ App::delete('/v1/functions/:functionId/executions/:executionId')
Query::equal('active', [true]),
]);
- if ($schedule && !$schedule->isEmpty()) {
+ if (!$schedule->isEmpty()) {
$schedule
->setAttribute('resourceUpdatedAt', DateTime::now())
->setAttribute('active', false);
@@ -2307,6 +2348,7 @@ App::post('/v1/functions/:functionId/variables')
->desc('Create variable')
->groups(['api', 'functions'])
->label('scope', 'functions.write')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('audits.event', 'variable.create')
->label('audits.resource', 'function/{request.functionId}')
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -2371,6 +2413,7 @@ App::get('/v1/functions/:functionId/variables')
->desc('List variables')
->groups(['api', 'functions'])
->label('scope', 'functions.read')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'functions')
->label('sdk.method', 'listVariables')
@@ -2398,6 +2441,7 @@ App::get('/v1/functions/:functionId/variables/:variableId')
->desc('Get variable')
->groups(['api', 'functions'])
->label('scope', 'functions.read')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'functions')
->label('sdk.method', 'getVariable')
@@ -2437,6 +2481,7 @@ App::put('/v1/functions/:functionId/variables/:variableId')
->desc('Update variable')
->groups(['api', 'functions'])
->label('scope', 'functions.write')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('audits.event', 'variable.update')
->label('audits.resource', 'function/{request.functionId}')
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -2498,6 +2543,7 @@ App::delete('/v1/functions/:functionId/variables/:variableId')
->desc('Delete variable')
->groups(['api', 'functions'])
->label('scope', 'functions.write')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('audits.event', 'variable.delete')
->label('audits.resource', 'function/{request.functionId}')
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -2546,6 +2592,7 @@ App::get('/v1/functions/templates')
->groups(['api'])
->desc('List function templates')
->label('scope', 'public')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('sdk.namespace', 'functions')
->label('sdk.method', 'listTemplates')
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -2583,6 +2630,7 @@ App::get('/v1/functions/templates')
App::get('/v1/functions/templates/:templateId')
->desc('Get function template')
->label('scope', 'public')
+ ->label('resourceType', RESOURCE_TYPE_FUNCTIONS)
->label('sdk.namespace', 'functions')
->label('sdk.method', 'getTemplate')
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -2595,9 +2643,11 @@ App::get('/v1/functions/templates/:templateId')
->action(function (string $templateId, Response $response) {
$templates = Config::getParam('function-templates', []);
- $template = array_shift(\array_filter($templates, function ($template) use ($templateId) {
+ $filtered = \array_filter($templates, function ($template) use ($templateId) {
return $template['id'] === $templateId;
- }));
+ });
+
+ $template = array_shift($filtered);
if (empty($template)) {
throw new Exception(Exception::FUNCTION_TEMPLATE_NOT_FOUND);
diff --git a/app/controllers/api/health.php b/app/controllers/api/health.php
index f4581df8e4..60a8c0ca97 100644
--- a/app/controllers/api/health.php
+++ b/app/controllers/api/health.php
@@ -135,6 +135,7 @@ App::get('/v1/health/cache')
foreach ($configs as $key => $config) {
foreach ($config as $database) {
try {
+ /** @var \Utopia\Cache\Adapter $adapter */
$adapter = $pools->get($database)->pop()->getResource();
$checkStart = \microtime(true);
@@ -191,11 +192,11 @@ App::get('/v1/health/queue')
foreach ($configs as $key => $config) {
foreach ($config as $database) {
+ $checkStart = \microtime(true);
try {
+ /** @var Connection $adapter */
$adapter = $pools->get($database)->pop()->getResource();
- $checkStart = \microtime(true);
-
if ($adapter->ping()) {
$output[] = new Document([
'name' => $key . " ($database)",
@@ -249,6 +250,7 @@ App::get('/v1/health/pubsub')
foreach ($configs as $key => $config) {
foreach ($config as $database) {
try {
+ /** @var \Appwrite\PubSub\Adapter $adapter */
$adapter = $pools->get($database)->pop()->getResource();
$checkStart = \microtime(true);
diff --git a/app/controllers/api/locale.php b/app/controllers/api/locale.php
index 2917bc8416..1f042d2239 100644
--- a/app/controllers/api/locale.php
+++ b/app/controllers/api/locale.php
@@ -63,7 +63,7 @@ App::get('/v1/locale')
$response
->addHeader('Cache-Control', 'public, max-age=' . $time)
- ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + $time) . ' GMT') // 45 days cache
+ ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
;
$response->dynamic(new Document($output), Response::MODEL_LOCALE);
});
diff --git a/app/controllers/api/messaging.php b/app/controllers/api/messaging.php
index 7da0348a8f..e4a627d027 100644
--- a/app/controllers/api/messaging.php
+++ b/app/controllers/api/messaging.php
@@ -32,6 +32,7 @@ use Utopia\Database\Query;
use Utopia\Database\Validator\Authorization;
use Utopia\Database\Validator\Datetime as DatetimeValidator;
use Utopia\Database\Validator\Queries;
+use Utopia\Database\Validator\Query\Cursor;
use Utopia\Database\Validator\Query\Limit;
use Utopia\Database\Validator\Query\Offset;
use Utopia\Database\Validator\Roles;
@@ -55,6 +56,7 @@ App::post('/v1/messaging/providers/mailgun')
->label('audits.resource', 'provider/{response.$id}')
->label('event', 'providers.[providerId].create')
->label('scope', 'providers.write')
+ ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'createMailgunProvider')
@@ -142,6 +144,7 @@ App::post('/v1/messaging/providers/sendgrid')
->label('audits.resource', 'provider/{response.$id}')
->label('event', 'providers.[providerId].create')
->label('scope', 'providers.write')
+ ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'createSendgridProvider')
@@ -217,6 +220,7 @@ App::post('/v1/messaging/providers/smtp')
->label('audits.resource', 'provider/{response.$id}')
->label('event', 'providers.[providerId].create')
->label('scope', 'providers.write')
+ ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'createSmtpProvider')
@@ -304,6 +308,7 @@ App::post('/v1/messaging/providers/msg91')
->label('audits.event', 'provider.create')
->label('audits.resource', 'provider/{response.$id}')
->label('scope', 'providers.write')
+ ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
->label('event', 'providers.[providerId].create')
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
@@ -381,6 +386,7 @@ App::post('/v1/messaging/providers/telesign')
->label('audits.resource', 'provider/{response.$id}')
->label('event', 'providers.[providerId].create')
->label('scope', 'providers.write')
+ ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'createTelesignProvider')
@@ -458,6 +464,7 @@ App::post('/v1/messaging/providers/textmagic')
->label('audits.resource', 'provider/{response.$id}')
->label('event', 'providers.[providerId].create')
->label('scope', 'providers.write')
+ ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'createTextmagicProvider')
@@ -535,6 +542,7 @@ App::post('/v1/messaging/providers/twilio')
->label('audits.resource', 'provider/{response.$id}')
->label('event', 'providers.[providerId].create')
->label('scope', 'providers.write')
+ ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'createTwilioProvider')
@@ -612,6 +620,7 @@ App::post('/v1/messaging/providers/vonage')
->label('audits.resource', 'provider/{response.$id}')
->label('event', 'providers.[providerId].create')
->label('scope', 'providers.write')
+ ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'createVonageProvider')
@@ -689,6 +698,7 @@ App::post('/v1/messaging/providers/fcm')
->label('audits.resource', 'provider/{response.$id}')
->label('event', 'providers.[providerId].create')
->label('scope', 'providers.write')
+ ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'createFcmProvider')
@@ -752,6 +762,7 @@ App::post('/v1/messaging/providers/apns')
->label('audits.resource', 'provider/{response.$id}')
->label('event', 'providers.[providerId].create')
->label('scope', 'providers.write')
+ ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'createApnsProvider')
@@ -835,6 +846,7 @@ App::get('/v1/messaging/providers')
->desc('List providers')
->groups(['api', 'messaging'])
->label('scope', 'providers.read')
+ ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'listProviders')
@@ -866,6 +878,11 @@ App::get('/v1/messaging/providers')
$cursor = reset($cursor);
if ($cursor) {
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
$providerId = $cursor->getValue();
$cursorDocument = Authorization::skip(fn () => $dbForProject->getDocument('providers', $providerId));
@@ -886,6 +903,7 @@ App::get('/v1/messaging/providers/:providerId/logs')
->desc('List provider logs')
->groups(['api', 'messaging'])
->label('scope', 'providers.read')
+ ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'listProviderLogs')
@@ -974,6 +992,7 @@ App::get('/v1/messaging/providers/:providerId')
->desc('Get provider')
->groups(['api', 'messaging'])
->label('scope', 'providers.read')
+ ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'getProvider')
@@ -1001,6 +1020,7 @@ App::patch('/v1/messaging/providers/mailgun/:providerId')
->label('audits.resource', 'provider/{response.$id}')
->label('event', 'providers.[providerId].update')
->label('scope', 'providers.write')
+ ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'updateMailgunProvider')
@@ -1107,6 +1127,7 @@ App::patch('/v1/messaging/providers/sendgrid/:providerId')
->label('audits.resource', 'provider/{response.$id}')
->label('event', 'providers.[providerId].update')
->label('scope', 'providers.write')
+ ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'updateSendgridProvider')
@@ -1198,6 +1219,7 @@ App::patch('/v1/messaging/providers/smtp/:providerId')
->label('audits.resource', 'provider/{response.$id}')
->label('event', 'providers.[providerId].update')
->label('scope', 'providers.write')
+ ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'updateSmtpProvider')
@@ -1320,6 +1342,7 @@ App::patch('/v1/messaging/providers/msg91/:providerId')
->label('audits.resource', 'provider/{response.$id}')
->label('event', 'providers.[providerId].update')
->label('scope', 'providers.write')
+ ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'updateMsg91Provider')
@@ -1400,6 +1423,7 @@ App::patch('/v1/messaging/providers/telesign/:providerId')
->label('audits.resource', 'provider/{response.$id}')
->label('event', 'providers.[providerId].update')
->label('scope', 'providers.write')
+ ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'updateTelesignProvider')
@@ -1482,6 +1506,7 @@ App::patch('/v1/messaging/providers/textmagic/:providerId')
->label('audits.resource', 'provider/{response.$id}')
->label('event', 'providers.[providerId].update')
->label('scope', 'providers.write')
+ ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'updateTextmagicProvider')
@@ -1564,6 +1589,7 @@ App::patch('/v1/messaging/providers/twilio/:providerId')
->label('audits.resource', 'provider/{response.$id}')
->label('event', 'providers.[providerId].update')
->label('scope', 'providers.write')
+ ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'updateTwilioProvider')
@@ -1646,6 +1672,7 @@ App::patch('/v1/messaging/providers/vonage/:providerId')
->label('audits.resource', 'provider/{response.$id}')
->label('event', 'providers.[providerId].update')
->label('scope', 'providers.write')
+ ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'updateVonageProvider')
@@ -1728,6 +1755,7 @@ App::patch('/v1/messaging/providers/fcm/:providerId')
->label('audits.resource', 'provider/{response.$id}')
->label('event', 'providers.[providerId].update')
->label('scope', 'providers.write')
+ ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'updateFcmProvider')
@@ -1797,6 +1825,7 @@ App::patch('/v1/messaging/providers/apns/:providerId')
->label('audits.resource', 'provider/{response.$id}')
->label('event', 'providers.[providerId].update')
->label('scope', 'providers.write')
+ ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'updateApnsProvider')
@@ -1892,6 +1921,7 @@ App::delete('/v1/messaging/providers/:providerId')
->label('audits.resource', 'provider/{request.$providerId}')
->label('event', 'providers.[providerId].delete')
->label('scope', 'providers.write')
+ ->label('resourceType', RESOURCE_TYPE_PROVIDERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'deleteProvider')
@@ -1927,6 +1957,7 @@ App::post('/v1/messaging/topics')
->label('audits.resource', 'topic/{response.$id}')
->label('event', 'topics.[topicId].create')
->label('scope', 'topics.write')
+ ->label('resourceType', RESOURCE_TYPE_TOPICS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'createTopic')
@@ -1967,6 +1998,7 @@ App::get('/v1/messaging/topics')
->desc('List topics')
->groups(['api', 'messaging'])
->label('scope', 'topics.read')
+ ->label('resourceType', RESOURCE_TYPE_TOPICS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'listTopics')
@@ -1998,6 +2030,11 @@ App::get('/v1/messaging/topics')
$cursor = reset($cursor);
if ($cursor) {
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
$topicId = $cursor->getValue();
$cursorDocument = Authorization::skip(fn () => $dbForProject->getDocument('topics', $topicId));
@@ -2018,6 +2055,7 @@ App::get('/v1/messaging/topics/:topicId/logs')
->desc('List topic logs')
->groups(['api', 'messaging'])
->label('scope', 'topics.read')
+ ->label('resourceType', RESOURCE_TYPE_TOPICS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'listTopicLogs')
@@ -2107,6 +2145,7 @@ App::get('/v1/messaging/topics/:topicId')
->desc('Get topic')
->groups(['api', 'messaging'])
->label('scope', 'topics.read')
+ ->label('resourceType', RESOURCE_TYPE_TOPICS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'getTopic')
@@ -2135,6 +2174,7 @@ App::patch('/v1/messaging/topics/:topicId')
->label('audits.resource', 'topic/{response.$id}')
->label('event', 'topics.[topicId].update')
->label('scope', 'topics.write')
+ ->label('resourceType', RESOURCE_TYPE_TOPICS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'updateTopic')
@@ -2179,6 +2219,7 @@ App::delete('/v1/messaging/topics/:topicId')
->label('audits.resource', 'topic/{request.$topicId}')
->label('event', 'topics.[topicId].delete')
->label('scope', 'topics.write')
+ ->label('resourceType', RESOURCE_TYPE_TOPICS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'deleteTopic')
@@ -2219,6 +2260,7 @@ App::post('/v1/messaging/topics/:topicId/subscribers')
->label('audits.resource', 'subscriber/{response.$id}')
->label('event', 'topics.[topicId].subscribers.[subscriberId].create')
->label('scope', 'subscribers.write')
+ ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
->label('sdk.auth', [APP_AUTH_TYPE_JWT, APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'createSubscriber')
@@ -2312,6 +2354,7 @@ App::get('/v1/messaging/topics/:topicId/subscribers')
->desc('List subscribers')
->groups(['api', 'messaging'])
->label('scope', 'subscribers.read')
+ ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'listSubscribers')
@@ -2352,6 +2395,11 @@ App::get('/v1/messaging/topics/:topicId/subscribers')
$cursor = reset($cursor);
if ($cursor) {
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
$subscriberId = $cursor->getValue();
$cursorDocument = Authorization::skip(fn () => $dbForProject->getDocument('subscribers', $subscriberId));
@@ -2386,6 +2434,7 @@ App::get('/v1/messaging/subscribers/:subscriberId/logs')
->desc('List subscriber logs')
->groups(['api', 'messaging'])
->label('scope', 'subscribers.read')
+ ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'listSubscriberLogs')
@@ -2475,6 +2524,7 @@ App::get('/v1/messaging/topics/:topicId/subscribers/:subscriberId')
->desc('Get subscriber')
->groups(['api', 'messaging'])
->label('scope', 'subscribers.read')
+ ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'getSubscriber')
@@ -2517,6 +2567,7 @@ App::delete('/v1/messaging/topics/:topicId/subscribers/:subscriberId')
->label('audits.resource', 'subscriber/{request.$subscriberId}')
->label('event', 'topics.[topicId].subscribers.[subscriberId].delete')
->label('scope', 'subscribers.write')
+ ->label('resourceType', RESOURCE_TYPE_SUBSCRIBERS)
->label('sdk.auth', [APP_AUTH_TYPE_JWT, APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'deleteSubscriber')
@@ -2576,6 +2627,7 @@ App::post('/v1/messaging/messages/email')
->label('audits.resource', 'message/{response.$id}')
->label('event', 'messages.[messageId].create')
->label('scope', 'messages.write')
+ ->label('resourceType', RESOURCE_TYPE_MESSAGES)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'createEmail')
@@ -2728,6 +2780,7 @@ App::post('/v1/messaging/messages/sms')
->label('audits.resource', 'message/{response.$id}')
->label('event', 'messages.[messageId].create')
->label('scope', 'messages.write')
+ ->label('resourceType', RESOURCE_TYPE_MESSAGES)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'createSms')
@@ -2844,6 +2897,7 @@ App::post('/v1/messaging/messages/push')
->label('audits.resource', 'message/{response.$id}')
->label('event', 'messages.[messageId].create')
->label('scope', 'messages.write')
+ ->label('resourceType', RESOURCE_TYPE_MESSAGES)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'createPush')
@@ -3017,6 +3071,7 @@ App::get('/v1/messaging/messages')
->desc('List messages')
->groups(['api', 'messaging'])
->label('scope', 'messages.read')
+ ->label('resourceType', RESOURCE_TYPE_MESSAGES)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'listMessages')
@@ -3048,6 +3103,11 @@ App::get('/v1/messaging/messages')
$cursor = reset($cursor);
if ($cursor) {
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
$messageId = $cursor->getValue();
$cursorDocument = Authorization::skip(fn () => $dbForProject->getDocument('messages', $messageId));
@@ -3068,6 +3128,7 @@ App::get('/v1/messaging/messages/:messageId/logs')
->desc('List message logs')
->groups(['api', 'messaging'])
->label('scope', 'messages.read')
+ ->label('resourceType', RESOURCE_TYPE_MESSAGES)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'listMessageLogs')
@@ -3157,6 +3218,7 @@ App::get('/v1/messaging/messages/:messageId/targets')
->desc('List message targets')
->groups(['api', 'messaging'])
->label('scope', 'messages.read')
+ ->label('resourceType', RESOURCE_TYPE_MESSAGES)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'listTargets')
@@ -3202,6 +3264,11 @@ App::get('/v1/messaging/messages/:messageId/targets')
$cursor = reset($cursor);
if ($cursor) {
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
$targetId = $cursor->getValue();
$cursorDocument = $dbForProject->getDocument('targets', $targetId);
@@ -3222,6 +3289,7 @@ App::get('/v1/messaging/messages/:messageId')
->desc('Get message')
->groups(['api', 'messaging'])
->label('scope', 'messages.read')
+ ->label('resourceType', RESOURCE_TYPE_MESSAGES)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'getMessage')
@@ -3249,6 +3317,7 @@ App::patch('/v1/messaging/messages/email/:messageId')
->label('audits.resource', 'message/{response.$id}')
->label('event', 'messages.[messageId].update')
->label('scope', 'messages.write')
+ ->label('resourceType', RESOURCE_TYPE_MESSAGES)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'updateEmail')
@@ -3449,6 +3518,7 @@ App::patch('/v1/messaging/messages/sms/:messageId')
->label('audits.resource', 'message/{response.$id}')
->label('event', 'messages.[messageId].update')
->label('scope', 'messages.write')
+ ->label('resourceType', RESOURCE_TYPE_MESSAGES)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'updateSms')
@@ -3604,6 +3674,7 @@ App::patch('/v1/messaging/messages/push/:messageId')
->label('audits.resource', 'message/{response.$id}')
->label('event', 'messages.[messageId].update')
->label('scope', 'messages.write')
+ ->label('resourceType', RESOURCE_TYPE_MESSAGES)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'updatePush')
@@ -3842,6 +3913,7 @@ App::delete('/v1/messaging/messages/:messageId')
->label('audits.resource', 'message/{request.messageId}')
->label('event', 'messages.[messageId].delete')
->label('scope', 'messages.write')
+ ->label('resourceType', RESOURCE_TYPE_MESSAGES)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'messaging')
->label('sdk.method', 'delete')
diff --git a/app/controllers/api/migrations.php b/app/controllers/api/migrations.php
index 374a5575a7..bebb6ebaea 100644
--- a/app/controllers/api/migrations.php
+++ b/app/controllers/api/migrations.php
@@ -16,6 +16,7 @@ use Utopia\Database\Document;
use Utopia\Database\Exception\Query as QueryException;
use Utopia\Database\Helpers\ID;
use Utopia\Database\Query;
+use Utopia\Database\Validator\Query\Cursor;
use Utopia\Database\Validator\UID;
use Utopia\Migration\Sources\Appwrite;
use Utopia\Migration\Sources\Firebase;
@@ -60,6 +61,7 @@ App::post('/v1/migrations/appwrite')
'status' => 'pending',
'stage' => 'init',
'source' => Appwrite::getName(),
+ 'destination' => Appwrite::getName(),
'credentials' => [
'endpoint' => $endpoint,
'projectId' => $projectId,
@@ -119,7 +121,7 @@ App::post('/v1/migrations/firebase/oauth')
Query::equal('provider', ['firebase']),
Query::equal('userInternalId', [$user->getInternalId()]),
]);
- if ($identity === false || $identity->isEmpty()) {
+ if ($identity->isEmpty()) {
throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
}
@@ -164,6 +166,7 @@ App::post('/v1/migrations/firebase/oauth')
'status' => 'pending',
'stage' => 'init',
'source' => Firebase::getName(),
+ 'destination' => Appwrite::getName(),
'credentials' => [
'serviceAccount' => json_encode($serviceAccount),
],
@@ -224,6 +227,7 @@ App::post('/v1/migrations/firebase')
'status' => 'pending',
'stage' => 'init',
'source' => Firebase::getName(),
+ 'destination' => Appwrite::getName(),
'credentials' => [
'serviceAccount' => $serviceAccount,
],
@@ -279,6 +283,7 @@ App::post('/v1/migrations/supabase')
'status' => 'pending',
'stage' => 'init',
'source' => Supabase::getName(),
+ 'destination' => Appwrite::getName(),
'credentials' => [
'endpoint' => $endpoint,
'apiKey' => $apiKey,
@@ -340,6 +345,7 @@ App::post('/v1/migrations/nhost')
'status' => 'pending',
'stage' => 'init',
'source' => NHost::getName(),
+ 'destination' => Appwrite::getName(),
'credentials' => [
'subdomain' => $subdomain,
'region' => $region,
@@ -404,6 +410,12 @@ App::get('/v1/migrations')
$cursor = reset($cursor);
if ($cursor) {
/** @var Query $cursor */
+
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
$migrationId = $cursor->getValue();
$cursorDocument = $dbForProject->getDocument('migrations', $migrationId);
@@ -564,7 +576,7 @@ App::get('/v1/migrations/firebase/report/oauth')
Query::equal('userInternalId', [$user->getInternalId()]),
]);
- if ($identity === false || $identity->isEmpty()) {
+ if ($identity->isEmpty()) {
throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
}
@@ -739,13 +751,13 @@ App::get('/v1/migrations/firebase/redirect')
Query::equal('providerEmail', [$email]),
]);
- if ($identity !== false && !$identity->isEmpty()) {
+ if (!$identity->isEmpty()) {
if ($identity->getAttribute('userInternalId', '') !== $user->getInternalId()) {
throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
}
}
- if ($identity !== false && !$identity->isEmpty()) {
+ if (!$identity->isEmpty()) {
$identity = $identity
->setAttribute('providerAccessToken', $accessToken)
->setAttribute('providerRefreshToken', $refreshToken)
@@ -808,7 +820,7 @@ App::get('/v1/migrations/firebase/projects')
Query::equal('userInternalId', [$user->getInternalId()]),
]);
- if ($identity === false || $identity->isEmpty()) {
+ if ($identity->isEmpty()) {
throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
}
@@ -888,7 +900,7 @@ App::get('/v1/migrations/firebase/deauthorize')
Query::equal('userInternalId', [$user->getInternalId()]),
]);
- if ($identity === false || $identity->isEmpty()) {
+ if ($identity->isEmpty()) {
throw new Exception(Exception::GENERAL_ACCESS_FORBIDDEN, 'Not authenticated with Firebase'); //TODO: Replace with USER_IDENTITY_NOT_FOUND
}
diff --git a/app/controllers/api/project.php b/app/controllers/api/project.php
index 62a34bb5ce..6053326308 100644
--- a/app/controllers/api/project.php
+++ b/app/controllers/api/project.php
@@ -47,6 +47,7 @@ App::get('/v1/project/usage')
METRIC_USERS,
METRIC_BUCKETS,
METRIC_FILES_STORAGE,
+ METRIC_DATABASES_STORAGE,
METRIC_DEPLOYMENTS_STORAGE,
METRIC_BUILDS_STORAGE
],
@@ -56,6 +57,7 @@ App::get('/v1/project/usage')
METRIC_NETWORK_OUTBOUND,
METRIC_USERS,
METRIC_EXECUTIONS,
+ METRIC_DATABASES_STORAGE,
METRIC_EXECUTIONS_MB_SECONDS,
METRIC_BUILDS_MB_SECONDS
]
@@ -182,6 +184,23 @@ App::get('/v1/project/usage')
];
}, $dbForProject->find('buckets'));
+ $databasesStorageBreakdown = array_map(function ($database) use ($dbForProject) {
+ $id = $database->getId();
+ $name = $database->getAttribute('name');
+ $metric = str_replace('{databaseInternalId}', $database->getInternalId(), METRIC_DATABASE_ID_STORAGE);
+
+ $value = $dbForProject->findOne('stats', [
+ Query::equal('metric', [$metric]),
+ Query::equal('period', ['inf'])
+ ]);
+
+ return [
+ 'resourceId' => $id,
+ 'name' => $name,
+ 'value' => $value['value'] ?? 0,
+ ];
+ }, $dbForProject->find('databases'));
+
$functionsStorageBreakdown = array_map(function ($function) use ($dbForProject) {
$id = $function->getId();
$name = $function->getAttribute('name');
@@ -269,6 +288,7 @@ App::get('/v1/project/usage')
'buildsMbSecondsTotal' => $total[METRIC_BUILDS_MB_SECONDS],
'documentsTotal' => $total[METRIC_DOCUMENTS],
'databasesTotal' => $total[METRIC_DATABASES],
+ 'databasesStorageTotal' => $total[METRIC_DATABASES_STORAGE],
'usersTotal' => $total[METRIC_USERS],
'bucketsTotal' => $total[METRIC_BUCKETS],
'filesStorageTotal' => $total[METRIC_FILES_STORAGE],
@@ -279,6 +299,7 @@ App::get('/v1/project/usage')
'executionsMbSecondsBreakdown' => $executionsMbSecondsBreakdown,
'buildsMbSecondsBreakdown' => $buildsMbSecondsBreakdown,
'bucketsBreakdown' => $bucketsBreakdown,
+ 'databasesStorageBreakdown' => $databasesStorageBreakdown,
'executionsMbSecondsBreakdown' => $executionsMbSecondsBreakdown,
'buildsMbSecondsBreakdown' => $buildsMbSecondsBreakdown,
'functionsStorageBreakdown' => $functionsStorageBreakdown,
diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php
index 3a8c232195..92d3103293 100644
--- a/app/controllers/api/projects.php
+++ b/app/controllers/api/projects.php
@@ -31,6 +31,7 @@ use Utopia\Database\Helpers\Permission;
use Utopia\Database\Helpers\Role;
use Utopia\Database\Query;
use Utopia\Database\Validator\Datetime as DatetimeValidator;
+use Utopia\Database\Validator\Query\Cursor;
use Utopia\Database\Validator\UID;
use Utopia\Domains\Validator\PublicDomain;
use Utopia\DSN\DSN;
@@ -110,6 +111,9 @@ App::post('/v1/projects')
'personalDataCheck' => false,
'mockNumbers' => [],
'sessionAlerts' => false,
+ 'membershipsUserName' => false,
+ 'membershipsUserEmail' => false,
+ 'membershipsMfa' => false,
];
foreach ($auth as $method) {
@@ -118,6 +122,10 @@ App::post('/v1/projects')
$projectId = ($projectId == 'unique()') ? ID::unique() : $projectId;
+ if ($projectId === 'console') {
+ throw new Exception(Exception::PROJECT_RESERVED_PROJECT, "'console' is a reserved project.");
+ }
+
$databases = Config::getParam('pools-database', []);
$databaseOverride = System::getEnv('_APP_DATABASE_OVERRIDE');
@@ -128,16 +136,14 @@ App::post('/v1/projects')
$dsn = $databases[array_rand($databases)];
}
- if ($projectId === 'console') {
- throw new Exception(Exception::PROJECT_RESERVED_PROJECT, "'console' is a reserved project.");
- }
-
// TODO: Temporary until all projects are using shared tables.
- if ($dsn === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
+ $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+
+ if (\in_array($dsn, $sharedTables)) {
$schema = 'appwrite';
$database = 'appwrite';
$namespace = System::getEnv('_APP_DATABASE_SHARED_NAMESPACE', '');
- $dsn = $schema . '://' . System::getEnv('_APP_DATABASE_SHARED_TABLES', '') . '?database=' . $database;
+ $dsn = $schema . '://' . $dsn . '?database=' . $database;
if (!empty($namespace)) {
$dsn .= '&namespace=' . $namespace;
@@ -191,47 +197,92 @@ App::post('/v1/projects')
$adapter = $pools->get($dsn->getHost())->pop()->getResource();
$dbForProject = new Database($adapter, $cache);
+ $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+ $sharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES_V1', ''));
- if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
- $dbForProject
- ->setSharedTables(true)
- ->setTenant($project->getInternalId())
- ->setNamespace($dsn->getParam('namespace'));
- } else {
- $dbForProject
- ->setSharedTables(false)
- ->setTenant(null)
- ->setNamespace('_' . $project->getInternalId());
- }
+ $projectTables = !\in_array($dsn->getHost(), $sharedTables);
+ $sharedTablesV1 = \in_array($dsn->getHost(), $sharedTablesV1);
+ $sharedTablesV2 = !$projectTables && !$sharedTablesV1;
+ $sharedTables = $sharedTablesV1 || $sharedTablesV2;
- $dbForProject->create();
-
- $audit = new Audit($dbForProject);
- $audit->setup();
-
- $abuse = new TimeLimit('', 0, 1, $dbForProject);
- $abuse->setup();
-
- /** @var array $collections */
- $collections = Config::getParam('collections', [])['projects'] ?? [];
-
- foreach ($collections as $key => $collection) {
- if (($collection['$collection'] ?? '') !== Database::METADATA) {
- continue;
+ if (!$sharedTablesV2) {
+ if ($sharedTables) {
+ $dbForProject
+ ->setSharedTables(true)
+ ->setTenant($sharedTablesV1 ? $project->getInternalId() : null)
+ ->setNamespace($dsn->getParam('namespace'));
+ } else {
+ $dbForProject
+ ->setSharedTables(false)
+ ->setTenant(null)
+ ->setNamespace('_' . $project->getInternalId());
}
- $attributes = \array_map(function (array $attribute) {
- return new Document($attribute);
- }, $collection['attributes']);
-
- $indexes = \array_map(function (array $index) {
- return new Document($index);
- }, $collection['indexes']);
+ $create = true;
try {
- $dbForProject->createCollection($key, $attributes, $indexes);
+ $dbForProject->create();
} catch (Duplicate) {
- // Collection already exists
+ $create = false;
+ }
+
+ if ($create || $projectTables) {
+ $audit = new Audit($dbForProject);
+ $audit->setup();
+
+ $abuse = new TimeLimit('', 0, 1, $dbForProject);
+ $abuse->setup();
+ }
+
+ if (!$create && $sharedTablesV1) {
+ $attributes = \array_map(fn ($attribute) => new Document($attribute), Audit::ATTRIBUTES);
+ $indexes = \array_map(fn (array $index) => new Document($index), Audit::INDEXES);
+ $dbForProject->createDocument(Database::METADATA, new Document([
+ '$id' => ID::custom('audit'),
+ '$permissions' => [Permission::create(Role::any())],
+ 'name' => 'audit',
+ 'attributes' => $attributes,
+ 'indexes' => $indexes,
+ 'documentSecurity' => true
+ ]));
+
+ $attributes = \array_map(fn ($attribute) => new Document($attribute), TimeLimit::ATTRIBUTES);
+ $indexes = \array_map(fn (array $index) => new Document($index), TimeLimit::INDEXES);
+ $dbForProject->createDocument(Database::METADATA, new Document([
+ '$id' => ID::custom('abuse'),
+ '$permissions' => [Permission::create(Role::any())],
+ 'name' => 'abuse',
+ 'attributes' => $attributes,
+ 'indexes' => $indexes,
+ 'documentSecurity' => true
+ ]));
+ }
+
+ if ($create || $sharedTablesV1) {
+ /** @var array $collections */
+ $collections = Config::getParam('collections', [])['projects'] ?? [];
+
+ foreach ($collections as $key => $collection) {
+ if (($collection['$collection'] ?? '') !== Database::METADATA) {
+ continue;
+ }
+
+ $attributes = \array_map(fn ($attribute) => new Document($attribute), $collection['attributes']);
+ $indexes = \array_map(fn (array $index) => new Document($index), $collection['indexes']);
+
+ try {
+ $dbForProject->createCollection($key, $attributes, $indexes);
+ } catch (Duplicate) {
+ $dbForProject->createDocument(Database::METADATA, new Document([
+ '$id' => ID::custom($key),
+ '$permissions' => [Permission::create(Role::any())],
+ 'name' => $key,
+ 'attributes' => $attributes,
+ 'indexes' => $indexes,
+ 'documentSecurity' => true
+ ]));
+ }
+ }
}
}
@@ -279,6 +330,12 @@ App::get('/v1/projects')
$cursor = reset($cursor);
if ($cursor) {
/** @var Query $cursor */
+
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
$projectId = $cursor->getValue();
$cursorDocument = $dbForConsole->getDocument('projects', $projectId);
@@ -641,6 +698,41 @@ App::patch('/v1/projects/:projectId/auth/session-alerts')
$response->dynamic($project, Response::MODEL_PROJECT);
});
+App::patch('/v1/projects/:projectId/auth/memberships-privacy')
+ ->desc('Update project memberships privacy attributes')
+ ->groups(['api', 'projects'])
+ ->label('scope', 'projects.write')
+ ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
+ ->label('sdk.namespace', 'projects')
+ ->label('sdk.method', 'updateMembershipsPrivacy')
+ ->label('sdk.response.code', Response::STATUS_CODE_OK)
+ ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+ ->label('sdk.response.model', Response::MODEL_PROJECT)
+ ->param('projectId', '', new UID(), 'Project unique ID.')
+ ->param('userName', true, new Boolean(true), 'Set to true to show userName to members of a team.')
+ ->param('userEmail', true, new Boolean(true), 'Set to true to show email to members of a team.')
+ ->param('mfa', true, new Boolean(true), 'Set to true to show mfa to members of a team.')
+ ->inject('response')
+ ->inject('dbForConsole')
+ ->action(function (string $projectId, bool $userName, bool $userEmail, bool $mfa, Response $response, Database $dbForConsole) {
+ $project = $dbForConsole->getDocument('projects', $projectId);
+
+ if ($project->isEmpty()) {
+ throw new Exception(Exception::PROJECT_NOT_FOUND);
+ }
+
+ $auths = $project->getAttribute('auths', []);
+
+ $auths['membershipsUserName'] = $userName;
+ $auths['membershipsUserEmail'] = $userEmail;
+ $auths['membershipsMfa'] = $mfa;
+
+ $dbForConsole->updateDocument('projects', $project->getId(), $project
+ ->setAttribute('auths', $auths));
+
+ $response->dynamic($project, Response::MODEL_PROJECT);
+ });
+
App::patch('/v1/projects/:projectId/auth/limit')
->desc('Update project users limit')
->groups(['api', 'projects'])
@@ -923,6 +1015,7 @@ App::delete('/v1/projects/:projectId')
}
$queueForDeletes
+ ->setProject($project)
->setType(DELETE_TYPE_DOCUMENT)
->setDocument($project);
@@ -1052,7 +1145,7 @@ App::get('/v1/projects/:projectId/webhooks/:webhookId')
Query::equal('projectInternalId', [$project->getInternalId()]),
]);
- if ($webhook === false || $webhook->isEmpty()) {
+ if ($webhook->isEmpty()) {
throw new Exception(Exception::WEBHOOK_NOT_FOUND);
}
@@ -1095,7 +1188,7 @@ App::put('/v1/projects/:projectId/webhooks/:webhookId')
Query::equal('projectInternalId', [$project->getInternalId()]),
]);
- if ($webhook === false || $webhook->isEmpty()) {
+ if ($webhook->isEmpty()) {
throw new Exception(Exception::WEBHOOK_NOT_FOUND);
}
@@ -1145,7 +1238,7 @@ App::patch('/v1/projects/:projectId/webhooks/:webhookId/signature')
Query::equal('projectInternalId', [$project->getInternalId()]),
]);
- if ($webhook === false || $webhook->isEmpty()) {
+ if ($webhook->isEmpty()) {
throw new Exception(Exception::WEBHOOK_NOT_FOUND);
}
@@ -1183,7 +1276,7 @@ App::delete('/v1/projects/:projectId/webhooks/:webhookId')
Query::equal('projectInternalId', [$project->getInternalId()]),
]);
- if ($webhook === false || $webhook->isEmpty()) {
+ if ($webhook->isEmpty()) {
throw new Exception(Exception::WEBHOOK_NOT_FOUND);
}
@@ -1199,7 +1292,7 @@ App::delete('/v1/projects/:projectId/webhooks/:webhookId')
App::post('/v1/projects/:projectId/keys')
->desc('Create key')
->groups(['api', 'projects'])
- ->label('scope', 'projects.write')
+ ->label('scope', 'keys.write')
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
->label('sdk.namespace', 'projects')
->label('sdk.method', 'createKey')
@@ -1249,7 +1342,7 @@ App::post('/v1/projects/:projectId/keys')
App::get('/v1/projects/:projectId/keys')
->desc('List keys')
->groups(['api', 'projects'])
- ->label('scope', 'projects.read')
+ ->label('scope', 'keys.read')
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
->label('sdk.namespace', 'projects')
->label('sdk.method', 'listKeys')
@@ -1281,7 +1374,7 @@ App::get('/v1/projects/:projectId/keys')
App::get('/v1/projects/:projectId/keys/:keyId')
->desc('Get key')
->groups(['api', 'projects'])
- ->label('scope', 'projects.read')
+ ->label('scope', 'keys.read')
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
->label('sdk.namespace', 'projects')
->label('sdk.method', 'getKey')
@@ -1305,7 +1398,7 @@ App::get('/v1/projects/:projectId/keys/:keyId')
Query::equal('projectInternalId', [$project->getInternalId()]),
]);
- if ($key === false || $key->isEmpty()) {
+ if ($key->isEmpty()) {
throw new Exception(Exception::KEY_NOT_FOUND);
}
@@ -1315,7 +1408,7 @@ App::get('/v1/projects/:projectId/keys/:keyId')
App::put('/v1/projects/:projectId/keys/:keyId')
->desc('Update key')
->groups(['api', 'projects'])
- ->label('scope', 'projects.write')
+ ->label('scope', 'keys.write')
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
->label('sdk.namespace', 'projects')
->label('sdk.method', 'updateKey')
@@ -1342,7 +1435,7 @@ App::put('/v1/projects/:projectId/keys/:keyId')
Query::equal('projectInternalId', [$project->getInternalId()]),
]);
- if ($key === false || $key->isEmpty()) {
+ if ($key->isEmpty()) {
throw new Exception(Exception::KEY_NOT_FOUND);
}
@@ -1361,7 +1454,7 @@ App::put('/v1/projects/:projectId/keys/:keyId')
App::delete('/v1/projects/:projectId/keys/:keyId')
->desc('Delete key')
->groups(['api', 'projects'])
- ->label('scope', 'projects.write')
+ ->label('scope', 'keys.write')
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
->label('sdk.namespace', 'projects')
->label('sdk.method', 'deleteKey')
@@ -1384,7 +1477,7 @@ App::delete('/v1/projects/:projectId/keys/:keyId')
Query::equal('projectInternalId', [$project->getInternalId()]),
]);
- if ($key === false || $key->isEmpty()) {
+ if ($key->isEmpty()) {
throw new Exception(Exception::KEY_NOT_FOUND);
}
@@ -1436,7 +1529,7 @@ App::post('/v1/projects/:projectId/platforms')
->desc('Create platform')
->groups(['api', 'projects'])
->label('audits.event', 'platforms.create')
- ->label('scope', 'projects.write')
+ ->label('scope', 'platforms.write')
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
->label('sdk.namespace', 'projects')
->label('sdk.method', 'createPlatform')
@@ -1486,7 +1579,7 @@ App::post('/v1/projects/:projectId/platforms')
App::get('/v1/projects/:projectId/platforms')
->desc('List platforms')
->groups(['api', 'projects'])
- ->label('scope', 'projects.read')
+ ->label('scope', 'platforms.read')
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
->label('sdk.namespace', 'projects')
->label('sdk.method', 'listPlatforms')
@@ -1518,7 +1611,7 @@ App::get('/v1/projects/:projectId/platforms')
App::get('/v1/projects/:projectId/platforms/:platformId')
->desc('Get platform')
->groups(['api', 'projects'])
- ->label('scope', 'projects.read')
+ ->label('scope', 'platforms.read')
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
->label('sdk.namespace', 'projects')
->label('sdk.method', 'getPlatform')
@@ -1542,7 +1635,7 @@ App::get('/v1/projects/:projectId/platforms/:platformId')
Query::equal('projectInternalId', [$project->getInternalId()]),
]);
- if ($platform === false || $platform->isEmpty()) {
+ if ($platform->isEmpty()) {
throw new Exception(Exception::PLATFORM_NOT_FOUND);
}
@@ -1552,7 +1645,7 @@ App::get('/v1/projects/:projectId/platforms/:platformId')
App::put('/v1/projects/:projectId/platforms/:platformId')
->desc('Update platform')
->groups(['api', 'projects'])
- ->label('scope', 'projects.write')
+ ->label('scope', 'platforms.write')
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
->label('sdk.namespace', 'projects')
->label('sdk.method', 'updatePlatform')
@@ -1579,7 +1672,7 @@ App::put('/v1/projects/:projectId/platforms/:platformId')
Query::equal('projectInternalId', [$project->getInternalId()]),
]);
- if ($platform === false || $platform->isEmpty()) {
+ if ($platform->isEmpty()) {
throw new Exception(Exception::PLATFORM_NOT_FOUND);
}
@@ -1600,7 +1693,7 @@ App::delete('/v1/projects/:projectId/platforms/:platformId')
->desc('Delete platform')
->groups(['api', 'projects'])
->label('audits.event', 'platforms.delete')
- ->label('scope', 'projects.write')
+ ->label('scope', 'platforms.write')
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
->label('sdk.namespace', 'projects')
->label('sdk.method', 'deletePlatform')
@@ -1623,7 +1716,7 @@ App::delete('/v1/projects/:projectId/platforms/:platformId')
Query::equal('projectInternalId', [$project->getInternalId()]),
]);
- if ($platform === false || $platform->isEmpty()) {
+ if ($platform->isEmpty()) {
throw new Exception(Exception::PLATFORM_NOT_FOUND);
}
@@ -1744,7 +1837,7 @@ App::post('/v1/projects/:projectId/smtp/tests')
->param('port', 587, new Integer(), 'SMTP server port', true)
->param('username', '', new Text(0, 0), 'SMTP server username', true)
->param('password', '', new Text(0, 0), 'SMTP server password', true)
- ->param('secure', '', new WhiteList(['tls'], true), 'Does SMTP server use secure connection', true)
+ ->param('secure', '', new WhiteList(['tls', 'ssl'], true), 'Does SMTP server use secure connection', true)
->inject('response')
->inject('dbForConsole')
->inject('queueForMails')
diff --git a/app/controllers/api/proxy.php b/app/controllers/api/proxy.php
index 84484a7209..8ff921ffeb 100644
--- a/app/controllers/api/proxy.php
+++ b/app/controllers/api/proxy.php
@@ -13,6 +13,7 @@ use Utopia\Database\Document;
use Utopia\Database\Exception\Query as QueryException;
use Utopia\Database\Helpers\ID;
use Utopia\Database\Query;
+use Utopia\Database\Validator\Query\Cursor;
use Utopia\Database\Validator\UID;
use Utopia\Domains\Domain;
use Utopia\Logger\Log;
@@ -59,11 +60,17 @@ App::post('/v1/proxy/rules')
throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'This domain name is not allowed. Please pick another one.');
}
- $document = $dbForConsole->findOne('rules', [
- Query::equal('domain', [$domain]),
- ]);
+ // TODO: @christyjacob remove once we migrate the rules in 1.7.x
+ if (System::getEnv('_APP_RULES_FORMAT') === 'md5') {
+ $document = $dbForConsole->getDocument('rules', md5($domain));
+ } else {
+ $document = $dbForConsole->findOne('rules', [
+ Query::equal('domain', [$domain]),
+ ]);
+ }
- if ($document && !$document->isEmpty()) {
+
+ if (!$document->isEmpty()) {
if ($document->getAttribute('projectId') === $project->getId()) {
$resourceType = $document->getAttribute('resourceType');
$resourceId = $document->getAttribute('resourceId');
@@ -102,7 +109,9 @@ App::post('/v1/proxy/rules')
throw new Exception(Exception::GENERAL_ARGUMENT_INVALID, 'Domain may not start with http:// or https://.');
}
- $ruleId = ID::unique();
+ // TODO: @christyjacob remove once we migrate the rules in 1.7.x
+ $ruleId = System::getEnv('_APP_RULES_FORMAT') === 'md5' ? md5($domain->get()) : ID::unique();
+
$rule = new Document([
'$id' => $ruleId,
'projectId' => $project->getId(),
@@ -185,6 +194,12 @@ App::get('/v1/proxy/rules')
$cursor = reset($cursor);
if ($cursor) {
/** @var Query $cursor */
+
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
$ruleId = $cursor->getValue();
$cursorDocument = $dbForConsole->getDocument('rules', $ruleId);
diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
index ca248c2628..7d4361a192 100644
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@@ -16,7 +16,8 @@ use Utopia\App;
use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\Document;
-use Utopia\Database\Exception\Duplicate;
+use Utopia\Database\Exception\Duplicate as DuplicateException;
+use Utopia\Database\Exception\NotFound as NotFoundException;
use Utopia\Database\Exception\Query as QueryException;
use Utopia\Database\Helpers\ID;
use Utopia\Database\Helpers\Permission;
@@ -24,6 +25,7 @@ use Utopia\Database\Helpers\Role;
use Utopia\Database\Query;
use Utopia\Database\Validator\Authorization;
use Utopia\Database\Validator\Permissions;
+use Utopia\Database\Validator\Query\Cursor;
use Utopia\Database\Validator\UID;
use Utopia\Image\Image;
use Utopia\Storage\Compression\Algorithms\GZIP;
@@ -48,6 +50,7 @@ App::post('/v1/storage/buckets')
->desc('Create bucket')
->groups(['api', 'storage'])
->label('scope', 'buckets.write')
+ ->label('resourceType', RESOURCE_TYPE_BUCKETS)
->label('event', 'buckets.[bucketId].create')
->label('audits.event', 'bucket.create')
->label('audits.resource', 'bucket/{response.$id}')
@@ -65,19 +68,20 @@ App::post('/v1/storage/buckets')
->param('enabled', true, new Boolean(true), 'Is bucket enabled? When set to \'disabled\', users cannot access the files in this bucket but Server SDKs with and API key can still access the bucket. No files are lost when this is toggled.', true)
->param('maximumFileSize', fn (array $plan) => empty($plan['fileSize']) ? (int) System::getEnv('_APP_STORAGE_LIMIT', 0) : $plan['fileSize'] * 1000 * 1000, fn (array $plan) => new Range(1, empty($plan['fileSize']) ? (int) System::getEnv('_APP_STORAGE_LIMIT', 0) : $plan['fileSize'] * 1000 * 1000), 'Maximum file size allowed in bytes. Maximum allowed value is ' . Storage::human(System::getEnv('_APP_STORAGE_LIMIT', 0), 0) . '.', true, ['plan'])
->param('allowedFileExtensions', [], new ArrayList(new Text(64), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Allowed file extensions. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' extensions are allowed, each 64 characters long.', true)
- ->param('compression', Compression::NONE, new WhiteList([Compression::NONE, Compression::GZIP, Compression::ZSTD]), 'Compression algorithm choosen for compression. Can be one of ' . Compression::NONE . ', [' . Compression::GZIP . '](https://en.wikipedia.org/wiki/Gzip), or [' . Compression::ZSTD . '](https://en.wikipedia.org/wiki/Zstd), For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' compression is skipped even if it\'s enabled', true)
+ ->param('compression', Compression::NONE, new WhiteList([Compression::NONE, Compression::GZIP, Compression::ZSTD], true), 'Compression algorithm choosen for compression. Can be one of ' . Compression::NONE . ', [' . Compression::GZIP . '](https://en.wikipedia.org/wiki/Gzip), or [' . Compression::ZSTD . '](https://en.wikipedia.org/wiki/Zstd), For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' compression is skipped even if it\'s enabled', true)
->param('encryption', true, new Boolean(true), 'Is encryption enabled? For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' encryption is skipped even if it\'s enabled', true)
->param('antivirus', true, new Boolean(true), 'Is virus scanning enabled? For file size above ' . Storage::human(APP_LIMIT_ANTIVIRUS, 0) . ' AntiVirus scanning is skipped even if it\'s enabled', true)
->inject('response')
->inject('dbForProject')
->inject('queueForEvents')
- ->action(function (string $bucketId, string $name, ?array $permissions, bool $fileSecurity, bool $enabled, int $maximumFileSize, array $allowedFileExtensions, string $compression, bool $encryption, bool $antivirus, Response $response, Database $dbForProject, Event $queueForEvents) {
+ ->action(function (string $bucketId, string $name, ?array $permissions, bool $fileSecurity, bool $enabled, int $maximumFileSize, array $allowedFileExtensions, ?string $compression, ?bool $encryption, bool $antivirus, Response $response, Database $dbForProject, Event $queueForEvents) {
$bucketId = $bucketId === 'unique()' ? ID::unique() : $bucketId;
// Map aggregate permissions into the multiple permissions they represent.
$permissions = Permission::aggregate($permissions);
-
+ $compression ??= Compression::NONE;
+ $encryption ??= true;
try {
$files = (Config::getParam('collections', [])['buckets'] ?? [])['files'] ?? [];
if (empty($files)) {
@@ -129,7 +133,7 @@ App::post('/v1/storage/buckets')
$bucket = $dbForProject->getDocument('buckets', $bucketId);
$dbForProject->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes, permissions: $permissions ?? [], documentSecurity: $fileSecurity);
- } catch (Duplicate) {
+ } catch (DuplicateException) {
throw new Exception(Exception::STORAGE_BUCKET_ALREADY_EXISTS);
}
@@ -146,6 +150,7 @@ App::get('/v1/storage/buckets')
->desc('List buckets')
->groups(['api', 'storage'])
->label('scope', 'buckets.read')
+ ->label('resourceType', RESOURCE_TYPE_BUCKETS)
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'storage')
->label('sdk.method', 'listBuckets')
@@ -178,6 +183,12 @@ App::get('/v1/storage/buckets')
$cursor = reset($cursor);
if ($cursor) {
/** @var Query $cursor */
+
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
$bucketId = $cursor->getValue();
$cursorDocument = $dbForProject->getDocument('buckets', $bucketId);
@@ -200,6 +211,7 @@ App::get('/v1/storage/buckets/:bucketId')
->desc('Get bucket')
->groups(['api', 'storage'])
->label('scope', 'buckets.read')
+ ->label('resourceType', RESOURCE_TYPE_BUCKETS)
->label('sdk.auth', [APP_AUTH_TYPE_KEY])
->label('sdk.namespace', 'storage')
->label('sdk.method', 'getBucket')
@@ -225,6 +237,7 @@ App::put('/v1/storage/buckets/:bucketId')
->desc('Update bucket')
->groups(['api', 'storage'])
->label('scope', 'buckets.write')
+ ->label('resourceType', RESOURCE_TYPE_BUCKETS)
->label('event', 'buckets.[bucketId].update')
->label('audits.event', 'bucket.update')
->label('audits.resource', 'bucket/{response.$id}')
@@ -242,13 +255,13 @@ App::put('/v1/storage/buckets/:bucketId')
->param('enabled', true, new Boolean(true), 'Is bucket enabled? When set to \'disabled\', users cannot access the files in this bucket but Server SDKs with and API key can still access the bucket. No files are lost when this is toggled.', true)
->param('maximumFileSize', fn (array $plan) => empty($plan['fileSize']) ? (int) System::getEnv('_APP_STORAGE_LIMIT', 0) : $plan['fileSize'] * 1000 * 1000, fn (array $plan) => new Range(1, empty($plan['fileSize']) ? (int) System::getEnv('_APP_STORAGE_LIMIT', 0) : $plan['fileSize'] * 1000 * 1000), 'Maximum file size allowed in bytes. Maximum allowed value is ' . Storage::human(System::getEnv('_APP_STORAGE_LIMIT', 0), 0) . '.', true, ['plan'])
->param('allowedFileExtensions', [], new ArrayList(new Text(64), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Allowed file extensions. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' extensions are allowed, each 64 characters long.', true)
- ->param('compression', Compression::NONE, new WhiteList([Compression::NONE, Compression::GZIP, Compression::ZSTD]), 'Compression algorithm choosen for compression. Can be one of ' . Compression::NONE . ', [' . Compression::GZIP . '](https://en.wikipedia.org/wiki/Gzip), or [' . Compression::ZSTD . '](https://en.wikipedia.org/wiki/Zstd), For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' compression is skipped even if it\'s enabled', true)
+ ->param('compression', Compression::NONE, new WhiteList([Compression::NONE, Compression::GZIP, Compression::ZSTD], true), 'Compression algorithm choosen for compression. Can be one of ' . Compression::NONE . ', [' . Compression::GZIP . '](https://en.wikipedia.org/wiki/Gzip), or [' . Compression::ZSTD . '](https://en.wikipedia.org/wiki/Zstd), For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' compression is skipped even if it\'s enabled', true)
->param('encryption', true, new Boolean(true), 'Is encryption enabled? For file size above ' . Storage::human(APP_STORAGE_READ_BUFFER, 0) . ' encryption is skipped even if it\'s enabled', true)
->param('antivirus', true, new Boolean(true), 'Is virus scanning enabled? For file size above ' . Storage::human(APP_LIMIT_ANTIVIRUS, 0) . ' AntiVirus scanning is skipped even if it\'s enabled', true)
->inject('response')
->inject('dbForProject')
->inject('queueForEvents')
- ->action(function (string $bucketId, string $name, ?array $permissions, bool $fileSecurity, bool $enabled, ?int $maximumFileSize, array $allowedFileExtensions, string $compression, bool $encryption, bool $antivirus, Response $response, Database $dbForProject, Event $queueForEvents) {
+ ->action(function (string $bucketId, string $name, ?array $permissions, bool $fileSecurity, bool $enabled, ?int $maximumFileSize, array $allowedFileExtensions, ?string $compression, ?bool $encryption, bool $antivirus, Response $response, Database $dbForProject, Event $queueForEvents) {
$bucket = $dbForProject->getDocument('buckets', $bucketId);
if ($bucket->isEmpty()) {
@@ -261,11 +274,8 @@ App::put('/v1/storage/buckets/:bucketId')
$enabled ??= $bucket->getAttribute('enabled', true);
$encryption ??= $bucket->getAttribute('encryption', true);
$antivirus ??= $bucket->getAttribute('antivirus', true);
+ $compression ??= $bucket->getAttribute('compression', Compression::NONE);
- /**
- * Map aggregate permissions into the multiple permissions they represent,
- * accounting for the resource type given that some types not allowed specific permissions.
- */
// Map aggregate permissions into the multiple permissions they represent.
$permissions = Permission::aggregate($permissions);
@@ -279,11 +289,11 @@ App::put('/v1/storage/buckets/:bucketId')
->setAttribute('encryption', $encryption)
->setAttribute('compression', $compression)
->setAttribute('antivirus', $antivirus));
+
$dbForProject->updateCollection('bucket_' . $bucket->getInternalId(), $permissions, $fileSecurity);
$queueForEvents
- ->setParam('bucketId', $bucket->getId())
- ;
+ ->setParam('bucketId', $bucket->getId());
$response->dynamic($bucket, Response::MODEL_BUCKET);
});
@@ -292,6 +302,7 @@ App::delete('/v1/storage/buckets/:bucketId')
->desc('Delete bucket')
->groups(['api', 'storage'])
->label('scope', 'buckets.write')
+ ->label('resourceType', RESOURCE_TYPE_BUCKETS)
->label('audits.event', 'bucket.delete')
->label('event', 'buckets.[bucketId].delete')
->label('audits.resource', 'bucket/{request.bucketId}')
@@ -330,10 +341,11 @@ App::delete('/v1/storage/buckets/:bucketId')
});
App::post('/v1/storage/buckets/:bucketId/files')
- ->alias('/v1/storage/files', ['bucketId' => 'default'])
+ ->alias('/v1/storage/files')
->desc('Create file')
->groups(['api', 'storage'])
->label('scope', 'files.write')
+ ->label('resourceType', RESOURCE_TYPE_BUCKETS)
->label('audits.event', 'file.create')
->label('event', 'buckets.[bucketId].files.[fileId].create')
->label('audits.resource', 'file/{response.$id}')
@@ -657,7 +669,11 @@ App::post('/v1/storage/buckets/:bucketId/files')
'metadata' => $metadata,
]);
- $file = $dbForProject->createDocument('bucket_' . $bucket->getInternalId(), $doc);
+ try {
+ $file = $dbForProject->createDocument('bucket_' . $bucket->getInternalId(), $doc);
+ } catch (NotFoundException) {
+ throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
+ }
} else {
$file = $file
->setAttribute('chunksUploaded', $chunksUploaded)
@@ -673,15 +689,19 @@ App::post('/v1/storage/buckets/:bucketId/files')
if (!$validator->isValid($bucket->getCreate())) {
throw new Exception(Exception::USER_UNAUTHORIZED);
}
- $file = Authorization::skip(fn () => $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file));
+
+ try {
+ $file = Authorization::skip(fn () => $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file));
+ } catch (NotFoundException) {
+ throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
+ }
}
}
$queueForEvents
->setParam('bucketId', $bucket->getId())
->setParam('fileId', $file->getId())
- ->setContext('bucket', $bucket)
- ;
+ ->setContext('bucket', $bucket);
$metadata = null; // was causing leaks as it was passed by reference
@@ -691,10 +711,11 @@ App::post('/v1/storage/buckets/:bucketId/files')
});
App::get('/v1/storage/buckets/:bucketId/files')
- ->alias('/v1/storage/files', ['bucketId' => 'default'])
+ ->alias('/v1/storage/files')
->desc('List files')
->groups(['api', 'storage'])
->label('scope', 'files.read')
+ ->label('resourceType', RESOURCE_TYPE_BUCKETS)
->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
->label('sdk.namespace', 'storage')
->label('sdk.method', 'listFiles')
@@ -725,11 +746,7 @@ App::get('/v1/storage/buckets/:bucketId/files')
throw new Exception(Exception::USER_UNAUTHORIZED);
}
- try {
- $queries = Query::parseQueries($queries);
- } catch (QueryException $e) {
- throw new Exception(Exception::GENERAL_QUERY_INVALID, $e->getMessage());
- }
+ $queries = Query::parseQueries($queries);
if (!empty($search)) {
$queries[] = Query::search('search', $search);
@@ -744,6 +761,12 @@ App::get('/v1/storage/buckets/:bucketId/files')
$cursor = reset($cursor);
if ($cursor) {
/** @var Query $cursor */
+
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
$fileId = $cursor->getValue();
if ($fileSecurity && !$valid) {
@@ -761,12 +784,16 @@ App::get('/v1/storage/buckets/:bucketId/files')
$filterQueries = Query::groupByType($queries)['filters'];
- if ($fileSecurity && !$valid) {
- $files = $dbForProject->find('bucket_' . $bucket->getInternalId(), $queries);
- $total = $dbForProject->count('bucket_' . $bucket->getInternalId(), $filterQueries, APP_LIMIT_COUNT);
- } else {
- $files = Authorization::skip(fn () => $dbForProject->find('bucket_' . $bucket->getInternalId(), $queries));
- $total = Authorization::skip(fn () => $dbForProject->count('bucket_' . $bucket->getInternalId(), $filterQueries, APP_LIMIT_COUNT));
+ try {
+ if ($fileSecurity && !$valid) {
+ $files = $dbForProject->find('bucket_' . $bucket->getInternalId(), $queries);
+ $total = $dbForProject->count('bucket_' . $bucket->getInternalId(), $filterQueries, APP_LIMIT_COUNT);
+ } else {
+ $files = Authorization::skip(fn () => $dbForProject->find('bucket_' . $bucket->getInternalId(), $queries));
+ $total = Authorization::skip(fn () => $dbForProject->count('bucket_' . $bucket->getInternalId(), $filterQueries, APP_LIMIT_COUNT));
+ }
+ } catch (NotFoundException) {
+ throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
}
$response->dynamic(new Document([
@@ -776,10 +803,11 @@ App::get('/v1/storage/buckets/:bucketId/files')
});
App::get('/v1/storage/buckets/:bucketId/files/:fileId')
- ->alias('/v1/storage/files/:fileId', ['bucketId' => 'default'])
+ ->alias('/v1/storage/files/:fileId')
->desc('Get file')
->groups(['api', 'storage'])
->label('scope', 'files.read')
+ ->label('resourceType', RESOURCE_TYPE_BUCKETS)
->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
->label('sdk.namespace', 'storage')
->label('sdk.method', 'getFile')
@@ -823,10 +851,11 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId')
});
App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
- ->alias('/v1/storage/files/:fileId/preview', ['bucketId' => 'default'])
+ ->alias('/v1/storage/files/:fileId/preview')
->desc('Get file preview')
->groups(['api', 'storage'])
->label('scope', 'files.read')
+ ->label('resourceType', RESOURCE_TYPE_BUCKETS)
->label('cache', true)
->label('cache.resourceType', 'bucket/{request.bucketId}')
->label('cache.resource', 'file/{request.fileId}')
@@ -889,10 +918,6 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
throw new Exception(Exception::STORAGE_FILE_NOT_FOUND);
}
- if ((\strpos($request->getAccept(), 'image/webp') === false) && ('webp' === $output)) { // Fallback webp to jpeg when no browser support
- $output = 'jpg';
- }
-
$inputs = Config::getParam('storage-inputs');
$outputs = Config::getParam('storage-outputs');
$fileLogos = Config::getParam('storage-logos');
@@ -990,7 +1015,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
$contentType = (\array_key_exists($output, $outputs)) ? $outputs[$output] : $outputs['jpg'];
$response
- ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + 60 * 60 * 24 * 30) . ' GMT')
+ ->addHeader('Cache-Control', 'private, max-age=2592000') // 30 days
->setContentType($contentType)
->file($data)
;
@@ -999,10 +1024,11 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
});
App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
- ->alias('/v1/storage/files/:fileId/download', ['bucketId' => 'default'])
+ ->alias('/v1/storage/files/:fileId/download')
->desc('Get file for download')
->groups(['api', 'storage'])
->label('scope', 'files.read')
+ ->label('resourceType', RESOURCE_TYPE_BUCKETS)
->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
->label('sdk.namespace', 'storage')
->label('sdk.method', 'getFileDownload')
@@ -1053,7 +1079,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
$response
->setContentType($file->getAttribute('mimeType'))
- ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + (60 * 60 * 24 * 45)) . ' GMT') // 45 days cache
+ ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
->addHeader('X-Peak', \memory_get_peak_usage())
->addHeader('Content-Disposition', 'attachment; filename="' . $file->getAttribute('name', '') . '"')
;
@@ -1139,10 +1165,11 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
});
App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
- ->alias('/v1/storage/files/:fileId/view', ['bucketId' => 'default'])
+ ->alias('/v1/storage/files/:fileId/view')
->desc('Get file for view')
->groups(['api', 'storage'])
->label('scope', 'files.read')
+ ->label('resourceType', RESOURCE_TYPE_BUCKETS)
->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
->label('sdk.namespace', 'storage')
->label('sdk.method', 'getFileView')
@@ -1203,7 +1230,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
->addHeader('Content-Security-Policy', 'script-src none;')
->addHeader('X-Content-Type-Options', 'nosniff')
->addHeader('Content-Disposition', 'inline; filename="' . $file->getAttribute('name', '') . '"')
- ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + (60 * 60 * 24 * 45)) . ' GMT') // 45 days cache
+ ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
->addHeader('X-Peak', \memory_get_peak_usage())
;
@@ -1294,6 +1321,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
->desc('Get file for push notification')
->groups(['api', 'storage'])
->label('scope', 'public')
+ ->label('resourceType', RESOURCE_TYPE_BUCKETS)
->label('sdk.response.code', Response::STATUS_CODE_OK)
->label('sdk.response.type', '*/*')
->label('sdk.methodType', 'location')
@@ -1357,7 +1385,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
->addHeader('Content-Security-Policy', 'script-src none;')
->addHeader('X-Content-Type-Options', 'nosniff')
->addHeader('Content-Disposition', 'inline; filename="' . $file->getAttribute('name', '') . '"')
- ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + (60 * 60 * 24 * 45)) . ' GMT') // 45 days cache
+ ->addHeader('Cache-Control', 'private, max-age=3888000') // 45 days
->addHeader('X-Peak', \memory_get_peak_usage());
$size = $file->getAttribute('sizeOriginal', 0);
@@ -1444,10 +1472,11 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/push')
});
App::put('/v1/storage/buckets/:bucketId/files/:fileId')
- ->alias('/v1/storage/files/:fileId', ['bucketId' => 'default'])
+ ->alias('/v1/storage/files/:fileId')
->desc('Update file')
->groups(['api', 'storage'])
->label('scope', 'files.write')
+ ->label('resourceType', RESOURCE_TYPE_BUCKETS)
->label('event', 'buckets.[bucketId].files.[fileId].update')
->label('audits.event', 'file.update')
->label('audits.resource', 'file/{response.$id}')
@@ -1533,10 +1562,14 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
$file->setAttribute('name', $name);
}
- if ($fileSecurity && !$valid) {
- $file = $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file);
- } else {
- $file = Authorization::skip(fn () => $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file));
+ try {
+ if ($fileSecurity && !$valid) {
+ $file = $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file);
+ } else {
+ $file = Authorization::skip(fn () => $dbForProject->updateDocument('bucket_' . $bucket->getInternalId(), $fileId, $file));
+ }
+ } catch (NotFoundException) {
+ throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
}
$queueForEvents
@@ -1552,6 +1585,7 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
->desc('Delete file')
->groups(['api', 'storage'])
->label('scope', 'files.write')
+ ->label('resourceType', RESOURCE_TYPE_BUCKETS)
->label('event', 'buckets.[bucketId].files.[fileId].delete')
->label('audits.event', 'file.delete')
->label('audits.resource', 'file/{request.fileId}')
@@ -1618,10 +1652,14 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
->setResource('file/' . $fileId)
;
- if ($fileSecurity && !$valid) {
- $deleted = $dbForProject->deleteDocument('bucket_' . $bucket->getInternalId(), $fileId);
- } else {
- $deleted = Authorization::skip(fn () => $dbForProject->deleteDocument('bucket_' . $bucket->getInternalId(), $fileId));
+ try {
+ if ($fileSecurity && !$valid) {
+ $deleted = $dbForProject->deleteDocument('bucket_' . $bucket->getInternalId(), $fileId);
+ } else {
+ $deleted = Authorization::skip(fn () => $dbForProject->deleteDocument('bucket_' . $bucket->getInternalId(), $fileId));
+ }
+ } catch (NotFoundException) {
+ throw new Exception(Exception::STORAGE_BUCKET_NOT_FOUND);
}
if (!$deleted) {
@@ -1645,6 +1683,7 @@ App::get('/v1/storage/usage')
->desc('Get storage usage stats')
->groups(['api', 'storage'])
->label('scope', 'files.read')
+ ->label('resourceType', RESOURCE_TYPE_BUCKETS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
->label('sdk.namespace', 'storage')
->label('sdk.method', 'getUsage')
@@ -1724,6 +1763,7 @@ App::get('/v1/storage/:bucketId/usage')
->desc('Get bucket usage stats')
->groups(['api', 'storage'])
->label('scope', 'files.read')
+ ->label('resourceType', RESOURCE_TYPE_BUCKETS)
->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
->label('sdk.namespace', 'storage')
->label('sdk.method', 'getBucketUsage')
diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index f98cdd721c..f829800b98 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -34,6 +34,7 @@ use Utopia\Database\Query;
use Utopia\Database\Validator\Authorization;
use Utopia\Database\Validator\Key;
use Utopia\Database\Validator\Queries;
+use Utopia\Database\Validator\Query\Cursor;
use Utopia\Database\Validator\Query\Limit;
use Utopia\Database\Validator\Query\Offset;
use Utopia\Database\Validator\UID;
@@ -43,6 +44,7 @@ use Utopia\Validator\ArrayList;
use Utopia\Validator\Assoc;
use Utopia\Validator\Host;
use Utopia\Validator\Text;
+use Utopia\Validator\WhiteList;
App::post('/v1/teams')
->desc('Create team')
@@ -169,6 +171,12 @@ App::get('/v1/teams')
$cursor = reset($cursor);
if ($cursor) {
/** @var Query $cursor */
+
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
$teamId = $cursor->getValue();
$cursorDocument = $dbForProject->getDocument('teams', $teamId);
@@ -394,7 +402,17 @@ App::post('/v1/teams/:teamId/memberships')
->param('email', '', new Email(), 'Email of the new team member.', true)
->param('userId', '', new UID(), 'ID of the user to be added to a team.', true)
->param('phone', '', new Phone(), 'Phone number. Format this number with a leading \'+\' and a country code, e.g., +16175551212.', true)
- ->param('roles', [], new ArrayList(new Key(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Array of strings. Use this param to set the user roles in the team. A role can be any string. Learn more about [roles and permissions](https://appwrite.io/docs/permissions). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 32 characters long.')
+ ->param('roles', [], function (Document $project) {
+ if ($project->getId() === 'console') {
+ ;
+ $roles = array_keys(Config::getParam('roles', []));
+ array_filter($roles, function ($role) {
+ return !in_array($role, [Auth::USER_ROLE_APPS, Auth::USER_ROLE_GUESTS, Auth::USER_ROLE_USERS]);
+ });
+ return new ArrayList(new WhiteList($roles), APP_LIMIT_ARRAY_PARAMS_SIZE);
+ }
+ return new ArrayList(new Key(), APP_LIMIT_ARRAY_PARAMS_SIZE);
+ }, 'Array of strings. Use this param to set the user roles in the team. A role can be any string. Learn more about [roles and permissions](https://appwrite.io/docs/permissions). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 32 characters long.', false, ['project'])
->param('url', '', fn ($clients) => new Host($clients), 'URL to redirect the user back to your app from the invitation email. This parameter is not required when an API key is supplied. Only URLs from hostnames in your project platform list are allowed. This requirement helps to prevent an [open redirect](https://cheatsheetseries.owasp.org/cheatsheets/Unvalidated_Redirects_and_Forwards_Cheat_Sheet.html) attack against your project API.', true, ['clients']) // TODO add our own built-in confirm page
->param('name', '', new Text(128), 'Name of the new team member. Max length: 128 chars.', true)
->inject('response')
@@ -449,17 +467,17 @@ App::post('/v1/teams/:teamId/memberships')
$name = empty($name) ? $invitee->getAttribute('name', '') : $name;
} elseif (!empty($email)) {
$invitee = $dbForProject->findOne('users', [Query::equal('email', [$email])]); // Get user by email address
- if (!empty($invitee) && !empty($phone) && $invitee->getAttribute('phone', '') !== $phone) {
+ if (!$invitee->isEmpty() && !empty($phone) && $invitee->getAttribute('phone', '') !== $phone) {
throw new Exception(Exception::USER_ALREADY_EXISTS, 'Given email and phone doesn\'t match', 409);
}
} elseif (!empty($phone)) {
$invitee = $dbForProject->findOne('users', [Query::equal('phone', [$phone])]);
- if (!empty($invitee) && !empty($email) && $invitee->getAttribute('email', '') !== $email) {
+ if (!$invitee->isEmpty() && !empty($email) && $invitee->getAttribute('email', '') !== $email) {
throw new Exception(Exception::USER_ALREADY_EXISTS, 'Given phone and email doesn\'t match', 409);
}
}
- if (empty($invitee)) { // Create new user if no user with same email found
+ if ($invitee->isEmpty()) { // Create new user if no user with same email found
$limit = $project->getAttribute('auths', [])['limit'] ?? 0;
if (!$isPrivilegedUser && !$isAppUser && $limit !== 0 && $project->getId() !== 'console') { // check users limit, console invites are allways allowed.
@@ -474,7 +492,7 @@ App::post('/v1/teams/:teamId/memberships')
$identityWithMatchingEmail = $dbForProject->findOne('identities', [
Query::equal('providerEmail', [$email]),
]);
- if ($identityWithMatchingEmail !== false && !$identityWithMatchingEmail->isEmpty()) {
+ if (!$identityWithMatchingEmail->isEmpty()) {
throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
}
@@ -709,9 +727,9 @@ App::get('/v1/teams/:teamId/memberships')
->param('queries', [], new Memberships(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Memberships::ALLOWED_ATTRIBUTES), true)
->param('search', '', new Text(256), 'Search term to filter your list results. Max length: 256 chars.', true)
->inject('response')
+ ->inject('project')
->inject('dbForProject')
- ->action(function (string $teamId, array $queries, string $search, Response $response, Database $dbForProject) {
-
+ ->action(function (string $teamId, array $queries, string $search, Response $response, Document $project, Database $dbForProject) {
$team = $dbForProject->getDocument('teams', $teamId);
if ($team->isEmpty()) {
@@ -740,6 +758,13 @@ App::get('/v1/teams/:teamId/memberships')
$cursor = reset($cursor);
if ($cursor) {
/** @var Query $cursor */
+
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
+
$membershipId = $cursor->getValue();
$cursorDocument = $dbForProject->getDocument('memberships', $membershipId);
@@ -765,27 +790,51 @@ App::get('/v1/teams/:teamId/memberships')
$memberships = array_filter($memberships, fn (Document $membership) => !empty($membership->getAttribute('userId')));
- $memberships = array_map(function ($membership) use ($dbForProject, $team) {
- $user = $dbForProject->getDocument('users', $membership->getAttribute('userId'));
+ $membershipsPrivacy = [
+ 'userName' => $project->getAttribute('auths', [])['membershipsUserName'] ?? true,
+ 'userEmail' => $project->getAttribute('auths', [])['membershipsUserEmail'] ?? true,
+ 'mfa' => $project->getAttribute('auths', [])['membershipsMfa'] ?? true,
+ ];
- $mfa = $user->getAttribute('mfa', false);
- if ($mfa) {
- $totp = TOTP::getAuthenticatorFromUser($user);
- $totpEnabled = $totp && $totp->getAttribute('verified', false);
- $emailEnabled = $user->getAttribute('email', false) && $user->getAttribute('emailVerification', false);
- $phoneEnabled = $user->getAttribute('phone', false) && $user->getAttribute('phoneVerification', false);
+ $roles = Authorization::getRoles();
+ $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+ $isAppUser = Auth::isAppUser($roles);
- if (!$totpEnabled && !$emailEnabled && !$phoneEnabled) {
- $mfa = false;
+ $membershipsPrivacy = array_map(function ($privacy) use ($isPrivilegedUser, $isAppUser) {
+ return $privacy || $isPrivilegedUser || $isAppUser;
+ }, $membershipsPrivacy);
+
+ $memberships = array_map(function ($membership) use ($dbForProject, $team, $membershipsPrivacy) {
+ $user = !empty(array_filter($membershipsPrivacy))
+ ? $dbForProject->getDocument('users', $membership->getAttribute('userId'))
+ : new Document();
+
+ if ($membershipsPrivacy['mfa']) {
+ $mfa = $user->getAttribute('mfa', false);
+
+ if ($mfa) {
+ $totp = TOTP::getAuthenticatorFromUser($user);
+ $totpEnabled = $totp && $totp->getAttribute('verified', false);
+ $emailEnabled = $user->getAttribute('email', false) && $user->getAttribute('emailVerification', false);
+ $phoneEnabled = $user->getAttribute('phone', false) && $user->getAttribute('phoneVerification', false);
+
+ if (!$totpEnabled && !$emailEnabled && !$phoneEnabled) {
+ $mfa = false;
+ }
}
+
+ $membership->setAttribute('mfa', $mfa);
}
- $membership
- ->setAttribute('mfa', $mfa)
- ->setAttribute('teamName', $team->getAttribute('name'))
- ->setAttribute('userName', $user->getAttribute('name'))
- ->setAttribute('userEmail', $user->getAttribute('email'))
- ;
+ if ($membershipsPrivacy['userName']) {
+ $membership->setAttribute('userName', $user->getAttribute('name'));
+ }
+
+ if ($membershipsPrivacy['userEmail']) {
+ $membership->setAttribute('userEmail', $user->getAttribute('email'));
+ }
+
+ $membership->setAttribute('teamName', $team->getAttribute('name'));
return $membership;
}, $memberships);
@@ -812,8 +861,9 @@ App::get('/v1/teams/:teamId/memberships/:membershipId')
->param('teamId', '', new UID(), 'Team ID.')
->param('membershipId', '', new UID(), 'Membership ID.')
->inject('response')
+ ->inject('project')
->inject('dbForProject')
- ->action(function (string $teamId, string $membershipId, Response $response, Database $dbForProject) {
+ ->action(function (string $teamId, string $membershipId, Response $response, Document $project, Database $dbForProject) {
$team = $dbForProject->getDocument('teams', $teamId);
@@ -827,27 +877,50 @@ App::get('/v1/teams/:teamId/memberships/:membershipId')
throw new Exception(Exception::MEMBERSHIP_NOT_FOUND);
}
- $user = $dbForProject->getDocument('users', $membership->getAttribute('userId'));
+ $membershipsPrivacy = [
+ 'userName' => $project->getAttribute('auths', [])['membershipsUserName'] ?? true,
+ 'userEmail' => $project->getAttribute('auths', [])['membershipsUserEmail'] ?? true,
+ 'mfa' => $project->getAttribute('auths', [])['membershipsMfa'] ?? true,
+ ];
- $mfa = $user->getAttribute('mfa', false);
+ $roles = Authorization::getRoles();
+ $isPrivilegedUser = Auth::isPrivilegedUser($roles);
+ $isAppUser = Auth::isAppUser($roles);
- if ($mfa) {
- $totp = TOTP::getAuthenticatorFromUser($user);
- $totpEnabled = $totp && $totp->getAttribute('verified', false);
- $emailEnabled = $user->getAttribute('email', false) && $user->getAttribute('emailVerification', false);
- $phoneEnabled = $user->getAttribute('phone', false) && $user->getAttribute('phoneVerification', false);
+ $membershipsPrivacy = array_map(function ($privacy) use ($isPrivilegedUser, $isAppUser) {
+ return $privacy || $isPrivilegedUser || $isAppUser;
+ }, $membershipsPrivacy);
- if (!$totpEnabled && !$emailEnabled && !$phoneEnabled) {
- $mfa = false;
+ $user = !empty(array_filter($membershipsPrivacy))
+ ? $dbForProject->getDocument('users', $membership->getAttribute('userId'))
+ : new Document();
+
+ if ($membershipsPrivacy['mfa']) {
+ $mfa = $user->getAttribute('mfa', false);
+
+ if ($mfa) {
+ $totp = TOTP::getAuthenticatorFromUser($user);
+ $totpEnabled = $totp && $totp->getAttribute('verified', false);
+ $emailEnabled = $user->getAttribute('email', false) && $user->getAttribute('emailVerification', false);
+ $phoneEnabled = $user->getAttribute('phone', false) && $user->getAttribute('phoneVerification', false);
+
+ if (!$totpEnabled && !$emailEnabled && !$phoneEnabled) {
+ $mfa = false;
+ }
}
+
+ $membership->setAttribute('mfa', $mfa);
}
- $membership
- ->setAttribute('mfa', $mfa)
- ->setAttribute('teamName', $team->getAttribute('name'))
- ->setAttribute('userName', $user->getAttribute('name'))
- ->setAttribute('userEmail', $user->getAttribute('email'))
- ;
+ if ($membershipsPrivacy['userName']) {
+ $membership->setAttribute('userName', $user->getAttribute('name'));
+ }
+
+ if ($membershipsPrivacy['userEmail']) {
+ $membership->setAttribute('userEmail', $user->getAttribute('email'));
+ }
+
+ $membership->setAttribute('teamName', $team->getAttribute('name'));
$response->dynamic($membership, Response::MODEL_MEMBERSHIP);
});
@@ -868,7 +941,17 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
->label('sdk.response.model', Response::MODEL_MEMBERSHIP)
->param('teamId', '', new UID(), 'Team ID.')
->param('membershipId', '', new UID(), 'Membership ID.')
- ->param('roles', [], new ArrayList(new Key(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of strings. Use this param to set the user\'s roles in the team. A role can be any string. Learn more about [roles and permissions](https://appwrite.io/docs/permissions). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 32 characters long.')
+ ->param('roles', [], function (Document $project) {
+ if ($project->getId() === 'console') {
+ ;
+ $roles = array_keys(Config::getParam('roles', []));
+ array_filter($roles, function ($role) {
+ return !in_array($role, [Auth::USER_ROLE_APPS, Auth::USER_ROLE_GUESTS, Auth::USER_ROLE_USERS]);
+ });
+ return new ArrayList(new WhiteList($roles), APP_LIMIT_ARRAY_PARAMS_SIZE);
+ }
+ return new ArrayList(new Key(), APP_LIMIT_ARRAY_PARAMS_SIZE);
+ }, 'An array of strings. Use this param to set the user\'s roles in the team. A role can be any string. Learn more about [roles and permissions](https://appwrite.io/docs/permissions). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 32 characters long.', false, ['project'])
->inject('request')
->inject('response')
->inject('user')
@@ -977,7 +1060,8 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
throw new Exception(Exception::TEAM_INVITE_MISMATCH, 'Invite does not belong to current user (' . $user->getAttribute('email') . ')');
}
- if ($user->isEmpty()) {
+ $hasSession = !$user->isEmpty();
+ if (!$hasSession) {
$user->setAttributes($dbForProject->getDocument('users', $userId)->getArrayCopy()); // Get user
}
@@ -996,39 +1080,64 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
Authorization::skip(fn () => $dbForProject->updateDocument('users', $user->getId(), $user->setAttribute('emailVerification', true)));
- // Log user in
+ // Create session for the user if not logged in
+ if (!$hasSession) {
+ Authorization::setRole(Role::user($user->getId())->toString());
- Authorization::setRole(Role::user($user->getId())->toString());
+ $detector = new Detector($request->getUserAgent('UNKNOWN'));
+ $record = $geodb->get($request->getIP());
+ $authDuration = $project->getAttribute('auths', [])['duration'] ?? Auth::TOKEN_EXPIRATION_LOGIN_LONG;
+ $expire = DateTime::addSeconds(new \DateTime(), $authDuration);
+ $secret = Auth::tokenGenerator();
+ $session = new Document(array_merge([
+ '$id' => ID::unique(),
+ '$permissions' => [
+ Permission::read(Role::user($user->getId())),
+ Permission::update(Role::user($user->getId())),
+ Permission::delete(Role::user($user->getId())),
+ ],
+ 'userId' => $user->getId(),
+ 'userInternalId' => $user->getInternalId(),
+ 'provider' => Auth::SESSION_PROVIDER_EMAIL,
+ 'providerUid' => $user->getAttribute('email'),
+ 'secret' => Auth::hash($secret), // One way hash encryption to protect DB leak
+ 'userAgent' => $request->getUserAgent('UNKNOWN'),
+ 'ip' => $request->getIP(),
+ 'factors' => ['email'],
+ 'countryCode' => ($record) ? \strtolower($record['country']['iso_code']) : '--',
+ 'expire' => DateTime::addSeconds(new \DateTime(), $authDuration)
+ ], $detector->getOS(), $detector->getClient(), $detector->getDevice()));
- $detector = new Detector($request->getUserAgent('UNKNOWN'));
- $record = $geodb->get($request->getIP());
- $authDuration = $project->getAttribute('auths', [])['duration'] ?? Auth::TOKEN_EXPIRATION_LOGIN_LONG;
- $expire = DateTime::addSeconds(new \DateTime(), $authDuration);
- $secret = Auth::tokenGenerator();
- $session = new Document(array_merge([
- '$id' => ID::unique(),
- 'userId' => $user->getId(),
- 'userInternalId' => $user->getInternalId(),
- 'provider' => Auth::SESSION_PROVIDER_EMAIL,
- 'providerUid' => $user->getAttribute('email'),
- 'secret' => Auth::hash($secret), // One way hash encryption to protect DB leak
- 'userAgent' => $request->getUserAgent('UNKNOWN'),
- 'ip' => $request->getIP(),
- 'factors' => ['email'],
- 'countryCode' => ($record) ? \strtolower($record['country']['iso_code']) : '--',
- 'expire' => DateTime::addSeconds(new \DateTime(), $authDuration)
- ], $detector->getOS(), $detector->getClient(), $detector->getDevice()));
+ $session = $dbForProject->createDocument('sessions', $session);
- $session = $dbForProject->createDocument('sessions', $session
- ->setAttribute('$permissions', [
- Permission::read(Role::user($user->getId())),
- Permission::update(Role::user($user->getId())),
- Permission::delete(Role::user($user->getId())),
- ]));
+ Authorization::setRole(Role::user($userId)->toString());
- $dbForProject->purgeCachedDocument('users', $user->getId());
+ if (!Config::getParam('domainVerification')) {
+ $response->addHeader('X-Fallback-Cookies', \json_encode([Auth::$cookieName => Auth::encodeSession($user->getId(), $secret)]));
+ }
- Authorization::setRole(Role::user($userId)->toString());
+ $response
+ ->addCookie(
+ name: Auth::$cookieName . '_legacy',
+ value: Auth::encodeSession($user->getId(), $secret),
+ expire: (new \DateTime($expire))->getTimestamp(),
+ path: '/',
+ domain: Config::getParam('cookieDomain'),
+ secure: ('https' === $protocol),
+ httponly: true
+ )
+ ->addCookie(
+ name: Auth::$cookieName,
+ value: Auth::encodeSession($user->getId(), $secret),
+ expire: (new \DateTime($expire))->getTimestamp(),
+ path: '/',
+ domain: Config::getParam('cookieDomain'),
+ secure: ('https' === $protocol),
+ httponly: true,
+ sameSite: Config::getParam('cookieSamesite')
+ )
+ ;
+ }
$membership = $dbForProject->updateDocument('memberships', $membership->getId(), $membership);
@@ -1042,22 +1151,11 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
->setParam('membershipId', $membership->getId())
;
- if (!Config::getParam('domainVerification')) {
- $response
- ->addHeader('X-Fallback-Cookies', \json_encode([Auth::$cookieName => Auth::encodeSession($user->getId(), $secret)]))
- ;
- }
-
- $response
- ->addCookie(Auth::$cookieName . '_legacy', Auth::encodeSession($user->getId(), $secret), (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, null)
- ->addCookie(Auth::$cookieName, Auth::encodeSession($user->getId(), $secret), (new \DateTime($expire))->getTimestamp(), '/', Config::getParam('cookieDomain'), ('https' == $protocol), true, Config::getParam('cookieSamesite'))
- ;
-
$response->dynamic(
$membership
- ->setAttribute('teamName', $team->getAttribute('name'))
- ->setAttribute('userName', $user->getAttribute('name'))
- ->setAttribute('userEmail', $user->getAttribute('email')),
+ ->setAttribute('teamName', $team->getAttribute('name'))
+ ->setAttribute('userName', $user->getAttribute('name'))
+ ->setAttribute('userEmail', $user->getAttribute('email')),
Response::MODEL_MEMBERSHIP
);
});
diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php
index 571df4fdb2..bdb24572eb 100644
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@@ -36,6 +36,7 @@ use Utopia\Database\Helpers\Role;
use Utopia\Database\Query;
use Utopia\Database\Validator\Authorization;
use Utopia\Database\Validator\Queries;
+use Utopia\Database\Validator\Query\Cursor;
use Utopia\Database\Validator\Query\Limit;
use Utopia\Database\Validator\Query\Offset;
use Utopia\Database\Validator\UID;
@@ -50,7 +51,7 @@ use Utopia\Validator\Text;
use Utopia\Validator\WhiteList;
/** TODO: Remove function when we move to using utopia/platform */
-function createUser(string $hash, mixed $hashOptions, string $userId, ?string $email, ?string $password, ?string $phone, string $name, Document $project, Database $dbForProject, Event $queueForEvents, Hooks $hooks): Document
+function createUser(string $hash, mixed $hashOptions, string $userId, ?string $email, ?string $password, ?string $phone, string $name, Document $project, Database $dbForProject, Hooks $hooks): Document
{
$plaintextPassword = $password;
$hashOptionsObject = (\is_string($hashOptions)) ? \json_decode($hashOptions, true) : $hashOptions; // Cast to JSON array
@@ -63,7 +64,7 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
$identityWithMatchingEmail = $dbForProject->findOne('identities', [
Query::equal('providerEmail', [$email]),
]);
- if ($identityWithMatchingEmail !== false && !$identityWithMatchingEmail->isEmpty()) {
+ if (!$identityWithMatchingEmail->isEmpty()) {
throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
}
}
@@ -140,7 +141,7 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
$existingTarget = $dbForProject->findOne('targets', [
Query::equal('identifier', [$email]),
]);
- if ($existingTarget) {
+ if (!$existingTarget->isEmpty()) {
$user->setAttribute('targets', $existingTarget, Document::SET_TYPE_APPEND);
}
}
@@ -164,7 +165,7 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
$existingTarget = $dbForProject->findOne('targets', [
Query::equal('identifier', [$phone]),
]);
- if ($existingTarget) {
+ if (!$existingTarget->isEmpty()) {
$user->setAttribute('targets', $existingTarget, Document::SET_TYPE_APPEND);
}
}
@@ -175,15 +176,12 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
throw new Exception(Exception::USER_ALREADY_EXISTS);
}
- $queueForEvents->setParam('userId', $user->getId());
-
return $user;
}
App::post('/v1/users')
->desc('Create user')
->groups(['api', 'users'])
- ->label('event', 'users.[userId].create')
->label('scope', 'users.write')
->label('audits.event', 'user.create')
->label('audits.resource', 'user/{response.$id}')
@@ -202,10 +200,9 @@ App::post('/v1/users')
->inject('response')
->inject('project')
->inject('dbForProject')
- ->inject('queueForEvents')
->inject('hooks')
- ->action(function (string $userId, ?string $email, ?string $phone, ?string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $queueForEvents, Hooks $hooks) {
- $user = createUser('plaintext', '{}', $userId, $email, $password, $phone, $name, $project, $dbForProject, $queueForEvents, $hooks);
+ ->action(function (string $userId, ?string $email, ?string $phone, ?string $password, string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+ $user = createUser('plaintext', '{}', $userId, $email, $password, $phone, $name, $project, $dbForProject, $hooks);
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
->dynamic($user, Response::MODEL_USER);
@@ -214,7 +211,6 @@ App::post('/v1/users')
App::post('/v1/users/bcrypt')
->desc('Create user with bcrypt password')
->groups(['api', 'users'])
- ->label('event', 'users.[userId].create')
->label('scope', 'users.write')
->label('audits.event', 'user.create')
->label('audits.resource', 'user/{response.$id}')
@@ -232,10 +228,9 @@ App::post('/v1/users/bcrypt')
->inject('response')
->inject('project')
->inject('dbForProject')
- ->inject('queueForEvents')
->inject('hooks')
- ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $queueForEvents, Hooks $hooks) {
- $user = createUser('bcrypt', '{}', $userId, $email, $password, null, $name, $project, $dbForProject, $queueForEvents, $hooks);
+ ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+ $user = createUser('bcrypt', '{}', $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -245,7 +240,6 @@ App::post('/v1/users/bcrypt')
App::post('/v1/users/md5')
->desc('Create user with MD5 password')
->groups(['api', 'users'])
- ->label('event', 'users.[userId].create')
->label('scope', 'users.write')
->label('audits.event', 'user.create')
->label('audits.resource', 'user/{response.$id}')
@@ -263,10 +257,9 @@ App::post('/v1/users/md5')
->inject('response')
->inject('project')
->inject('dbForProject')
- ->inject('queueForEvents')
->inject('hooks')
- ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $queueForEvents, Hooks $hooks) {
- $user = createUser('md5', '{}', $userId, $email, $password, null, $name, $project, $dbForProject, $queueForEvents, $hooks);
+ ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+ $user = createUser('md5', '{}', $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -276,7 +269,6 @@ App::post('/v1/users/md5')
App::post('/v1/users/argon2')
->desc('Create user with Argon2 password')
->groups(['api', 'users'])
- ->label('event', 'users.[userId].create')
->label('scope', 'users.write')
->label('audits.event', 'user.create')
->label('audits.resource', 'user/{response.$id}')
@@ -294,10 +286,9 @@ App::post('/v1/users/argon2')
->inject('response')
->inject('project')
->inject('dbForProject')
- ->inject('queueForEvents')
->inject('hooks')
- ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $queueForEvents, Hooks $hooks) {
- $user = createUser('argon2', '{}', $userId, $email, $password, null, $name, $project, $dbForProject, $queueForEvents, $hooks);
+ ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+ $user = createUser('argon2', '{}', $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -307,7 +298,6 @@ App::post('/v1/users/argon2')
App::post('/v1/users/sha')
->desc('Create user with SHA password')
->groups(['api', 'users'])
- ->label('event', 'users.[userId].create')
->label('scope', 'users.write')
->label('audits.event', 'user.create')
->label('audits.resource', 'user/{response.$id}')
@@ -326,16 +316,15 @@ App::post('/v1/users/sha')
->inject('response')
->inject('project')
->inject('dbForProject')
- ->inject('queueForEvents')
->inject('hooks')
- ->action(function (string $userId, string $email, string $password, string $passwordVersion, string $name, Response $response, Document $project, Database $dbForProject, Event $queueForEvents, Hooks $hooks) {
+ ->action(function (string $userId, string $email, string $password, string $passwordVersion, string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
$options = '{}';
if (!empty($passwordVersion)) {
$options = '{"version":"' . $passwordVersion . '"}';
}
- $user = createUser('sha', $options, $userId, $email, $password, null, $name, $project, $dbForProject, $queueForEvents, $hooks);
+ $user = createUser('sha', $options, $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -345,7 +334,6 @@ App::post('/v1/users/sha')
App::post('/v1/users/phpass')
->desc('Create user with PHPass password')
->groups(['api', 'users'])
- ->label('event', 'users.[userId].create')
->label('scope', 'users.write')
->label('audits.event', 'user.create')
->label('audits.resource', 'user/{response.$id}')
@@ -363,10 +351,9 @@ App::post('/v1/users/phpass')
->inject('response')
->inject('project')
->inject('dbForProject')
- ->inject('queueForEvents')
->inject('hooks')
- ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Event $queueForEvents, Hooks $hooks) {
- $user = createUser('phpass', '{}', $userId, $email, $password, null, $name, $project, $dbForProject, $queueForEvents, $hooks);
+ ->action(function (string $userId, string $email, string $password, string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+ $user = createUser('phpass', '{}', $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -376,7 +363,6 @@ App::post('/v1/users/phpass')
App::post('/v1/users/scrypt')
->desc('Create user with Scrypt password')
->groups(['api', 'users'])
- ->label('event', 'users.[userId].create')
->label('scope', 'users.write')
->label('audits.event', 'user.create')
->label('audits.resource', 'user/{response.$id}')
@@ -399,9 +385,8 @@ App::post('/v1/users/scrypt')
->inject('response')
->inject('project')
->inject('dbForProject')
- ->inject('queueForEvents')
->inject('hooks')
- ->action(function (string $userId, string $email, string $password, string $passwordSalt, int $passwordCpu, int $passwordMemory, int $passwordParallel, int $passwordLength, string $name, Response $response, Document $project, Database $dbForProject, Event $queueForEvents, Hooks $hooks) {
+ ->action(function (string $userId, string $email, string $password, string $passwordSalt, int $passwordCpu, int $passwordMemory, int $passwordParallel, int $passwordLength, string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
$options = [
'salt' => $passwordSalt,
'costCpu' => $passwordCpu,
@@ -410,7 +395,7 @@ App::post('/v1/users/scrypt')
'length' => $passwordLength
];
- $user = createUser('scrypt', \json_encode($options), $userId, $email, $password, null, $name, $project, $dbForProject, $queueForEvents, $hooks);
+ $user = createUser('scrypt', \json_encode($options), $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -420,7 +405,6 @@ App::post('/v1/users/scrypt')
App::post('/v1/users/scrypt-modified')
->desc('Create user with Scrypt modified password')
->groups(['api', 'users'])
- ->label('event', 'users.[userId].create')
->label('scope', 'users.write')
->label('audits.event', 'user.create')
->label('audits.resource', 'user/{response.$id}')
@@ -441,10 +425,9 @@ App::post('/v1/users/scrypt-modified')
->inject('response')
->inject('project')
->inject('dbForProject')
- ->inject('queueForEvents')
->inject('hooks')
- ->action(function (string $userId, string $email, string $password, string $passwordSalt, string $passwordSaltSeparator, string $passwordSignerKey, string $name, Response $response, Document $project, Database $dbForProject, Event $queueForEvents, Hooks $hooks) {
- $user = createUser('scryptMod', '{"signerKey":"' . $passwordSignerKey . '","saltSeparator":"' . $passwordSaltSeparator . '","salt":"' . $passwordSalt . '"}', $userId, $email, $password, null, $name, $project, $dbForProject, $queueForEvents, $hooks);
+ ->action(function (string $userId, string $email, string $password, string $passwordSalt, string $passwordSaltSeparator, string $passwordSignerKey, string $name, Response $response, Document $project, Database $dbForProject, Hooks $hooks) {
+ $user = createUser('scryptMod', '{"signerKey":"' . $passwordSignerKey . '","saltSeparator":"' . $passwordSaltSeparator . '","salt":"' . $passwordSalt . '"}', $userId, $email, $password, null, $name, $project, $dbForProject, $hooks);
$response
->setStatusCode(Response::STATUS_CODE_CREATED)
@@ -576,6 +559,12 @@ App::get('/v1/users')
$cursor = reset($cursor);
if ($cursor) {
/** @var Query $cursor */
+
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
$userId = $cursor->getValue();
$cursorDocument = $dbForProject->getDocument('users', $userId);
@@ -886,6 +875,11 @@ App::get('/v1/users/:userId/targets')
$cursor = reset($cursor);
if ($cursor) {
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
$targetId = $cursor->getValue();
$cursorDocument = $dbForProject->getDocument('targets', $targetId);
@@ -938,6 +932,12 @@ App::get('/v1/users/identities')
$cursor = reset($cursor);
if ($cursor) {
/** @var Query $cursor */
+
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
$identityId = $cursor->getValue();
$cursorDocument = $dbForProject->getDocument('identities', $identityId);
@@ -1214,7 +1214,7 @@ App::patch('/v1/users/:userId/email')
Query::equal('providerEmail', [$email]),
Query::notEqual('userInternalId', $user->getInternalId()),
]);
- if ($identityWithMatchingEmail !== false && !$identityWithMatchingEmail->isEmpty()) {
+ if (!$identityWithMatchingEmail->isEmpty()) {
throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
}
@@ -1485,7 +1485,9 @@ App::patch('/v1/users/:userId/targets/:targetId')
throw new Exception(Exception::PROVIDER_INCORRECT_TYPE);
}
- $target->setAttribute('identifier', $identifier);
+ $target
+ ->setAttribute('identifier', $identifier)
+ ->setAttribute('expired', false);
}
if ($providerId) {
@@ -1499,8 +1501,9 @@ App::patch('/v1/users/:userId/targets/:targetId')
throw new Exception(Exception::PROVIDER_INCORRECT_TYPE);
}
- $target->setAttribute('providerId', $provider->getId());
- $target->setAttribute('providerInternalId', $provider->getInternalId());
+ $target
+ ->setAttribute('providerId', $provider->getId())
+ ->setAttribute('providerInternalId', $provider->getInternalId());
}
if ($name) {
@@ -1801,6 +1804,7 @@ App::post('/v1/users/:userId/sessions')
'provider' => Auth::SESSION_PROVIDER_SERVER,
'secret' => Auth::hash($secret), // One way hash encryption to protect DB leak
'userAgent' => $request->getUserAgent('UNKNOWN'),
+ 'factors' => ['server'],
'ip' => $request->getIP(),
'countryCode' => ($record) ? \strtolower($record['country']['iso_code']) : '--',
'expire' => $expire,
@@ -1813,8 +1817,11 @@ App::post('/v1/users/:userId/sessions')
$countryName = $locale->getText('countries.' . strtolower($session->getAttribute('countryCode')), $locale->getText('locale.country.unknown'));
$session = $dbForProject->createDocument('sessions', $session);
+
+ $dbForProject->purgeCachedDocument('users', $user->getId());
+
$session
- ->setAttribute('secret', $secret)
+ ->setAttribute('secret', Auth::encodeSession($user->getId(), $secret))
->setAttribute('countryName', $countryName);
$queueForEvents
diff --git a/app/controllers/api/vcs.php b/app/controllers/api/vcs.php
index f3381490ec..bbb1d9c3f8 100644
--- a/app/controllers/api/vcs.php
+++ b/app/controllers/api/vcs.php
@@ -20,6 +20,7 @@ use Utopia\Database\Helpers\Permission;
use Utopia\Database\Helpers\Role;
use Utopia\Database\Query;
use Utopia\Database\Validator\Authorization;
+use Utopia\Database\Validator\Query\Cursor;
use Utopia\Detector\Adapter\Bun;
use Utopia\Detector\Adapter\CPP;
use Utopia\Detector\Adapter\Dart;
@@ -109,7 +110,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
Query::orderDesc('$createdAt'),
]));
- if ($latestComment !== false && !$latestComment->isEmpty()) {
+ if (!$latestComment->isEmpty()) {
$latestCommentId = $latestComment->getAttribute('providerCommentId', '');
$comment = new Comment();
$comment->parseComment($github->getComment($owner, $repositoryName, $latestCommentId));
@@ -370,13 +371,11 @@ App::get('/v1/vcs/github/callback')
$identity = $dbForConsole->findOne('identities', [
Query::equal('providerEmail', [$email]),
]);
- if ($identity !== false && !$identity->isEmpty()) {
+ if (!$identity->isEmpty()) {
if ($identity->getAttribute('userInternalId', '') !== $user->getInternalId()) {
throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
}
- }
- if ($identity !== false && !$identity->isEmpty()) {
$identity = $identity
->setAttribute('providerAccessToken', $accessToken)
->setAttribute('providerRefreshToken', $refreshToken)
@@ -417,7 +416,7 @@ App::get('/v1/vcs/github/callback')
Query::equal('projectInternalId', [$projectInternalId])
]);
- if ($installation === false || $installation->isEmpty()) {
+ if ($installation->isEmpty()) {
$teamId = $project->getAttribute('teamId', '');
$installation = new Document([
@@ -725,7 +724,7 @@ App::post('/v1/vcs/github/installations/:installationId/providerRepositories')
Query::equal('provider', ['github']),
Query::equal('userInternalId', [$user->getInternalId()]),
]);
- if ($identity === false || $identity->isEmpty()) {
+ if ($identity->isEmpty()) {
throw new Exception(Exception::USER_IDENTITY_NOT_FOUND);
}
@@ -1069,6 +1068,12 @@ App::get('/v1/vcs/installations')
$cursor = reset($cursor);
if ($cursor) {
/** @var Query $cursor */
+
+ $validator = new Cursor();
+ if (!$validator->isValid($cursor)) {
+ throw new Exception(Exception::GENERAL_QUERY_INVALID, $validator->getDescription());
+ }
+
$installationId = $cursor->getValue();
$cursorDocument = $dbForConsole->getDocument('installations', $installationId);
diff --git a/app/controllers/general.php b/app/controllers/general.php
index 0bbfa2b694..54e6e1e791 100644
--- a/app/controllers/general.php
+++ b/app/controllers/general.php
@@ -6,6 +6,7 @@ use Ahc\Jwt\JWT;
use Appwrite\Auth\Auth;
use Appwrite\Event\Certificate;
use Appwrite\Event\Event;
+use Appwrite\Event\Func;
use Appwrite\Event\Usage;
use Appwrite\Extend\Exception as AppwriteException;
use Appwrite\Network\Validator\Origin;
@@ -25,6 +26,7 @@ use Utopia\App;
use Utopia\CLI\Console;
use Utopia\Config\Config;
use Utopia\Database\Database;
+use Utopia\Database\DateTime;
use Utopia\Database\Document;
use Utopia\Database\Helpers\ID;
use Utopia\Database\Query;
@@ -44,20 +46,28 @@ Config::setParam('domainVerification', false);
Config::setParam('cookieDomain', 'localhost');
Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);
-function router(App $utopia, Database $dbForConsole, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Event $queueForEvents, Usage $queueForUsage, Reader $geodb)
+function router(App $utopia, Database $dbForConsole, callable $getProjectDB, SwooleRequest $swooleRequest, Request $request, Response $response, Event $queueForEvents, Usage $queueForUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname)
{
$utopia->getRoute()?->label('error', __DIR__ . '/../views/general/error.phtml');
$host = $request->getHostname() ?? '';
+ if (!empty($previewHostname)) {
+ $host = $previewHostname;
+ }
- $route = Authorization::skip(
- fn () => $dbForConsole->find('rules', [
- Query::equal('domain', [$host]),
- Query::limit(1)
- ])
- )[0] ?? null;
+ // TODO: @christyjacob remove once we migrate the rules in 1.7.x
+ if (System::getEnv('_APP_RULES_FORMAT') === 'md5') {
+ $route = Authorization::skip(fn () => $dbForConsole->getDocument('rules', md5($host)));
+ } else {
+ $route = Authorization::skip(
+ fn () => $dbForConsole->find('rules', [
+ Query::equal('domain', [$host]),
+ Query::limit(1)
+ ])
+ )[0] ?? new Document();
+ }
- if ($route === null) {
+ if ($route->isEmpty()) {
if ($host === System::getEnv('_APP_DOMAIN_FUNCTIONS', '')) {
throw new AppwriteException(AppwriteException::GENERAL_ACCESS_FORBIDDEN, 'This domain cannot be used for security reasons. Please use any subdomain instead.');
}
@@ -67,7 +77,7 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo
}
if (System::getEnv('_APP_OPTIONS_ROUTER_PROTECTION', 'disabled') === 'enabled') {
- if ($host !== 'localhost' && $host !== APP_HOSTNAME_INTERNAL) { // localhost allowed for proxy, APP_HOSTNAME_INTERNAL allowed for migrations
+ if ($host !== 'localhost' && $host !== APP_HOSTNAME_INTERNAL && $host !== System::getEnv('_APP_CONSOLE_DOMAIN', '')) {
throw new AppwriteException(AppwriteException::GENERAL_ACCESS_FORBIDDEN, 'Router protection does not allow accessing Appwrite over this domain. Please add it as custom domain to your project or disable _APP_OPTIONS_ROUTER_PROTECTION environment variable.');
}
}
@@ -135,6 +145,10 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo
throw new AppwriteException(AppwriteException::FUNCTION_NOT_FOUND);
}
+ if ($isResourceBlocked($project, RESOURCE_TYPE_FUNCTIONS, $functionId)) {
+ throw new AppwriteException(AppwriteException::GENERAL_RESOURCE_BLOCKED);
+ }
+
$version = $function->getAttribute('version', 'v2');
$runtimes = Config::getParam($version === 'v2' ? 'runtimes-v2' : 'runtimes', []);
$spec = Config::getParam('runtime-specifications')[$function->getAttribute('specification', APP_FUNCTION_SPECIFICATION_DEFAULT)];
@@ -346,27 +360,11 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo
throw $th;
}
} finally {
- $fileSize = 0;
- $file = $request->getFiles('file');
- if (!empty($file)) {
- $fileSize = (\is_array($file['size']) && isset($file['size'][0])) ? $file['size'][0] : $file['size'];
- }
-
- $queueForUsage
- ->addMetric(METRIC_NETWORK_REQUESTS, 1)
- ->addMetric(METRIC_NETWORK_INBOUND, $request->getSize() + $fileSize)
- ->addMetric(METRIC_NETWORK_OUTBOUND, $response->getSize())
- ->addMetric(METRIC_EXECUTIONS, 1)
- ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS), 1)
- ->addMetric(METRIC_EXECUTIONS_COMPUTE, (int)($execution->getAttribute('duration') * 1000)) // per project
- ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE), (int)($execution->getAttribute('duration') * 1000)) // per function
- ->addMetric(METRIC_EXECUTIONS_MB_SECONDS, (int)(($spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT)))
- ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS), (int)(($spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT)))
+ $queueForFunctions
+ ->setType(Func::TYPE_ASYNC_WRITE)
+ ->setExecution($execution)
->setProject($project)
- ->trigger()
- ;
-
- $execution = Authorization::skip(fn () => $dbForProject->createDocument('executions', $execution));
+ ->trigger();
}
$execution->setAttribute('logs', '');
@@ -396,6 +394,26 @@ function router(App $utopia, Database $dbForConsole, callable $getProjectDB, Swo
->setStatusCode($execution['responseStatusCode'] ?? 200)
->send($body);
+ $fileSize = 0;
+ $file = $request->getFiles('file');
+ if (!empty($file)) {
+ $fileSize = (\is_array($file['size']) && isset($file['size'][0])) ? $file['size'][0] : $file['size'];
+ }
+
+ $queueForUsage
+ ->addMetric(METRIC_NETWORK_REQUESTS, 1)
+ ->addMetric(METRIC_NETWORK_INBOUND, $request->getSize() + $fileSize)
+ ->addMetric(METRIC_NETWORK_OUTBOUND, $response->getSize())
+ ->addMetric(METRIC_EXECUTIONS, 1)
+ ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS), 1)
+ ->addMetric(METRIC_EXECUTIONS_COMPUTE, (int)($execution->getAttribute('duration') * 1000)) // per project
+ ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_COMPUTE), (int)($execution->getAttribute('duration') * 1000)) // per function
+ ->addMetric(METRIC_EXECUTIONS_MB_SECONDS, (int)(($spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT)))
+ ->addMetric(str_replace('{functionInternalId}', $function->getInternalId(), METRIC_FUNCTION_ID_EXECUTIONS_MB_SECONDS), (int)(($spec['memory'] ?? APP_FUNCTION_MEMORY_DEFAULT) * $execution->getAttribute('duration', 0) * ($spec['cpus'] ?? APP_FUNCTION_CPUS_DEFAULT)))
+ ->setProject($project)
+ ->trigger()
+ ;
+
return true;
} elseif ($type === 'api') {
$utopia->getRoute()?->label('error', '');
@@ -450,15 +468,18 @@ App::init()
->inject('queueForUsage')
->inject('queueForEvents')
->inject('queueForCertificates')
- ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Document $console, Document $project, Database $dbForConsole, callable $getProjectDB, Locale $locale, array $localeCodes, array $clients, Reader $geodb, Usage $queueForUsage, Event $queueForEvents, Certificate $queueForCertificates) {
+ ->inject('queueForFunctions')
+ ->inject('isResourceBlocked')
+ ->inject('previewHostname')
+ ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Document $console, Document $project, Database $dbForConsole, callable $getProjectDB, Locale $locale, array $localeCodes, array $clients, Reader $geodb, Usage $queueForUsage, Event $queueForEvents, Certificate $queueForCertificates, Func $queueForFunctions, callable $isResourceBlocked, string $previewHostname) {
/*
* Appwrite Router
*/
$host = $request->getHostname() ?? '';
$mainDomain = System::getEnv('_APP_DOMAIN', '');
// Only run Router when external domain
- if ($host !== $mainDomain) {
- if (router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $geodb)) {
+ if ($host !== $mainDomain || !empty($previewHostname)) {
+ if (router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname)) {
return;
}
}
@@ -506,19 +527,31 @@ App::init()
if (!empty($envDomain) && $envDomain !== 'localhost') {
$mainDomain = $envDomain;
} else {
- $domainDocument = $dbForConsole->findOne('rules', [Query::orderAsc('$id')]);
- $mainDomain = $domainDocument ? $domainDocument->getAttribute('domain') : $domain->get();
+ // TODO: @christyjacob remove once we migrate the rules in 1.7.x
+ if (System::getEnv('_APP_RULES_FORMAT') === 'md5') {
+ $domainDocument = $dbForConsole->getDocument('rules', md5($envDomain));
+ } else {
+ $domainDocument = $dbForConsole->findOne('rules', [Query::orderAsc('$id')]);
+ }
+ $mainDomain = !$domainDocument->isEmpty() ? $domainDocument->getAttribute('domain') : $domain->get();
}
if ($mainDomain !== $domain->get()) {
Console::warning($domain->get() . ' is not a main domain. Skipping SSL certificate generation.');
} else {
- $domainDocument = $dbForConsole->findOne('rules', [
- Query::equal('domain', [$domain->get()])
- ]);
+ // TODO: @christyjacob remove once we migrate the rules in 1.7.x
+ if (System::getEnv('_APP_RULES_FORMAT') === 'md5') {
+ $domainDocument = $dbForConsole->getDocument('rules', md5($domain->get()));
+ } else {
+ $domainDocument = $dbForConsole->findOne('rules', [
+ Query::equal('domain', [$domain->get()])
+ ]);
+ }
- if (!$domainDocument) {
+ if ($domainDocument->isEmpty()) {
$domainDocument = new Document([
+ // TODO: @christyjacob remove once we migrate the rules in 1.7.x
+ '$id' => System::getEnv('_APP_RULES_FORMAT') === 'md5' ? md5($domain->get()) : ID::unique(),
'domain' => $domain->get(),
'resourceType' => 'api',
'status' => 'verifying',
@@ -666,16 +699,19 @@ App::options()
->inject('getProjectDB')
->inject('queueForEvents')
->inject('queueForUsage')
+ ->inject('queueForFunctions')
->inject('geodb')
- ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Reader $geodb) {
+ ->inject('isResourceBlocked')
+ ->inject('previewHostname')
+ ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname) {
/*
* Appwrite Router
*/
$host = $request->getHostname() ?? '';
$mainDomain = System::getEnv('_APP_DOMAIN', '');
// Only run Router when external domain
- if ($host !== $mainDomain) {
- if (router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $geodb)) {
+ if ($host !== $mainDomain || !empty($previewHostname)) {
+ if (router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname)) {
return;
}
}
@@ -761,6 +797,8 @@ App::error()
case 'Utopia\Database\Exception\Relationship':
$error = new AppwriteException(AppwriteException::RELATIONSHIP_VALUE_INVALID, $error->getMessage(), previous: $error);
break;
+ case 'Utopia\Database\Exception\NotFound':
+ $error = new AppwriteException(AppwriteException::COLLECTION_NOT_FOUND, $error->getMessage(), previous: $error);
}
$code = $error->getCode();
@@ -828,6 +866,8 @@ App::error()
if (isset($user) && !$user->isEmpty()) {
$log->setUser(new User($user->getId()));
+ } else {
+ $log->setUser(new User('guest-' . hash('sha256', $request->getIP())));
}
try {
@@ -838,7 +878,7 @@ App::error()
}
$log->setNamespace("http");
- $log->setServer(\gethostname());
+ $log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
$log->setVersion($version);
$log->setType(Log::TYPE_ERROR);
$log->setMessage($error->getMessage());
@@ -859,12 +899,17 @@ App::error()
$action = $route->getLabel("sdk.namespace", "UNKNOWN_NAMESPACE") . '.' . $route->getLabel("sdk.method", "UNKNOWN_METHOD");
$log->setAction($action);
+ $log->addTag('service', $action);
$isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
$log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
- $responseCode = $logger->addLog($log);
- Console::info('Log pushed with status code: ' . $responseCode);
+ try {
+ $responseCode = $logger->addLog($log);
+ Console::info('Error log pushed with status code: ' . $responseCode);
+ } catch (Throwable $th) {
+ Console::error('Error pushing log: ' . $th->getMessage());
+ }
}
/** Wrap all exceptions inside Appwrite\Extend\Exception */
@@ -953,16 +998,19 @@ App::get('/robots.txt')
->inject('getProjectDB')
->inject('queueForEvents')
->inject('queueForUsage')
+ ->inject('queueForFunctions')
->inject('geodb')
- ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Reader $geodb) {
+ ->inject('isResourceBlocked')
+ ->inject('previewHostname')
+ ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname) {
$host = $request->getHostname() ?? '';
$mainDomain = System::getEnv('_APP_DOMAIN', '');
- if ($host === $mainDomain || $host === 'localhost') {
+ if (($host === $mainDomain || $host === 'localhost') && empty($previewHostname)) {
$template = new View(__DIR__ . '/../views/general/robots.phtml');
$response->text($template->render(false));
} else {
- router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $geodb);
+ router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname);
}
});
@@ -978,16 +1026,19 @@ App::get('/humans.txt')
->inject('getProjectDB')
->inject('queueForEvents')
->inject('queueForUsage')
+ ->inject('queueForFunctions')
->inject('geodb')
- ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Reader $geodb) {
+ ->inject('isResourceBlocked')
+ ->inject('previewHostname')
+ ->action(function (App $utopia, SwooleRequest $swooleRequest, Request $request, Response $response, Database $dbForConsole, callable $getProjectDB, Event $queueForEvents, Usage $queueForUsage, Func $queueForFunctions, Reader $geodb, callable $isResourceBlocked, string $previewHostname) {
$host = $request->getHostname() ?? '';
$mainDomain = System::getEnv('_APP_DOMAIN', '');
- if ($host === $mainDomain || $host === 'localhost') {
+ if (($host === $mainDomain || $host === 'localhost') && empty($previewHostname)) {
$template = new View(__DIR__ . '/../views/general/humans.phtml');
$response->text($template->render(false));
} else {
- router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $geodb);
+ router($utopia, $dbForConsole, $getProjectDB, $swooleRequest, $request, $response, $queueForEvents, $queueForUsage, $queueForFunctions, $geodb, $isResourceBlocked, $previewHostname);
}
});
@@ -1044,6 +1095,38 @@ App::get('/.well-known/acme-challenge/*')
include_once __DIR__ . '/shared/api.php';
include_once __DIR__ . '/shared/api/auth.php';
+App::get('/v1/ping')
+ ->groups(['api', 'general'])
+ ->desc('Test the connection between the Appwrite and the SDK.')
+ ->label('scope', 'global')
+ ->label('event', 'projects.[projectId].ping')
+ ->inject('response')
+ ->inject('project')
+ ->inject('dbForConsole')
+ ->inject('queueForEvents')
+ ->action(function (Response $response, Document $project, Database $dbForConsole, Event $queueForEvents) {
+ if ($project->isEmpty()) {
+ throw new AppwriteException(AppwriteException::PROJECT_NOT_FOUND);
+ }
+
+ $pingCount = $project->getAttribute('pingCount', 0) + 1;
+ $pingedAt = DateTime::now();
+
+ $project
+ ->setAttribute('pingCount', $pingCount)
+ ->setAttribute('pingedAt', $pingedAt);
+
+ Authorization::skip(function () use ($dbForConsole, $project) {
+ $dbForConsole->updateDocument('projects', $project->getId(), $project);
+ });
+
+ $queueForEvents
+ ->setParam('projectId', $project->getId())
+ ->setPayload($response->output($project, Response::MODEL_PROJECT));
+
+ $response->text('Pong!');
+ });
+
App::wildcard()
->groups(['api'])
->label('scope', 'global')
diff --git a/app/controllers/mock.php b/app/controllers/mock.php
index fdb1d80dcc..bc071fc885 100644
--- a/app/controllers/mock.php
+++ b/app/controllers/mock.php
@@ -158,7 +158,7 @@ App::patch('/v1/mock/functions-v2')
App::post('/v1/mock/api-key-unprefixed')
->desc('Create API Key (without standard prefix)')
->groups(['mock', 'api', 'projects'])
- ->label('scope', 'projects.write')
+ ->label('scope', 'public')
->label('docs', false)
->param('projectId', '', new UID(), 'Project ID.')
->inject('response')
diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php
index 6d87940ff7..91883b0895 100644
--- a/app/controllers/shared/api.php
+++ b/app/controllers/shared/api.php
@@ -11,10 +11,11 @@ use Appwrite\Event\Delete;
use Appwrite\Event\Event;
use Appwrite\Event\Func;
use Appwrite\Event\Messaging;
+use Appwrite\Event\Realtime;
use Appwrite\Event\Usage;
+use Appwrite\Event\Webhook;
use Appwrite\Extend\Exception;
use Appwrite\Extend\Exception as AppwriteException;
-use Appwrite\Messaging\Adapter\Realtime;
use Appwrite\Utopia\Request;
use Appwrite\Utopia\Response;
use Utopia\Abuse\Abuse;
@@ -28,6 +29,7 @@ use Utopia\Database\DateTime;
use Utopia\Database\Document;
use Utopia\Database\Helpers\Role;
use Utopia\Database\Validator\Authorization;
+use Utopia\Queue\Connection;
use Utopia\System\System;
use Utopia\Validator\WhiteList;
@@ -57,8 +59,36 @@ $parseLabel = function (string $label, array $responsePayload, array $requestPar
return $label;
};
-$databaseListener = function (string $event, Document $document, Document $project, Usage $queueForUsage, Database $dbForProject) {
+$eventDatabaseListener = function (Document $document, Response $response, Event $queueForEvents, Func $queueForFunctions, Webhook $queueForWebhooks, Realtime $queueForRealtime) {
+ // Only trigger events for user creation with the database listener.
+ if ($document->getCollection() !== 'users') {
+ return;
+ }
+ $queueForEvents
+ ->setEvent('users.[userId].create')
+ ->setParam('userId', $document->getId())
+ ->setPayload($response->output($document, Response::MODEL_USER));
+
+ // Trigger functions, webhooks, and realtime events
+ $queueForFunctions
+ ->from($queueForEvents)
+ ->trigger();
+
+ $queueForWebhooks
+ ->from($queueForEvents)
+ ->trigger();
+
+ if ($queueForEvents->getProject()->getId() === 'console') {
+ return;
+ }
+
+ $queueForRealtime
+ ->from($queueForEvents)
+ ->trigger();
+};
+
+$usageDatabaseListener = function (string $event, Document $document, Usage $queueForUsage) {
$value = 1;
if ($event === Database::EVENT_DOCUMENT_DELETE) {
$value = -1;
@@ -95,7 +125,7 @@ $databaseListener = function (string $event, Document $document, Document $proje
$databaseInternalId = $parts[1] ?? 0;
$queueForUsage
->addMetric(METRIC_COLLECTIONS, $value) // per project
- ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, METRIC_DATABASE_ID_COLLECTIONS), $value) // per database
+ ->addMetric(str_replace('{databaseInternalId}', $databaseInternalId, METRIC_DATABASE_ID_COLLECTIONS), $value)
;
if ($event === Database::EVENT_DOCUMENT_DELETE) {
@@ -155,47 +185,28 @@ App::init()
->inject('utopia')
->inject('request')
->inject('dbForConsole')
+ ->inject('dbForProject')
->inject('project')
->inject('user')
->inject('session')
->inject('servers')
->inject('mode')
- ->action(function (App $utopia, Request $request, Database $dbForConsole, Document $project, Document $user, ?Document $session, array $servers, string $mode) {
+ ->inject('team')
+ ->action(function (App $utopia, Request $request, Database $dbForConsole, Database $dbForProject, Document $project, Document $user, ?Document $session, array $servers, string $mode, Document $team) {
$route = $utopia->getRoute();
if ($project->isEmpty()) {
throw new Exception(Exception::PROJECT_NOT_FOUND);
}
- /**
- * ACL Check
- */
+ /** Default role */
+ $roles = Config::getParam('roles', []);
$role = ($user->isEmpty())
? Role::guests()->toString()
: Role::users()->toString();
- // Add user roles
- $memberships = $user->find('teamId', $project->getAttribute('teamId'), 'memberships');
-
- if ($memberships) {
- foreach ($memberships->getAttribute('roles', []) as $memberRole) {
- switch ($memberRole) {
- case 'owner':
- $role = Auth::USER_ROLE_OWNER;
- break;
- case 'admin':
- $role = Auth::USER_ROLE_ADMIN;
- break;
- case 'developer':
- $role = Auth::USER_ROLE_DEVELOPER;
- break;
- }
- }
- }
-
- $roles = Config::getParam('roles', []);
- $scope = $route->getLabel('scope', 'none'); // Allowed scope for chosen route
- $scopes = $roles[$role]['scopes']; // Allowed scopes for user role
+ /** Allowed Scopes for the role */
+ $scopes = $roles[$role]['scopes'];
$apiKey = $request->getHeader('x-appwrite-key', '');
@@ -294,13 +305,65 @@ App::init()
}
}
}
+ // Admin User Authentication
+ elseif (($project->getId() === 'console' && !$team->isEmpty() && !$user->isEmpty()) || ($project->getId() !== 'console' && !$user->isEmpty() && $mode === APP_MODE_ADMIN)) {
+ $teamId = $team->getId();
+ $adminRoles = [];
+ $memberships = $user->getAttribute('memberships', []);
+ foreach ($memberships as $membership) {
+ if ($membership->getAttribute('confirm', false) === true && $membership->getAttribute('teamId') === $teamId) {
+ $adminRoles = $membership->getAttribute('roles', []);
+ break;
+ }
+ }
+
+ if (empty($adminRoles)) {
+ throw new Exception(Exception::USER_UNAUTHORIZED);
+ }
+
+ $scopes = []; // reset scope if admin
+ foreach ($adminRoles as $role) {
+ $scopes = \array_merge($scopes, $roles[$role]['scopes']);
+ }
+
+ Authorization::setDefaultStatus(false); // Cancel security segmentation for admin users.
+ }
+
+ $scopes = \array_unique($scopes);
Authorization::setRole($role);
-
foreach (Auth::getRoles($user) as $authRole) {
Authorization::setRole($authRole);
}
+ /**
+ * Update project last activity
+ */
+ if (!$project->isEmpty() && $project->getId() !== 'console') {
+ $accessedAt = $project->getAttribute('accessedAt', '');
+ if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_PROJECT_ACCESS)) > $accessedAt) {
+ $project->setAttribute('accessedAt', DateTime::now());
+ Authorization::skip(fn () => $dbForConsole->updateDocument('projects', $project->getId(), $project));
+ }
+ }
+
+ /**
+ * Update user last activity
+ */
+ if (!empty($user->getId())) {
+ $accessedAt = $user->getAttribute('accessedAt', '');
+ if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_USER_ACCESS)) > $accessedAt) {
+ $user->setAttribute('accessedAt', DateTime::now());
+
+ if (APP_MODE_ADMIN !== $mode) {
+ $dbForProject->updateDocument('users', $user->getId(), $user);
+ } else {
+ $dbForConsole->updateDocument('users', $user->getId(), $user);
+ }
+ }
+ }
+
+ /** Do not allow access to disabled services */
$service = $route->getLabel('sdk.namespace', '');
if (!empty($service)) {
if (
@@ -311,14 +374,14 @@ App::init()
throw new Exception(Exception::GENERAL_SERVICE_DISABLED);
}
}
- if (!\in_array($scope, $scopes)) {
- if ($project->isEmpty()) { // Check if permission is denied because project is missing
- throw new Exception(Exception::PROJECT_NOT_FOUND);
- }
+ /** Do now allow access if scope is not allowed */
+ $scope = $route->getLabel('scope', 'none');
+ if (!\in_array($scope, $scopes)) {
throw new Exception(Exception::GENERAL_UNAUTHORIZED_SCOPE, $user->getAttribute('email', 'User') . ' (role: ' . \strtolower($roles[$role]['label']) . ') missing scope (' . $scope . ')');
}
+ /** Do not allow access to blocked accounts */
if (false === $user->getAttribute('status')) { // Account is blocked
throw new Exception(Exception::USER_BLOCKED);
}
@@ -348,6 +411,7 @@ App::init()
->inject('response')
->inject('project')
->inject('user')
+ ->inject('queue')
->inject('queueForEvents')
->inject('queueForMessaging')
->inject('queueForAudits')
@@ -357,7 +421,7 @@ App::init()
->inject('queueForUsage')
->inject('dbForProject')
->inject('mode')
- ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Usage $queueForUsage, Database $dbForProject, string $mode) use ($databaseListener) {
+ ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Connection $queue, Event $queueForEvents, Messaging $queueForMessaging, Audit $queueForAudits, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Usage $queueForUsage, Database $dbForProject, string $mode) use ($usageDatabaseListener, $eventDatabaseListener) {
$route = $utopia->getRoute();
@@ -451,9 +515,24 @@ App::init()
$queueForBuilds->setProject($project);
$queueForMessaging->setProject($project);
+ // Clone the queues, to prevent events triggered by the database listener
+ // from overwriting the events that are supposed to be triggered in the shutdown hook.
+ $queueForEventsClone = new Event($queue);
+ $queueForFunctions = new Func($queue);
+ $queueForWebhooks = new Webhook($queue);
+ $queueForRealtime = new Realtime();
+
$dbForProject
- ->on(Database::EVENT_DOCUMENT_CREATE, 'calculate-usage', fn ($event, $document) => $databaseListener($event, $document, $project, $queueForUsage, $dbForProject))
- ->on(Database::EVENT_DOCUMENT_DELETE, 'calculate-usage', fn ($event, $document) => $databaseListener($event, $document, $project, $queueForUsage, $dbForProject));
+ ->on(Database::EVENT_DOCUMENT_CREATE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForUsage))
+ ->on(Database::EVENT_DOCUMENT_DELETE, 'calculate-usage', fn ($event, $document) => $usageDatabaseListener($event, $document, $queueForUsage))
+ ->on(Database::EVENT_DOCUMENT_CREATE, 'create-trigger-events', fn ($event, $document) => $eventDatabaseListener(
+ $document,
+ $response,
+ $queueForEventsClone->from($queueForEvents),
+ $queueForFunctions->from($queueForEvents),
+ $queueForWebhooks->from($queueForEvents),
+ $queueForRealtime->from($queueForEvents)
+ ));
$useCache = $route->getLabel('cache', false);
if ($useCache) {
@@ -503,7 +582,7 @@ App::init()
}
$response
- ->addHeader('Expires', \date('D, d M Y H:i:s', \time() + $timestamp) . ' GMT')
+ ->addHeader('Cache-Control', sprintf('private, max-age=%d', $timestamp))
->addHeader('X-Appwrite-Cache', 'hit')
->setContentType($cacheLog->getAttribute('mimeType'))
->send($data);
@@ -511,7 +590,7 @@ App::init()
$response
->addHeader('Cache-Control', 'no-cache, no-store, must-revalidate')
->addHeader('Pragma', 'no-cache')
- ->addHeader('Expires', 0)
+ ->addHeader('Expires', '0')
->addHeader('X-Appwrite-Cache', 'miss')
;
}
@@ -586,11 +665,11 @@ App::shutdown()
->inject('queueForDatabase')
->inject('queueForBuilds')
->inject('queueForMessaging')
- ->inject('dbForProject')
->inject('queueForFunctions')
- ->inject('mode')
- ->inject('dbForConsole')
- ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Event $queueForEvents, Audit $queueForAudits, Usage $queueForUsage, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Messaging $queueForMessaging, Database $dbForProject, Func $queueForFunctions, string $mode, Database $dbForConsole) use ($parseLabel) {
+ ->inject('queueForWebhooks')
+ ->inject('queueForRealtime')
+ ->inject('dbForProject')
+ ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Event $queueForEvents, Audit $queueForAudits, Usage $queueForUsage, Delete $queueForDeletes, EventDatabase $queueForDatabase, Build $queueForBuilds, Messaging $queueForMessaging, Func $queueForFunctions, Event $queueForWebhooks, Realtime $queueForRealtime, Database $dbForProject) use ($parseLabel) {
$responsePayload = $response->getPayload();
@@ -599,54 +678,18 @@ App::shutdown()
$queueForEvents->setPayload($responsePayload);
}
- /**
- * Trigger functions.
- */
- if (!$queueForEvents->isPaused()) {
- $queueForFunctions
- ->from($queueForEvents)
- ->trigger();
- }
- /**
- * Trigger webhooks.
- */
- $queueForEvents
- ->setClass(Event::WEBHOOK_CLASS_NAME)
- ->setQueue(Event::WEBHOOK_QUEUE_NAME)
+ $queueForWebhooks
+ ->from($queueForEvents)
+ ->trigger();
+
+ $queueForFunctions
+ ->from($queueForEvents)
->trigger();
- /**
- * Trigger realtime.
- */
if ($project->getId() !== 'console') {
- $allEvents = Event::generateEvents($queueForEvents->getEvent(), $queueForEvents->getParams());
- $payload = new Document($queueForEvents->getPayload());
-
- $db = $queueForEvents->getContext('database');
- $collection = $queueForEvents->getContext('collection');
- $bucket = $queueForEvents->getContext('bucket');
-
- $target = Realtime::fromPayload(
- // Pass first, most verbose event pattern
- event: $allEvents[0],
- payload: $payload,
- project: $project,
- database: $db,
- collection: $collection,
- bucket: $bucket,
- );
-
- Realtime::send(
- projectId: $target['projectId'] ?? $project->getId(),
- payload: $queueForEvents->getRealtimePayload(),
- events: $allEvents,
- channels: $target['channels'],
- roles: $target['roles'],
- options: [
- 'permissionsChanged' => $target['permissionsChanged'],
- 'userId' => $queueForEvents->getParam('userId')
- ]
- );
+ $queueForRealtime
+ ->from($queueForEvents)
+ ->trigger();
}
}
@@ -746,8 +789,6 @@ App::shutdown()
}
}
-
-
if ($project->getId() !== 'console') {
if (!Auth::isPrivilegedUser(Authorization::getRoles())) {
$fileSize = 0;
@@ -766,33 +807,6 @@ App::shutdown()
->setProject($project)
->trigger();
}
-
- /**
- * Update project last activity
- */
- if (!$project->isEmpty() && $project->getId() !== 'console') {
- $accessedAt = $project->getAttribute('accessedAt', '');
- if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_PROJECT_ACCESS)) > $accessedAt) {
- $project->setAttribute('accessedAt', DateTime::now());
- Authorization::skip(fn () => $dbForConsole->updateDocument('projects', $project->getId(), $project));
- }
- }
-
- /**
- * Update user last activity
- */
- if (!$user->isEmpty()) {
- $accessedAt = $user->getAttribute('accessedAt', '');
- if (DateTime::formatTz(DateTime::addSeconds(new \DateTime(), -APP_USER_ACCESS)) > $accessedAt) {
- $user->setAttribute('accessedAt', DateTime::now());
-
- if (APP_MODE_ADMIN !== $mode) {
- $dbForProject->updateDocument('users', $user->getId(), $user);
- } else {
- $dbForConsole->updateDocument('users', $user->getId(), $user);
- }
- }
- }
});
App::init()
diff --git a/app/http.php b/app/http.php
index 7e1291142b..c4e48a7f69 100644
--- a/app/http.php
+++ b/app/http.php
@@ -9,16 +9,21 @@ use Swoole\Http\Request as SwooleRequest;
use Swoole\Http\Response as SwooleResponse;
use Swoole\Http\Server;
use Swoole\Process;
+use Swoole\Table;
use Utopia\Abuse\Adapters\Database\TimeLimit;
use Utopia\App;
use Utopia\Audit\Audit;
+use Utopia\Cache\Cache;
use Utopia\CLI\Console;
use Utopia\Config\Config;
use Utopia\Database\Database;
+use Utopia\Database\DateTime;
use Utopia\Database\Document;
+use Utopia\Database\Exception\Duplicate;
use Utopia\Database\Helpers\ID;
use Utopia\Database\Helpers\Permission;
use Utopia\Database\Helpers\Role;
+use Utopia\Database\Query;
use Utopia\Database\Validator\Authorization;
use Utopia\Logger\Log;
use Utopia\Logger\Log\User;
@@ -26,6 +31,12 @@ use Utopia\Pools\Group;
use Utopia\Swoole\Files;
use Utopia\System\System;
+const DOMAIN_SYNC_TIMER = 30; // 30 seconds
+
+$domains = new Table(1_000_000); // 1 million rows
+$domains->column('value', Table::TYPE_INT, 1);
+$domains->create();
+
$http = new Server(
host: "0.0.0.0",
port: System::getEnv('PORT', 80),
@@ -33,16 +44,17 @@ $http = new Server(
);
$payloadSize = 12 * (1024 * 1024); // 12MB - adding slight buffer for headers and other data that might be sent with the payload - update later with valid testing
-$workerNumber = swoole_cpu_num() * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));
+$totalWorkers = swoole_cpu_num() * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));
$http
->set([
- 'worker_num' => $workerNumber,
+ 'worker_num' => $totalWorkers,
+ 'dispatch_func' => 'dispatch',
'open_http2_protocol' => true,
- 'http_compression' => true,
- 'http_compression_level' => 6,
+ 'http_compression' => false,
'package_max_length' => $payloadSize,
'buffer_output_size' => $payloadSize,
+ 'task_worker_num' => 1, // required for the task to fetch domains background
]);
$http->on(Constant::EVENT_WORKER_START, function ($server, $workerId) {
@@ -57,6 +69,93 @@ $http->on(Constant::EVENT_AFTER_RELOAD, function ($server, $workerId) {
Console::success('Reload completed...');
});
+/**
+ * Assigns HTTP requests to worker threads by analyzing its payload/content.
+ *
+ * Routes requests as 'safe' or 'risky' based on specific content patterns (like POST actions or certain domains)
+ * to optimize load distribution between the workers. Utilizes `$safeThreadsPercent` to manage risk by assigning
+ * riskier tasks to a dedicated worker subset. Prefers idle workers, with fallback to random selection if necessary.
+ * doc: https://openswoole.com/docs/modules/swoole-server/configuration#dispatch_func
+ *
+ * @param Server $server Swoole server instance.
+ * @param int $fd client ID
+ * @param int $type the type of data and its current state
+ * @param string|null $data Request content for categorization.
+ * @global int $totalThreads Total number of workers.
+ * @return int Chosen worker ID for the request.
+ */
+function dispatch(Server $server, int $fd, int $type, $data = null): int
+{
+ global $totalWorkers, $domains;
+
+ // If data is not set we can send request to any worker
+ // first we try to pick idle worker, if not we randomly pick a worker
+ if ($data === null) {
+ for ($i = 0; $i < $totalWorkers; $i++) {
+ if ($server->getWorkerStatus($i) === SWOOLE_WORKER_IDLE) {
+ return $i;
+ }
+ }
+ return rand(0, $totalWorkers - 1);
+ }
+
+ $riskyWorkersPercent = intval(System::getEnv('_APP_RISKY_WORKERS_PERCENT', 80)) / 100; // Decimal form 0 to 1
+
+ // Each worker has numeric ID, starting from 0 and incrementing
+ // From 0 to riskyWorkers, we consider safe workers
+ // From riskyWorkers to totalWorkers, we consider risky workers
+ $riskyWorkers = (int) floor($totalWorkers * $riskyWorkersPercent); // Absolute amount of risky workers
+
+ $domain = '';
+ // max up to 3 as first line has request details and second line has host
+ $lines = explode("\n", $data, 3);
+ $request = $lines[0];
+ if (count($lines) > 1) {
+ $domain = trim(explode('Host: ', $lines[1])[1]);
+ }
+
+ // Sync executions are considered risky
+ $risky = false;
+ if (str_starts_with($request, 'POST') && str_contains($request, '/executions')) {
+ $risky = true;
+ } elseif (str_ends_with($domain, System::getEnv('_APP_DOMAIN_FUNCTIONS'))) {
+ $risky = true;
+ } elseif ($domains->get(md5($domain), 'value') === 1) {
+ // executions request coming from custom domain
+ $risky = true;
+ }
+
+ if ($risky) {
+ // If risky request, only consider risky workers
+ for ($j = $riskyWorkers; $j < $totalWorkers; $j++) {
+ /** Reference https://openswoole.com/docs/modules/swoole-server-getWorkerStatus#description */
+ if ($server->getWorkerStatus($j) === SWOOLE_WORKER_IDLE) {
+ // If idle worker found, give to him
+ return $j;
+ }
+ }
+
+ // If no idle workers, give to random risky worker
+ $worker = rand($riskyWorkers, $totalWorkers - 1);
+ Console::warning("swoole_dispatch: Risky branch: did not find a idle worker, picking random worker {$worker}");
+ return $worker;
+ }
+
+ // If safe request, give to any idle worker
+ // Its fine to pick risky worker here, because it's idle. Idle is never actually risky
+ for ($i = 0; $i < $totalWorkers; $i++) {
+ if ($server->getWorkerStatus($i) === SWOOLE_WORKER_IDLE) {
+ return $i;
+ }
+ }
+
+ // If no idle worker found, give to random safe worker
+ // We avoid risky workers here, as it could be in work - not idle. Thats exactly when they are risky.
+ $worker = rand(0, $riskyWorkers - 1);
+ Console::warning("swoole_dispatch: Non-risky branch: did not find a idle worker, picking random worker {$worker}");
+ return $worker;
+}
+
include __DIR__ . '/controllers/general.php';
$http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $register) {
@@ -90,9 +189,9 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
Console::success('[Setup] - Server database init started...');
try {
- Console::success('[Setup] - Creating database: appwrite...');
+ Console::success('[Setup] - Creating console database...');
$dbForConsole->create();
- } catch (\Throwable $e) {
+ } catch (Duplicate) {
Console::success('[Setup] - Skip: metadata table already exists');
}
@@ -117,34 +216,10 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
continue;
}
- Console::success('[Setup] - Creating collection: ' . $collection['$id'] . '...');
+ Console::success('[Setup] - Creating console collection: ' . $collection['$id'] . '...');
- $attributes = [];
- $indexes = [];
-
- foreach ($collection['attributes'] as $attribute) {
- $attributes[] = new Document([
- '$id' => ID::custom($attribute['$id']),
- 'type' => $attribute['type'],
- 'size' => $attribute['size'],
- 'required' => $attribute['required'],
- 'signed' => $attribute['signed'],
- 'array' => $attribute['array'],
- 'filters' => $attribute['filters'],
- 'default' => $attribute['default'] ?? null,
- 'format' => $attribute['format'] ?? ''
- ]);
- }
-
- foreach ($collection['indexes'] as $index) {
- $indexes[] = new Document([
- '$id' => ID::custom($index['$id']),
- 'type' => $index['type'],
- 'attributes' => $index['attributes'],
- 'lengths' => $index['lengths'],
- 'orders' => $index['orders'],
- ]);
- }
+ $attributes = \array_map(fn ($attribute) => new Document($attribute), $collection['attributes']);
+ $indexes = \array_map(fn (array $index) => new Document($index), $collection['indexes']);
$dbForConsole->createCollection($key, $attributes, $indexes);
}
@@ -179,36 +254,55 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
throw new Exception('Files collection is not configured.');
}
- $attributes = [];
- $indexes = [];
-
- foreach ($files['attributes'] as $attribute) {
- $attributes[] = new Document([
- '$id' => ID::custom($attribute['$id']),
- 'type' => $attribute['type'],
- 'size' => $attribute['size'],
- 'required' => $attribute['required'],
- 'signed' => $attribute['signed'],
- 'array' => $attribute['array'],
- 'filters' => $attribute['filters'],
- 'default' => $attribute['default'] ?? null,
- 'format' => $attribute['format'] ?? ''
- ]);
- }
-
- foreach ($files['indexes'] as $index) {
- $indexes[] = new Document([
- '$id' => ID::custom($index['$id']),
- 'type' => $index['type'],
- 'attributes' => $index['attributes'],
- 'lengths' => $index['lengths'],
- 'orders' => $index['orders'],
- ]);
- }
+ $attributes = \array_map(fn ($attribute) => new Document($attribute), $files['attributes']);
+ $indexes = \array_map(fn (array $index) => new Document($index), $files['indexes']);
$dbForConsole->createCollection('bucket_' . $bucket->getInternalId(), $attributes, $indexes);
}
+ $projectCollections = $collections['projects'];
+ $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+ $sharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES_V1', ''));
+ $sharedTablesV2 = \array_diff($sharedTables, $sharedTablesV1);
+
+ $cache = $app->getResource('cache');
+
+ foreach ($sharedTablesV2 as $hostname) {
+ $adapter = $pools
+ ->get($hostname)
+ ->pop()
+ ->getResource();
+
+ $dbForProject = (new Database($adapter, $cache))
+ ->setDatabase('appwrite')
+ ->setSharedTables(true)
+ ->setTenant(null)
+ ->setNamespace(System::getEnv('_APP_DATABASE_SHARED_NAMESPACE', ''));
+
+ try {
+ Console::success('[Setup] - Creating project database: ' . $hostname . '...');
+ $dbForProject->create();
+ } catch (Duplicate) {
+ Console::success('[Setup] - Skip: metadata table already exists');
+ }
+
+ foreach ($projectCollections as $key => $collection) {
+ if (($collection['$collection'] ?? '') !== Database::METADATA) {
+ continue;
+ }
+ if (!$dbForProject->getCollection($key)->isEmpty()) {
+ continue;
+ }
+
+ $attributes = \array_map(fn ($attribute) => new Document($attribute), $collection['attributes']);
+ $indexes = \array_map(fn (array $index) => new Document($index), $collection['indexes']);
+
+ Console::success('[Setup] - Creating project collection: ' . $collection['$id'] . '...');
+
+ $dbForProject->createCollection($key, $attributes, $indexes);
+ }
+ }
+
$pools->reclaim();
Console::success('[Setup] - Server database init completed...');
@@ -217,6 +311,9 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
Console::success('Server started successfully (max payload is ' . number_format($payloadSize) . ' bytes)');
Console::info("Master pid {$http->master_pid}, manager pid {$http->manager_pid}");
+ // Start the task that starts fetching custom domains
+ $http->task([], 0);
+
// listen ctrl + c
Process::signal(2, function () use ($http) {
Console::log('Stop by Ctrl+C');
@@ -224,7 +321,7 @@ $http->on(Constant::EVENT_START, function (Server $http) use ($payloadSize, $reg
});
});
-$http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swooleResponse) use ($register) {
+$http->on(Constant::EVENT_REQUEST, function (SwooleRequest $swooleRequest, SwooleResponse $swooleResponse) use ($register) {
App::setResource('swooleRequest', fn () => $swooleRequest);
App::setResource('swooleResponse', fn () => $swooleResponse);
@@ -244,6 +341,8 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
}
$app = new App('UTC');
+ $app->setCompression(true);
+ $app->setCompressionMinSize(intval(System::getEnv('_APP_COMPRESSION_MIN_SIZE_BYTES', '1024'))); // 1KB
$pools = $register->get('pools');
App::setResource('pools', fn () => $pools);
@@ -271,10 +370,12 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
if (isset($user) && !$user->isEmpty()) {
$log->setUser(new User($user->getId()));
+ } else {
+ $log->setUser(new User('guest-' . hash('sha256', $request->getIP())));
}
$log->setNamespace("http");
- $log->setServer(\gethostname());
+ $log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
$log->setVersion($version);
$log->setType(Log::TYPE_ERROR);
$log->setMessage($th->getMessage());
@@ -294,12 +395,17 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
$action = $route->getLabel("sdk.namespace", "UNKNOWN_NAMESPACE") . '.' . $route->getLabel("sdk.method", "UNKNOWN_METHOD");
$log->setAction($action);
+ $log->addTag('service', $action);
$isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
$log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
- $responseCode = $logger->addLog($log);
- Console::info('Log pushed with status code: ' . $responseCode);
+ try {
+ $responseCode = $logger->addLog($log);
+ Console::info('Error log pushed with status code: ' . $responseCode);
+ } catch (Throwable $th) {
+ Console::error('Error pushing log: ' . $th->getMessage());
+ }
}
Console::error('[Error] Type: ' . get_class($th));
@@ -328,4 +434,59 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo
}
});
+// Fetch domains every `DOMAIN_SYNC_TIMER` seconds and update in the memory
+$http->on('Task', function () use ($register, $domains) {
+ $lastSyncUpdate = null;
+ $pools = $register->get('pools');
+ App::setResource('pools', fn () => $pools);
+ $app = new App('UTC');
+
+ /** @var Utopia\Database\Database $dbForConsole */
+ $dbForConsole = $app->getResource('dbForConsole');
+
+ Console::loop(function () use ($dbForConsole, $domains, &$lastSyncUpdate) {
+ try {
+ $time = DateTime::now();
+ $limit = 1000;
+ $sum = $limit;
+ $latestDocument = null;
+
+ while ($sum === $limit) {
+ $queries = [Query::limit($limit)];
+ if ($latestDocument !== null) {
+ $queries[] = Query::cursorAfter($latestDocument);
+ }
+ if ($lastSyncUpdate != null) {
+ $queries[] = Query::greaterThanEqual('$updatedAt', $lastSyncUpdate);
+ }
+ $queries[] = Query::equal('resourceType', ['function']);
+ $results = [];
+ try {
+ $results = Authorization::skip(fn () => $dbForConsole->find('rules', $queries));
+ } catch (Throwable $th) {
+ Console::error($th->getMessage());
+ }
+
+ $sum = count($results);
+ foreach ($results as $document) {
+ $domain = $document->getAttribute('domain');
+ if (str_ends_with($domain, System::getEnv('_APP_DOMAIN_FUNCTIONS'))) {
+ continue;
+ }
+ $domains->set(md5($domain), ['value' => 1]);
+ }
+ $latestDocument = !empty(array_key_last($results)) ? $results[array_key_last($results)] : null;
+ }
+ $lastSyncUpdate = $time;
+ if ($sum > 0) {
+ Console::log("Sync domains tick: {$sum} domains were updated");
+ }
+ } catch (Throwable $th) {
+ Console::error($th->getMessage());
+ }
+ }, DOMAIN_SYNC_TIMER, 0, function ($error) {
+ Console::error($error);
+ });
+});
+
$http->start();
diff --git a/app/init.php b/app/init.php
index b4ab772e0e..30ece74553 100644
--- a/app/init.php
+++ b/app/init.php
@@ -31,7 +31,9 @@ use Appwrite\Event\Func;
use Appwrite\Event\Mail;
use Appwrite\Event\Messaging;
use Appwrite\Event\Migration;
+use Appwrite\Event\Realtime;
use Appwrite\Event\Usage;
+use Appwrite\Event\Webhook;
use Appwrite\Extend\Exception;
use Appwrite\Functions\Specification;
use Appwrite\GraphQL\Promises\Adapter\Swoole;
@@ -40,7 +42,9 @@ use Appwrite\Hooks\Hooks;
use Appwrite\Network\Validator\Email;
use Appwrite\Network\Validator\Origin;
use Appwrite\OpenSSL\OpenSSL;
+use Appwrite\PubSub\Adapter\Redis as PubSub;
use Appwrite\URL\URL as AppwriteURL;
+use Appwrite\Utopia\Request;
use MaxMind\Db\Reader;
use PHPMailer\PHPMailer\PHPMailer;
use Swoole\Database\PDOProxy;
@@ -119,7 +123,7 @@ const APP_USER_ACCESS = 24 * 60 * 60; // 24 hours
const APP_PROJECT_ACCESS = 24 * 60 * 60; // 24 hours
const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
const APP_CACHE_BUSTER = 4318;
-const APP_VERSION_STABLE = '1.6.0';
+const APP_VERSION_STABLE = '1.6.1';
const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
const APP_DATABASE_ATTRIBUTE_IP = 'ip';
@@ -129,6 +133,7 @@ const APP_DATABASE_ATTRIBUTE_INT_RANGE = 'intRange';
const APP_DATABASE_ATTRIBUTE_FLOAT_RANGE = 'floatRange';
const APP_DATABASE_ATTRIBUTE_STRING_MAX_LENGTH = 1_073_741_824; // 2^32 bits / 4 bits per char
const APP_DATABASE_TIMEOUT_MILLISECONDS = 15_000;
+const APP_DATABASE_QUERY_MAX_VALUES = 500;
const APP_STORAGE_UPLOADS = '/storage/uploads';
const APP_STORAGE_FUNCTIONS = '/storage/functions';
const APP_STORAGE_BUILDS = '/storage/builds';
@@ -148,9 +153,12 @@ const APP_SOCIAL_DEV = 'https://dev.to/appwrite';
const APP_SOCIAL_STACKSHARE = 'https://stackshare.io/appwrite';
const APP_SOCIAL_YOUTUBE = 'https://www.youtube.com/c/appwrite?sub_confirmation=1';
const APP_HOSTNAME_INTERNAL = 'appwrite';
-const APP_FUNCTION_SPECIFICATION_DEFAULT = Specification::S_05VCPU_512MB;
+const APP_FUNCTION_SPECIFICATION_DEFAULT = Specification::S_1VCPU_512MB;
const APP_FUNCTION_CPUS_DEFAULT = 0.5;
const APP_FUNCTION_MEMORY_DEFAULT = 512;
+const APP_PLATFORM_SERVER = 'server';
+const APP_PLATFORM_CLIENT = 'client';
+const APP_PLATFORM_CONSOLE = 'console';
// Database Reconnect
const DATABASE_RECONNECT_SLEEP = 2;
@@ -238,10 +246,13 @@ const METRIC_MESSAGES_TYPE_PROVIDER_FAILED = METRIC_MESSAGES . '.{type}.{provid
const METRIC_SESSIONS = 'sessions';
const METRIC_DATABASES = 'databases';
const METRIC_COLLECTIONS = 'collections';
+const METRIC_DATABASES_STORAGE = 'databases.storage';
const METRIC_DATABASE_ID_COLLECTIONS = '{databaseInternalId}.collections';
+const METRIC_DATABASE_ID_STORAGE = '{databaseInternalId}.databases.storage';
const METRIC_DOCUMENTS = 'documents';
const METRIC_DATABASE_ID_DOCUMENTS = '{databaseInternalId}.documents';
const METRIC_DATABASE_ID_COLLECTION_ID_DOCUMENTS = '{databaseInternalId}.{collectionInternalId}.documents';
+const METRIC_DATABASE_ID_COLLECTION_ID_STORAGE = '{databaseInternalId}.{collectionInternalId}.databases.storage';
const METRIC_BUCKETS = 'buckets';
const METRIC_FILES = 'files';
const METRIC_FILES_STORAGE = 'files.storage';
@@ -278,6 +289,17 @@ const METRIC_NETWORK_REQUESTS = 'network.requests';
const METRIC_NETWORK_INBOUND = 'network.inbound';
const METRIC_NETWORK_OUTBOUND = 'network.outbound';
+// Resource types
+
+const RESOURCE_TYPE_PROJECTS = 'projects';
+const RESOURCE_TYPE_FUNCTIONS = 'functions';
+const RESOURCE_TYPE_DATABASES = 'databases';
+const RESOURCE_TYPE_BUCKETS = 'buckets';
+const RESOURCE_TYPE_PROVIDERS = 'providers';
+const RESOURCE_TYPE_TOPICS = 'topics';
+const RESOURCE_TYPE_SUBSCRIBERS = 'subscribers';
+const RESOURCE_TYPE_MESSAGES = 'messages';
+
$register = new Registry();
App::setMode(System::getEnv('_APP_ENV', App::MODE_TYPE_PRODUCTION));
@@ -952,7 +974,10 @@ $register->set('pools', function () {
$adapter->setDatabase($dsn->getPath());
break;
case 'pubsub':
- $adapter = $resource();
+ $adapter = match ($dsn->getScheme()) {
+ 'redis' => new PubSub($resource()),
+ default => null
+ };
break;
case 'queue':
$adapter = match ($dsn->getScheme()) {
@@ -1115,6 +1140,12 @@ App::setResource('queueForDeletes', function (Connection $queue) {
App::setResource('queueForEvents', function (Connection $queue) {
return new Event($queue);
}, ['queue']);
+App::setResource('queueForWebhooks', function (Connection $queue) {
+ return new Webhook($queue);
+}, ['queue']);
+App::setResource('queueForRealtime', function () {
+ return new Realtime();
+}, []);
App::setResource('queueForAudits', function (Connection $queue) {
return new Audit($queue);
}, ['queue']);
@@ -1252,13 +1283,13 @@ App::setResource('user', function ($mode, $project, $console, $request, $respons
$user = new Document([]);
}
- if (APP_MODE_ADMIN === $mode) {
- if ($user->find('teamInternalId', $project->getAttribute('teamInternalId'), 'memberships')) {
- Authorization::setDefaultStatus(false); // Cancel security segmentation for admin users.
- } else {
- $user = new Document([]);
- }
- }
+ // if (APP_MODE_ADMIN === $mode) {
+ // if ($user->find('teamInternalId', $project->getAttribute('teamInternalId'), 'memberships')) {
+ // Authorization::setDefaultStatus(false); // Cancel security segmentation for admin users.
+ // } else {
+ // $user = new Document([]);
+ // }
+ // }
$authJWT = $request->getHeader('x-appwrite-jwt', '');
@@ -1335,7 +1366,7 @@ App::setResource('console', function () {
'$collection' => ID::custom('projects'),
'description' => 'Appwrite core engine',
'logo' => '',
- 'teamId' => -1,
+ 'teamId' => null,
'webhooks' => [],
'keys' => [],
'platforms' => [
@@ -1391,16 +1422,12 @@ App::setResource('dbForProject', function (Group $pools, Database $dbForConsole,
$database
->setMetadata('host', \gethostname())
->setMetadata('project', $project->getId())
- ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS);
+ ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS)
+ ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
- try {
- $dsn = new DSN($project->getAttribute('database'));
- } catch (\InvalidArgumentException) {
- // TODO: Temporary until all projects are using shared tables
- $dsn = new DSN('mysql://' . $project->getAttribute('database'));
- }
+ $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
- if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
+ if (\in_array($dsn->getHost(), $sharedTables)) {
$database
->setSharedTables(true)
->setTenant($project->getInternalId())
@@ -1427,7 +1454,8 @@ App::setResource('dbForConsole', function (Group $pools, Cache $cache) {
->setNamespace('_console')
->setMetadata('host', \gethostname())
->setMetadata('project', 'console')
- ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS);
+ ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS)
+ ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
return $database;
}, ['pools', 'cache']);
@@ -1451,9 +1479,12 @@ App::setResource('getProjectDB', function (Group $pools, Database $dbForConsole,
$database
->setMetadata('host', \gethostname())
->setMetadata('project', $project->getId())
- ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS);
+ ->setTimeout(APP_DATABASE_TIMEOUT_MILLISECONDS)
+ ->setMaxQueryValues(APP_DATABASE_QUERY_MAX_VALUES);
- if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
+ $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+
+ if (\in_array($dsn->getHost(), $sharedTables)) {
$database
->setSharedTables(true)
->setTenant($project->getInternalId())
@@ -1516,9 +1547,9 @@ App::setResource('deviceForBuilds', function ($project) {
return getDevice(APP_STORAGE_BUILDS . '/app-' . $project->getId());
}, ['project']);
-function getDevice($root): Device
+function getDevice(string $root, string $connection = ''): Device
{
- $connection = System::getEnv('_APP_CONNECTIONS_STORAGE', '');
+ $connection = !empty($connection) ? $connection : System::getEnv('_APP_CONNECTIONS_STORAGE', '');
if (!empty($connection)) {
$acl = 'private';
@@ -1760,6 +1791,51 @@ App::setResource('requestTimestamp', function ($request) {
}
return $requestTimestamp;
}, ['request']);
+
App::setResource('plan', function (array $plan = []) {
return [];
});
+
+App::setResource('team', function (Document $project, Database $dbForConsole, App $utopia, Request $request) {
+ $teamInternalId = '';
+ if ($project->getId() !== 'console') {
+ $teamInternalId = $project->getAttribute('teamInternalId', '');
+ } else {
+ $route = $utopia->match($request);
+ $path = $route->getPath();
+ if (str_starts_with($path, '/v1/projects/:projectId')) {
+ $uri = $request->getURI();
+ $pid = explode('/', $uri)[3];
+ $p = Authorization::skip(fn () => $dbForConsole->getDocument('projects', $pid));
+ $teamInternalId = $p->getAttribute('teamInternalId', '');
+ } elseif ($path === '/v1/projects') {
+ $teamId = $request->getParam('teamId', '');
+ $team = Authorization::skip(fn () => $dbForConsole->getDocument('teams', $teamId));
+ return $team;
+ }
+ }
+
+ $team = Authorization::skip(function () use ($dbForConsole, $teamInternalId) {
+ return $dbForConsole->findOne('teams', [
+ Query::equal('$internalId', [$teamInternalId]),
+ ]);
+ });
+
+ return $team;
+}, ['project', 'dbForConsole', 'utopia', 'request']);
+
+App::setResource(
+ 'isResourceBlocked',
+ fn () => fn (Document $project, string $resourceType, ?string $resourceId) => false
+);
+
+App::setResource('previewHostname', function (Request $request) {
+ if (App::isDevelopment()) {
+ $host = $request->getQuery('appwrite-hostname') ?? '';
+ if (!empty($host)) {
+ return $host;
+ }
+ }
+
+ return '';
+}, ['request']);
diff --git a/app/realtime.php b/app/realtime.php
index b8fdb2cf21..03eaa53bcc 100644
--- a/app/realtime.php
+++ b/app/realtime.php
@@ -29,6 +29,7 @@ use Utopia\Database\Validator\Authorization;
use Utopia\DSN\DSN;
use Utopia\Logger\Log;
use Utopia\System\System;
+use Utopia\Telemetry\Adapter\None as NoTelemetry;
use Utopia\WebSocket\Adapter;
use Utopia\WebSocket\Server;
@@ -40,7 +41,7 @@ require_once __DIR__ . '/init.php';
Runtime::enableCoroutine(SWOOLE_HOOK_ALL);
// Allows overriding
-if (!function_exists("getConsoleDB")) {
+if (!function_exists('getConsoleDB')) {
function getConsoleDB(): Database
{
global $register;
@@ -66,7 +67,7 @@ if (!function_exists("getConsoleDB")) {
}
// Allows overriding
-if (!function_exists("getProjectDB")) {
+if (!function_exists('getProjectDB')) {
function getProjectDB(Document $project): Database
{
global $register;
@@ -92,7 +93,9 @@ if (!function_exists("getProjectDB")) {
$database = new Database($adapter, getCache());
- if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
+ $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+
+ if (\in_array($dsn->getHost(), $sharedTables)) {
$database
->setSharedTables(true)
->setTenant($project->getInternalId())
@@ -113,7 +116,7 @@ if (!function_exists("getProjectDB")) {
}
// Allows overriding
-if (!function_exists("getCache")) {
+if (!function_exists('getCache')) {
function getCache(): Cache
{
global $register;
@@ -135,7 +138,21 @@ if (!function_exists("getCache")) {
}
}
-$realtime = new Realtime();
+if (!function_exists('getRealtime')) {
+ function getRealtime(): Realtime
+ {
+ return new Realtime();
+ }
+}
+
+if (!function_exists('getTelemetry')) {
+ function getTelemetry(int $workerId): Utopia\Telemetry\Adapter
+ {
+ return new NoTelemetry();
+ }
+}
+
+$realtime = getRealtime();
/**
* Table for statistics across all workers.
@@ -167,7 +184,7 @@ $logError = function (Throwable $error, string $action) use ($register) {
$log = new Log();
$log->setNamespace("realtime");
- $log->setServer(gethostname());
+ $log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
$log->setVersion($version);
$log->setType(Log::TYPE_ERROR);
$log->setMessage($error->getMessage());
@@ -184,8 +201,12 @@ $logError = function (Throwable $error, string $action) use ($register) {
$isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
$log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
- $responseCode = $logger->addLog($log);
- Console::info('Realtime log pushed with status code: ' . $responseCode);
+ try {
+ $responseCode = $logger->addLog($log);
+ Console::info('Error log pushed with status code: ' . $responseCode);
+ } catch (Throwable $th) {
+ Console::error('Error pushing log: ' . $th->getMessage());
+ }
}
Console::error('[Error] Type: ' . get_class($error));
@@ -263,6 +284,12 @@ $server->onStart(function () use ($stats, $register, $containerId, &$statsDocume
$server->onWorkerStart(function (int $workerId) use ($server, $register, $stats, $realtime, $logError) {
Console::success('Worker ' . $workerId . ' started successfully');
+ $telemetry = getTelemetry($workerId);
+ $register->set('telemetry', fn () => $telemetry);
+ $register->set('telemetry.connectionCounter', fn () => $telemetry->createUpDownCounter('realtime.server.open_connections'));
+ $register->set('telemetry.connectionCreatedCounter', fn () => $telemetry->createCounter('realtime.server.connection.created'));
+ $register->set('telemetry.messageSentCounter', fn () => $telemetry->createCounter('realtime.server.message.sent'));
+
$attempts = 0;
$start = time();
@@ -354,17 +381,16 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
}
$start = time();
- $redis = $register->get('pools')->get('pubsub')->pop()->getResource(); /** @var Redis $redis */
- $redis->setOption(Redis::OPT_READ_TIMEOUT, -1);
-
- if ($redis->ping(true)) {
+ /** @var \Appwrite\PubSub\Adapter $pubsub */
+ $pubsub = $register->get('pools')->get('pubsub')->pop()->getResource();
+ if ($pubsub->ping(true)) {
$attempts = 0;
Console::success('Pub/sub connection established (worker: ' . $workerId . ')');
} else {
Console::error('Pub/sub failed (worker: ' . $workerId . ')');
}
- $redis->subscribe(['realtime'], function (Redis $redis, string $channel, string $payload) use ($server, $workerId, $stats, $register, $realtime) {
+ $pubsub->subscribe(['realtime'], function (mixed $redis, string $channel, string $payload) use ($server, $workerId, $stats, $register, $realtime) {
$event = json_decode($payload, true);
if ($event['permissionsChanged'] && isset($event['userId'])) {
@@ -406,6 +432,7 @@ $server->onWorkerStart(function (int $workerId) use ($server, $register, $stats,
);
if (($num = count($receivers)) > 0) {
+ $register->get('telemetry.messageSentCounter')->add($num);
$stats->incr($event['project'], 'messages', $num);
}
});
@@ -509,6 +536,9 @@ $server->onOpen(function (int $connection, SwooleRequest $request) use ($server,
]
]));
+ $register->get('telemetry.connectionCounter')->add(1);
+ $register->get('telemetry.connectionCreatedCounter')->add(1);
+
$stats->set($project->getId(), [
'projectId' => $project->getId(),
'teamId' => $project->getAttribute('teamId')
@@ -582,9 +612,12 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
}
switch ($message['type']) {
- /**
- * This type is used to authenticate.
- */
+ case 'ping':
+ $server->send([$connection], json_encode([
+ 'type' => 'pong'
+ ]));
+
+ break;
case 'authentication':
if (!array_key_exists('session', $message['data'])) {
throw new Exception(Exception::REALTIME_MESSAGE_FORMAT_INVALID, 'Payload is not valid.');
@@ -642,12 +675,14 @@ $server->onMessage(function (int $connection, string $message) use ($server, $re
}
});
-$server->onClose(function (int $connection) use ($realtime, $stats) {
+$server->onClose(function (int $connection) use ($realtime, $stats, $register) {
if (array_key_exists($connection, $realtime->connections)) {
$stats->decr($realtime->connections[$connection]['projectId'], 'connectionsTotal');
}
$realtime->unsubscribe($connection);
+ $register->get('telemetry.connectionCounter')->add(-1);
+
Console::info('Connection close: ' . $connection);
});
diff --git a/app/views/install/compose.phtml b/app/views/install/compose.phtml
index 8f83fed544..ad6d883c4c 100644
--- a/app/views/install/compose.phtml
+++ b/app/views/install/compose.phtml
@@ -73,6 +73,7 @@ $image = $this->getParam('image', '');
- _APP_ENV
- _APP_WORKER_PER_CORE
- _APP_LOCALE
+ - _APP_COMPRESSION_MIN_SIZE_BYTES
- _APP_CONSOLE_WHITELIST_ROOT
- _APP_CONSOLE_WHITELIST_EMAILS
- _APP_CONSOLE_SESSION_ALERTS
@@ -166,7 +167,7 @@ $image = $this->getParam('image', '');
appwrite-console:
<<: *x-logging
container_name: appwrite-console
- image: /console:5.0.12
+ image: /console:5.2.27
restart: unless-stopped
networks:
- appwrite
@@ -531,6 +532,8 @@ $image = $this->getParam('image', '');
- _APP_SMTP_USERNAME
- _APP_SMTP_PASSWORD
- _APP_LOGGING_CONFIG
+ - _APP_DOMAIN
+ - _APP_OPTIONS_FORCE_HTTPS
appwrite-worker-messaging:
image: /:
diff --git a/app/worker.php b/app/worker.php
index 9bcdae78e6..7e4eafeea2 100644
--- a/app/worker.php
+++ b/app/worker.php
@@ -2,6 +2,7 @@
require_once __DIR__ . '/init.php';
+use Appwrite\Certificates\LetsEncrypt;
use Appwrite\Event\Audit;
use Appwrite\Event\Build;
use Appwrite\Event\Certificate;
@@ -16,7 +17,6 @@ use Appwrite\Event\Usage;
use Appwrite\Event\UsageDump;
use Appwrite\Platform\Appwrite;
use Swoole\Runtime;
-use Utopia\App;
use Utopia\Cache\Adapter\Sharding;
use Utopia\Cache\Cache;
use Utopia\CLI\Console;
@@ -93,7 +93,9 @@ Server::setResource('dbForProject', function (Cache $cache, Registry $register,
$dsn = new DSN('mysql://' . $project->getAttribute('database'));
}
- if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
+ $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+
+ if (\in_array($dsn->getHost(), $sharedTables)) {
$database
->setSharedTables(true)
->setTenant($project->getInternalId())
@@ -126,7 +128,9 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForConso
if (isset($databases[$dsn->getHost()])) {
$database = $databases[$dsn->getHost()];
- if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
+ $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+
+ if (\in_array($dsn->getHost(), $sharedTables)) {
$database
->setSharedTables(true)
->setTenant($project->getInternalId())
@@ -150,7 +154,9 @@ Server::setResource('getProjectDB', function (Group $pools, Database $dbForConso
$databases[$dsn->getHost()] = $database;
- if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
+ $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+
+ if (\in_array($dsn->getHost(), $sharedTables)) {
$database
->setSharedTables(true)
->setTenant($project->getInternalId())
@@ -272,6 +278,64 @@ Server::setResource('deviceForCache', function (Document $project) {
return getDevice(APP_STORAGE_CACHE . '/app-' . $project->getId());
}, ['project']);
+Server::setResource(
+ 'isResourceBlocked',
+ fn () => fn (Document $project, string $resourceType, ?string $resourceId) => false
+);
+
+Server::setResource('certificates', function () {
+ $email = System::getEnv('_APP_EMAIL_CERTIFICATES', System::getEnv('_APP_SYSTEM_SECURITY_EMAIL_ADDRESS'));
+ if (empty($email)) {
+ throw new Exception('You must set a valid security email address (_APP_EMAIL_CERTIFICATES) to issue a LetsEncrypt SSL certificate.');
+ }
+
+ return new LetsEncrypt($email);
+});
+
+Server::setResource('logError', function (Registry $register, Document $project) {
+ return function (Throwable $error, string $namespace, string $action, ?array $extras) use ($register, $project) {
+ $logger = $register->get('logger');
+
+ if ($logger) {
+ $version = System::getEnv('_APP_VERSION', 'UNKNOWN');
+
+ $log = new Log();
+ $log->setNamespace($namespace);
+ $log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
+ $log->setVersion($version);
+ $log->setType(Log::TYPE_ERROR);
+ $log->setMessage($error->getMessage());
+
+ $log->addTag('code', $error->getCode());
+ $log->addTag('verboseType', get_class($error));
+ $log->addTag('projectId', $project->getId() ?? '');
+
+ $log->addExtra('file', $error->getFile());
+ $log->addExtra('line', $error->getLine());
+ $log->addExtra('trace', $error->getTraceAsString());
+
+
+ foreach ($extras as $key => $value) {
+ $log->addExtra($key, $value);
+ }
+
+ $log->setAction($action);
+
+ $isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
+ $log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
+
+ try {
+ $responseCode = $logger->addLog($log);
+ Console::info('Error log pushed with status code: ' . $responseCode);
+ } catch (Throwable $th) {
+ Console::error('Error pushing log: ' . $th->getMessage());
+ }
+ }
+
+ Console::warning("Failed: {$error->getMessage()}");
+ Console::warning($error->getTraceAsString());
+ };
+}, ['register', 'project']);
$pools = $register->get('pools');
$platform = new Appwrite();
@@ -330,7 +394,7 @@ $worker
if ($logger) {
$log->setNamespace("appwrite-worker");
- $log->setServer(\gethostname());
+ $log->setServer(System::getEnv('_APP_LOGGING_SERVICE_IDENTIFIER', \gethostname()));
$log->setVersion($version);
$log->setType(Log::TYPE_ERROR);
$log->setMessage($error->getMessage());
@@ -346,8 +410,12 @@ $worker
$isProduction = System::getEnv('_APP_ENV', 'development') === 'production';
$log->setEnvironment($isProduction ? Log::ENVIRONMENT_PRODUCTION : Log::ENVIRONMENT_STAGING);
- $responseCode = $logger->addLog($log);
- Console::info('Usage stats log pushed with status code: ' . $responseCode);
+ try {
+ $responseCode = $logger->addLog($log);
+ Console::info('Error log pushed with status code: ' . $responseCode);
+ } catch (Throwable $th) {
+ Console::error('Error pushing log: ' . $th->getMessage());
+ }
}
Console::error('[Error] Type: ' . get_class($error));
diff --git a/composer.json b/composer.json
index 38ead1fbcd..512e203a5e 100644
--- a/composer.json
+++ b/composer.json
@@ -43,24 +43,24 @@
"ext-openssl": "*",
"ext-zlib": "*",
"ext-sockets": "*",
- "appwrite/php-runtimes": "0.15.*",
+ "appwrite/php-runtimes": "0.16.*",
"appwrite/php-clamav": "2.0.*",
- "utopia-php/abuse": "0.43.0",
+ "utopia-php/abuse": "0.43.*",
"utopia-php/analytics": "0.10.*",
- "utopia-php/audit": "0.43.0",
- "utopia-php/cache": "0.10.*",
+ "utopia-php/audit": "0.43.*",
+ "utopia-php/cache": "0.11.*",
"utopia-php/cli": "0.15.*",
"utopia-php/config": "0.2.*",
- "utopia-php/database": "0.53.4",
+ "utopia-php/database": "0.53.200",
"utopia-php/domains": "0.5.*",
"utopia-php/dsn": "0.2.1",
"utopia-php/framework": "0.33.*",
"utopia-php/fetch": "0.2.*",
- "utopia-php/image": "0.6.*",
+ "utopia-php/image": "0.7.*",
"utopia-php/locale": "0.4.*",
"utopia-php/logger": "0.6.*",
"utopia-php/messaging": "0.12.*",
- "utopia-php/migration": "0.5.*",
+ "utopia-php/migration": "0.6.*",
"utopia-php/orchestration": "0.9.*",
"utopia-php/platform": "0.7.*",
"utopia-php/pools": "0.5.*",
@@ -69,7 +69,8 @@
"utopia-php/registry": "0.5.*",
"utopia-php/storage": "0.18.*",
"utopia-php/swoole": "0.8.*",
- "utopia-php/system": "0.8.*",
+ "utopia-php/system": "0.9.*",
+ "utopia-php/telemetry": "0.1.*",
"utopia-php/vcs": "0.8.*",
"utopia-php/websocket": "0.1.*",
"matomo/device-detector": "6.1.*",
@@ -96,6 +97,10 @@
"config": {
"platform": {
"php": "8.3"
+ },
+ "allow-plugins": {
+ "php-http/discovery": false,
+ "tbachert/spi": false
}
}
}
diff --git a/composer.lock b/composer.lock
index d31ecfa317..ee947d27f0 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "e7fdbd3a7d4375ee8c139cecdaeb2d24",
+ "content-hash": "fae350df93342992edd8f639948e1570",
"packages": [
{
"name": "adhocore/jwt",
@@ -65,16 +65,16 @@
},
{
"name": "appwrite/appwrite",
- "version": "10.1.0",
+ "version": "11.1.0",
"source": {
"type": "git",
"url": "https://github.com/appwrite/sdk-for-php.git",
- "reference": "da579af70723cfc117b5af84375bdef117e27312"
+ "reference": "1d043f543acdb17b9fdb440b1b2dd208e400bad3"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/appwrite/sdk-for-php/zipball/da579af70723cfc117b5af84375bdef117e27312",
- "reference": "da579af70723cfc117b5af84375bdef117e27312",
+ "url": "https://api.github.com/repos/appwrite/sdk-for-php/zipball/1d043f543acdb17b9fdb440b1b2dd208e400bad3",
+ "reference": "1d043f543acdb17b9fdb440b1b2dd208e400bad3",
"shasum": ""
},
"require": {
@@ -83,7 +83,8 @@
"php": ">=7.1.0"
},
"require-dev": {
- "phpunit/phpunit": "3.7.35"
+ "mockery/mockery": "^1.6.6",
+ "phpunit/phpunit": "^10"
},
"type": "library",
"autoload": {
@@ -99,10 +100,10 @@
"support": {
"email": "team@appwrite.io",
"issues": "https://github.com/appwrite/sdk-for-php/issues",
- "source": "https://github.com/appwrite/sdk-for-php/tree/10.1.0",
+ "source": "https://github.com/appwrite/sdk-for-php/tree/11.1.0",
"url": "https://appwrite.io/support"
},
- "time": "2023-11-20T09:56:12+00:00"
+ "time": "2024-06-26T07:03:23+00:00"
},
{
"name": "appwrite/php-clamav",
@@ -156,21 +157,21 @@
},
{
"name": "appwrite/php-runtimes",
- "version": "0.15.0",
+ "version": "0.16.5",
"source": {
"type": "git",
"url": "https://github.com/appwrite/runtimes.git",
- "reference": "68ea5bcc24c513a6d641ddf9412bbab13e5dfb94"
+ "reference": "1e430646fdf847a7caf3c611dcf3d6d5a28c3fd9"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/appwrite/runtimes/zipball/68ea5bcc24c513a6d641ddf9412bbab13e5dfb94",
- "reference": "68ea5bcc24c513a6d641ddf9412bbab13e5dfb94",
+ "url": "https://api.github.com/repos/appwrite/runtimes/zipball/1e430646fdf847a7caf3c611dcf3d6d5a28c3fd9",
+ "reference": "1e430646fdf847a7caf3c611dcf3d6d5a28c3fd9",
"shasum": ""
},
"require": {
"php": ">=8.0",
- "utopia-php/system": "0.8.*"
+ "utopia-php/system": "0.9.*"
},
"require-dev": {
"laravel/pint": "^1.15",
@@ -205,9 +206,9 @@
],
"support": {
"issues": "https://github.com/appwrite/runtimes/issues",
- "source": "https://github.com/appwrite/runtimes/tree/0.15.0"
+ "source": "https://github.com/appwrite/runtimes/tree/0.16.5"
},
- "time": "2024-08-21T10:23:45+00:00"
+ "time": "2024-11-25T15:17:06+00:00"
},
{
"name": "beberlei/assert",
@@ -3135,16 +3136,16 @@
},
{
"name": "utopia-php/abuse",
- "version": "0.43.0",
+ "version": "0.43.1",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/abuse.git",
- "reference": "6346a3b4c5177a43160035a7289e30fdfb0790d6"
+ "reference": "e404c21e8dcf6a310bc83cf1d74e716b105598fa"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/utopia-php/abuse/zipball/6346a3b4c5177a43160035a7289e30fdfb0790d6",
- "reference": "6346a3b4c5177a43160035a7289e30fdfb0790d6",
+ "url": "https://api.github.com/repos/utopia-php/abuse/zipball/e404c21e8dcf6a310bc83cf1d74e716b105598fa",
+ "reference": "e404c21e8dcf6a310bc83cf1d74e716b105598fa",
"shasum": ""
},
"require": {
@@ -3180,9 +3181,9 @@
],
"support": {
"issues": "https://github.com/utopia-php/abuse/issues",
- "source": "https://github.com/utopia-php/abuse/tree/0.43.0"
+ "source": "https://github.com/utopia-php/abuse/tree/0.43.1"
},
- "time": "2024-08-30T05:17:23+00:00"
+ "time": "2024-10-23T04:29:12+00:00"
},
{
"name": "utopia-php/analytics",
@@ -3232,16 +3233,16 @@
},
{
"name": "utopia-php/audit",
- "version": "0.43.0",
+ "version": "0.43.1",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/audit.git",
- "reference": "cef22b5dc6a6d28fcd522f41c7bf7ded4a4dfd3e"
+ "reference": "04a47dd1f5f92e2d50e971a06bcc9e759325d277"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/utopia-php/audit/zipball/cef22b5dc6a6d28fcd522f41c7bf7ded4a4dfd3e",
- "reference": "cef22b5dc6a6d28fcd522f41c7bf7ded4a4dfd3e",
+ "url": "https://api.github.com/repos/utopia-php/audit/zipball/04a47dd1f5f92e2d50e971a06bcc9e759325d277",
+ "reference": "04a47dd1f5f92e2d50e971a06bcc9e759325d277",
"shasum": ""
},
"require": {
@@ -3273,22 +3274,22 @@
],
"support": {
"issues": "https://github.com/utopia-php/audit/issues",
- "source": "https://github.com/utopia-php/audit/tree/0.43.0"
+ "source": "https://github.com/utopia-php/audit/tree/0.43.1"
},
- "time": "2024-08-30T05:17:36+00:00"
+ "time": "2024-10-23T04:27:59+00:00"
},
{
"name": "utopia-php/cache",
- "version": "0.10.2",
+ "version": "0.11.0",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/cache.git",
- "reference": "b22c6eb6d308de246b023efd0fc9758aee8b8247"
+ "reference": "8ebcab5aac7606331cef69b0081f6c9eff2e58bc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/utopia-php/cache/zipball/b22c6eb6d308de246b023efd0fc9758aee8b8247",
- "reference": "b22c6eb6d308de246b023efd0fc9758aee8b8247",
+ "url": "https://api.github.com/repos/utopia-php/cache/zipball/8ebcab5aac7606331cef69b0081f6c9eff2e58bc",
+ "reference": "8ebcab5aac7606331cef69b0081f6c9eff2e58bc",
"shasum": ""
},
"require": {
@@ -3299,7 +3300,7 @@
},
"require-dev": {
"laravel/pint": "1.2.*",
- "phpstan/phpstan": "1.9.x-dev",
+ "phpstan/phpstan": "^1.12",
"phpunit/phpunit": "^9.3",
"vimeo/psalm": "4.13.1"
},
@@ -3323,9 +3324,9 @@
],
"support": {
"issues": "https://github.com/utopia-php/cache/issues",
- "source": "https://github.com/utopia-php/cache/tree/0.10.2"
+ "source": "https://github.com/utopia-php/cache/tree/0.11.0"
},
- "time": "2024-06-25T20:36:35+00:00"
+ "time": "2024-11-05T16:53:58+00:00"
},
{
"name": "utopia-php/cli",
@@ -3475,32 +3476,32 @@
},
{
"name": "utopia-php/database",
- "version": "0.53.4",
+ "version": "0.53.200",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/database.git",
- "reference": "36a0e89d983afc1368635282e04fa762220a1d2a"
+ "reference": "570c63a3760d0e1404679ddfacd9484af40bd9fc"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/utopia-php/database/zipball/36a0e89d983afc1368635282e04fa762220a1d2a",
- "reference": "36a0e89d983afc1368635282e04fa762220a1d2a",
+ "url": "https://api.github.com/repos/utopia-php/database/zipball/570c63a3760d0e1404679ddfacd9484af40bd9fc",
+ "reference": "570c63a3760d0e1404679ddfacd9484af40bd9fc",
"shasum": ""
},
"require": {
"ext-mbstring": "*",
"ext-pdo": "*",
- "php": ">=8.0",
- "utopia-php/cache": "0.10.*",
+ "php": ">=8.3",
+ "utopia-php/cache": "0.11.*",
"utopia-php/framework": "0.33.*",
"utopia-php/mongo": "0.3.*"
},
"require-dev": {
"fakerphp/faker": "1.23.*",
- "laravel/pint": "1.17.*",
- "pcov/clobber": "2.0.*",
- "phpstan/phpstan": "1.11.*",
- "phpunit/phpunit": "9.6.*",
+ "laravel/pint": "1.*",
+ "pcov/clobber": "2.*",
+ "phpstan/phpstan": "1.*",
+ "phpunit/phpunit": "9.*",
"rregeer/phpunit-coverage-check": "0.3.*",
"swoole/ide-helper": "5.1.3",
"utopia-php/cli": "0.14.*"
@@ -3525,9 +3526,9 @@
],
"support": {
"issues": "https://github.com/utopia-php/database/issues",
- "source": "https://github.com/utopia-php/database/tree/0.53.4"
+ "source": "https://github.com/utopia-php/database/tree/0.53.200"
},
- "time": "2024-09-10T10:19:57+00:00"
+ "time": "2024-12-01T07:59:15+00:00"
},
{
"name": "utopia-php/domains",
@@ -3724,21 +3725,21 @@
},
{
"name": "utopia-php/image",
- "version": "0.6.1",
+ "version": "0.7.0",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/image.git",
- "reference": "2d74c27e69e65a93cf94a16586598a04fe435bf0"
+ "reference": "fcea143edbad524bf871ddbebe801d981f91f181"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/utopia-php/image/zipball/2d74c27e69e65a93cf94a16586598a04fe435bf0",
- "reference": "2d74c27e69e65a93cf94a16586598a04fe435bf0",
+ "url": "https://api.github.com/repos/utopia-php/image/zipball/fcea143edbad524bf871ddbebe801d981f91f181",
+ "reference": "fcea143edbad524bf871ddbebe801d981f91f181",
"shasum": ""
},
"require": {
"ext-imagick": "*",
- "php": ">=8.0"
+ "php": ">=8.1"
},
"require-dev": {
"laravel/pint": "1.2.*",
@@ -3766,9 +3767,9 @@
],
"support": {
"issues": "https://github.com/utopia-php/image/issues",
- "source": "https://github.com/utopia-php/image/tree/0.6.1"
+ "source": "https://github.com/utopia-php/image/tree/0.7.0"
},
- "time": "2024-02-05T13:31:44+00:00"
+ "time": "2024-10-02T05:45:38+00:00"
},
{
"name": "utopia-php/locale",
@@ -3928,27 +3929,35 @@
},
{
"name": "utopia-php/migration",
- "version": "0.5.3",
+ "version": "0.6.13",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/migration.git",
- "reference": "b30e7834da69e25084b0c8e9ba29e4a7b54c6eb6"
+ "reference": "68d9b0a9477755afcda607e7e8109785cae17a13"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/utopia-php/migration/zipball/b30e7834da69e25084b0c8e9ba29e4a7b54c6eb6",
- "reference": "b30e7834da69e25084b0c8e9ba29e4a7b54c6eb6",
+ "url": "https://api.github.com/repos/utopia-php/migration/zipball/68d9b0a9477755afcda607e7e8109785cae17a13",
+ "reference": "68d9b0a9477755afcda607e7e8109785cae17a13",
"shasum": ""
},
"require": {
- "appwrite/appwrite": "10.1.0",
- "php": "8.*"
+ "appwrite/appwrite": "11.1.*",
+ "ext-curl": "*",
+ "ext-openssl": "*",
+ "php": "8.3.*",
+ "utopia-php/database": "0.53.*",
+ "utopia-php/dsn": "0.2.*",
+ "utopia-php/framework": "0.33.*",
+ "utopia-php/storage": "0.18.*"
},
"require-dev": {
- "laravel/pint": "1.*",
- "phpunit/phpunit": "9.*",
- "utopia-php/cli": "^0.18.0",
- "vlucas/phpdotenv": "5.*"
+ "ext-pdo": "*",
+ "laravel/pint": "1.17.*",
+ "phpstan/phpstan": "1.11.*",
+ "phpunit/phpunit": "11.2.*",
+ "utopia-php/cli": "0.16.*",
+ "vlucas/phpdotenv": "5.6.*"
},
"type": "library",
"autoload": {
@@ -3970,9 +3979,9 @@
],
"support": {
"issues": "https://github.com/utopia-php/migration/issues",
- "source": "https://github.com/utopia-php/migration/tree/0.5.3"
+ "source": "https://github.com/utopia-php/migration/tree/0.6.13"
},
- "time": "2024-09-10T10:45:18+00:00"
+ "time": "2024-11-26T13:57:53+00:00"
},
{
"name": "utopia-php/mongo",
@@ -4460,16 +4469,16 @@
},
{
"name": "utopia-php/system",
- "version": "0.8.0",
+ "version": "0.9.0",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/system.git",
- "reference": "a2cbfb3c69b9ecb8b6f06c5774f3cf279ea7665e"
+ "reference": "8e4a7edaf2dfeb4c9524e9f766d27754f2c4b64d"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/utopia-php/system/zipball/a2cbfb3c69b9ecb8b6f06c5774f3cf279ea7665e",
- "reference": "a2cbfb3c69b9ecb8b6f06c5774f3cf279ea7665e",
+ "url": "https://api.github.com/repos/utopia-php/system/zipball/8e4a7edaf2dfeb4c9524e9f766d27754f2c4b64d",
+ "reference": "8e4a7edaf2dfeb4c9524e9f766d27754f2c4b64d",
"shasum": ""
},
"require": {
@@ -4510,9 +4519,9 @@
],
"support": {
"issues": "https://github.com/utopia-php/system/issues",
- "source": "https://github.com/utopia-php/system/tree/0.8.0"
+ "source": "https://github.com/utopia-php/system/tree/0.9.0"
},
- "time": "2024-04-01T10:22:28+00:00"
+ "time": "2024-10-09T14:44:01+00:00"
},
{
"name": "utopia-php/telemetry",
@@ -4566,22 +4575,22 @@
},
{
"name": "utopia-php/vcs",
- "version": "0.8.2",
+ "version": "0.8.6",
"source": {
"type": "git",
"url": "https://github.com/utopia-php/vcs.git",
- "reference": "eb9b7eade1a46a4f660e0d5a6304f7fa26ec9d18"
+ "reference": "b10225f54d5670f09f83e82e09de9d820ada6931"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/utopia-php/vcs/zipball/eb9b7eade1a46a4f660e0d5a6304f7fa26ec9d18",
- "reference": "eb9b7eade1a46a4f660e0d5a6304f7fa26ec9d18",
+ "url": "https://api.github.com/repos/utopia-php/vcs/zipball/b10225f54d5670f09f83e82e09de9d820ada6931",
+ "reference": "b10225f54d5670f09f83e82e09de9d820ada6931",
"shasum": ""
},
"require": {
"adhocore/jwt": "^1.1",
"php": ">=8.0",
- "utopia-php/cache": "^0.10.0",
+ "utopia-php/cache": "^0.11.0",
"utopia-php/framework": "0.*.*"
},
"require-dev": {
@@ -4609,9 +4618,9 @@
],
"support": {
"issues": "https://github.com/utopia-php/vcs/issues",
- "source": "https://github.com/utopia-php/vcs/tree/0.8.2"
+ "source": "https://github.com/utopia-php/vcs/tree/0.8.6"
},
- "time": "2024-08-13T14:36:30+00:00"
+ "time": "2024-12-10T13:13:23+00:00"
},
{
"name": "utopia-php/websocket",
diff --git a/docker-compose.yml b/docker-compose.yml
index 6ecb0ecff8..f9a79ee84d 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -96,6 +96,7 @@ services:
- _APP_EDITION
- _APP_WORKER_PER_CORE
- _APP_LOCALE
+ - _APP_COMPRESSION_MIN_SIZE_BYTES
- _APP_CONSOLE_WHITELIST_ROOT
- _APP_CONSOLE_WHITELIST_EMAILS
- _APP_CONSOLE_SESSION_ALERTS
@@ -192,11 +193,13 @@ services:
- _APP_EXPERIMENT_LOGGING_PROVIDER
- _APP_EXPERIMENT_LOGGING_CONFIG
- _APP_DATABASE_SHARED_TABLES
+ - _APP_DATABASE_SHARED_TABLES_V1
+ - _APP_DATABASE_SHARED_NAMESPACE
appwrite-console:
<<: *x-logging
container_name: appwrite-console
- image: appwrite/console:5.0.12
+ image: appwrite/console:5.2.27
restart: unless-stopped
networks:
- appwrite
@@ -381,6 +384,8 @@ services:
- _APP_EXECUTOR_SECRET
- _APP_EXECUTOR_HOST
- _APP_DATABASE_SHARED_TABLES
+ - _APP_DATABASE_SHARED_TABLES_V1
+ - _APP_EMAIL_CERTIFICATES
appwrite-worker-databases:
entrypoint: worker-databases
@@ -863,7 +868,7 @@ services:
appwrite-assistant:
container_name: appwrite-assistant
- image: appwrite/assistant:0.4.0
+ image: appwrite/assistant:0.5.0
networks:
- appwrite
environment:
@@ -1053,4 +1058,4 @@ volumes:
appwrite-certificates:
appwrite-functions:
appwrite-builds:
- appwrite-config:
+ appwrite-config:
\ No newline at end of file
diff --git a/docs/references/account/create-token-magic-url.md b/docs/references/account/create-token-magic-url.md
index 6ebe4154b8..99ad6dba5e 100644
--- a/docs/references/account/create-token-magic-url.md
+++ b/docs/references/account/create-token-magic-url.md
@@ -1,3 +1,3 @@
-Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST /v1/account/sessions/token](https://appwrite.io/docs/references/cloud/client-web/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour. If you are on a mobile device you can leave the URL parameter empty, so that the login completion will be handled by your Appwrite instance by default.
+Sends the user an email with a secret key for creating a session. If the provided user ID has not been registered, a new user will be created. When the user clicks the link in the email, the user is redirected back to the URL you provided with the secret key and userId values attached to the URL query string. Use the query string parameters to submit a request to the [POST /v1/account/sessions/token](https://appwrite.io/docs/references/cloud/client-web/account#createSession) endpoint to complete the login process. The link sent to the user's email address is valid for 1 hour.
A user is limited to 10 active sessions at a time by default. [Learn more about session limits](https://appwrite.io/docs/authentication-security#limits).
diff --git a/docs/references/teams/get-team-member.md b/docs/references/teams/get-team-member.md
index fab52c1a75..91bf44c73b 100644
--- a/docs/references/teams/get-team-member.md
+++ b/docs/references/teams/get-team-member.md
@@ -1 +1 @@
-Get a team member by the membership unique id. All team members have read access for this resource.
\ No newline at end of file
+Get a team member by the membership unique id. All team members have read access for this resource. Hide sensitive attributes from the response by toggling membership privacy in the Console.
\ No newline at end of file
diff --git a/docs/references/teams/list-team-members.md b/docs/references/teams/list-team-members.md
index d7dd04977f..540a665d98 100644
--- a/docs/references/teams/list-team-members.md
+++ b/docs/references/teams/list-team-members.md
@@ -1 +1 @@
-Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint.
\ No newline at end of file
+Use this endpoint to list a team's members using the team's ID. All team members have read access to this endpoint. Hide sensitive attributes from the response by toggling membership privacy in the Console.
\ No newline at end of file
diff --git a/phpunit.xml b/phpunit.xml
index 90ebd4225f..4c4e55ea4e 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -33,6 +33,7 @@
./tests/e2e/Services/Storage
./tests/e2e/Services/Webhooks
./tests/e2e/Services/Messaging
+ ./tests/e2e/Services/Migrations
./tests/e2e/Services/Functions/FunctionsBase.php
./tests/e2e/Services/Functions/FunctionsCustomServerTest.php
./tests/e2e/Services/Functions/FunctionsCustomClientTest.php
diff --git a/src/Appwrite/Certificates/Adapter.php b/src/Appwrite/Certificates/Adapter.php
new file mode 100644
index 0000000000..711e4c09b9
--- /dev/null
+++ b/src/Appwrite/Certificates/Adapter.php
@@ -0,0 +1,14 @@
+email = $email;
+ }
+
+
+ public function issueCertificate(string $certName, string $domain): ?string
+ {
+ $stdout = '';
+ $stderr = '';
+
+ $staging = (App::isProduction()) ? '' : ' --dry-run';
+ $exit = Console::execute(
+ "certbot certonly -v --webroot --noninteractive --agree-tos{$staging}"
+ . " --email " . $this->email
+ . " --cert-name " . $certName
+ . " -w " . APP_STORAGE_CERTIFICATES
+ . " -d {$domain}",
+ '',
+ $stdout,
+ $stderr
+ );
+
+ // Unexpected error, usually 5XX, API limits, ...
+ if ($exit !== 0) {
+ throw new Exception('Failed to issue a certificate with message: ' . $stderr);
+ }
+
+ // Prepare folder in storage for domain
+ $path = APP_STORAGE_CERTIFICATES . '/' . $domain;
+ if (!\is_readable($path)) {
+ if (!\mkdir($path, 0755, true)) {
+ throw new Exception('Failed to create path for certificate.');
+ }
+ }
+
+ // Move generated files
+ if (!@\rename('/etc/letsencrypt/live/' . $certName . '/cert.pem', APP_STORAGE_CERTIFICATES . '/' . $domain . '/cert.pem')) {
+ throw new Exception('Failed to rename certificate cert.pem. Let\'s Encrypt log: ' . $stderr . ' ; ' . $stdout);
+ }
+
+ if (!@\rename('/etc/letsencrypt/live/' . $certName . '/chain.pem', APP_STORAGE_CERTIFICATES . '/' . $domain . '/chain.pem')) {
+ throw new Exception('Failed to rename certificate chain.pem. Let\'s Encrypt log: ' . $stderr . ' ; ' . $stdout);
+ }
+
+ if (!@\rename('/etc/letsencrypt/live/' . $certName . '/fullchain.pem', APP_STORAGE_CERTIFICATES . '/' . $domain . '/fullchain.pem')) {
+ throw new Exception('Failed to rename certificate fullchain.pem. Let\'s Encrypt log: ' . $stderr . ' ; ' . $stdout);
+ }
+
+ if (!@\rename('/etc/letsencrypt/live/' . $certName . '/privkey.pem', APP_STORAGE_CERTIFICATES . '/' . $domain . '/privkey.pem')) {
+ throw new Exception('Failed to rename certificate privkey.pem. Let\'s Encrypt log: ' . $stderr . ' ; ' . $stdout);
+ }
+
+ $config = \implode(PHP_EOL, [
+ "tls:",
+ " certificates:",
+ " - certFile: /storage/certificates/{$domain}/fullchain.pem",
+ " keyFile: /storage/certificates/{$domain}/privkey.pem"
+ ]);
+
+ // Save configuration into Traefik using our new cert files
+ if (!\file_put_contents(APP_STORAGE_CONFIG . '/' . $domain . '.yml', $config)) {
+ throw new Exception('Failed to save Traefik configuration.');
+ }
+
+ $certPath = APP_STORAGE_CERTIFICATES . '/' . $domain . '/cert.pem';
+ $certData = openssl_x509_parse(file_get_contents($certPath));
+ $validTo = $certData['validTo_time_t'] ?? null;
+ $dt = (new \DateTime())->setTimestamp($validTo);
+ return DateTime::addSeconds($dt, -60 * 60 * 24 * 30);
+ }
+
+ public function isRenewRequired(string $domain, Log $log): bool
+ {
+ $certPath = APP_STORAGE_CERTIFICATES . '/' . $domain . '/cert.pem';
+ if (\file_exists($certPath)) {
+ $certData = openssl_x509_parse(file_get_contents($certPath));
+ $validTo = $certData['validTo_time_t'] ?? 0;
+
+ if (empty($validTo)) {
+ $log->addTag('certificateDomain', $domain);
+ throw new Exception('Unable to read certificate file (cert.pem).');
+ }
+
+ // LetsEncrypt allows renewal 30 days before expiry
+ $expiryInAdvance = (60 * 60 * 24 * 30);
+ if ($validTo - $expiryInAdvance > \time()) {
+ $log->addTag('certificateDomain', $domain);
+ $log->addExtra('certificateData', \is_array($certData) ? \json_encode($certData) : \strval($certData));
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ public function deleteCertificate(string $domain): void
+ {
+ $directory = APP_STORAGE_CERTIFICATES . '/' . $domain;
+ $checkTraversal = realpath($directory) === $directory;
+
+ if ($checkTraversal && is_dir($directory)) {
+ // Delete files, so Traefik is aware of change
+ array_map('unlink', glob($directory . '/*.*'));
+ rmdir($directory);
+ Console::info("Deleted certificate files for {$domain}");
+ } else {
+ Console::info("No certificate files found for {$domain}");
+ }
+ }
+}
diff --git a/src/Appwrite/Event/Audit.php b/src/Appwrite/Event/Audit.php
index 4b02849970..17506bfe6c 100644
--- a/src/Appwrite/Event/Audit.php
+++ b/src/Appwrite/Event/Audit.php
@@ -121,6 +121,10 @@ class Audit extends Event
*/
public function trigger(): string|bool
{
+ if ($this->paused) {
+ return false;
+ }
+
$client = new Client($this->queue, $this->connection);
return $client->enqueue([
diff --git a/src/Appwrite/Event/Build.php b/src/Appwrite/Event/Build.php
index b8cb62a6f8..1fbf20a9f9 100644
--- a/src/Appwrite/Event/Build.php
+++ b/src/Appwrite/Event/Build.php
@@ -112,6 +112,10 @@ class Build extends Event
*/
public function trigger(): string|bool
{
+ if ($this->paused) {
+ return false;
+ }
+
$client = new Client($this->queue, $this->connection);
return $client->enqueue([
diff --git a/src/Appwrite/Event/Certificate.php b/src/Appwrite/Event/Certificate.php
index 85058c96fe..5d30c3d5ac 100644
--- a/src/Appwrite/Event/Certificate.php
+++ b/src/Appwrite/Event/Certificate.php
@@ -74,6 +74,10 @@ class Certificate extends Event
*/
public function trigger(): string|bool
{
+ if ($this->paused) {
+ return false;
+ }
+
$client = new Client($this->queue, $this->connection);
return $client->enqueue([
diff --git a/src/Appwrite/Event/Database.php b/src/Appwrite/Event/Database.php
index f9eb7d9a7d..1b0ea6851c 100644
--- a/src/Appwrite/Event/Database.php
+++ b/src/Appwrite/Event/Database.php
@@ -108,6 +108,10 @@ class Database extends Event
*/
public function trigger(): string|bool
{
+ if ($this->paused) {
+ return false;
+ }
+
try {
$dsn = new DSN($this->getProject()->getAttribute('database'));
} catch (\InvalidArgumentException) {
diff --git a/src/Appwrite/Event/Delete.php b/src/Appwrite/Event/Delete.php
index 064fbcefa9..1a4c9318e3 100644
--- a/src/Appwrite/Event/Delete.php
+++ b/src/Appwrite/Event/Delete.php
@@ -140,6 +140,10 @@ class Delete extends Event
*/
public function trigger(): string|bool
{
+ if ($this->paused) {
+ return false;
+ }
+
$client = new Client($this->queue, $this->connection);
return $client->enqueue([
diff --git a/src/Appwrite/Event/Event.php b/src/Appwrite/Event/Event.php
index 43eda511df..e3a2e394cf 100644
--- a/src/Appwrite/Event/Event.php
+++ b/src/Appwrite/Event/Event.php
@@ -65,6 +65,24 @@ class Event
{
}
+ /**
+ * Set paused state for this event.
+ */
+ public function setPaused(bool $paused): self
+ {
+ $this->paused = $paused;
+
+ return $this;
+ }
+
+ /**
+ * Get paused state for this event.
+ */
+ public function getPaused(): bool
+ {
+ return $this->paused;
+ }
+
/**
* Set queue used for this event.
*
@@ -204,19 +222,6 @@ class Event
return $this->payload;
}
- public function getRealtimePayload(): array
- {
- $payload = [];
-
- foreach ($this->payload as $key => $value) {
- if (!isset($this->sensitive[$key])) {
- $payload[$key] = $value;
- }
- }
-
- return $payload;
- }
-
/**
* Set context for this event.
*
@@ -530,20 +535,21 @@ class Event
}
/**
- * Get the value of paused
+ * Generate a function event from a base event
+ *
+ * @param Event $event
+ *
+ * @return self
+ *
*/
- public function isPaused(): bool
+ public function from(Event $event): self
{
- return $this->paused;
- }
-
- /**
- * Set the value of paused
- */
- public function setPaused(bool $paused): self
- {
- $this->paused = $paused;
-
+ $this->project = $event->getProject();
+ $this->user = $event->getUser();
+ $this->payload = $event->getPayload();
+ $this->event = $event->getEvent();
+ $this->params = $event->getParams();
+ $this->context = $event->context;
return $this;
}
}
diff --git a/src/Appwrite/Event/Func.php b/src/Appwrite/Event/Func.php
index 0cbaf17b60..0ad639a9f5 100644
--- a/src/Appwrite/Event/Func.php
+++ b/src/Appwrite/Event/Func.php
@@ -8,6 +8,8 @@ use Utopia\Queue\Connection;
class Func extends Event
{
+ public const TYPE_ASYNC_WRITE = 'async_write';
+
protected string $jwt = '';
protected string $type = '';
protected string $body = '';
@@ -236,22 +238,4 @@ class Func extends Event
'method' => $this->method,
]);
}
-
- /**
- * Generate a function event from a base event
- *
- * @param Event $event
- *
- * @return self
- *
- */
- public function from(Event $event): self
- {
- $this->project = $event->getProject();
- $this->user = $event->getUser();
- $this->payload = $event->getPayload();
- $this->event = $event->getEvent();
- $this->params = $event->getParams();
- return $this;
- }
}
diff --git a/src/Appwrite/Event/Mail.php b/src/Appwrite/Event/Mail.php
index 9bdbf6044d..a0fca75688 100644
--- a/src/Appwrite/Event/Mail.php
+++ b/src/Appwrite/Event/Mail.php
@@ -404,6 +404,10 @@ class Mail extends Event
*/
public function trigger(): string|bool
{
+ if ($this->paused) {
+ return false;
+ }
+
$client = new Client($this->queue, $this->connection);
return $client->enqueue([
diff --git a/src/Appwrite/Event/Messaging.php b/src/Appwrite/Event/Messaging.php
index f97ff02d21..ab9b1bee6b 100644
--- a/src/Appwrite/Event/Messaging.php
+++ b/src/Appwrite/Event/Messaging.php
@@ -182,6 +182,10 @@ class Messaging extends Event
*/
public function trigger(): string | bool
{
+ if ($this->paused) {
+ return false;
+ }
+
$client = new Client($this->queue, $this->connection);
return $client->enqueue([
diff --git a/src/Appwrite/Event/Migration.php b/src/Appwrite/Event/Migration.php
index 478291829b..789b8e2160 100644
--- a/src/Appwrite/Event/Migration.php
+++ b/src/Appwrite/Event/Migration.php
@@ -75,13 +75,16 @@ class Migration extends Event
*/
public function trigger(): string|bool
{
+ if ($this->paused) {
+ return false;
+ }
$client = new Client($this->queue, $this->connection);
return $client->enqueue([
'project' => $this->project,
'user' => $this->user,
- 'migration' => $this->migration
+ 'migration' => $this->migration,
]);
}
}
diff --git a/src/Appwrite/Event/Realtime.php b/src/Appwrite/Event/Realtime.php
new file mode 100644
index 0000000000..f4f00b59d4
--- /dev/null
+++ b/src/Appwrite/Event/Realtime.php
@@ -0,0 +1,70 @@
+payload as $key => $value) {
+ if (!isset($this->sensitive[$key])) {
+ $payload[$key] = $value;
+ }
+ }
+
+ return $payload;
+ }
+
+ /**
+ * Execute Event.
+ *
+ * @return string|bool
+ * @throws InvalidArgumentException
+ */
+ public function trigger(): string|bool
+ {
+ if ($this->paused || empty($this->event)) {
+ return false;
+ }
+
+ $allEvents = Event::generateEvents($this->getEvent(), $this->getParams());
+ $payload = new Document($this->getPayload());
+
+ $db = $this->getContext('database');
+ $collection = $this->getContext('collection');
+ $bucket = $this->getContext('bucket');
+
+ $target = RealtimeAdapter::fromPayload(
+ // Pass first, most verbose event pattern
+ event: $allEvents[0],
+ payload: $payload,
+ project: $this->getProject(),
+ database: $db,
+ collection: $collection,
+ bucket: $bucket,
+ );
+
+ RealtimeAdapter::send(
+ projectId: $target['projectId'] ?? $this->getProject()->getId(),
+ payload: $this->getRealtimePayload(),
+ events: $allEvents,
+ channels: $target['channels'],
+ roles: $target['roles'],
+ options: [
+ 'permissionsChanged' => $target['permissionsChanged'],
+ 'userId' => $this->getParam('userId')
+ ]
+ );
+
+ return true;
+ }
+}
diff --git a/src/Appwrite/Event/Usage.php b/src/Appwrite/Event/Usage.php
index 4426f4ab1b..161c251c8e 100644
--- a/src/Appwrite/Event/Usage.php
+++ b/src/Appwrite/Event/Usage.php
@@ -57,6 +57,10 @@ class Usage extends Event
*/
public function trigger(): string|bool
{
+ if ($this->paused) {
+ return false;
+ }
+
$client = new Client($this->queue, $this->connection);
return $client->enqueue([
'project' => $this->getProject(),
diff --git a/src/Appwrite/Event/UsageDump.php b/src/Appwrite/Event/UsageDump.php
index 8f87908849..2998e4e104 100644
--- a/src/Appwrite/Event/UsageDump.php
+++ b/src/Appwrite/Event/UsageDump.php
@@ -38,6 +38,10 @@ class UsageDump extends Event
*/
public function trigger(): string|bool
{
+ if ($this->paused) {
+ return false;
+ }
+
$client = new Client($this->queue, $this->connection);
return $client->enqueue([
diff --git a/src/Appwrite/Event/Webhook.php b/src/Appwrite/Event/Webhook.php
new file mode 100644
index 0000000000..125c9a78d5
--- /dev/null
+++ b/src/Appwrite/Event/Webhook.php
@@ -0,0 +1,17 @@
+setQueue(Event::WEBHOOK_QUEUE_NAME)
+ ->setClass(Event::WEBHOOK_CLASS_NAME);
+ }
+}
diff --git a/src/Appwrite/Extend/Exception.php b/src/Appwrite/Extend/Exception.php
index d25332126c..54bf6d96ea 100644
--- a/src/Appwrite/Extend/Exception.php
+++ b/src/Appwrite/Extend/Exception.php
@@ -39,6 +39,7 @@ class Exception extends \Exception
public const GENERAL_UNKNOWN = 'general_unknown';
public const GENERAL_MOCK = 'general_mock';
public const GENERAL_ACCESS_FORBIDDEN = 'general_access_forbidden';
+ public const GENERAL_RESOURCE_BLOCKED = 'general_resource_blocked';
public const GENERAL_UNKNOWN_ORIGIN = 'general_unknown_origin';
public const GENERAL_API_DISABLED = 'general_api_disabled';
public const GENERAL_SERVICE_DISABLED = 'general_service_disabled';
diff --git a/src/Appwrite/GraphQL/Types/Mapper.php b/src/Appwrite/GraphQL/Types/Mapper.php
index 36b246b28b..d8f1d7da09 100644
--- a/src/Appwrite/GraphQL/Types/Mapper.php
+++ b/src/Appwrite/GraphQL/Types/Mapper.php
@@ -50,6 +50,7 @@ class Mapper
$defaults = [
'boolean' => Type::boolean(),
'string' => Type::string(),
+ 'payload' => Type::string(),
'integer' => Type::int(),
'double' => Type::float(),
'datetime' => Type::string(),
diff --git a/src/Appwrite/Messaging/Adapter/Realtime.php b/src/Appwrite/Messaging/Adapter/Realtime.php
index 55d8db2924..dceafacf6e 100644
--- a/src/Appwrite/Messaging/Adapter/Realtime.php
+++ b/src/Appwrite/Messaging/Adapter/Realtime.php
@@ -7,7 +7,6 @@ use Utopia\Database\DateTime;
use Utopia\Database\Document;
use Utopia\Database\Helpers\ID;
use Utopia\Database\Helpers\Role;
-use Utopia\System\System;
class Realtime extends Adapter
{
@@ -139,20 +138,26 @@ class Realtime extends Adapter
$permissionsChanged = array_key_exists('permissionsChanged', $options) && $options['permissionsChanged'];
$userId = array_key_exists('userId', $options) ? $options['userId'] : null;
- $redis = new \Redis(); //TODO: make this part of the constructor
- $redis->connect(System::getEnv('_APP_REDIS_HOST', ''), System::getEnv('_APP_REDIS_PORT', ''));
- $redis->publish('realtime', json_encode([
- 'project' => $projectId,
- 'roles' => $roles,
- 'permissionsChanged' => $permissionsChanged,
- 'userId' => $userId,
- 'data' => [
- 'events' => $events,
- 'channels' => $channels,
- 'timestamp' => DateTime::formatTz(DateTime::now()),
- 'payload' => $payload
- ]
- ]));
+ global $register;
+ $pubsub = $register->get('pools')->get('pubsub')->pop();
+ try {
+ /** @var \Appwrite\PubSub\Adapter $redis */
+ $redis = $pubsub->getResource();
+ $redis->publish('realtime', json_encode([
+ 'project' => $projectId,
+ 'roles' => $roles,
+ 'permissionsChanged' => $permissionsChanged,
+ 'userId' => $userId,
+ 'data' => [
+ 'events' => $events,
+ 'channels' => $channels,
+ 'timestamp' => DateTime::formatTz(DateTime::now()),
+ 'payload' => $payload
+ ]
+ ]));
+ } finally {
+ $pubsub->reclaim();
+ }
}
/**
@@ -243,7 +248,11 @@ class Realtime extends Adapter
* @param string $event
* @param Document $payload
* @param Document|null $project
+ * @param Document|null $database
+ * @param Document|null $collection
+ * @param Document|null $bucket
* @return array
+ * @throws \Exception
*/
public static function fromPayload(string $event, Document $payload, Document $project = null, Document $database = null, Document $collection = null, Document $bucket = null): array
{
@@ -262,6 +271,13 @@ class Realtime extends Adapter
break;
case 'rules':
$channels[] = 'console';
+ $channels[] = 'projects.' . $project->getId();
+ $projectId = 'console';
+ $roles = [Role::team($project->getAttribute('teamId'))->toString()];
+ break;
+ case 'projects':
+ $channels[] = 'console';
+ $channels[] = 'projects.' . $parts[1];
$projectId = 'console';
$roles = [Role::team($project->getAttribute('teamId'))->toString()];
break;
@@ -280,6 +296,7 @@ class Realtime extends Adapter
case 'databases':
if (in_array($parts[4] ?? [], ['attributes', 'indexes'])) {
$channels[] = 'console';
+ $channels[] = 'projects.' . $project->getId();
$projectId = 'console';
$roles = [Role::team($project->getAttribute('teamId'))->toString()];
} elseif (($parts[4] ?? '') === 'documents') {
@@ -319,6 +336,7 @@ class Realtime extends Adapter
if ($parts[2] === 'executions') {
if (!empty($payload->getRead())) {
$channels[] = 'console';
+ $channels[] = 'projects.' . $project->getId();
$channels[] = 'executions';
$channels[] = 'executions.' . $payload->getId();
$channels[] = 'functions.' . $payload->getAttribute('functionId');
@@ -326,6 +344,7 @@ class Realtime extends Adapter
}
} elseif ($parts[2] === 'deployments') {
$channels[] = 'console';
+ $channels[] = 'projects.' . $project->getId();
$projectId = 'console';
$roles = [Role::team($project->getAttribute('teamId'))->toString()];
}
@@ -333,6 +352,7 @@ class Realtime extends Adapter
break;
case 'migrations':
$channels[] = 'console';
+ $channels[] = 'projects.' . $project->getId();
$projectId = 'console';
$roles = [Role::team($project->getAttribute('teamId'))->toString()];
break;
diff --git a/src/Appwrite/Migration/Migration.php b/src/Appwrite/Migration/Migration.php
index cee1b2d263..19f69b1a4f 100644
--- a/src/Appwrite/Migration/Migration.php
+++ b/src/Appwrite/Migration/Migration.php
@@ -91,6 +91,7 @@ abstract class Migration
'1.5.10' => 'V20',
'1.5.11' => 'V20',
'1.6.0' => 'V21',
+ '1.6.1' => 'V21',
];
/**
diff --git a/src/Appwrite/Platform/Tasks/Doctor.php b/src/Appwrite/Platform/Tasks/Doctor.php
index 82d1ca2d59..c43afea527 100644
--- a/src/Appwrite/Platform/Tasks/Doctor.php
+++ b/src/Appwrite/Platform/Tasks/Doctor.php
@@ -3,6 +3,7 @@
namespace Appwrite\Platform\Tasks;
use Appwrite\ClamAV\Network;
+use Appwrite\PubSub\Adapter;
use Utopia\App;
use Utopia\CLI\Console;
use Utopia\Config\Config;
@@ -158,6 +159,7 @@ class Doctor extends Action
foreach ($configs as $key => $config) {
foreach ($config as $pool) {
try {
+ /** @var Adapter $adapter */
$adapter = $pools->get($pool)->pop()->getResource();
if ($adapter->ping()) {
diff --git a/src/Appwrite/Platform/Tasks/Maintenance.php b/src/Appwrite/Platform/Tasks/Maintenance.php
index 1da8a58ebe..40e72dc683 100644
--- a/src/Appwrite/Platform/Tasks/Maintenance.php
+++ b/src/Appwrite/Platform/Tasks/Maintenance.php
@@ -49,12 +49,7 @@ class Maintenance extends Action
$this->foreachProject($dbForConsole, function (Document $project) use ($queueForDeletes, $usageStatsRetentionHourly) {
$queueForDeletes->setProject($project);
- $this->notifyDeleteTargets($queueForDeletes);
- $this->notifyDeleteExecutionLogs($queueForDeletes);
- $this->notifyDeleteAbuseLogs($queueForDeletes);
- $this->notifyDeleteAuditLogs($queueForDeletes);
- $this->notifyDeleteUsageStats($usageStatsRetentionHourly, $queueForDeletes);
- $this->notifyDeleteExpiredSessions($queueForDeletes);
+ $this->notifyProjects($queueForDeletes, $usageStatsRetentionHourly);
});
$this->notifyDeleteConnections($queueForDeletes);
@@ -64,6 +59,19 @@ class Maintenance extends Action
}, $interval, $delay);
}
+ /**
+ * Hook to allow sub-classes to extend project-level maintenance functionality.
+ */
+ protected function notifyProjects(Delete $queueForDeletes, int $usageStatsRetentionHourly): void
+ {
+ $this->notifyDeleteTargets($queueForDeletes);
+ $this->notifyDeleteExecutionLogs($queueForDeletes);
+ $this->notifyDeleteAbuseLogs($queueForDeletes);
+ $this->notifyDeleteAuditLogs($queueForDeletes);
+ $this->notifyDeleteUsageStats($usageStatsRetentionHourly, $queueForDeletes);
+ $this->notifyDeleteExpiredSessions($queueForDeletes);
+ }
+
protected function foreachProject(Database $dbForConsole, callable $callback): void
{
// TODO: @Meldiron name of this method no longer matches. It does not delete, and it gives whole document
@@ -141,6 +149,7 @@ class Maintenance extends Action
$certificates = $dbForConsole->find('certificates', [
Query::lessThan('attempts', 5), // Maximum 5 attempts
+ Query::isNotNull('renewDate'),
Query::lessThanEqual('renewDate', $time), // includes 60 days cooldown (we have 30 days to renew)
Query::limit(200), // Limit 200 comes from LetsEncrypt (300 orders per 3 hours, keeping some for new domains)
]);
diff --git a/src/Appwrite/Platform/Tasks/ScheduleBase.php b/src/Appwrite/Platform/Tasks/ScheduleBase.php
index 79a05dcd13..a1b85c341f 100644
--- a/src/Appwrite/Platform/Tasks/ScheduleBase.php
+++ b/src/Appwrite/Platform/Tasks/ScheduleBase.php
@@ -24,11 +24,8 @@ abstract class ScheduleBase extends Action
abstract public static function getName(): string;
abstract public static function getSupportedResource(): string;
-
- abstract protected function enqueueResources(
- Group $pools,
- Database $dbForConsole
- );
+ abstract public static function getCollectionId(): string;
+ abstract protected function enqueueResources(Group $pools, Database $dbForConsole, callable $getProjectDB): void;
public function __construct()
{
@@ -62,14 +59,8 @@ abstract class ScheduleBase extends Action
$getSchedule = function (Document $schedule) use ($dbForConsole, $getProjectDB): array {
$project = $dbForConsole->getDocument('projects', $schedule->getAttribute('projectId'));
- $collectionId = match ($schedule->getAttribute('resourceType')) {
- 'function' => 'functions',
- 'message' => 'messages',
- 'execution' => 'executions'
- };
-
$resource = $getProjectDB($project)->getDocument(
- $collectionId,
+ static::getCollectionId(),
$schedule->getAttribute('resourceId')
);
@@ -113,12 +104,7 @@ abstract class ScheduleBase extends Action
try {
$this->schedules[$document->getInternalId()] = $getSchedule($document);
} catch (\Throwable $th) {
- $collectionId = match ($document->getAttribute('resourceType')) {
- 'function' => 'functions',
- 'message' => 'messages',
- 'execution' => 'executions'
- };
-
+ $collectionId = static::getCollectionId();
Console::error("Failed to load schedule for project {$document['projectId']} {$collectionId} {$document['resourceId']}");
Console::error($th->getMessage());
}
@@ -133,7 +119,7 @@ abstract class ScheduleBase extends Action
Console::success("Starting timers at " . DateTime::now());
- run(function () use ($dbForConsole, &$lastSyncUpdate, $getSchedule, $pools) {
+ run(function () use ($dbForConsole, &$lastSyncUpdate, $getSchedule, $pools, $getProjectDB) {
/**
* The timer synchronize $schedules copy with database collection.
*/
@@ -172,10 +158,10 @@ abstract class ScheduleBase extends Action
$new = \strtotime($document['resourceUpdatedAt']);
if (!$document['active']) {
- Console::info("Removing: {$document['resourceId']}");
+ Console::info("Removing: {$document['resourceType']}::{$document['resourceId']}");
unset($this->schedules[$document->getInternalId()]);
} elseif ($new !== $org) {
- Console::info("Updating: {$document['resourceId']}");
+ Console::info("Updating: {$document['resourceType']}::{$document['resourceId']}");
$this->schedules[$document->getInternalId()] = $getSchedule($document);
}
}
@@ -193,10 +179,10 @@ abstract class ScheduleBase extends Action
Timer::tick(
static::ENQUEUE_TIMER * 1000,
- fn () => $this->enqueueResources($pools, $dbForConsole)
+ fn () => $this->enqueueResources($pools, $dbForConsole, $getProjectDB)
);
- $this->enqueueResources($pools, $dbForConsole);
+ $this->enqueueResources($pools, $dbForConsole, $getProjectDB);
});
}
}
diff --git a/src/Appwrite/Platform/Tasks/ScheduleExecutions.php b/src/Appwrite/Platform/Tasks/ScheduleExecutions.php
index 682d796585..73a2814397 100644
--- a/src/Appwrite/Platform/Tasks/ScheduleExecutions.php
+++ b/src/Appwrite/Platform/Tasks/ScheduleExecutions.php
@@ -22,7 +22,12 @@ class ScheduleExecutions extends ScheduleBase
return 'execution';
}
- protected function enqueueResources(Group $pools, Database $dbForConsole): void
+ public static function getCollectionId(): string
+ {
+ return 'executions';
+ }
+
+ protected function enqueueResources(Group $pools, Database $dbForConsole, callable $getProjectDB): void
{
$queue = $pools->get('queue')->pop();
$connection = $queue->getResource();
diff --git a/src/Appwrite/Platform/Tasks/ScheduleFunctions.php b/src/Appwrite/Platform/Tasks/ScheduleFunctions.php
index e2c278714f..4d57902330 100644
--- a/src/Appwrite/Platform/Tasks/ScheduleFunctions.php
+++ b/src/Appwrite/Platform/Tasks/ScheduleFunctions.php
@@ -26,7 +26,12 @@ class ScheduleFunctions extends ScheduleBase
return 'function';
}
- protected function enqueueResources(Group $pools, Database $dbForConsole): void
+ public static function getCollectionId(): string
+ {
+ return 'functions';
+ }
+
+ protected function enqueueResources(Group $pools, Database $dbForConsole, callable $getProjectDB): void
{
$timerStart = \microtime(true);
$time = DateTime::now();
diff --git a/src/Appwrite/Platform/Tasks/ScheduleMessages.php b/src/Appwrite/Platform/Tasks/ScheduleMessages.php
index 167f1282ed..b9d8e2a282 100644
--- a/src/Appwrite/Platform/Tasks/ScheduleMessages.php
+++ b/src/Appwrite/Platform/Tasks/ScheduleMessages.php
@@ -21,7 +21,12 @@ class ScheduleMessages extends ScheduleBase
return 'message';
}
- protected function enqueueResources(Group $pools, Database $dbForConsole): void
+ public static function getCollectionId(): string
+ {
+ return 'messages';
+ }
+
+ protected function enqueueResources(Group $pools, Database $dbForConsole, callable $getProjectDB): void
{
foreach ($this->schedules as $schedule) {
if (!$schedule['active']) {
diff --git a/src/Appwrite/Platform/Tasks/Specs.php b/src/Appwrite/Platform/Tasks/Specs.php
index e171f2f405..f71de98d95 100644
--- a/src/Appwrite/Platform/Tasks/Specs.php
+++ b/src/Appwrite/Platform/Tasks/Specs.php
@@ -5,9 +5,11 @@ namespace Appwrite\Platform\Tasks;
use Appwrite\Specification\Format\OpenAPI3;
use Appwrite\Specification\Format\Swagger2;
use Appwrite\Specification\Specification;
-use Appwrite\Utopia\Response;
+use Appwrite\Utopia\Request as AppwriteRequest;
+use Appwrite\Utopia\Response as AppwriteResponse;
use Exception;
-use Swoole\Http\Response as HttpResponse;
+use Swoole\Http\Request as SwooleRequest;
+use Swoole\Http\Response as SwooleResponse;
use Utopia\App;
use Utopia\Cache\Adapter\None;
use Utopia\Cache\Cache;
@@ -17,7 +19,8 @@ use Utopia\Database\Adapter\MySQL;
use Utopia\Database\Database;
use Utopia\Platform\Action;
use Utopia\Registry\Registry;
-use Utopia\Request;
+use Utopia\Request as UtopiaRequest;
+use Utopia\Response as UtopiaResponse;
use Utopia\System\System;
use Utopia\Validator\Text;
use Utopia\Validator\WhiteList;
@@ -29,6 +32,16 @@ class Specs extends Action
return 'specs';
}
+ public function getRequest(): UtopiaRequest
+ {
+ return new AppwriteRequest(new SwooleRequest());
+ }
+
+ public function getResponse(): UtopiaResponse
+ {
+ return new AppwriteResponse(new SwooleResponse());
+ }
+
public function __construct()
{
$this
@@ -42,11 +55,11 @@ class Specs extends Action
public function action(string $version, string $mode, Registry $register): void
{
$appRoutes = App::getRoutes();
- $response = new Response(new HttpResponse());
+ $response = $this->getResponse();
$mocks = ($mode === 'mocks');
// Mock dependencies
- App::setResource('request', fn () => new Request());
+ App::setResource('request', fn () => $this->getRequest());
App::setResource('response', fn () => $response);
App::setResource('dbForConsole', fn () => new Database(new MySQL(''), new Cache(new None())));
App::setResource('dbForProject', fn () => new Database(new MySQL(''), new Cache(new None())));
@@ -183,10 +196,8 @@ class Specs extends Action
case APP_AUTH_TYPE_SESSION:
$sdkPlatforms[] = APP_PLATFORM_CLIENT;
break;
- case APP_AUTH_TYPE_KEY:
- $sdkPlatforms[] = APP_PLATFORM_SERVER;
- break;
case APP_AUTH_TYPE_JWT:
+ case APP_AUTH_TYPE_KEY:
$sdkPlatforms[] = APP_PLATFORM_SERVER;
break;
case APP_AUTH_TYPE_ADMIN:
diff --git a/src/Appwrite/Platform/Workers/Certificates.php b/src/Appwrite/Platform/Workers/Certificates.php
index 58dc1dd28a..4f32877fcf 100644
--- a/src/Appwrite/Platform/Workers/Certificates.php
+++ b/src/Appwrite/Platform/Workers/Certificates.php
@@ -2,6 +2,7 @@
namespace Appwrite\Platform\Workers;
+use Appwrite\Certificates\Adapter as CertificatesAdapter;
use Appwrite\Event\Event;
use Appwrite\Event\Func;
use Appwrite\Event\Mail;
@@ -11,7 +12,6 @@ use Appwrite\Template\Template;
use Appwrite\Utopia\Response\Model\Rule;
use Exception;
use Throwable;
-use Utopia\App;
use Utopia\CLI\Console;
use Utopia\Database\Database;
use Utopia\Database\DateTime;
@@ -48,7 +48,11 @@ class Certificates extends Action
->inject('queueForEvents')
->inject('queueForFunctions')
->inject('log')
- ->callback(fn (Message $message, Database $dbForConsole, Mail $queueForMails, Event $queueForEvents, Func $queueForFunctions, Log $log) => $this->action($message, $dbForConsole, $queueForMails, $queueForEvents, $queueForFunctions, $log));
+ ->inject('certificates')
+ ->callback(
+ fn (Message $message, Database $dbForConsole, Mail $queueForMails, Event $queueForEvents, Func $queueForFunctions, Log $log, CertificatesAdapter $certificates) =>
+ $this->action($message, $dbForConsole, $queueForMails, $queueForEvents, $queueForFunctions, $log, $certificates)
+ );
}
/**
@@ -58,11 +62,12 @@ class Certificates extends Action
* @param Event $queueForEvents
* @param Func $queueForFunctions
* @param Log $log
+ * @param CertificatesAdapter $certificates
* @return void
* @throws Throwable
* @throws \Utopia\Database\Exception
*/
- public function action(Message $message, Database $dbForConsole, Mail $queueForMails, Event $queueForEvents, Func $queueForFunctions, Log $log): void
+ public function action(Message $message, Database $dbForConsole, Mail $queueForMails, Event $queueForEvents, Func $queueForFunctions, Log $log, CertificatesAdapter $certificates): void
{
$payload = $message->getPayload() ?? [];
@@ -76,7 +81,7 @@ class Certificates extends Action
$log->addTag('domain', $domain->get());
- $this->execute($domain, $dbForConsole, $queueForMails, $queueForEvents, $queueForFunctions, $log, $skipRenewCheck);
+ $this->execute($domain, $dbForConsole, $queueForMails, $queueForEvents, $queueForFunctions, $log, $certificates, $skipRenewCheck);
}
/**
@@ -85,24 +90,24 @@ class Certificates extends Action
* @param Mail $queueForMails
* @param Event $queueForEvents
* @param Func $queueForFunctions
+ * @param CertificatesAdapter $certificates
* @param bool $skipRenewCheck
* @return void
* @throws Throwable
* @throws \Utopia\Database\Exception
*/
- private function execute(Domain $domain, Database $dbForConsole, Mail $queueForMails, Event $queueForEvents, Func $queueForFunctions, Log $log, bool $skipRenewCheck = false): void
+ private function execute(Domain $domain, Database $dbForConsole, Mail $queueForMails, Event $queueForEvents, Func $queueForFunctions, Log $log, CertificatesAdapter $certificates, bool $skipRenewCheck = false): void
{
/**
* 1. Read arguments and validate domain
* 2. Get main domain
* 3. Validate CNAME DNS if parameter is not main domain (meaning it's custom domain)
- * 4. Validate security email. Cannot be empty, required by LetsEncrypt
- * 5. Validate renew date with certificate file, unless requested to skip by parameter
- * 6. Issue a certificate using certbot CLI
- * 7. Update 'log' attribute on certificate document with Certbot message
- * 8. Create storage folder for certificate, if not ready already
- * 9. Move certificates from Certbot location to our Storage
- * 10. Create/Update our Storage with new Traefik config with new certificate paths
+ * 4. Validate renew date with certificate file, unless requested to skip by parameter
+ * 5. Issue a certificate using certbot CLI
+ * 6. Update 'log' attribute on certificate document with Certbot message
+ * 7. Create storage folder for certificate, if not ready already
+ * 8. Move certificates from Certbot location to our Storage
+ * 9. Create/Update our Storage with new Traefik config with new certificate paths
* 11. Read certificate file and update 'renewDate' on certificate document
* 12. Update 'issueDate' and 'attempts' on certificate
*
@@ -119,14 +124,14 @@ class Certificates extends Action
* 2. Save document to database
* 3. Update all domains documents with current certificate ID
*
- * Note: Renewals are checked and scheduled from maintenence worker
+ * Note: Renewals are checked and scheduled from maintenance worker
*/
// Get current certificate
$certificate = $dbForConsole->findOne('certificates', [Query::equal('domain', [$domain->get()])]);
// If we don't have certificate for domain yet, let's create new document. At the end we save it
- if (!$certificate) {
+ if ($certificate->isEmpty()) {
$certificate = new Document();
$certificate->setAttribute('domain', $domain->get());
}
@@ -134,40 +139,27 @@ class Certificates extends Action
$success = false;
try {
- // Email for alerts is required by LetsEncrypt
- $email = System::getEnv('_APP_EMAIL_CERTIFICATES', System::getEnv('_APP_SYSTEM_SECURITY_EMAIL_ADDRESS'));
- if (empty($email)) {
- throw new Exception('You must set a valid security email address (_APP_EMAIL_CERTIFICATES) to issue an SSL certificate.');
- }
-
// Validate domain and DNS records. Skip if job is forced
if (!$skipRenewCheck) {
$mainDomain = $this->getMainDomain();
$isMainDomain = !isset($mainDomain) || $domain->get() === $mainDomain;
$this->validateDomain($domain, $isMainDomain, $log);
+
+ // If certificate exists already, double-check expiry date. Skip if job is forced
+ if (!$certificates->isRenewRequired($domain->get(), $log)) {
+ throw new Exception('Renew isn\'t required.');
+ }
}
- // If certificate exists already, double-check expiry date. Skip if job is forced
- if (!$skipRenewCheck && !$this->isRenewRequired($domain->get(), $log)) {
- throw new Exception('Renew isn\'t required.');
- }
-
- // Prepare folder name for certbot. Using this helps prevent miss-match in LetsEncrypt configuration when renewing certificate
- $folder = ID::unique();
-
- // Generate certificate files using Let's Encrypt
- $letsEncryptData = $this->issueCertificate($folder, $domain->get(), $email);
+ // Prepare unique cert name. Using this helps prevent miss-match in configuration when renewing certificates.
+ $certName = ID::unique();
+ $renewDate = $certificates->issueCertificate($certName, $domain->get());
// Command succeeded, store all data into document
- $logs = 'Certificate successfully generated.';
- $certificate->setAttribute('logs', \mb_strcut($logs, 0, 1000000));// Limit to 1MB
-
-
- // Give certificates to Traefik
- $this->applyCertificateFiles($folder, $domain->get(), $letsEncryptData);
+ $certificate->setAttribute('logs', 'Certificate successfully generated.');
// Update certificate info stored in database
- $certificate->setAttribute('renewDate', $this->getRenewDate($domain->get()));
+ $certificate->setAttribute('renewDate', $renewDate);
$certificate->setAttribute('attempts', 0);
$certificate->setAttribute('issueDate', DateTime::now());
$success = true;
@@ -181,7 +173,7 @@ class Certificates extends Action
$attempts = $certificate->getAttribute('attempts', 0) + 1;
$certificate->setAttribute('attempts', $attempts);
- // Store cuttent time as renew date to ensure another attempt in next maintenance cycle
+ // Store current time as renew date to ensure another attempt in next maintenance cycle.
$certificate->setAttribute('renewDate', DateTime::now());
// Send email to security email
@@ -216,7 +208,7 @@ class Certificates extends Action
{
// Check if update or insert required
$certificateDocument = $dbForConsole->findOne('certificates', [Query::equal('domain', [$domain])]);
- if (!empty($certificateDocument) && !$certificateDocument->isEmpty()) {
+ if (!$certificateDocument->isEmpty()) {
// Merge new data with current data
$certificate = new Document(\array_merge($certificateDocument->getArrayCopy(), $certificate->getArrayCopy()));
$certificate = $dbForConsole->updateDocument('certificates', $certificate->getId(), $certificate);
@@ -245,8 +237,8 @@ class Certificates extends Action
}
/**
- * Internal domain validation functionality to prevent unnecessary attempts failed from Let's Encrypt side. We check:
- * - Domain needs to be public and valid (prevents NFT domains that are not supported by Let's Encrypt)
+ * Internal domain validation functionality to prevent unnecessary attempts. We check:
+ * - Domain needs to be public and valid (prevents NFT domains that are not supported)
* - Domain must have proper DNS record
*
* @param Domain $domain Domain which we validate
@@ -292,136 +284,6 @@ class Certificates extends Action
}
}
- /**
- * Reads expiry date of certificate from file and decides if renewal is required or not.
- *
- * @param string $domain Domain for which we check certificate file
- * @return bool True, if certificate needs to be renewed
- * @throws Exception
- */
- private function isRenewRequired(string $domain, Log $log): bool
- {
- $certPath = APP_STORAGE_CERTIFICATES . '/' . $domain . '/cert.pem';
- if (\file_exists($certPath)) {
- $validTo = null;
-
- $certData = openssl_x509_parse(file_get_contents($certPath));
- $validTo = $certData['validTo_time_t'] ?? 0;
-
- if (empty($validTo)) {
- $log->addTag('certificateDomain', $domain);
- throw new Exception('Unable to read certificate file (cert.pem).');
- }
-
- // LetsEncrypt allows renewal 30 days before expiry
- $expiryInAdvance = (60 * 60 * 24 * 30);
- if ($validTo - $expiryInAdvance > \time()) {
- $log->addTag('certificateDomain', $domain);
- $log->addExtra('certificateData', \is_array($certData) ? \json_encode($certData) : \strval($certData));
- return false;
- }
- }
-
- return true;
- }
-
- /**
- * LetsEncrypt communication to issue certificate (using certbot CLI)
- *
- * @param string $folder Folder into which certificates should be generated
- * @param string $domain Domain to generate certificate for
- * @return array Named array with keys 'stdout' and 'stderr', both string
- * @throws Exception
- */
- private function issueCertificate(string $folder, string $domain, string $email): array
- {
- $stdout = '';
- $stderr = '';
-
- $staging = (App::isProduction()) ? '' : ' --dry-run';
- $exit = Console::execute("certbot certonly -v --webroot --noninteractive --agree-tos{$staging}"
- . " --email " . $email
- . " --cert-name " . $folder
- . " -w " . APP_STORAGE_CERTIFICATES
- . " -d {$domain}", '', $stdout, $stderr);
-
- // Unexpected error, usually 5XX, API limits, ...
- if ($exit !== 0) {
- throw new Exception('Failed to issue a certificate with message: ' . $stderr);
- }
-
- return [
- 'stdout' => $stdout,
- 'stderr' => $stderr
- ];
- }
-
- /**
- * Read new renew date from certificate file generated by Let's Encrypt
- *
- * @param string $domain Domain which certificate was generated for
- * @return string
- * @throws \Utopia\Database\Exception
- */
- private function getRenewDate(string $domain): string
- {
- $certPath = APP_STORAGE_CERTIFICATES . '/' . $domain . '/cert.pem';
- $certData = openssl_x509_parse(file_get_contents($certPath));
- $validTo = $certData['validTo_time_t'] ?? null;
- $dt = (new \DateTime())->setTimestamp($validTo);
- return DateTime::addSeconds($dt, -60 * 60 * 24 * 30); // -30 days
- }
-
- /**
- * Method to take files from Let's Encrypt, and put it into Traefik.
- *
- * @param string $domain Domain which certificate was generated for
- * @param string $folder Folder in which certificates were generated
- * @param array $letsEncryptData Let's Encrypt logs to use for additional info when throwing error
- * @return void
- * @throws Exception
- */
- private function applyCertificateFiles(string $folder, string $domain, array $letsEncryptData): void
- {
-
- // Prepare folder in storage for domain
- $path = APP_STORAGE_CERTIFICATES . '/' . $domain;
- if (!\is_readable($path)) {
- if (!\mkdir($path, 0755, true)) {
- throw new Exception('Failed to create path for certificate.');
- }
- }
-
- // Move generated files
- if (!@\rename('/etc/letsencrypt/live/' . $folder . '/cert.pem', APP_STORAGE_CERTIFICATES . '/' . $domain . '/cert.pem')) {
- throw new Exception('Failed to rename certificate cert.pem. Let\'s Encrypt log: ' . $letsEncryptData['stderr'] . ' ; ' . $letsEncryptData['stdout']);
- }
-
- if (!@\rename('/etc/letsencrypt/live/' . $folder . '/chain.pem', APP_STORAGE_CERTIFICATES . '/' . $domain . '/chain.pem')) {
- throw new Exception('Failed to rename certificate chain.pem. Let\'s Encrypt log: ' . $letsEncryptData['stderr'] . ' ; ' . $letsEncryptData['stdout']);
- }
-
- if (!@\rename('/etc/letsencrypt/live/' . $folder . '/fullchain.pem', APP_STORAGE_CERTIFICATES . '/' . $domain . '/fullchain.pem')) {
- throw new Exception('Failed to rename certificate fullchain.pem. Let\'s Encrypt log: ' . $letsEncryptData['stderr'] . ' ; ' . $letsEncryptData['stdout']);
- }
-
- if (!@\rename('/etc/letsencrypt/live/' . $folder . '/privkey.pem', APP_STORAGE_CERTIFICATES . '/' . $domain . '/privkey.pem')) {
- throw new Exception('Failed to rename certificate privkey.pem. Let\'s Encrypt log: ' . $letsEncryptData['stderr'] . ' ; ' . $letsEncryptData['stdout']);
- }
-
- $config = \implode(PHP_EOL, [
- "tls:",
- " certificates:",
- " - certFile: /storage/certificates/{$domain}/fullchain.pem",
- " keyFile: /storage/certificates/{$domain}/privkey.pem"
- ]);
-
- // Save configuration into Traefik using our new cert files
- if (!\file_put_contents(APP_STORAGE_CONFIG . '/' . $domain . '.yml', $config)) {
- throw new Exception('Failed to save Traefik configuration.');
- }
- }
-
/**
* Method to make sure information about error is delivered to admnistrator.
*
@@ -477,12 +339,16 @@ class Certificates extends Action
*/
private function updateDomainDocuments(string $certificateId, string $domain, bool $success, Database $dbForConsole, Event $queueForEvents, Func $queueForFunctions): void
{
+ // TODO: @christyjacob remove once we migrate the rules in 1.7.x
+ if (System::getEnv('_APP_RULES_FORMAT') === 'md5') {
+ $rule = $dbForConsole->getDocument('rules', md5($domain));
+ } else {
+ $rule = $dbForConsole->findOne('rules', [
+ Query::equal('domain', [$domain]),
+ ]);
+ }
- $rule = $dbForConsole->findOne('rules', [
- Query::equal('domain', [$domain]),
- ]);
-
- if ($rule !== false && !$rule->isEmpty()) {
+ if (!$rule->isEmpty()) {
$rule->setAttribute('certificateId', $certificateId);
$rule->setAttribute('status', $success ? 'verified' : 'unverified');
$dbForConsole->updateDocument('rules', $rule->getId(), $rule);
@@ -496,6 +362,10 @@ class Certificates extends Action
$project = $dbForConsole->getDocument('projects', $projectId);
+ if ($project->isEmpty()) {
+ return;
+ }
+
/** Trigger Webhook */
$ruleModel = new Rule();
$queueForEvents
diff --git a/src/Appwrite/Platform/Workers/Databases.php b/src/Appwrite/Platform/Workers/Databases.php
index 56f5f012e8..f9073465cd 100644
--- a/src/Appwrite/Platform/Workers/Databases.php
+++ b/src/Appwrite/Platform/Workers/Databases.php
@@ -5,13 +5,13 @@ namespace Appwrite\Platform\Workers;
use Appwrite\Event\Event;
use Appwrite\Messaging\Adapter\Realtime;
use Exception;
-use Utopia\Audit\Audit;
use Utopia\CLI\Console;
use Utopia\Database\Database;
use Utopia\Database\Document;
use Utopia\Database\Exception as DatabaseException;
use Utopia\Database\Exception\Authorization;
use Utopia\Database\Exception\Conflict;
+use Utopia\Database\Exception\NotFound;
use Utopia\Database\Exception\Restricted;
use Utopia\Database\Exception\Structure;
use Utopia\Database\Query;
@@ -93,6 +93,7 @@ class Databases extends Action
* @throws Authorization
* @throws Conflict
* @throws \Exception
+ * @throws \Throwable
*/
private function createAttribute(Document $database, Document $collection, Document $attribute, Document $project, Database $dbForConsole, Database $dbForProject): void
{
@@ -135,7 +136,6 @@ class Databases extends Action
$options = $attribute->getAttribute('options', []);
$project = $dbForConsole->getDocument('projects', $projectId);
-
try {
switch ($type) {
case Database::VAR_RELATIONSHIP:
@@ -171,7 +171,6 @@ class Databases extends Action
$dbForProject->updateDocument('attributes', $attribute->getId(), $attribute->setAttribute('status', 'available'));
} catch (\Throwable $e) {
- // TODO: Send non DatabaseExceptions to Sentry
Console::error($e->getMessage());
if ($e instanceof DatabaseException) {
@@ -194,15 +193,17 @@ class Databases extends Action
$relatedAttribute->setAttribute('status', 'failed')
);
}
+
+ throw $e;
} finally {
$this->trigger($database, $collection, $attribute, $project, $projectId, $events);
- }
- if ($type === Database::VAR_RELATIONSHIP && $options['twoWay']) {
- $dbForProject->purgeCachedDocument('database_' . $database->getInternalId(), $relatedCollection->getId());
- }
+ if ($type === Database::VAR_RELATIONSHIP && $options['twoWay']) {
+ $dbForProject->purgeCachedDocument('database_' . $database->getInternalId(), $relatedCollection->getId());
+ }
- $dbForProject->purgeCachedDocument('database_' . $database->getInternalId(), $collectionId);
+ $dbForProject->purgeCachedDocument('database_' . $database->getInternalId(), $collectionId);
+ }
}
/**
@@ -216,6 +217,7 @@ class Databases extends Action
* @throws Authorization
* @throws Conflict
* @throws \Exception
+ * @throws \Throwable
**/
private function deleteAttribute(Document $database, Document $collection, Document $attribute, Document $project, Database $dbForConsole, Database $dbForProject): void
{
@@ -249,7 +251,7 @@ class Databases extends Action
// - stuck: attribute was available but cannot be removed
try {
- if ($status !== 'failed') {
+ try {
if ($type === Database::VAR_RELATIONSHIP) {
if ($options['twoWay']) {
$relatedCollection = $dbForProject->getDocument('database_' . $database->getInternalId(), $options['relatedCollection']);
@@ -266,96 +268,107 @@ class Databases extends Action
} elseif (!$dbForProject->deleteAttribute('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId(), $key)) {
throw new DatabaseException('Failed to delete Attribute');
}
- }
- $dbForProject->deleteDocument('attributes', $attribute->getId());
+ $dbForProject->deleteDocument('attributes', $attribute->getId());
- if (!$relatedAttribute->isEmpty()) {
- $dbForProject->deleteDocument('attributes', $relatedAttribute->getId());
- }
- } catch (\Throwable $e) {
- // TODO: Send non DatabaseExceptions to Sentry
- Console::error($e->getMessage());
-
- if ($e instanceof DatabaseException) {
- $attribute->setAttribute('error', $e->getMessage());
if (!$relatedAttribute->isEmpty()) {
- $relatedAttribute->setAttribute('error', $e->getMessage());
+ $dbForProject->deleteDocument('attributes', $relatedAttribute->getId());
+ }
+
+ } catch (NotFound $e) {
+ Console::error($e->getMessage());
+
+ $dbForProject->deleteDocument('attributes', $attribute->getId());
+
+ if (!$relatedAttribute->isEmpty()) {
+ $dbForProject->deleteDocument('attributes', $relatedAttribute->getId());
+ }
+
+ throw $e;
+
+ } catch (\Throwable $e) {
+ Console::error($e->getMessage());
+
+ if ($e instanceof DatabaseException) {
+ $attribute->setAttribute('error', $e->getMessage());
+ if (!$relatedAttribute->isEmpty()) {
+ $relatedAttribute->setAttribute('error', $e->getMessage());
+ }
}
- }
- $dbForProject->updateDocument(
- 'attributes',
- $attribute->getId(),
- $attribute->setAttribute('status', 'stuck')
- );
- if (!$relatedAttribute->isEmpty()) {
$dbForProject->updateDocument(
'attributes',
- $relatedAttribute->getId(),
- $relatedAttribute->setAttribute('status', 'stuck')
+ $attribute->getId(),
+ $attribute->setAttribute('status', 'stuck')
);
+ if (!$relatedAttribute->isEmpty()) {
+ $dbForProject->updateDocument(
+ 'attributes',
+ $relatedAttribute->getId(),
+ $relatedAttribute->setAttribute('status', 'stuck')
+ );
+ }
+
+ throw $e;
+ } finally {
+ $this->trigger($database, $collection, $attribute, $project, $projectId, $events);
}
- } finally {
- $this->trigger($database, $collection, $attribute, $project, $projectId, $events);
- }
- // The underlying database removes/rebuilds indexes when attribute is removed
- // Update indexes table with changes
- /** @var Document[] $indexes */
- $indexes = $collection->getAttribute('indexes', []);
+ // The underlying database removes/rebuilds indexes when attribute is removed
+ // Update indexes table with changes
+ /** @var Document[] $indexes */
+ $indexes = $collection->getAttribute('indexes', []);
- foreach ($indexes as $index) {
- /** @var string[] $attributes */
- $attributes = $index->getAttribute('attributes');
- $lengths = $index->getAttribute('lengths');
- $orders = $index->getAttribute('orders');
+ foreach ($indexes as $index) {
+ /** @var string[] $attributes */
+ $attributes = $index->getAttribute('attributes');
+ $lengths = $index->getAttribute('lengths');
+ $orders = $index->getAttribute('orders');
- $found = \array_search($key, $attributes);
+ $found = \array_search($key, $attributes);
- if ($found !== false) {
- // If found, remove entry from attributes, lengths, and orders
- // array_values wraps array_diff to reindex array keys
- // when found attribute is removed from array
- $attributes = \array_values(\array_diff($attributes, [$attributes[$found]]));
- $lengths = \array_values(\array_diff($lengths, isset($lengths[$found]) ? [$lengths[$found]] : []));
- $orders = \array_values(\array_diff($orders, isset($orders[$found]) ? [$orders[$found]] : []));
+ if ($found !== false) {
+ // If found, remove entry from attributes, lengths, and orders
+ // array_values wraps array_diff to reindex array keys
+ // when found attribute is removed from array
+ $attributes = \array_values(\array_diff($attributes, [$attributes[$found]]));
+ $lengths = \array_values(\array_diff($lengths, isset($lengths[$found]) ? [$lengths[$found]] : []));
+ $orders = \array_values(\array_diff($orders, isset($orders[$found]) ? [$orders[$found]] : []));
- if (empty($attributes)) {
- $dbForProject->deleteDocument('indexes', $index->getId());
- } else {
- $index
- ->setAttribute('attributes', $attributes, Document::SET_TYPE_ASSIGN)
- ->setAttribute('lengths', $lengths, Document::SET_TYPE_ASSIGN)
- ->setAttribute('orders', $orders, Document::SET_TYPE_ASSIGN);
-
- // Check if an index exists with the same attributes and orders
- $exists = false;
- foreach ($indexes as $existing) {
- if (
- $existing->getAttribute('key') !== $index->getAttribute('key') // Ignore itself
- && $existing->getAttribute('attributes') === $index->getAttribute('attributes')
- && $existing->getAttribute('orders') === $index->getAttribute('orders')
- ) {
- $exists = true;
- break;
- }
- }
-
- if ($exists) { // Delete the duplicate if created, else update in db
- $this->deleteIndex($database, $collection, $index, $project, $dbForConsole, $dbForProject);
+ if (empty($attributes)) {
+ $dbForProject->deleteDocument('indexes', $index->getId());
} else {
- $dbForProject->updateDocument('indexes', $index->getId(), $index);
+ $index
+ ->setAttribute('attributes', $attributes, Document::SET_TYPE_ASSIGN)
+ ->setAttribute('lengths', $lengths, Document::SET_TYPE_ASSIGN)
+ ->setAttribute('orders', $orders, Document::SET_TYPE_ASSIGN);
+
+ // Check if an index exists with the same attributes and orders
+ $exists = false;
+ foreach ($indexes as $existing) {
+ if (
+ $existing->getAttribute('key') !== $index->getAttribute('key') // Ignore itself
+ && $existing->getAttribute('attributes') === $index->getAttribute('attributes')
+ && $existing->getAttribute('orders') === $index->getAttribute('orders')
+ ) {
+ $exists = true;
+ break;
+ }
+ }
+
+ if ($exists) { // Delete the duplicate if created, else update in db
+ $this->deleteIndex($database, $collection, $index, $project, $dbForConsole, $dbForProject);
+ } else {
+ $dbForProject->updateDocument('indexes', $index->getId(), $index);
+ }
}
}
}
- }
+ } finally {
+ $dbForProject->purgeCachedDocument('database_' . $database->getInternalId(), $collectionId);
- $dbForProject->purgeCachedDocument('database_' . $database->getInternalId(), $collectionId);
- $dbForProject->purgeCachedCollection('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId());
-
- if (!$relatedCollection->isEmpty() && !$relatedAttribute->isEmpty()) {
- $dbForProject->purgeCachedDocument('database_' . $database->getInternalId(), $relatedCollection->getId());
- $dbForProject->purgeCachedCollection('database_' . $database->getInternalId() . '_collection_' . $relatedCollection->getInternalId());
+ if (!$relatedCollection->isEmpty() && !$relatedAttribute->isEmpty()) {
+ $dbForProject->purgeCachedDocument('database_' . $database->getInternalId(), $relatedCollection->getId());
+ }
}
}
@@ -371,6 +384,7 @@ class Databases extends Action
* @throws Conflict
* @throws Structure
* @throws DatabaseException
+ * @throws \Throwable
*/
private function createIndex(Document $database, Document $collection, Document $index, Document $project, Database $dbForConsole, Database $dbForProject): void
{
@@ -402,9 +416,7 @@ class Databases extends Action
}
$dbForProject->updateDocument('indexes', $index->getId(), $index->setAttribute('status', 'available'));
} catch (\Throwable $e) {
- // TODO: Send non DatabaseExceptions to Sentry
Console::error($e->getMessage());
-
if ($e instanceof DatabaseException) {
$index->setAttribute('error', $e->getMessage());
}
@@ -413,11 +425,12 @@ class Databases extends Action
$index->getId(),
$index->setAttribute('status', 'failed')
);
+
+ throw $e;
} finally {
$this->trigger($database, $collection, $index, $project, $projectId, $events);
+ $dbForProject->purgeCachedDocument('database_' . $database->getInternalId(), $collectionId);
}
-
- $dbForProject->purgeCachedDocument('database_' . $database->getInternalId(), $collectionId);
}
/**
@@ -432,6 +445,7 @@ class Databases extends Action
* @throws Conflict
* @throws Structure
* @throws DatabaseException
+ * @throws \Throwable
*/
private function deleteIndex(Document $database, Document $collection, Document $index, Document $project, Database $dbForConsole, Database $dbForProject): void
{
@@ -460,7 +474,6 @@ class Databases extends Action
$dbForProject->deleteDocument('indexes', $index->getId());
$index->setAttribute('status', 'deleted');
} catch (\Throwable $e) {
- // TODO: Send non DatabaseExceptions to Sentry
Console::error($e->getMessage());
if ($e instanceof DatabaseException) {
@@ -471,11 +484,13 @@ class Databases extends Action
$index->getId(),
$index->setAttribute('status', 'stuck')
);
+
+ throw $e;
+
} finally {
$this->trigger($database, $collection, $index, $project, $projectId, $events);
+ $dbForProject->purgeCachedDocument('database_' . $database->getInternalId(), $collection->getId());
}
-
- $dbForProject->purgeCachedDocument('database_' . $database->getInternalId(), $collection->getId());
}
/**
@@ -492,8 +507,6 @@ class Databases extends Action
});
$dbForProject->deleteCollection('database_' . $database->getInternalId());
-
- $this->deleteAuditLogsByResource('database/' . $database->getId(), $project, $dbForProject);
}
/**
@@ -549,23 +562,8 @@ class Databases extends Action
Query::equal('databaseInternalId', [$databaseInternalId]),
Query::equal('collectionInternalId', [$collectionInternalId])
], $dbForProject);
-
- $this->deleteAuditLogsByResource('database/' . $databaseId . '/collection/' . $collectionId, $project, $dbForProject);
}
- /**
- * @param string $resource
- * @param Document $project
- * @param Database $dbForProject
- * @return void
- * @throws Exception
- */
- protected function deleteAuditLogsByResource(string $resource, Document $project, Database $dbForProject): void
- {
- $this->deleteByGroup(Audit::COLLECTION, [
- Query::equal('resource', [$resource])
- ], $dbForProject);
- }
/**
* @param string $collection collectionID
diff --git a/src/Appwrite/Platform/Workers/Deletes.php b/src/Appwrite/Platform/Workers/Deletes.php
index c70d9ca11b..e6002bf75f 100644
--- a/src/Appwrite/Platform/Workers/Deletes.php
+++ b/src/Appwrite/Platform/Workers/Deletes.php
@@ -3,6 +3,7 @@
namespace Appwrite\Platform\Workers;
use Appwrite\Auth\Auth;
+use Appwrite\Certificates\Adapter as CertificatesAdapter;
use Appwrite\Extend\Exception;
use Executor\Executor;
use Throwable;
@@ -50,18 +51,22 @@ class Deletes extends Action
->inject('deviceForFunctions')
->inject('deviceForBuilds')
->inject('deviceForCache')
+ ->inject('certificates')
->inject('abuseRetention')
->inject('executionRetention')
->inject('auditRetention')
->inject('log')
- ->callback(fn ($message, $dbForConsole, callable $getProjectDB, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForBuilds, Device $deviceForCache, string $abuseRetention, string $executionRetention, string $auditRetention, Log $log) => $this->action($message, $dbForConsole, $getProjectDB, $deviceForFiles, $deviceForFunctions, $deviceForBuilds, $deviceForCache, $abuseRetention, $executionRetention, $auditRetention, $log));
+ ->callback(
+ fn ($message, $dbForConsole, callable $getProjectDB, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForBuilds, Device $deviceForCache, CertificatesAdapter $certificates, string $abuseRetention, string $executionRetention, string $auditRetention, Log $log) =>
+ $this->action($message, $dbForConsole, $getProjectDB, $deviceForFiles, $deviceForFunctions, $deviceForBuilds, $deviceForCache, $certificates, $abuseRetention, $executionRetention, $auditRetention, $log)
+ );
}
/**
* @throws Exception
* @throws Throwable
*/
- public function action(Message $message, Database $dbForConsole, callable $getProjectDB, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForBuilds, Device $deviceForCache, string $abuseRetention, string $executionRetention, string $auditRetention, Log $log): void
+ public function action(Message $message, Database $dbForConsole, callable $getProjectDB, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForBuilds, Device $deviceForCache, CertificatesAdapter $certificates, string $abuseRetention, string $executionRetention, string $auditRetention, Log $log): void
{
$payload = $message->getPayload() ?? [];
@@ -84,10 +89,10 @@ class Deletes extends Action
case DELETE_TYPE_DOCUMENT:
switch ($document->getCollection()) {
case DELETE_TYPE_PROJECTS:
- $this->deleteProject($dbForConsole, $getProjectDB, $deviceForFiles, $deviceForFunctions, $deviceForBuilds, $deviceForCache, $document);
+ $this->deleteProject($dbForConsole, $getProjectDB, $deviceForFiles, $deviceForFunctions, $deviceForBuilds, $deviceForCache, $certificates, $document);
break;
case DELETE_TYPE_FUNCTIONS:
- $this->deleteFunction($dbForConsole, $getProjectDB, $deviceForFunctions, $deviceForBuilds, $document, $project);
+ $this->deleteFunction($dbForConsole, $getProjectDB, $deviceForFunctions, $deviceForBuilds, $certificates, $document, $project);
break;
case DELETE_TYPE_DEPLOYMENTS:
$this->deleteDeployment($getProjectDB, $deviceForFunctions, $deviceForBuilds, $document, $project);
@@ -102,7 +107,7 @@ class Deletes extends Action
$this->deleteInstallation($dbForConsole, $getProjectDB, $document, $project);
break;
case DELETE_TYPE_RULES:
- $this->deleteRule($dbForConsole, $document);
+ $this->deleteRule($dbForConsole, $document, $certificates);
break;
default:
Console::error('No lazy delete operation available for document of type: ' . $document->getCollection());
@@ -110,7 +115,7 @@ class Deletes extends Action
}
break;
case DELETE_TYPE_TEAM_PROJECTS:
- $this->deleteProjectsByTeam($dbForConsole, $getProjectDB, $document);
+ $this->deleteProjectsByTeam($dbForConsole, $getProjectDB, $certificates, $document);
break;
case DELETE_TYPE_EXECUTIONS:
$this->deleteExecutionLogs($project, $getProjectDB, $executionRetention);
@@ -119,10 +124,6 @@ class Deletes extends Action
if (!$project->isEmpty()) {
$this->deleteAuditLogs($project, $getProjectDB, $auditRetention);
}
-
- if (!$document->isEmpty()) {
- $this->deleteAuditLogsByResource($getProjectDB, 'document/' . $document->getId(), $project);
- }
break;
case DELETE_TYPE_ABUSE:
$this->deleteAbuseLogs($project, $getProjectDB, $abuseRetention);
@@ -268,7 +269,7 @@ class Deletes extends Action
MESSAGE_TYPE_EMAIL => 'emailTotal',
MESSAGE_TYPE_SMS => 'smsTotal',
MESSAGE_TYPE_PUSH => 'pushTotal',
- default => throw new Exception('Invalid target provider type'),
+ default => throw new Exception('Invalid target CertificatesAdapter type'),
};
$dbForProject->decreaseDocumentAttribute(
'topics',
@@ -446,7 +447,7 @@ class Deletes extends Action
* @throws Structure
* @throws Exception
*/
- private function deleteProjectsByTeam(Database $dbForConsole, callable $getProjectDB, Document $document): void
+ private function deleteProjectsByTeam(Database $dbForConsole, callable $getProjectDB, CertificatesAdapter $certificates, Document $document): void
{
$projects = $dbForConsole->find('projects', [
@@ -459,7 +460,7 @@ class Deletes extends Action
$deviceForBuilds = getDevice(APP_STORAGE_BUILDS . '/app-' . $project->getId());
$deviceForCache = getDevice(APP_STORAGE_CACHE . '/app-' . $project->getId());
- $this->deleteProject($dbForConsole, $getProjectDB, $deviceForFiles, $deviceForFunctions, $deviceForBuilds, $deviceForCache, $project);
+ $this->deleteProject($dbForConsole, $getProjectDB, $deviceForFiles, $deviceForFunctions, $deviceForBuilds, $deviceForCache, $certificates, $project);
$dbForConsole->deleteDocument('projects', $project->getId());
}
}
@@ -477,9 +478,10 @@ class Deletes extends Action
* @throws Authorization
* @throws DatabaseException
*/
- private function deleteProject(Database $dbForConsole, callable $getProjectDB, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForBuilds, Device $deviceForCache, Document $document): void
+ private function deleteProject(Database $dbForConsole, callable $getProjectDB, Device $deviceForFiles, Device $deviceForFunctions, Device $deviceForBuilds, Device $deviceForCache, CertificatesAdapter $certificates, Document $document): void
{
$projectInternalId = $document->getInternalId();
+ $projectId = $document->getId();
try {
$dsn = new DSN($document->getAttribute('database', 'console'));
@@ -498,18 +500,30 @@ class Deletes extends Action
$limit = \count($projectCollectionIds) + 25;
+ $sharedTables = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES', ''));
+ $sharedTablesV1 = \explode(',', System::getEnv('_APP_DATABASE_SHARED_TABLES_V1', ''));
+
+ $projectTables = !\in_array($dsn->getHost(), $sharedTables);
+ $sharedTablesV1 = \in_array($dsn->getHost(), $sharedTablesV1);
+ $sharedTablesV2 = !$projectTables && !$sharedTablesV1;
+ $sharedTables = $sharedTablesV1 || $sharedTablesV2;
+
while (true) {
$collections = $dbForProject->listCollections($limit);
foreach ($collections as $collection) {
- if ($dsn->getHost() !== System::getEnv('_APP_DATABASE_SHARED_TABLES', '') || !\in_array($collection->getId(), $projectCollectionIds)) {
- $dbForProject->deleteCollection($collection->getId());
- } else {
- $this->deleteByGroup($collection->getId(), [], database: $dbForProject);
+ try {
+ if ($projectTables || !\in_array($collection->getId(), $projectCollectionIds)) {
+ $dbForProject->deleteCollection($collection->getId());
+ } else {
+ $this->deleteByGroup($collection->getId(), [], database: $dbForProject);
+ }
+ } catch (Throwable $e) {
+ Console::error('Error deleting '.$collection->getId().' '.$e->getMessage());
}
}
- if ($dsn->getHost() === System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
+ if ($sharedTables) {
$collectionsIds = \array_map(fn ($collection) => $collection->getId(), $collections);
if (empty(\array_diff($collectionsIds, $projectCollectionIds))) {
@@ -528,8 +542,8 @@ class Deletes extends Action
// Delete project and function rules
$this->deleteByGroup('rules', [
Query::equal('projectInternalId', [$projectInternalId])
- ], $dbForConsole, function (Document $document) use ($dbForConsole) {
- $this->deleteRule($dbForConsole, $document);
+ ], $dbForConsole, function (Document $document) use ($dbForConsole, $certificates) {
+ $this->deleteRule($dbForConsole, $document, $certificates);
});
// Delete Keys
@@ -557,11 +571,23 @@ class Deletes extends Action
Query::equal('projectInternalId', [$projectInternalId]),
], $dbForConsole);
+ // Delete Schedules (No projectInternalId in this collection)
+ $this->deleteByGroup('schedules', [
+ Query::equal('projectId', [$projectId]),
+ ], $dbForConsole);
+
// Delete metadata table
- if ($dsn->getHost() !== System::getEnv('_APP_DATABASE_SHARED_TABLES', '')) {
- $dbForProject->deleteCollection('_metadata');
- } else {
- $this->deleteByGroup('_metadata', [], $dbForProject);
+ if ($projectTables) {
+ $dbForProject->deleteCollection(Database::METADATA);
+ } elseif ($sharedTablesV1) {
+ $this->deleteByGroup(Database::METADATA, [], $dbForProject);
+ } elseif ($sharedTablesV2) {
+ $queries = \array_map(
+ fn ($id) => Query::notEqual('$id', $id),
+ $projectCollectionIds
+ );
+
+ $this->deleteByGroup(Database::METADATA, $queries, $dbForProject);
}
// Delete all storage directories
@@ -716,22 +742,6 @@ class Deletes extends Action
}
}
- /**
- * @param callable $getProjectDB
- * @param string $resource
- * @param Document $project
- * @return void
- * @throws Exception
- */
- private function deleteAuditLogsByResource(callable $getProjectDB, string $resource, Document $project): void
- {
- $dbForProject = $getProjectDB($project);
-
- $this->deleteByGroup(Audit::COLLECTION, [
- Query::equal('resource', [$resource])
- ], $dbForProject);
- }
-
/**
* @param callable $getProjectDB
* @param Device $deviceForFunctions
@@ -741,7 +751,7 @@ class Deletes extends Action
* @return void
* @throws Exception
*/
- private function deleteFunction(Database $dbForConsole, callable $getProjectDB, Device $deviceForFunctions, Device $deviceForBuilds, Document $document, Document $project): void
+ private function deleteFunction(Database $dbForConsole, callable $getProjectDB, Device $deviceForFunctions, Device $deviceForBuilds, CertificatesAdapter $certificates, Document $document, Document $project): void
{
$projectId = $project->getId();
$dbForProject = $getProjectDB($project);
@@ -756,8 +766,8 @@ class Deletes extends Action
Query::equal('resourceType', ['function']),
Query::equal('resourceInternalId', [$functionInternalId]),
Query::equal('projectInternalId', [$project->getInternalId()])
- ], $dbForConsole, function (Document $document) use ($project, $dbForConsole) {
- $this->deleteRule($dbForConsole, $document);
+ ], $dbForConsole, function (Document $document) use ($project, $dbForConsole, $certificates) {
+ $this->deleteRule($dbForConsole, $document, $certificates);
});
/**
@@ -955,7 +965,7 @@ class Deletes extends Action
* @return void
* @throws Exception
*/
- private function deleteByGroup(string $collection, array $queries, Database $database, callable $callback = null): void
+ protected function deleteByGroup(string $collection, array $queries, Database $database, callable $callback = null): void
{
$count = 0;
$chunk = 0;
@@ -997,7 +1007,7 @@ class Deletes extends Action
* @return void
* @throws Exception
*/
- private function listByGroup(string $collection, array $queries, Database $database, callable $callback = null): void
+ protected function listByGroup(string $collection, array $queries, Database $database, callable $callback = null): void
{
$count = 0;
$chunk = 0;
@@ -1043,21 +1053,10 @@ class Deletes extends Action
* @param Document $document rule document
* @return void
*/
- private function deleteRule(Database $dbForConsole, Document $document): void
+ private function deleteRule(Database $dbForConsole, Document $document, CertificatesAdapter $certificates): void
{
-
$domain = $document->getAttribute('domain');
- $directory = APP_STORAGE_CERTIFICATES . '/' . $domain;
- $checkTraversal = realpath($directory) === $directory;
-
- if ($checkTraversal && is_dir($directory)) {
- // Delete files, so Traefik is aware of change
- array_map('unlink', glob($directory . '/*.*'));
- rmdir($directory);
- Console::info("Deleted certificate files for {$domain}");
- } else {
- Console::info("No certificate files found for {$domain}");
- }
+ $certificates->deleteCertificate($domain);
// Delete certificate document, so Appwrite is aware of change
if (isset($document['certificateId'])) {
diff --git a/src/Appwrite/Platform/Workers/Functions.php b/src/Appwrite/Platform/Workers/Functions.php
index e60f67416d..72a3334f2f 100644
--- a/src/Appwrite/Platform/Workers/Functions.php
+++ b/src/Appwrite/Platform/Workers/Functions.php
@@ -41,29 +41,18 @@ class Functions extends Action
$this
->desc('Functions worker')
->groups(['functions'])
+ ->inject('project')
->inject('message')
->inject('dbForProject')
->inject('queueForFunctions')
->inject('queueForEvents')
->inject('queueForUsage')
->inject('log')
- ->callback(fn (Message $message, Database $dbForProject, Func $queueForFunctions, Event $queueForEvents, Usage $queueForUsage, Log $log) => $this->action($message, $dbForProject, $queueForFunctions, $queueForEvents, $queueForUsage, $log));
+ ->inject('isResourceBlocked')
+ ->callback(fn (Document $project, Message $message, Database $dbForProject, Func $queueForFunctions, Event $queueForEvents, Usage $queueForUsage, Log $log, callable $isResourceBlocked) => $this->action($project, $message, $dbForProject, $queueForFunctions, $queueForEvents, $queueForUsage, $log, $isResourceBlocked));
}
- /**
- * @param Message $message
- * @param Database $dbForProject
- * @param Func $queueForFunctions
- * @param Event $queueForEvents
- * @param Usage $queueForUsage
- * @param Log $log
- * @return void
- * @throws Authorization
- * @throws Structure
- * @throws \Utopia\Database\Exception
- * @throws Conflict
- */
- public function action(Message $message, Database $dbForProject, Func $queueForFunctions, Event $queueForEvents, Usage $queueForUsage, Log $log): void
+ public function action(Document $project, Message $message, Database $dbForProject, Func $queueForFunctions, Event $queueForEvents, Usage $queueForUsage, Log $log, callable $isResourceBlocked): void
{
$payload = $message->getPayload() ?? [];
@@ -72,10 +61,17 @@ class Functions extends Action
}
$type = $payload['type'] ?? '';
+
+ // Short-term solution to offhand write operation from API container
+ if ($type === Func::TYPE_ASYNC_WRITE) {
+ $execution = new Document($payload['execution'] ?? []);
+ $dbForProject->createDocument('executions', $execution);
+ return;
+ }
+
$events = $payload['events'] ?? [];
$data = $payload['body'] ?? '';
$eventData = $payload['payload'] ?? '';
- $project = new Document($payload['project'] ?? []);
$function = new Document($payload['function'] ?? []);
$functionId = $payload['functionId'] ?? '';
$user = new Document($payload['user'] ?? []);
@@ -113,7 +109,6 @@ class Functions extends Action
$limit = 30;
$sum = 30;
$offset = 0;
- /** @var Document[] $functions */
while ($sum >= $limit) {
$functions = $dbForProject->find('functions', [
Query::limit($limit),
@@ -130,6 +125,12 @@ class Functions extends Action
if (!array_intersect($events, $function->getAttribute('events', []))) {
continue;
}
+
+ if ($isResourceBlocked($project, RESOURCE_TYPE_FUNCTIONS, $function->getId())) {
+ Console::log('Function ' . $function->getId() . ' is blocked, skipping execution.');
+ continue;
+ }
+
Console::success('Iterating function: ' . $function->getAttribute('name'));
$this->execute(
@@ -160,6 +161,11 @@ class Functions extends Action
return;
}
+ if ($isResourceBlocked($project, RESOURCE_TYPE_FUNCTIONS, $function->getId())) {
+ Console::log('Function ' . $function->getId() . ' is blocked, skipping execution.');
+ return;
+ }
+
/**
* Handle Schedule and HTTP execution.
*/
@@ -587,7 +593,8 @@ class Functions extends Action
$target = Realtime::fromPayload(
// Pass first, most verbose event pattern
event: $allEvents[0],
- payload: $execution
+ payload: $execution,
+ project: $project
);
Realtime::send(
projectId: 'console',
diff --git a/src/Appwrite/Platform/Workers/Messaging.php b/src/Appwrite/Platform/Workers/Messaging.php
index b0f05522fa..58f6265ff4 100644
--- a/src/Appwrite/Platform/Workers/Messaging.php
+++ b/src/Appwrite/Platform/Workers/Messaging.php
@@ -178,7 +178,7 @@ class Messaging extends Action
Query::equal('type', [$providerType]),
]);
- if ($default === false || $default->isEmpty()) {
+ if ($default->isEmpty()) {
$dbForProject->updateDocument('messages', $message->getId(), $message->setAttributes([
'status' => MessageStatus::FAILED,
'deliveryErrors' => ['No enabled provider found.']
@@ -489,11 +489,29 @@ class Messaging extends Action
return match ($provider->getAttribute('provider')) {
'mock' => new Mock('username', 'password'),
- 'twilio' => new Twilio($credentials['accountSid'], $credentials['authToken'], null, isset($credentials['messagingServiceSid']) ? $credentials['messagingServiceSid'] : null),
- 'textmagic' => new TextMagic($credentials['username'], $credentials['apiKey']),
- 'telesign' => new Telesign($credentials['customerId'], $credentials['apiKey']),
- 'msg91' => new Msg91($credentials['senderId'], $credentials['authKey'], $credentials['templateId']),
- 'vonage' => new Vonage($credentials['apiKey'], $credentials['apiSecret']),
+ 'twilio' => new Twilio(
+ $credentials['accountSid'] ?? '',
+ $credentials['authToken'] ?? '',
+ null,
+ $credentials['messagingServiceSid'] ?? null
+ ),
+ 'textmagic' => new TextMagic(
+ $credentials['username'] ?? '',
+ $credentials['apiKey'] ?? ''
+ ),
+ 'telesign' => new Telesign(
+ $credentials['customerId'] ?? '',
+ $credentials['apiKey'] ?? ''
+ ),
+ 'msg91' => new Msg91(
+ $credentials['senderId'] ?? '',
+ $credentials['authKey'] ?? '',
+ $credentials['templateId'] ?? ''
+ ),
+ 'vonage' => new Vonage(
+ $credentials['apiKey'] ?? '',
+ $credentials['apiSecret'] ?? ''
+ ),
default => null
};
}
@@ -506,11 +524,11 @@ class Messaging extends Action
return match ($provider->getAttribute('provider')) {
'mock' => new Mock('username', 'password'),
'apns' => new APNS(
- $credentials['authKey'],
- $credentials['authKeyId'],
- $credentials['teamId'],
- $credentials['bundleId'],
- $options['sandbox']
+ $credentials['authKey'] ?? '',
+ $credentials['authKeyId'] ?? '',
+ $credentials['teamId'] ?? '',
+ $credentials['bundleId'] ?? '',
+ $options['sandbox'] ?? false
),
'fcm' => new FCM(\json_encode($credentials['serviceAccountJSON'])),
default => null
@@ -521,24 +539,25 @@ class Messaging extends Action
{
$credentials = $provider->getAttribute('credentials', []);
$options = $provider->getAttribute('options', []);
+ $apiKey = $credentials['apiKey'] ?? '';
return match ($provider->getAttribute('provider')) {
'mock' => new Mock('username', 'password'),
'smtp' => new SMTP(
- $credentials['host'],
- $credentials['port'],
- $credentials['username'],
- $credentials['password'],
- $options['encryption'],
- $options['autoTLS'],
- $options['mailer'],
+ $credentials['host'] ?? '',
+ $credentials['port'] ?? 25,
+ $credentials['username'] ?? '',
+ $credentials['password'] ?? '',
+ $options['encryption'] ?? '',
+ $options['autoTLS'] ?? false,
+ $options['mailer'] ?? '',
),
'mailgun' => new Mailgun(
- $credentials['apiKey'],
- $credentials['domain'],
- $credentials['isEuRegion']
+ $apiKey,
+ $credentials['domain'] ?? '',
+ $credentials['isEuRegion'] ?? false
),
- 'sendgrid' => new Sendgrid($credentials['apiKey']),
+ 'sendgrid' => new Sendgrid($apiKey),
default => null
};
}
diff --git a/src/Appwrite/Platform/Workers/Migrations.php b/src/Appwrite/Platform/Workers/Migrations.php
index 8ab5ebac46..fdd885effa 100644
--- a/src/Appwrite/Platform/Workers/Migrations.php
+++ b/src/Appwrite/Platform/Workers/Migrations.php
@@ -8,6 +8,7 @@ use Appwrite\Permission;
use Appwrite\Role;
use Exception;
use Utopia\CLI\Console;
+use Utopia\Config\Config;
use Utopia\Database\Database;
use Utopia\Database\Document;
use Utopia\Database\Exception\Authorization;
@@ -15,12 +16,11 @@ use Utopia\Database\Exception\Conflict;
use Utopia\Database\Exception\Restricted;
use Utopia\Database\Exception\Structure;
use Utopia\Database\Helpers\ID;
-use Utopia\Logger\Log;
-use Utopia\Logger\Log\Breadcrumb;
-use Utopia\Migration\Destinations\Appwrite as DestinationsAppwrite;
+use Utopia\Migration\Destination;
+use Utopia\Migration\Destinations\Appwrite as DestinationAppwrite;
use Utopia\Migration\Exception as MigrationException;
use Utopia\Migration\Source;
-use Utopia\Migration\Sources\Appwrite;
+use Utopia\Migration\Sources\Appwrite as SourceAppwrite;
use Utopia\Migration\Sources\Firebase;
use Utopia\Migration\Sources\NHost;
use Utopia\Migration\Sources\Supabase;
@@ -30,8 +30,13 @@ use Utopia\Queue\Message;
class Migrations extends Action
{
- private ?Database $dbForProject = null;
- private ?Database $dbForConsole = null;
+ protected Database $dbForProject;
+
+ protected Database $dbForConsole;
+
+ protected Document $project;
+
+ protected $logError;
public static function getName(): string
{
@@ -48,19 +53,14 @@ class Migrations extends Action
->inject('message')
->inject('dbForProject')
->inject('dbForConsole')
- ->inject('log')
- ->callback(fn (Message $message, Database $dbForProject, Database $dbForConsole, Log $log) => $this->action($message, $dbForProject, $dbForConsole, $log));
+ ->inject('logError')
+ ->callback(fn (Message $message, Database $dbForProject, Database $dbForConsole, callable $logError) => $this->action($message, $dbForProject, $dbForConsole, $logError));
}
/**
- * @param Message $message
- * @param Database $dbForProject
- * @param Database $dbForConsole
- * @param Log $log
- * @return void
* @throws Exception
*/
- public function action(Message $message, Database $dbForProject, Database $dbForConsole, Log $log): void
+ public function action(Message $message, Database $dbForProject, Database $dbForConsole, callable $logError): void
{
$payload = $message->getPayload() ?? [];
@@ -78,6 +78,8 @@ class Migrations extends Action
$this->dbForProject = $dbForProject;
$this->dbForConsole = $dbForConsole;
+ $this->project = $project;
+ $this->logError = $logError;
/**
* Handle Event execution.
@@ -86,20 +88,17 @@ class Migrations extends Action
return;
}
- $log->addTag('migrationId', $migration->getId());
- $log->addTag('projectId', $project->getId());
-
- $this->processMigration($project, $migration, $log);
+ $this->processMigration($migration);
}
/**
- * @param string $source
- * @param array $credentials
- * @return Source
* @throws Exception
*/
- protected function processSource(string $source, array $credentials): Source
+ protected function processSource(Document $migration): Source
{
+ $source = $migration->getAttribute('source');
+ $credentials = $migration->getAttribute('credentials');
+
return match ($source) {
Firebase::getName() => new Firebase(
json_decode($credentials['serviceAccount'], true),
@@ -122,11 +121,34 @@ class Migrations extends Action
$credentials['password'],
$credentials['port'],
),
- Appwrite::getName() => new Appwrite($credentials['projectId'], str_starts_with($credentials['endpoint'], 'http://localhost/v1') ? 'http://appwrite/v1' : $credentials['endpoint'], $credentials['apiKey']),
+ SourceAppwrite::getName() => new SourceAppwrite(
+ $credentials['projectId'],
+ $credentials['endpoint'] === 'http://localhost/v1' ? 'http://appwrite/v1' : $credentials['endpoint'],
+ $credentials['apiKey'],
+ ),
default => throw new \Exception('Invalid source type'),
};
}
+ /**
+ * @throws Exception
+ */
+ protected function processDestination(Document $migration, string $apiKey): Destination
+ {
+ $destination = $migration->getAttribute('destination');
+
+ return match ($destination) {
+ DestinationAppwrite::getName() => new DestinationAppwrite(
+ $this->project->getId(),
+ 'http://appwrite/v1',
+ $apiKey,
+ $this->dbForProject,
+ Config::getParam('collections', [])['databases']['collections'],
+ ),
+ default => throw new \Exception('Invalid destination type'),
+ };
+ }
+
/**
* @throws Authorization
* @throws Structure
@@ -167,8 +189,6 @@ class Migrations extends Action
}
/**
- * @param Document $apiKey
- * @return void
* @throws \Utopia\Database\Exception
* @throws Authorization
* @throws Conflict
@@ -181,8 +201,6 @@ class Migrations extends Action
}
/**
- * @param Document $project
- * @return Document
* @throws Authorization
* @throws Structure
* @throws \Utopia\Database\Exception
@@ -233,99 +251,109 @@ class Migrations extends Action
}
/**
- * @param Document $project
- * @param Document $migration
- * @param Log $log
- * @return void
* @throws Authorization
* @throws Conflict
* @throws Restricted
* @throws Structure
* @throws \Utopia\Database\Exception
+ * @throws Exception
*/
- protected function processMigration(Document $project, Document $migration, Log $log): void
+ protected function processMigration(Document $migration): void
{
- /**
- * @var Document $migrationDocument
- * @var Transfer $transfer
- */
- $migrationDocument = null;
- $transfer = null;
+ $project = $this->project;
$projectDocument = $this->dbForConsole->getDocument('projects', $project->getId());
$tempAPIKey = $this->generateAPIKey($projectDocument);
+ $transfer = $source = $destination = null;
+
try {
- $migrationDocument = $this->dbForProject->getDocument('migrations', $migration->getId());
- $migrationDocument->setAttribute('stage', 'processing');
- $migrationDocument->setAttribute('status', 'processing');
- $log->addBreadcrumb(new Breadcrumb("debug", "migration", "Migration hit stage 'processing'", \microtime(true)));
- $this->updateMigrationDocument($migrationDocument, $projectDocument);
+ if (
+ $migration->getAttribute('source') === SourceAppwrite::getName() &&
+ empty($migration->getAttribute('credentials', []))
+ ) {
+ $credentials = $migration->getAttribute('credentials', []);
- $log->addTag('type', $migrationDocument->getAttribute('source'));
+ $credentials['projectId'] = $credentials['projectId'] ?? $projectDocument->getId();
+ $credentials['endpoint'] = $credentials['endpoint'] ?? 'http://appwrite/v1';
+ $credentials['apiKey'] = $credentials['apiKey'] ?? $tempAPIKey['secret'];
- $source = $this->processSource($migrationDocument->getAttribute('source'), $migrationDocument->getAttribute('credentials'));
+ $migration->setAttribute('credentials', $credentials);
+ }
+
+ $migration->setAttribute('stage', 'processing');
+ $migration->setAttribute('status', 'processing');
+ $this->updateMigrationDocument($migration, $projectDocument);
+
+ $source = $this->processSource($migration);
+ $destination = $this->processDestination($migration, $tempAPIKey->getAttribute('secret'));
$source->report();
- $destination = new DestinationsAppwrite(
- $projectDocument->getId(),
- 'http://appwrite/v1',
- $tempAPIKey['secret'],
- );
-
$transfer = new Transfer(
$source,
$destination
);
/** Start Transfer */
- $migrationDocument->setAttribute('stage', 'migrating');
- $log->addBreadcrumb(new Breadcrumb("debug", "migration", "Migration hit stage 'migrating'", \microtime(true)));
- $this->updateMigrationDocument($migrationDocument, $projectDocument);
- $transfer->run($migrationDocument->getAttribute('resources'), function () use ($migrationDocument, $transfer, $projectDocument) {
- $migrationDocument->setAttribute('resourceData', json_encode($transfer->getCache()));
- $migrationDocument->setAttribute('statusCounters', json_encode($transfer->getStatusCounters()));
+ $migration->setAttribute('stage', 'migrating');
+ $this->updateMigrationDocument($migration, $projectDocument);
- $this->updateMigrationDocument($migrationDocument, $projectDocument);
- });
+ $transfer->run(
+ $migration->getAttribute('resources'),
+ function () use ($migration, $transfer, $projectDocument) {
+ $migration->setAttribute('resourceData', json_encode($transfer->getCache()));
+ $migration->setAttribute('statusCounters', json_encode($transfer->getStatusCounters()));
+ $this->updateMigrationDocument($migration, $projectDocument);
+ },
+ $migration->getAttribute('resourceId'),
+ $migration->getAttribute('resourceType')
+ );
+
+ $destination->shutDown();
+ $source->shutDown();
$sourceErrors = $source->getErrors();
$destinationErrors = $destination->getErrors();
- if (!empty($sourceErrors) || !empty($destinationErrors)) {
- $migrationDocument->setAttribute('status', 'failed');
- $migrationDocument->setAttribute('stage', 'finished');
- $log->addBreadcrumb(new Breadcrumb("debug", "migration", "Migration hit stage 'finished' and failed", \microtime(true)));
+ if (! empty($sourceErrors) || ! empty($destinationErrors)) {
+ $migration->setAttribute('status', 'failed');
+ $migration->setAttribute('stage', 'finished');
$errorMessages = [];
foreach ($sourceErrors as $error) {
- /** @var MigrationException $error */
- $errorMessages[] = "Error occurred while fetching '{$error->getResourceGroup()}:{$error->getResourceId()}' from source with message: '{$error->getMessage()}'";
+ $message = "Error occurred while fetching '{$error->getResourceName()}:{$error->getResourceId()}' from source with message: '{$error->getMessage()}'";
+ if ($error->getPrevious()) {
+ $message .= " Message: ".$error->getPrevious()->getMessage() . " File: ".$error->getPrevious()->getFile() . " Line: ".$error->getPrevious()->getLine();
+ }
+
+ $errorMessages[] = $message;
}
foreach ($destinationErrors as $error) {
+ $message = "Error occurred while pushing '{$error->getResourceName()}:{$error->getResourceId()}' to destination with message: '{$error->getMessage()}'";
+
+ if ($error->getPrevious()) {
+ $message .= " Message: ".$error->getPrevious()->getMessage() . " File: ".$error->getPrevious()->getFile() . " Line: ".$error->getPrevious()->getLine();
+ }
+
/** @var MigrationException $error */
- $errorMessages[] = "Error occurred while pushing '{$error->getResourceGroup()}:{$error->getResourceId()}' to destination with message: '{$error->getMessage()}'";
+ $errorMessages[] = $message;
}
- $migrationDocument->setAttribute('errors', $errorMessages);
- $log->addExtra('migrationErrors', json_encode($errorMessages));
- $this->updateMigrationDocument($migrationDocument, $projectDocument);
+ $migration->setAttribute('errors', $errorMessages);
+ $this->updateMigrationDocument($migration, $projectDocument);
return;
}
- $migrationDocument->setAttribute('status', 'completed');
- $migrationDocument->setAttribute('stage', 'finished');
- $log->addBreadcrumb(new Breadcrumb("debug", "migration", "Migration hit stage 'finished' and succeeded", \microtime(true)));
+ $migration->setAttribute('status', 'completed');
+ $migration->setAttribute('stage', 'finished');
} catch (\Throwable $th) {
Console::error($th->getMessage());
+ Console::error($th->getTraceAsString());
- if ($migrationDocument) {
- Console::error($th->getMessage());
- Console::error($th->getTraceAsString());
- $migrationDocument->setAttribute('status', 'failed');
- $migrationDocument->setAttribute('stage', 'finished');
- $migrationDocument->setAttribute('errors', [$th->getMessage()]);
+ if (! $migration->isEmpty()) {
+ $migration->setAttribute('status', 'failed');
+ $migration->setAttribute('stage', 'finished');
return;
}
@@ -337,26 +365,50 @@ class Migrations extends Action
$errorMessages = [];
foreach ($sourceErrors as $error) {
/** @var MigrationException $error */
- $errorMessages[] = "Error occurred while fetching '{$error->getResourceGroup()}:{$error->getResourceId()}' from source with message '{$error->getMessage()}'";
+ $errorMessages[] = "Error occurred while fetching '{$error->getResourceName()}:{$error->getResourceId()}' from source with message '{$error->getMessage()}'";
}
foreach ($destinationErrors as $error) {
/** @var MigrationException $error */
- $errorMessages[] = "Error occurred while pushing '{$error->getResourceGroup()}:{$error->getResourceId()}' to destination with message '{$error->getMessage()}'";
+ $errorMessages[] = "Error occurred while pushing '{$error->getResourceName()}:{$error->getResourceId()}' to destination with message '{$error->getMessage()}'";
}
- $migrationDocument->setAttribute('errors', $errorMessages);
- $log->addTag('migrationErrors', json_encode($errorMessages));
+ $migration->setAttribute('errors', $errorMessages);
}
} finally {
- if ($tempAPIKey) {
+ if (! $tempAPIKey->isEmpty()) {
$this->removeAPIKey($tempAPIKey);
}
- if ($migrationDocument) {
- $this->updateMigrationDocument($migrationDocument, $projectDocument);
- if ($migrationDocument->getAttribute('status', '') == 'failed') {
- throw new Exception("Migration failed");
+ $this->updateMigrationDocument($migration, $projectDocument);
+
+ if ($migration->getAttribute('status', '') === 'failed') {
+ Console::error('Migration('.$migration->getInternalId().':'.$migration->getId().') failed, Project('.$this->project->getInternalId().':'.$this->project->getId().')');
+
+ $destination->error();
+ $source->error();
+
+ foreach ($source->getErrors() as $error) {
+ call_user_func($this->logError, $error, 'appwrite-worker', 'appwrite-queue-' . self::getName(), [
+ 'migrationId' => $migration->getId() ?? '',
+ 'source' => $migration->getAttribute('source') ?? '',
+ 'resourceName' => $error->getResourceName(),
+ 'resourceGroup' => $error->getResourceGroup()
+ ]);
}
+
+ foreach ($destination->getErrors() as $error) {
+ call_user_func($this->logError, $error, 'appwrite-worker', 'appwrite-queue-' . self::getName(), [
+ 'migrationId' => $migration->getId() ?? '',
+ 'source' => $migration->getAttribute('source') ?? '',
+ 'resourceName' => $error->getResourceName(),
+ 'resourceGroup' => $error->getResourceGroup()
+ ]);
+ }
+ }
+
+ if ($migration->getAttribute('status', '') === 'completed') {
+ $destination->success();
+ $source->success();
}
}
}
diff --git a/src/Appwrite/Platform/Workers/Usage.php b/src/Appwrite/Platform/Workers/Usage.php
index 034e558d5d..3f24210cea 100644
--- a/src/Appwrite/Platform/Workers/Usage.php
+++ b/src/Appwrite/Platform/Workers/Usage.php
@@ -15,9 +15,10 @@ class Usage extends Action
{
private array $stats = [];
private int $lastTriggeredTime = 0;
+ private int $aggregationInterval = 20;
private int $keys = 0;
private const INFINITY_PERIOD = '_inf_';
- private const KEYS_THRESHOLD = 10000;
+ private const KEYS_THRESHOLD = 20000;
public static function getName(): string
{
@@ -39,6 +40,7 @@ class Usage extends Action
$this->action($message, $getProjectDB, $queueForUsageDump);
});
+ $this->aggregationInterval = (int) System::getEnv('_APP_USAGE_AGGREGATION_INTERVAL', '20');
$this->lastTriggeredTime = time();
}
@@ -56,9 +58,7 @@ class Usage extends Action
if (empty($payload)) {
throw new Exception('Missing payload');
}
- //Todo Figure out way to preserve keys when the container is being recreated @shimonewman
- $aggregationInterval = (int) System::getEnv('_APP_USAGE_AGGREGATION_INTERVAL', '20');
$project = new Document($payload['project'] ?? []);
$projectId = $project->getInternalId();
foreach ($payload['reduce'] ?? [] as $document) {
@@ -74,7 +74,11 @@ class Usage extends Action
);
}
- $this->stats[$projectId]['project'] = $project;
+ $this->stats[$projectId]['project'] = [
+ '$uid' => $project->getId(),
+ '$internalId' => $project->getInternalId(),
+ 'database' => $project->getAttribute('database'),
+ ];
$this->stats[$projectId]['receivedAt'] = DateTime::now();
foreach ($payload['metrics'] ?? [] as $metric) {
$this->keys++;
@@ -89,7 +93,7 @@ class Usage extends Action
// If keys crossed threshold or X time passed since the last send and there are some keys in the array ($this->stats)
if (
$this->keys >= self::KEYS_THRESHOLD ||
- (time() - $this->lastTriggeredTime > $aggregationInterval && $this->keys > 0)
+ (time() - $this->lastTriggeredTime > $this->aggregationInterval && $this->keys > 0)
) {
Console::warning('[' . DateTime::now() . '] Aggregated ' . $this->keys . ' keys');
diff --git a/src/Appwrite/Platform/Workers/UsageDump.php b/src/Appwrite/Platform/Workers/UsageDump.php
index b7097dbb04..b5480e1dec 100644
--- a/src/Appwrite/Platform/Workers/UsageDump.php
+++ b/src/Appwrite/Platform/Workers/UsageDump.php
@@ -4,6 +4,7 @@ namespace Appwrite\Platform\Workers;
use Appwrite\Extend\Exception;
use Utopia\CLI\Console;
+use Utopia\Database\Database;
use Utopia\Database\DateTime;
use Utopia\Database\Document;
use Utopia\Database\Exception\Duplicate;
@@ -11,6 +12,10 @@ use Utopia\Platform\Action;
use Utopia\Queue\Message;
use Utopia\System\System;
+const METRIC_COLLECTION_LEVEL_STORAGE = 4;
+const METRIC_DATABASE_LEVEL_STORAGE = 3;
+const METRIC_PROJECT_LEVEL_STORAGE = 2;
+
class UsageDump extends Action
{
protected array $stats = [];
@@ -70,6 +75,15 @@ class UsageDump extends Action
continue;
}
+ if (str_contains($key, METRIC_DATABASES_STORAGE)) {
+ try {
+ $this->handleDatabaseStorage($key, $dbForProject);
+ } catch (\Exception $e) {
+ console::error('[' . DateTime::now() . '] failed to calculate database storage for key [' . $key . '] ' . $e->getMessage());
+ }
+ continue;
+ }
+
foreach ($this->periods as $period => $format) {
$time = 'inf' === $period ? null : date($format, time());
$id = \md5("{$time}_{$period}_{$key}");
@@ -107,4 +121,162 @@ class UsageDump extends Action
}
}
}
+
+ private function handleDatabaseStorage(string $key, Database $dbForProject): void
+ {
+ $data = explode('.', $key);
+ $start = microtime(true);
+
+ $updateMetric = function (Database $dbForProject, int $value, string $key, string $period, string|null $time) {
+ $id = \md5("{$time}_{$period}_{$key}");
+
+ try {
+ $dbForProject->createDocument('stats', new Document([
+ '$id' => $id,
+ 'period' => $period,
+ 'time' => $time,
+ 'metric' => $key,
+ 'value' => $value,
+ 'region' => System::getEnv('_APP_REGION', 'default'),
+ ]));
+ } catch (Duplicate $th) {
+ if ($value < 0) {
+ $dbForProject->decreaseDocumentAttribute(
+ 'stats',
+ $id,
+ 'value',
+ abs($value)
+ );
+ } else {
+ $dbForProject->increaseDocumentAttribute(
+ 'stats',
+ $id,
+ 'value',
+ $value
+ );
+ }
+ }
+ };
+
+ foreach ($this->periods as $period => $format) {
+ $time = 'inf' === $period ? null : date($format, time());
+ $id = \md5("{$time}_{$period}_{$key}");
+
+ $value = 0;
+ $previousValue = 0;
+ try {
+ $previousValue = ($dbForProject->getDocument('stats', $id))->getAttribute('value', 0);
+ } catch (\Exception $e) {
+ // No previous value
+ }
+
+ switch (count($data)) {
+ // Collection Level
+ case METRIC_COLLECTION_LEVEL_STORAGE:
+ Console::log('[' . DateTime::now() . '] Collection Level Storage Calculation [' . $key . ']');
+ $databaseInternalId = $data[0];
+ $collectionInternalId = $data[1];
+
+ try {
+ $value = $dbForProject->getSizeOfCollection('database_' . $databaseInternalId . '_collection_' . $collectionInternalId);
+ } catch (\Exception $e) {
+ // Collection not found
+ if ($e->getMessage() !== 'Collection not found') {
+ throw $e;
+ }
+ }
+
+ // Compare with previous value
+ $diff = $value - $previousValue;
+
+ if ($diff === 0) {
+ break;
+ }
+
+ // Update Collection
+ $updateMetric($dbForProject, $diff, $key, $period, $time);
+
+ // Update Database
+ $databaseKey = str_replace(['{databaseInternalId}'], [$data[0]], METRIC_DATABASE_ID_STORAGE);
+ $updateMetric($dbForProject, $diff, $databaseKey, $period, $time);
+
+ // Update Project
+ $projectKey = METRIC_DATABASES_STORAGE;
+ $updateMetric($dbForProject, $diff, $projectKey, $period, $time);
+ break;
+ // Database Level
+ case METRIC_DATABASE_LEVEL_STORAGE:
+ Console::log('[' . DateTime::now() . '] Database Level Storage Calculation [' . $key . ']');
+ $databaseInternalId = $data[0];
+
+ $collections = [];
+ try {
+ $collections = $dbForProject->find('database_' . $databaseInternalId);
+ } catch (\Exception $e) {
+ // Database not found
+ if ($e->getMessage() !== 'Collection not found') {
+ throw $e;
+ }
+ }
+
+ foreach ($collections as $collection) {
+ try {
+ $value += $dbForProject->getSizeOfCollection('database_' . $databaseInternalId . '_collection_' . $collection->getInternalId());
+ } catch (\Exception $e) {
+ // Collection not found
+ if ($e->getMessage() !== 'Collection not found') {
+ throw $e;
+ }
+ }
+ }
+
+ $diff = $value - $previousValue;
+
+ if ($diff === 0) {
+ break;
+ }
+
+ // Update Database
+ $databaseKey = str_replace(['{databaseInternalId}'], [$data[0]], METRIC_DATABASE_ID_STORAGE);
+ $updateMetric($dbForProject, $diff, $databaseKey, $period, $time);
+
+ // Update Project
+ $projectKey = METRIC_DATABASES_STORAGE;
+ $updateMetric($dbForProject, $diff, $projectKey, $period, $time);
+ break;
+ // Project Level
+ case METRIC_PROJECT_LEVEL_STORAGE:
+ Console::log('[' . DateTime::now() . '] Project Level Storage Calculation [' . $key . ']');
+ // Get all project databases
+ $databases = $dbForProject->find('database');
+
+ // Recalculate all databases
+ foreach ($databases as $database) {
+ $collections = $dbForProject->find('database_' . $database->getInternalId());
+
+ foreach ($collections as $collection) {
+ try {
+ $value += $dbForProject->getSizeOfCollection('database_' . $database->getInternalId() . '_collection_' . $collection->getInternalId());
+ } catch (\Exception $e) {
+ // Collection not found
+ if ($e->getMessage() !== 'Collection not found') {
+ throw $e;
+ }
+ }
+ }
+ }
+
+ $diff = $value - $previousValue;
+
+ // Update Project
+ $projectKey = METRIC_DATABASES_STORAGE;
+ $updateMetric($dbForProject, $diff, $projectKey, $period, $time);
+ break;
+ }
+ }
+
+ $end = microtime(true);
+
+ console::log('[' . DateTime::now() . '] DB Storage Calculation [' . $key . '] took ' . (($end - $start) * 1000) . ' milliseconds');
+ }
}
diff --git a/src/Appwrite/PubSub/Adapter.php b/src/Appwrite/PubSub/Adapter.php
new file mode 100644
index 0000000000..e5ddbe5e62
--- /dev/null
+++ b/src/Appwrite/PubSub/Adapter.php
@@ -0,0 +1,13 @@
+client = $client;
+
+ }
+
+ public function ping($message = null): bool
+ {
+ return $this->client->ping($message);
+ }
+
+ public function subscribe($channels, $callback)
+ {
+ return $this->client->subscribe($channels, $callback);
+ }
+
+ public function publish($channel, $message)
+ {
+ return $this->client->publish($channel, $message);
+ }
+}
diff --git a/src/Appwrite/Specification/Format/OpenAPI3.php b/src/Appwrite/Specification/Format/OpenAPI3.php
index a8da75eea0..65df0cb694 100644
--- a/src/Appwrite/Specification/Format/OpenAPI3.php
+++ b/src/Appwrite/Specification/Format/OpenAPI3.php
@@ -550,6 +550,7 @@ class OpenAPI3 extends Format
switch ($rule['type']) {
case 'string':
case 'datetime':
+ case 'payload':
$type = 'string';
break;
diff --git a/src/Appwrite/Specification/Format/Swagger2.php b/src/Appwrite/Specification/Format/Swagger2.php
index 6cb4986710..66a540a4d4 100644
--- a/src/Appwrite/Specification/Format/Swagger2.php
+++ b/src/Appwrite/Specification/Format/Swagger2.php
@@ -286,13 +286,26 @@ class Swagger2 extends Format
$validator = $validator->getValidator();
}
- $validatorClass = (!empty($validator)) ? \get_class($validator) : '';
- if ($validatorClass === 'Utopia\Validator\AnyOf') {
- $validator = $param['validator']->getValidators()[0];
- $validatorClass = \get_class($validator);
+ $class = !empty($validator)
+ ? \get_class($validator)
+ : '';
+
+ $base = !empty($class)
+ ? \get_parent_class($class)
+ : '';
+
+ switch ($base) {
+ case 'Appwrite\Utopia\Database\Validator\Queries\Base':
+ $class = $base;
+ break;
}
- switch ($validatorClass) {
+ if ($class === 'Utopia\Validator\AnyOf') {
+ $validator = $param['validator']->getValidators()[0];
+ $class = \get_class($validator);
+ }
+
+ switch ($class) {
case 'Utopia\Validator\Text':
case 'Utopia\Database\Validator\UID':
$node['type'] = $validator->getType();
@@ -349,29 +362,7 @@ class Swagger2 extends Format
$consumes = ['multipart/form-data'];
$node['type'] = 'payload';
break;
- case 'Appwrite\Utopia\Database\Validator\Queries\Attributes':
- case 'Appwrite\Utopia\Database\Validator\Queries\Buckets':
- case 'Appwrite\Utopia\Database\Validator\Queries\Collections':
- case 'Appwrite\Utopia\Database\Validator\Queries\Databases':
- case 'Appwrite\Utopia\Database\Validator\Queries\Deployments':
- case 'Appwrite\Utopia\Database\Validator\Queries\Executions':
- case 'Appwrite\Utopia\Database\Validator\Queries\Files':
- case 'Appwrite\Utopia\Database\Validator\Queries\Functions':
- case 'Appwrite\Utopia\Database\Validator\Queries\Identities':
- case 'Appwrite\Utopia\Database\Validator\Queries\Indexes':
- case 'Appwrite\Utopia\Database\Validator\Queries\Installations':
- case 'Appwrite\Utopia\Database\Validator\Queries\Memberships':
- case 'Appwrite\Utopia\Database\Validator\Queries\Messages':
- case 'Appwrite\Utopia\Database\Validator\Queries\Migrations':
- case 'Appwrite\Utopia\Database\Validator\Queries\Projects':
- case 'Appwrite\Utopia\Database\Validator\Queries\Providers':
- case 'Appwrite\Utopia\Database\Validator\Queries\Rules':
- case 'Appwrite\Utopia\Database\Validator\Queries\Subscribers':
- case 'Appwrite\Utopia\Database\Validator\Queries\Targets':
- case 'Appwrite\Utopia\Database\Validator\Queries\Teams':
- case 'Appwrite\Utopia\Database\Validator\Queries\Topics':
- case 'Appwrite\Utopia\Database\Validator\Queries\Users':
- case 'Appwrite\Utopia\Database\Validator\Queries\Variables':
+ case 'Appwrite\Utopia\Database\Validator\Queries\Base':
case 'Utopia\Database\Validator\Queries':
case 'Utopia\Database\Validator\Queries\Document':
case 'Utopia\Database\Validator\Queries\Documents':
@@ -586,6 +577,10 @@ class Swagger2 extends Format
$type = 'boolean';
break;
+ case 'payload':
+ $type = 'payload';
+ break;
+
default:
$type = 'object';
$rule['type'] = ($rule['type']) ?: 'none';
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Base.php b/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
index a3555c08dd..af5d59ddfd 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Base.php
@@ -66,7 +66,7 @@ class Base extends Queries
new Limit(),
new Offset(),
new Cursor(),
- new Filter($attributes),
+ new Filter($attributes, APP_DATABASE_QUERY_MAX_VALUES),
new Order($attributes),
];
diff --git a/src/Appwrite/Utopia/Database/Validator/Queries/Migrations.php b/src/Appwrite/Utopia/Database/Validator/Queries/Migrations.php
index 6b9e9e6d32..436a95534b 100644
--- a/src/Appwrite/Utopia/Database/Validator/Queries/Migrations.php
+++ b/src/Appwrite/Utopia/Database/Validator/Queries/Migrations.php
@@ -8,6 +8,7 @@ class Migrations extends Base
'status',
'stage',
'source',
+ 'destination',
'resources',
'statusCounters',
'resourceData',
diff --git a/src/Appwrite/Utopia/Request.php b/src/Appwrite/Utopia/Request.php
index 3f0a196d5e..26c1baf188 100644
--- a/src/Appwrite/Utopia/Request.php
+++ b/src/Appwrite/Utopia/Request.php
@@ -122,7 +122,11 @@ class Request extends UtopiaRequest
*/
public function getHeaders(): array
{
- $headers = $this->generateHeaders();
+ try {
+ $headers = $this->generateHeaders();
+ } catch (\Throwable) {
+ $headers = [];
+ }
if (empty($this->swoole->cookie)) {
return $headers;
diff --git a/src/Appwrite/Utopia/Response.php b/src/Appwrite/Utopia/Response.php
index a2c07d34b0..6cc2639f51 100644
--- a/src/Appwrite/Utopia/Response.php
+++ b/src/Appwrite/Utopia/Response.php
@@ -625,6 +625,11 @@ class Response extends SwooleResponse
}
}
+ if (!$data->isSet($key) && !$rule['required']) { // set output key null if data key is not set and required is false
+ $output[$key] = null;
+ continue;
+ }
+
if ($rule['array']) {
if (!is_array($data[$key])) {
throw new Exception($key . ' must be an array of type ' . $rule['type']);
diff --git a/src/Appwrite/Utopia/Response/Model.php b/src/Appwrite/Utopia/Response/Model.php
index 8a0bb78cba..d14d1be0c1 100644
--- a/src/Appwrite/Utopia/Response/Model.php
+++ b/src/Appwrite/Utopia/Response/Model.php
@@ -14,6 +14,7 @@ abstract class Model
public const TYPE_DATETIME = 'datetime';
public const TYPE_DATETIME_EXAMPLE = '2020-10-15T06:38:00.000+00:00';
public const TYPE_RELATIONSHIP = 'relationship';
+ public const TYPE_PAYLOAD = 'payload';
/**
* @var bool
diff --git a/src/Appwrite/Utopia/Response/Model/Attribute.php b/src/Appwrite/Utopia/Response/Model/Attribute.php
index 9f9ceca317..8c43f8d21c 100644
--- a/src/Appwrite/Utopia/Response/Model/Attribute.php
+++ b/src/Appwrite/Utopia/Response/Model/Attribute.php
@@ -47,7 +47,18 @@ class Attribute extends Model
'required' => false,
'example' => false,
])
- ;
+ ->addRule('$createdAt', [
+ 'type' => self::TYPE_DATETIME,
+ 'description' => 'Attribute creation date in ISO 8601 format.',
+ 'default' => '',
+ 'example' => self::TYPE_DATETIME_EXAMPLE,
+ ])
+ ->addRule('$updatedAt', [
+ 'type' => self::TYPE_DATETIME,
+ 'description' => 'Attribute update date in ISO 8601 format.',
+ 'default' => '',
+ 'example' => self::TYPE_DATETIME_EXAMPLE,
+ ]);
}
public array $conditions = [];
diff --git a/src/Appwrite/Utopia/Response/Model/Execution.php b/src/Appwrite/Utopia/Response/Model/Execution.php
index 90fbdc9689..80b65af696 100644
--- a/src/Appwrite/Utopia/Response/Model/Execution.php
+++ b/src/Appwrite/Utopia/Response/Model/Execution.php
@@ -84,7 +84,6 @@ class Execution extends Model
'type' => self::TYPE_STRING,
'description' => 'HTTP response body. This will return empty unless execution is created as synchronous.',
'default' => '',
- 'example' => 'Developers are awesome.',
])
->addRule('responseHeaders', [
'type' => Response::MODEL_HEADERS,
diff --git a/src/Appwrite/Utopia/Response/Model/Func.php b/src/Appwrite/Utopia/Response/Model/Func.php
index f4ff214d0b..ab2d7ba051 100644
--- a/src/Appwrite/Utopia/Response/Model/Func.php
+++ b/src/Appwrite/Utopia/Response/Model/Func.php
@@ -94,7 +94,7 @@ class Func extends Model
])
->addRule('schedule', [
'type' => self::TYPE_STRING,
- 'description' => 'Function execution schedult in CRON format.',
+ 'description' => 'Function execution schedule in CRON format.',
'default' => '',
'example' => '5 4 * * *',
])
diff --git a/src/Appwrite/Utopia/Response/Model/Index.php b/src/Appwrite/Utopia/Response/Model/Index.php
index 3d3d1a3b52..2d795ad439 100644
--- a/src/Appwrite/Utopia/Response/Model/Index.php
+++ b/src/Appwrite/Utopia/Response/Model/Index.php
@@ -49,13 +49,22 @@ class Index extends Model
'array' => true,
'required' => false,
])
- ;
+ ->addRule('$createdAt', [
+ 'type' => self::TYPE_DATETIME,
+ 'description' => 'Index creation date in ISO 8601 format.',
+ 'default' => '',
+ 'example' => self::TYPE_DATETIME_EXAMPLE,
+ ])
+ ->addRule('$updatedAt', [
+ 'type' => self::TYPE_DATETIME,
+ 'description' => 'Index update date in ISO 8601 format.',
+ 'default' => '',
+ 'example' => self::TYPE_DATETIME_EXAMPLE,
+ ]);
}
/**
* Get Name
- *
- * @return string
*/
public function getName(): string
{
@@ -64,8 +73,6 @@ class Index extends Model
/**
* Get Collection
- *
- * @return string
*/
public function getType(): string
{
diff --git a/src/Appwrite/Utopia/Response/Model/Membership.php b/src/Appwrite/Utopia/Response/Model/Membership.php
index 64283bd4a8..46153842bc 100644
--- a/src/Appwrite/Utopia/Response/Model/Membership.php
+++ b/src/Appwrite/Utopia/Response/Model/Membership.php
@@ -36,13 +36,13 @@ class Membership extends Model
])
->addRule('userName', [
'type' => self::TYPE_STRING,
- 'description' => 'User name.',
+ 'description' => 'User name. Hide this attribute by toggling membership privacy in the Console.',
'default' => '',
'example' => 'John Doe',
])
->addRule('userEmail', [
'type' => self::TYPE_STRING,
- 'description' => 'User email address.',
+ 'description' => 'User email address. Hide this attribute by toggling membership privacy in the Console.',
'default' => '',
'example' => 'john@appwrite.io',
])
@@ -78,7 +78,7 @@ class Membership extends Model
])
->addRule('mfa', [
'type' => self::TYPE_BOOLEAN,
- 'description' => 'Multi factor authentication status, true if the user has MFA enabled or false otherwise.',
+ 'description' => 'Multi factor authentication status, true if the user has MFA enabled or false otherwise. Hide this attribute by toggling membership privacy in the Console.',
'default' => false,
'example' => false,
])
diff --git a/src/Appwrite/Utopia/Response/Model/Migration.php b/src/Appwrite/Utopia/Response/Model/Migration.php
index 5a54eef3ad..f70dc37027 100644
--- a/src/Appwrite/Utopia/Response/Model/Migration.php
+++ b/src/Appwrite/Utopia/Response/Model/Migration.php
@@ -18,7 +18,7 @@ class Migration extends Model
])
->addRule('$createdAt', [
'type' => self::TYPE_DATETIME,
- 'description' => 'Variable creation date in ISO 8601 format.',
+ 'description' => 'Migration creation date in ISO 8601 format.',
'default' => '',
'example' => self::TYPE_DATETIME_EXAMPLE,
])
@@ -46,9 +46,15 @@ class Migration extends Model
'default' => '',
'example' => 'Appwrite',
])
+ ->addRule('destination', [
+ 'type' => self::TYPE_STRING,
+ 'description' => 'A string containing the type of destination of the migration.',
+ 'default' => 'Appwrite',
+ 'example' => 'Appwrite',
+ ])
->addRule('resources', [
'type' => self::TYPE_STRING,
- 'description' => 'Resources to migration.',
+ 'description' => 'Resources to migrate.',
'default' => [],
'example' => ['user'],
'array' => true
diff --git a/src/Appwrite/Utopia/Response/Model/Project.php b/src/Appwrite/Utopia/Response/Model/Project.php
index 80214aaa73..6e01baee84 100644
--- a/src/Appwrite/Utopia/Response/Model/Project.php
+++ b/src/Appwrite/Utopia/Response/Model/Project.php
@@ -151,6 +151,24 @@ class Project extends Model
'default' => false,
'example' => true,
])
+ ->addRule('authMembershipsUserName', [
+ 'type' => self::TYPE_BOOLEAN,
+ 'description' => 'Whether or not to show user names in the teams membership response.',
+ 'default' => false,
+ 'example' => true,
+ ])
+ ->addRule('authMembershipsUserEmail', [
+ 'type' => self::TYPE_BOOLEAN,
+ 'description' => 'Whether or not to show user emails in the teams membership response.',
+ 'default' => false,
+ 'example' => true,
+ ])
+ ->addRule('authMembershipsMfa', [
+ 'type' => self::TYPE_BOOLEAN,
+ 'description' => 'Whether or not to show user MFA status in the teams membership response.',
+ 'default' => false,
+ 'example' => true,
+ ])
->addRule('oAuthProviders', [
'type' => Response::MODEL_AUTH_PROVIDER,
'description' => 'List of Auth Providers.',
@@ -234,6 +252,18 @@ class Project extends Model
'default' => '',
'example' => 'tls',
])
+ ->addRule('pingCount', [
+ 'type' => self::TYPE_INTEGER,
+ 'description' => 'Number of times the ping was received for this project.',
+ 'default' => 0,
+ 'example' => 1,
+ ])
+ ->addRule('pingedAt', [
+ 'type' => self::TYPE_DATETIME,
+ 'description' => 'Last ping datetime in ISO 8601 format.',
+ 'default' => '',
+ 'example' => self::TYPE_DATETIME_EXAMPLE,
+ ])
;
$services = Config::getParam('services', []);
@@ -336,6 +366,9 @@ class Project extends Model
$document->setAttribute('authPersonalDataCheck', $authValues['personalDataCheck'] ?? false);
$document->setAttribute('authMockNumbers', $authValues['mockNumbers'] ?? []);
$document->setAttribute('authSessionAlerts', $authValues['sessionAlerts'] ?? false);
+ $document->setAttribute('authMembershipsUserName', $authValues['membershipsUserName'] ?? true);
+ $document->setAttribute('authMembershipsUserEmail', $authValues['membershipsUserEmail'] ?? true);
+ $document->setAttribute('authMembershipsMfa', $authValues['membershipsMfa'] ?? true);
foreach ($auth as $index => $method) {
$key = $method['key'];
diff --git a/src/Appwrite/Utopia/Response/Model/Target.php b/src/Appwrite/Utopia/Response/Model/Target.php
index d180b6c4c4..530749e006 100644
--- a/src/Appwrite/Utopia/Response/Model/Target.php
+++ b/src/Appwrite/Utopia/Response/Model/Target.php
@@ -32,7 +32,7 @@ class Target extends Model
'type' => self::TYPE_STRING,
'description' => 'Target Name.',
'default' => '',
- 'example' => 'Aegon apple token',
+ 'example' => 'Apple iPhone 12',
])
->addRule('userId', [
'type' => self::TYPE_STRING,
@@ -58,6 +58,12 @@ class Target extends Model
'description' => 'The target identifier.',
'default' => '',
'example' => 'token',
+ ])
+ ->addRule('expired', [
+ 'type' => self::TYPE_BOOLEAN,
+ 'description' => 'Is the target expired.',
+ 'default' => false,
+ 'example' => false,
]);
}
diff --git a/src/Appwrite/Utopia/Response/Model/UsageDatabase.php b/src/Appwrite/Utopia/Response/Model/UsageDatabase.php
index d4733f2568..eb985baabb 100644
--- a/src/Appwrite/Utopia/Response/Model/UsageDatabase.php
+++ b/src/Appwrite/Utopia/Response/Model/UsageDatabase.php
@@ -28,6 +28,12 @@ class UsageDatabase extends Model
'default' => 0,
'example' => 0,
])
+ ->addRule('storageTotal', [
+ 'type' => self::TYPE_INTEGER,
+ 'description' => 'Total aggregated number of total storage used in bytes.',
+ 'default' => 0,
+ 'example' => 0,
+ ])
->addRule('collections', [
'type' => Response::MODEL_METRIC,
'description' => 'Aggregated number of collections per period.',
@@ -42,6 +48,13 @@ class UsageDatabase extends Model
'example' => [],
'array' => true
])
+ ->addRule('storage', [
+ 'type' => Response::MODEL_METRIC,
+ 'description' => 'Aggregated storage used in bytes per period.',
+ 'default' => [],
+ 'example' => [],
+ 'array' => true
+ ])
;
}
diff --git a/src/Appwrite/Utopia/Response/Model/UsageDatabases.php b/src/Appwrite/Utopia/Response/Model/UsageDatabases.php
index f775f9489d..e0abba8ab8 100644
--- a/src/Appwrite/Utopia/Response/Model/UsageDatabases.php
+++ b/src/Appwrite/Utopia/Response/Model/UsageDatabases.php
@@ -34,6 +34,12 @@ class UsageDatabases extends Model
'default' => 0,
'example' => 0,
])
+ ->addRule('storageTotal', [
+ 'type' => self::TYPE_INTEGER,
+ 'description' => 'Total aggregated number of total databases storage in bytes.',
+ 'default' => 0,
+ 'example' => 0,
+ ])
->addRule('databases', [
'type' => Response::MODEL_METRIC,
'description' => 'Aggregated number of databases per period.',
@@ -55,6 +61,13 @@ class UsageDatabases extends Model
'example' => [],
'array' => true
])
+ ->addRule('storage', [
+ 'type' => Response::MODEL_METRIC,
+ 'description' => 'An array of the aggregated number of databases storage in bytes per period.',
+ 'default' => [],
+ 'example' => [],
+ 'array' => true
+ ])
;
}
diff --git a/src/Appwrite/Utopia/Response/Model/UsageProject.php b/src/Appwrite/Utopia/Response/Model/UsageProject.php
index 2703691238..17d9271f04 100644
--- a/src/Appwrite/Utopia/Response/Model/UsageProject.php
+++ b/src/Appwrite/Utopia/Response/Model/UsageProject.php
@@ -28,6 +28,12 @@ class UsageProject extends Model
'default' => 0,
'example' => 0,
])
+ ->addRule('databasesStorageTotal', [
+ 'type' => self::TYPE_INTEGER,
+ 'description' => 'Total aggregated sum of databases storage size (in bytes).',
+ 'default' => 0,
+ 'example' => 0,
+ ])
->addRule('usersTotal', [
'type' => self::TYPE_INTEGER,
'description' => 'Total aggregated number of users.',
@@ -118,6 +124,13 @@ class UsageProject extends Model
'example' => [],
'array' => true
])
+ ->addRule('databasesStorageBreakdown', [
+ 'type' => Response::MODEL_METRIC_BREAKDOWN,
+ 'description' => 'An array of the aggregated breakdown of storage usage by databases.',
+ 'default' => [],
+ 'example' => [],
+ 'array' => true
+ ])
->addRule('executionsMbSecondsBreakdown', [
'type' => Response::MODEL_METRIC_BREAKDOWN,
'description' => 'Aggregated breakdown in totals of execution mbSeconds by functions.',
diff --git a/tests/e2e/Client.php b/tests/e2e/Client.php
index 0774f1c6fd..dc80808b14 100644
--- a/tests/e2e/Client.php
+++ b/tests/e2e/Client.php
@@ -179,9 +179,14 @@ class Client
default => http_build_query($params),
};
- foreach ($headers as $i => $header) {
- $headers[] = $i . ':' . $header;
- unset($headers[$i]);
+ $formattedHeaders = [];
+ foreach ($headers as $key => $value) {
+ if (strtolower($key) === 'accept-encoding') {
+ curl_setopt($ch, CURLOPT_ENCODING, $value);
+ continue;
+ } else {
+ $formattedHeaders[] = $key . ': ' . $value;
+ }
}
curl_setopt($ch, CURLOPT_PATH_AS_IS, 1);
@@ -189,7 +194,7 @@ class Client
curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
curl_setopt($ch, CURLOPT_FOLLOWLOCATION, true);
curl_setopt($ch, CURLOPT_USERAGENT, 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/70.0.3538.77 Safari/537.36');
- curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
+ curl_setopt($ch, CURLOPT_HTTPHEADER, $formattedHeaders);
curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 0);
curl_setopt($ch, CURLOPT_TIMEOUT, 15);
curl_setopt($ch, CURLOPT_HEADERFUNCTION, function ($curl, $header) use (&$responseHeaders, &$cookies) {
@@ -220,7 +225,6 @@ class Client
curl_setopt($ch, CURLOPT_SSL_VERIFYHOST, false);
curl_setopt($ch, CURLOPT_SSL_VERIFYPEER, false);
}
-
$responseBody = curl_exec($ch);
$responseType = $responseHeaders['content-type'] ?? '';
$responseStatus = curl_getinfo($ch, CURLINFO_HTTP_CODE);
diff --git a/tests/e2e/General/CompressionTest.php b/tests/e2e/General/CompressionTest.php
new file mode 100644
index 0000000000..9affacfe0a
--- /dev/null
+++ b/tests/e2e/General/CompressionTest.php
@@ -0,0 +1,137 @@
+client->call(Client::METHOD_GET, '/ping', [
+ 'accept-encoding' => 'gzip',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertEquals('Pong!', $response['body']);
+ $this->assertLessThan(1024, strlen($response['body']));
+ $this->assertArrayNotHasKey('content-encoding', $response['headers']);
+
+ // without header
+ $response = $this->client->call(Client::METHOD_GET, '/ping', [
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertEquals('Pong!', $response['body']);
+ $this->assertLessThan(1024, strlen($response['body']));
+ $this->assertArrayNotHasKey('content-encoding', $response['headers']);
+ }
+
+ public function testLargeResponse()
+ {
+ // create an anonymous user
+ $response = $this->client->call(Client::METHOD_POST, '/users', array_merge([
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'content-type' => 'application/json',
+ ], $this->getHeaders()), [
+ 'userId' => ID::unique(),
+ 'email' => 'test@localhost.test',
+ 'password' => 'password',
+ 'name' => 'User Name',
+ ]);
+ $this->assertEquals(201, $response['headers']['status-code']);
+ $userId = $response['body']['$id'];
+
+ // set prefs with 2000 bytes of data
+ $prefs = ["longValue" => str_repeat('a', 2000)];
+
+ $response = $this->client->call(Client::METHOD_PATCH, '/users/' . $userId . '/prefs', array_merge([
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'content-type' => 'application/json',
+ ], $this->getHeaders()), [
+ 'prefs' => $prefs,
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+
+ // get prefs with compression
+ $response = $this->client->call(Client::METHOD_GET, '/users/' . $userId . '/prefs', array_merge([
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'accept-encoding' => 'gzip',
+ ], $this->getHeaders()));
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertArrayHasKey('content-encoding', $response['headers'], 'Content encoding should be gzip, headers received: ' . json_encode($response['headers'], JSON_PRETTY_PRINT));
+ $this->assertLessThan(2000, intval($response['headers']['content-length']));
+
+ // get prefs without compression
+ $response = $this->client->call(Client::METHOD_GET, '/users/' . $userId . '/prefs', array_merge([
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()));
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertGreaterThanOrEqual(2000, intval($response['headers']['content-length']));
+ $this->assertArrayNotHasKey('content-encoding', $response['headers']);
+ }
+
+ public function testImageResponse()
+ {
+ // create bucket
+ $bucket = $this->client->call(Client::METHOD_POST, '/storage/buckets', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), [
+ 'bucketId' => ID::unique(),
+ 'name' => 'Test Bucket',
+ 'fileSecurity' => true,
+ ]);
+ $bucketId = $bucket['body']['$id'];
+ $this->assertEquals(201, $bucket['headers']['status-code']);
+
+ // upload image
+ $file = $this->client->call(Client::METHOD_POST, '/storage/buckets/' . $bucketId . '/files', array_merge([
+ 'content-type' => 'multipart/form-data',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), [
+ 'fileId' => ID::unique(),
+ 'file' => new CURLFile(realpath(__DIR__ . '/../../resources/logo.png'), 'image/png', 'logo.png'),
+ 'permissions' => [
+ Permission::read(Role::any()),
+ Permission::update(Role::any()),
+ Permission::delete(Role::any()),
+ ],
+ ]);
+ $fileId = $file['body']['$id'];
+
+ // get image with header
+ $response = $this->client->call(Client::METHOD_GET, '/storage/buckets/' . $bucketId . '/files/' . $fileId, array_merge([
+ 'content-type' => 'application/json',
+ 'accept-encoding' => 'gzip',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()));
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertArrayNotHasKey('content-encoding', $response['headers']);
+ // get image without
+ $response = $this->client->call(Client::METHOD_GET, '/storage/buckets/' . $bucketId . '/files/' . $fileId, array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()));
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertArrayNotHasKey('content-encoding', $response['headers']);
+ }
+}
diff --git a/tests/e2e/General/HTTPTest.php b/tests/e2e/General/HTTPTest.php
index 0881966365..fe600cd0f8 100644
--- a/tests/e2e/General/HTTPTest.php
+++ b/tests/e2e/General/HTTPTest.php
@@ -133,7 +133,7 @@ class HTTPTest extends Scope
$this->assertEquals(200, $response['headers']['status-code']);
// looks like recent change in the validator
- $this->assertTrue(empty($response['body']['schemaValidationMessages']));
+ $this->assertEmpty($response['body']['schemaValidationMessages'], 'Schema validation failed for ' . $file . ': ' . json_encode($response['body']['schemaValidationMessages'], JSON_PRETTY_PRINT));
}
}
diff --git a/tests/e2e/General/PingTest.php b/tests/e2e/General/PingTest.php
new file mode 100644
index 0000000000..e41bac6736
--- /dev/null
+++ b/tests/e2e/General/PingTest.php
@@ -0,0 +1,55 @@
+client->call(Client::METHOD_GET, '/ping', [
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ]);
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertEquals('Pong!', $response['body']);
+
+ // With user session
+ $response = $this->client->call(Client::METHOD_GET, '/ping', array_merge([
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()));
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertEquals('Pong!', $response['body']);
+
+ // With API key
+ $response = $this->client->call(Client::METHOD_GET, '/ping', [
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertEquals('Pong!', $response['body']);
+
+ /**
+ * Test for FAILURE
+ */
+ // Fake project ID
+ $response = $this->client->call(Client::METHOD_GET, '/ping', \array_merge([
+ 'x-appwrite-project' => 'fake-project-id',
+ ], $this->getHeaders()));
+
+ $this->assertEquals(404, $response['headers']['status-code']);
+ $this->assertNotContains('Pong!', $response['body']);
+ }
+}
diff --git a/tests/e2e/General/UsageTest.php b/tests/e2e/General/UsageTest.php
index d3623acffc..c50a15fd3f 100644
--- a/tests/e2e/General/UsageTest.php
+++ b/tests/e2e/General/UsageTest.php
@@ -143,7 +143,7 @@ class UsageTest extends Scope
);
$this->assertEquals(200, $response['headers']['status-code']);
- $this->assertEquals(20, count($response['body']));
+ $this->assertEquals(22, count($response['body']));
$this->validateDates($response['body']['network']);
$this->validateDates($response['body']['requests']);
$this->validateDates($response['body']['users']);
@@ -324,7 +324,7 @@ class UsageTest extends Scope
]
);
- $this->assertEquals(20, count($response['body']));
+ $this->assertEquals(22, count($response['body']));
$this->assertEquals(1, count($response['body']['requests']));
$this->assertEquals($requestsTotal, $response['body']['requests'][array_key_last($response['body']['requests'])]['value']);
$this->validateDates($response['body']['requests']);
@@ -545,7 +545,7 @@ class UsageTest extends Scope
]
);
- $this->assertEquals(20, count($response['body']));
+ $this->assertEquals(22, count($response['body']));
$this->assertEquals(1, count($response['body']['requests']));
$this->assertEquals(1, count($response['body']['network']));
$this->assertEquals($requestsTotal, $response['body']['requests'][array_key_last($response['body']['requests'])]['value']);
@@ -590,6 +590,260 @@ class UsageTest extends Scope
return $data;
}
+ public function testDatabaseStoragePrepare(): array
+ {
+ $response = $this->client->call(
+ Client::METHOD_POST,
+ '/databases',
+ array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id']
+ ], $this->getHeaders()),
+ [
+ 'databaseId' => 'unique()',
+ 'name' => 'dbStorageStats',
+ ]
+ );
+
+ $this->assertNotEmpty($response['body']['$id']);
+ $databaseId = $response['body']['$id'];
+
+ $response = $this->client->call(
+ Client::METHOD_POST,
+ '/databases/' . $databaseId . '/collections',
+ array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id']
+ ], $this->getHeaders()),
+ [
+ 'collectionId' => 'unique()',
+ 'name' => 'collectionStorageStats',
+ 'documentSecurity' => false,
+ 'permissions' => [
+ Permission::read(Role::any()),
+ Permission::create(Role::any()),
+ Permission::update(Role::any()),
+ Permission::delete(Role::any()),
+ ],
+ ]
+ );
+
+ $this->assertNotEmpty($response['body']['$id']);
+ $collectionId = $response['body']['$id'];
+
+ $response = $this->client->call(
+ Client::METHOD_POST,
+ '/databases/' . $databaseId . '/collections/' . $collectionId . '/attributes' . '/string',
+ array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id']
+ ], $this->getHeaders()),
+ [
+ 'key' => 'data',
+ 'size' => 100000,
+ 'required' => true,
+ ]
+ );
+
+ return [
+ 'databaseId' => $databaseId,
+ 'collectionId' => $collectionId,
+ ];
+ }
+
+ // /** @depends testDatabaseStoragePrepare */
+ // #[Retry(count: 1)]
+ // public function testDatabaseStorageStatsCreateDocument(array $data): array
+ // {
+ // $databaseId = $data['databaseId'];
+ // $collectionId = $data['collectionId'];
+
+ // $originalProjectMetrics = $this->client->call(
+ // Client::METHOD_GET,
+ // '/project/usage',
+ // $this->getConsoleHeaders(),
+ // [
+ // 'period' => '1d',
+ // 'startDate' => self::getToday(),
+ // 'endDate' => self::getTomorrow(),
+ // ]
+ // );
+
+ // $this->assertEquals(200, $originalProjectMetrics['headers']['status-code']);
+ // $this->assertArrayHasKey('databasesStorageTotal', $originalProjectMetrics['body']);
+
+ // $originalProjectMetrics = $originalProjectMetrics['body'];
+
+ // $originalDatabaseMetrics = $this->client->call(
+ // Client::METHOD_GET,
+ // '/databases/' . $databaseId . '/usage?range=30d',
+ // $this->getConsoleHeaders()
+ // );
+
+ // $this->assertEquals(200, $originalDatabaseMetrics['headers']['status-code']);
+ // $this->assertArrayHasKey('storageTotal', $originalDatabaseMetrics['body']);
+ // $originalDatabaseMetrics = $originalDatabaseMetrics['body'];
+
+ // // Create documents
+ // for ($i = 0; $i < 100; $i++) {
+ // $response = $this->client->call(
+ // Client::METHOD_POST,
+ // '/databases/' . $databaseId . '/collections/' . $collectionId . '/documents',
+ // array_merge([
+ // 'content-type' => 'application/json',
+ // 'x-appwrite-project' => $this->getProject()['$id']
+ // ], $this->getHeaders()),
+ // [
+ // 'documentId' => 'unique()',
+ // 'data' => ['data' => str_repeat('a', 10000)],
+ // ]
+ // );
+
+ // $this->assertEquals(201, $response['headers']['status-code']);
+ // }
+
+ // sleep(self::WAIT);
+
+ // for ($i = 0; $i < 3; $i++) {
+ // try {
+ // $newProjectMetrics = $this->client->call(
+ // Client::METHOD_GET,
+ // '/project/usage',
+ // $this->getConsoleHeaders(),
+ // [
+ // 'period' => '1d',
+ // 'startDate' => self::getToday(),
+ // 'endDate' => self::getTomorrow(),
+ // ]
+ // );
+
+ // $this->assertEquals(200, $newProjectMetrics['headers']['status-code']);
+ // $this->assertArrayHasKey('databasesStorageTotal', $newProjectMetrics['body']);
+ // $this->assertGreaterThan($originalProjectMetrics['databasesStorageTotal'], $newProjectMetrics['body']['databasesStorageTotal']);
+
+ // $newProjectMetrics = $newProjectMetrics['body'];
+
+ // $newDatabaseMetrics = $this->client->call(
+ // Client::METHOD_GET,
+ // '/databases/' . $databaseId . '/usage?range=30d',
+ // $this->getConsoleHeaders()
+ // );
+
+ // $this->assertEquals(200, $newDatabaseMetrics['headers']['status-code']);
+ // $this->assertArrayHasKey('storageTotal', $newDatabaseMetrics['body']);
+ // $this->assertGreaterThan($originalDatabaseMetrics['storageTotal'], $newDatabaseMetrics['body']['storageTotal']);
+
+ // $newDatabaseMetrics = $newDatabaseMetrics['body'];
+
+ // return [
+ // 'databaseId' => $databaseId,
+ // 'collectionId' => $collectionId,
+ // 'currentProjectMetrics' => $newProjectMetrics,
+ // 'currentDatabaseMetrics' => $newDatabaseMetrics,
+ // ];
+ // } catch (ExpectationFailedException $e) {
+ // if ($i === 2) {
+ // throw $e;
+ // }
+ // sleep(self::WAIT);
+ // continue;
+ // }
+ // }
+ // }
+
+ // /** @depends testDatabaseStorageStatsCreateDocument */
+ // #[Retry(count: 1)]
+ // public function testDatabaseStorageStatsDeleteDocument(array $data): array
+ // {
+ // $databaseId = $data['databaseId'];
+ // $collectionId = $data['collectionId'];
+ // $currentProjectMetrics = $data['currentProjectMetrics'];
+ // $currentDatabaseMetrics = $data['currentDatabaseMetrics'];
+
+ // $documents = $this->client->call(
+ // Client::METHOD_GET,
+ // '/databases/' . $databaseId . '/collections/' . $collectionId . '/documents',
+ // array_merge([
+ // 'x-appwrite-project' => $this->getProject()['$id']
+ // ], $this->getHeaders()),
+ // [
+ // 'queries' => [
+ // Query::limit(50)->toString()
+ // ]
+ // ]
+ // );
+
+ // foreach ($documents['body']['documents'] as $document) {
+ // $response = $this->client->call(
+ // Client::METHOD_DELETE,
+ // '/databases/' . $databaseId . '/collections/' . $collectionId . '/documents/' . $document['$id'],
+ // array_merge([
+ // 'x-appwrite-project' => $this->getProject()['$id']
+ // ], $this->getHeaders())
+ // );
+
+ // $this->assertEquals(204, $response['headers']['status-code']);
+ // }
+
+ // sleep(self::WAIT);
+
+ // for ($i = 0; $i < 3; $i++) {
+ // try {
+ // $newProjectMetrics = $this->client->call(
+ // Client::METHOD_GET,
+ // '/project/usage',
+ // $this->getConsoleHeaders(),
+ // [
+ // 'period' => '1d',
+ // 'startDate' => self::getToday(),
+ // 'endDate' => self::getTomorrow(),
+ // ]
+ // );
+
+ // $this->assertEquals(200, $newProjectMetrics['headers']['status-code']);
+ // $this->assertArrayHasKey('databasesStorageTotal', $newProjectMetrics['body']);
+ // $this->assertLessThan($currentProjectMetrics['databasesStorageTotal'], $newProjectMetrics['body']['databasesStorageTotal']);
+
+ // $newProjectMetrics = $newProjectMetrics['body'];
+
+ // $newDatabaseMetrics = $this->client->call(
+ // Client::METHOD_GET,
+ // '/databases/' . $databaseId . '/usage?range=30d',
+ // $this->getConsoleHeaders()
+ // );
+
+ // $this->assertEquals(200, $newDatabaseMetrics['headers']['status-code']);
+ // $this->assertArrayHasKey('storageTotal', $newDatabaseMetrics['body']);
+ // $this->assertLessThan($currentDatabaseMetrics['storageTotal'], $newDatabaseMetrics['body']['storageTotal']);
+
+ // $newDatabaseMetrics = $newDatabaseMetrics['body'];
+
+ // return [
+ // 'databaseId' => $databaseId,
+ // 'collectionId' => $collectionId,
+ // 'currentProjectMetrics' => $newProjectMetrics,
+ // 'currentDatabaseMetrics' => $newDatabaseMetrics,
+ // ];
+ // } catch (ExpectationFailedException $e) {
+ // if ($i === 2) {
+ // throw $e;
+ // }
+ // sleep(self::WAIT);
+ // continue;
+ // }
+ // }
+
+ // $newProjectMetrics = $this->client->call(
+ // Client::METHOD_GET,
+ // '/project/usage',
+ // $this->getConsoleHeaders(),
+ // [
+ // 'period' => '1d',
+ // 'startDate' => self::getToday(),
+ // 'endDate' => self::getTomorrow(),
+ // ]
+ // );
+ // }
/** @depends testDatabaseStats */
public function testPrepareFunctionsStats(array $data): array
@@ -629,9 +883,6 @@ class UsageTest extends Scope
$this->assertEquals(201, $response['headers']['status-code']);
$this->assertNotEmpty($response['body']['$id']);
- $code = realpath(__DIR__ . '/../../resources/functions') . "/php/code.tar.gz";
- $this->packageCode('php');
-
$response = $this->client->call(
Client::METHOD_POST,
'/functions/' . $functionId . '/deployments',
@@ -641,8 +892,8 @@ class UsageTest extends Scope
], $this->getHeaders()),
[
'entrypoint' => 'index.php',
- 'code' => new CURLFile($code, 'application/x-gzip', \basename($code)),
- 'activate' => true
+ 'code' => $this->packageFunction('php'),
+ 'activate' => true,
]
);
@@ -680,7 +931,7 @@ class UsageTest extends Scope
'x-appwrite-project' => $this->getProject()['$id']
], $this->getHeaders()),
[
- 'async' => false,
+ 'async' => 'false',
]
);
@@ -704,7 +955,7 @@ class UsageTest extends Scope
'x-appwrite-project' => $this->getProject()['$id']
], $this->getHeaders()),
[
- 'async' => false,
+ 'async' => 'false',
]
);
diff --git a/tests/e2e/Scopes/ProjectCustom.php b/tests/e2e/Scopes/ProjectCustom.php
index ad2c93790c..7f84ace6f2 100644
--- a/tests/e2e/Scopes/ProjectCustom.php
+++ b/tests/e2e/Scopes/ProjectCustom.php
@@ -94,6 +94,8 @@ trait ProjectCustom
'topics.read',
'subscribers.write',
'subscribers.read',
+ 'migrations.write',
+ 'migrations.read'
],
]);
diff --git a/tests/e2e/Services/Account/AccountCustomClientTest.php b/tests/e2e/Services/Account/AccountCustomClientTest.php
index 244f84b161..cca27cc3be 100644
--- a/tests/e2e/Services/Account/AccountCustomClientTest.php
+++ b/tests/e2e/Services/Account/AccountCustomClientTest.php
@@ -2695,4 +2695,45 @@ class AccountCustomClientTest extends Scope
return $data;
}
+
+ public function testCreatePushTarget(): void
+ {
+ $response = $this->client->call(Client::METHOD_POST, '/account/targets/push', \array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id']
+ ], $this->getHeaders()), [
+ 'targetId' => ID::unique(),
+ 'identifier' => 'test-identifier',
+ ]);
+
+ $this->assertEquals(201, $response['headers']['status-code']);
+ $this->assertNotEmpty($response['body']['$id']);
+ $this->assertEquals('test-identifier', $response['body']['identifier']);
+ }
+
+ public function testUpdatePushTarget(): void
+ {
+ $response = $this->client->call(Client::METHOD_POST, '/account/targets/push', \array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), [
+ 'targetId' => ID::unique(),
+ 'identifier' => 'test-identifier-2',
+ ]);
+
+ $this->assertEquals(201, $response['headers']['status-code']);
+ $this->assertNotEmpty($response['body']['$id']);
+ $this->assertEquals('test-identifier-2', $response['body']['identifier']);
+
+ $response = $this->client->call(Client::METHOD_PUT, '/account/targets/'. $response['body']['$id'] .'/push', \array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), [
+ 'identifier' => 'test-identifier-updated',
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertEquals('test-identifier-updated', $response['body']['identifier']);
+ $this->assertEquals(false, $response['body']['expired']);
+ }
}
diff --git a/tests/e2e/Services/Databases/DatabasesBase.php b/tests/e2e/Services/Databases/DatabasesBase.php
index 04f2dbd8c8..d079cb313c 100644
--- a/tests/e2e/Services/Databases/DatabasesBase.php
+++ b/tests/e2e/Services/Databases/DatabasesBase.php
@@ -1744,6 +1744,21 @@ trait DatabasesBase
$this->assertEquals(400, $documents['headers']['status-code']);
+ /**
+ * Test null value for cursor
+ */
+
+ $documents = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections/' . $data['moviesId'] . '/documents', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), [
+ 'queries' => [
+ '{"method":"cursorAfter","values":[null]}',
+ ],
+ ]);
+
+ $this->assertEquals(400, $documents['headers']['status-code']);
+
return [];
}
@@ -2096,7 +2111,7 @@ trait DatabasesBase
*/
$conditions = [];
- for ($i = 0; $i < 101; $i++) {
+ for ($i = 0; $i < APP_DATABASE_QUERY_MAX_VALUES + 1; $i++) {
$conditions[] = $i;
}
@@ -2109,7 +2124,7 @@ trait DatabasesBase
],
]);
$this->assertEquals(400, $documents['headers']['status-code']);
- $this->assertEquals('Invalid query: Query on attribute has greater than 100 values: releaseYear', $documents['body']['message']);
+ $this->assertEquals('Invalid query: Query on attribute has greater than '.APP_DATABASE_QUERY_MAX_VALUES.' values: releaseYear', $documents['body']['message']);
$value = '';
diff --git a/tests/e2e/Services/Databases/DatabasesConsoleClientTest.php b/tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
index ca77cf2581..96bb0b5609 100644
--- a/tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
+++ b/tests/e2e/Services/Databases/DatabasesConsoleClientTest.php
@@ -224,7 +224,7 @@ class DatabasesConsoleClientTest extends Scope
]);
$this->assertEquals(200, $response['headers']['status-code']);
- $this->assertEquals(5, count($response['body']));
+ $this->assertEquals(7, count($response['body']));
$this->assertEquals('24h', $response['body']['range']);
$this->assertIsNumeric($response['body']['documentsTotal']);
$this->assertIsNumeric($response['body']['collectionsTotal']);
diff --git a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
index 7cb8adb815..b501e2119e 100644
--- a/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
+++ b/tests/e2e/Services/Databases/DatabasesCustomServerTest.php
@@ -1362,7 +1362,7 @@ class DatabasesCustomServerTest extends Scope
]);
$this->assertEquals(400, $tooWide['headers']['status-code']);
- $this->assertEquals('Attribute limit exceeded', $tooWide['body']['message']);
+ $this->assertEquals('attribute_limit_exceeded', $tooWide['body']['type']);
}
public function testIndexLimitException()
diff --git a/tests/e2e/Services/Functions/FunctionsBase.php b/tests/e2e/Services/Functions/FunctionsBase.php
index 2d94b9f0e3..a1bb8f2b21 100644
--- a/tests/e2e/Services/Functions/FunctionsBase.php
+++ b/tests/e2e/Services/Functions/FunctionsBase.php
@@ -2,234 +2,207 @@
namespace Tests\E2E\Services\Functions;
+use Appwrite\Tests\Async;
+use CURLFile;
use Tests\E2E\Client;
use Utopia\CLI\Console;
trait FunctionsBase
{
+ use Async;
+
protected string $stdout = '';
protected string $stderr = '';
- protected function packageCode($folder)
+ protected function setupFunction(mixed $params): string
{
- Console::execute('cd ' . realpath(__DIR__ . "/../../../resources/functions") . "/$folder && tar --exclude code.tar.gz -czf code.tar.gz .", '', $this->stdout, $this->stderr);
+ $function = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ]), $params);
+
+ $this->assertEquals($function['headers']['status-code'], 201, 'Setup function failed with status code: ' . $function['headers']['status-code'] . ' and response: ' . json_encode($function['body'], JSON_PRETTY_PRINT));
+
+ $functionId = $function['body']['$id'];
+
+ return $functionId;
}
- protected function awaitDeploymentIsBuilt($functionId, $deploymentId, $checkForSuccess = true): void
+ protected function setupDeployment(string $functionId, mixed $params): string
{
- while (true) {
- $deployment = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/deployments/' . $deploymentId, [
+ $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', array_merge([
+ 'content-type' => 'multipart/form-data',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ]), $params);
+ $this->assertEquals($deployment['headers']['status-code'], 202, 'Setup deployment failed with status code: ' . $deployment['headers']['status-code'] . ' and response: ' . json_encode($deployment['body'], JSON_PRETTY_PRINT));
+ $deploymentId = $deployment['body']['$id'] ?? '';
+
+ $this->assertEventually(function () use ($functionId, $deploymentId) {
+ $deployment = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/deployments/' . $deploymentId, array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey'],
- ]);
+ ]));
+ $this->assertEquals('ready', $deployment['body']['status'], 'Deployment status is not ready, deployment: ' . json_encode($deployment['body'], JSON_PRETTY_PRINT));
+ }, 50000, 500);
- if (
- $deployment['headers']['status-code'] >= 400
- || \in_array($deployment['body']['status'], ['ready', 'failed'])
- ) {
- break;
- }
-
- \sleep(1);
- }
-
- if ($checkForSuccess) {
- $this->assertEquals(200, $deployment['headers']['status-code']);
- $this->assertEquals('ready', $deployment['body']['status'], \json_encode($deployment['body']));
- }
+ return $deploymentId;
}
- // /**
- // * @depends testCreateTeam
- // */
- // public function testGetTeam($data):array
- // {
- // $id = $data['teamUid'] ?? '';
+ protected function cleanupFunction(string $functionId): void
+ {
+ $function = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ]));
- // /**
- // * Test for SUCCESS
- // */
- // $response = $this->client->call(Client::METHOD_GET, '/teams/'.$id, array_merge([
- // 'content-type' => 'application/json',
- // 'x-appwrite-project' => $this->getProject()['$id'],
- // ], $this->getHeaders()));
+ $this->assertEquals($function['headers']['status-code'], 204);
+ }
- // $this->assertEquals(200, $response['headers']['status-code']);
- // $this->assertNotEmpty($response['body']['$id']);
- // $this->assertEquals('Arsenal', $response['body']['name']);
- // $this->assertGreaterThan(-1, $response['body']['total']);
- // $this->assertIsInt($response['body']['total']);
- // $this->assertIsInt($response['body']['dateCreated']);
+ protected function createFunction(mixed $params): mixed
+ {
+ $function = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), $params);
- // /**
- // * Test for FAILURE
- // */
+ return $function;
+ }
- // return [];
- // }
+ protected function createVariable(string $functionId, mixed $params): mixed
+ {
+ $variable = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/variables', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), $params);
- // /**
- // * @depends testCreateTeam
- // */
- // public function testListTeams($data):array
- // {
- // /**
- // * Test for SUCCESS
- // */
- // $response = $this->client->call(Client::METHOD_GET, '/teams', array_merge([
- // 'content-type' => 'application/json',
- // 'x-appwrite-project' => $this->getProject()['$id'],
- // ], $this->getHeaders()));
+ return $variable;
+ }
- // $this->assertEquals(200, $response['headers']['status-code']);
- // $this->assertGreaterThan(0, $response['body']['total']);
- // $this->assertIsInt($response['body']['total']);
- // $this->assertCount(3, $response['body']['teams']);
+ protected function getFunction(string $functionId): mixed
+ {
+ $function = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId, array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()));
- // $response = $this->client->call(Client::METHOD_GET, '/teams', array_merge([
- // 'content-type' => 'application/json',
- // 'x-appwrite-project' => $this->getProject()['$id'],
- // ], $this->getHeaders()), [
- // 'limit' => 2,
- // ]);
+ return $function;
+ }
- // $this->assertEquals(200, $response['headers']['status-code']);
- // $this->assertGreaterThan(0, $response['body']['total']);
- // $this->assertIsInt($response['body']['total']);
- // $this->assertCount(2, $response['body']['teams']);
+ protected function getDeployment(string $functionId, string $deploymentId): mixed
+ {
+ $deployment = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/deployments/' . $deploymentId, array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()));
- // $response = $this->client->call(Client::METHOD_GET, '/teams', array_merge([
- // 'content-type' => 'application/json',
- // 'x-appwrite-project' => $this->getProject()['$id'],
- // ], $this->getHeaders()), [
- // 'offset' => 1,
- // ]);
+ return $deployment;
+ }
- // $this->assertEquals(200, $response['headers']['status-code']);
- // $this->assertGreaterThan(0, $response['body']['total']);
- // $this->assertIsInt($response['body']['total']);
- // $this->assertCount(2, $response['body']['teams']);
+ protected function getExecution(string $functionId, $executionId): mixed
+ {
+ $execution = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions/' . $executionId, array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()));
- // $response = $this->client->call(Client::METHOD_GET, '/teams', array_merge([
- // 'content-type' => 'application/json',
- // 'x-appwrite-project' => $this->getProject()['$id'],
- // ], $this->getHeaders()), [
- // 'search' => 'Manchester',
- // ]);
+ return $execution;
+ }
- // $this->assertEquals(200, $response['headers']['status-code']);
- // $this->assertGreaterThan(0, $response['body']['total']);
- // $this->assertIsInt($response['body']['total']);
- // $this->assertCount(1, $response['body']['teams']);
- // $this->assertEquals('Manchester United', $response['body']['teams'][0]['name']);
+ protected function listFunctions(mixed $params = []): mixed
+ {
+ $functions = $this->client->call(Client::METHOD_GET, '/functions', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), $params);
- // $response = $this->client->call(Client::METHOD_GET, '/teams', array_merge([
- // 'content-type' => 'application/json',
- // 'x-appwrite-project' => $this->getProject()['$id'],
- // ], $this->getHeaders()), [
- // 'search' => 'United',
- // ]);
+ return $functions;
+ }
- // $this->assertEquals(200, $response['headers']['status-code']);
- // $this->assertGreaterThan(0, $response['body']['total']);
- // $this->assertIsInt($response['body']['total']);
- // $this->assertCount(1, $response['body']['teams']);
- // $this->assertEquals('Manchester United', $response['body']['teams'][0]['name']);
+ protected function listDeployments(string $functionId, $params = []): mixed
+ {
+ $deployments = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/deployments', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), $params);
- // /**
- // * Test for FAILURE
- // */
+ return $deployments;
+ }
- // return [];
- // }
+ protected function listExecutions(string $functionId, mixed $params = []): mixed
+ {
+ $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), $params);
- // public function testUpdateTeam():array
- // {
- // /**
- // * Test for SUCCESS
- // */
- // $response = $this->client->call(Client::METHOD_POST, '/teams', array_merge([
- // 'content-type' => 'application/json',
- // 'x-appwrite-project' => $this->getProject()['$id'],
- // ], $this->getHeaders()), [
- // 'name' => 'Demo'
- // ]);
+ return $executions;
+ }
- // $this->assertEquals(201, $response['headers']['status-code']);
- // $this->assertNotEmpty($response['body']['$id']);
- // $this->assertEquals('Demo', $response['body']['name']);
- // $this->assertGreaterThan(-1, $response['body']['total']);
- // $this->assertIsInt($response['body']['total']);
- // $this->assertIsInt($response['body']['dateCreated']);
+ protected function packageFunction(string $function): CURLFile
+ {
+ $folderPath = realpath(__DIR__ . '/../../../resources/functions') . "/$function";
+ $tarPath = "$folderPath/code.tar.gz";
- // $response = $this->client->call(Client::METHOD_PUT, '/teams/'.$response['body']['$id'], array_merge([
- // 'content-type' => 'application/json',
- // 'x-appwrite-project' => $this->getProject()['$id'],
- // ], $this->getHeaders()), [
- // 'name' => 'Demo New'
- // ]);
+ Console::execute("cd $folderPath && tar --exclude code.tar.gz -czf code.tar.gz .", '', $this->stdout, $this->stderr);
- // $this->assertEquals(200, $response['headers']['status-code']);
- // $this->assertNotEmpty($response['body']['$id']);
- // $this->assertEquals('Demo New', $response['body']['name']);
- // $this->assertGreaterThan(-1, $response['body']['total']);
- // $this->assertIsInt($response['body']['total']);
- // $this->assertIsInt($response['body']['dateCreated']);
+ if (filesize($tarPath) > 1024 * 1024 * 5) {
+ throw new \Exception('Code package is too large. Use the chunked upload method instead.');
+ }
- // /**
- // * Test for FAILURE
- // */
- // $response = $this->client->call(Client::METHOD_PUT, '/teams/'.$response['body']['$id'], array_merge([
- // 'content-type' => 'application/json',
- // 'x-appwrite-project' => $this->getProject()['$id'],
- // ], $this->getHeaders()), [
- // ]);
+ return new CURLFile($tarPath, 'application/x-gzip', \basename($tarPath));
+ }
- // $this->assertEquals(400, $response['headers']['status-code']);
+ protected function createDeployment(string $functionId, mixed $params = []): mixed
+ {
+ $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', array_merge([
+ 'content-type' => 'multipart/form-data',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), $params);
- // return [];
- // }
+ return $deployment;
+ }
- // public function testDeleteTeam():array
- // {
- // /**
- // * Test for SUCCESS
- // */
- // $response = $this->client->call(Client::METHOD_POST, '/teams', array_merge([
- // 'content-type' => 'application/json',
- // 'x-appwrite-project' => $this->getProject()['$id'],
- // ], $this->getHeaders()), [
- // 'name' => 'Demo'
- // ]);
+ protected function getFunctionUsage(string $functionId, mixed $params): mixed
+ {
+ $usage = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/usage', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), $params);
- // $teamUid = $response['body']['$id'];
+ return $usage;
+ }
- // $this->assertEquals(201, $response['headers']['status-code']);
- // $this->assertNotEmpty($response['body']['$id']);
- // $this->assertEquals('Demo', $response['body']['name']);
- // $this->assertGreaterThan(-1, $response['body']['total']);
- // $this->assertIsInt($response['body']['total']);
- // $this->assertIsInt($response['body']['dateCreated']);
+ protected function getTemplate(string $templateId)
+ {
+ $template = $this->client->call(Client::METHOD_GET, '/functions/templates/' . $templateId, array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()));
- // $response = $this->client->call(Client::METHOD_DELETE, '/teams/'.$teamUid, array_merge([
- // 'content-type' => 'application/json',
- // 'x-appwrite-project' => $this->getProject()['$id'],
- // ], $this->getHeaders()));
+ return $template;
+ }
- // $this->assertEquals(204, $response['headers']['status-code']);
- // $this->assertEmpty($response['body']);
+ protected function createExecution(string $functionId, mixed $params = []): mixed
+ {
+ $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), $params);
- // /**
- // * Test for FAILURE
- // */
- // $response = $this->client->call(Client::METHOD_GET, '/teams/'.$teamUid, array_merge([
- // 'content-type' => 'application/json',
- // 'x-appwrite-project' => $this->getProject()['$id'],
- // ], $this->getHeaders()));
+ return $execution;
+ }
- // $this->assertEquals(404, $response['headers']['status-code']);
+ protected function deleteFunction(string $functionId): mixed
+ {
+ $function = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()));
- // return [];
- // }
+ return $function;
+ }
}
diff --git a/tests/e2e/Services/Functions/FunctionsConsoleClientTest.php b/tests/e2e/Services/Functions/FunctionsConsoleClientTest.php
index 8cb7f6f869..3a02cbcba2 100644
--- a/tests/e2e/Services/Functions/FunctionsConsoleClientTest.php
+++ b/tests/e2e/Services/Functions/FunctionsConsoleClientTest.php
@@ -13,13 +13,11 @@ class FunctionsConsoleClientTest extends Scope
{
use ProjectCustom;
use SideConsole;
+ use FunctionsBase;
public function testCreateFunction(): array
{
- $function = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $function = $this->createFunction([
'functionId' => ID::unique(),
'name' => 'Test',
'execute' => [Role::user($this->getUser()['$id'])->toString()],
@@ -35,10 +33,9 @@ class FunctionsConsoleClientTest extends Scope
$this->assertEquals(201, $function['headers']['status-code']);
- $response = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $functionId = $function['body']['$id'];
+
+ $function2 = $this->createFunction([
'functionId' => ID::unique(),
'name' => 'Test Failure',
'execute' => ['some-random-string'],
@@ -46,73 +43,59 @@ class FunctionsConsoleClientTest extends Scope
'entrypoint' => 'index.php',
]);
- $this->assertEquals(400, $response['headers']['status-code']);
+ $this->assertEquals(400, $function2['headers']['status-code']);
return [
- 'functionId' => $function['body']['$id']
+ 'functionId' => $functionId,
];
}
/**
* @depends testCreateFunction
*/
- public function testGetCollectionUsage(array $data)
+ public function testFunctionUsage(array $data)
{
- /**
- * Test for FAILURE
- */
-
- $response = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/usage', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id']
- ], $this->getHeaders()), [
- 'range' => '232h'
- ]);
-
- $this->assertEquals(400, $response['headers']['status-code']);
-
- $response = $this->client->call(Client::METHOD_GET, '/functions/randomFunctionId/usage', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id']
- ], $this->getHeaders()), [
- 'range' => '24h'
- ]);
-
- $this->assertEquals(404, $response['headers']['status-code']);
-
/**
* Test for SUCCESS
*/
-
- $response = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/usage', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id']
- ], $this->getHeaders()), [
+ $usage = $this->getFunctionUsage($data['functionId'], [
'range' => '24h'
]);
+ $this->assertEquals(200, $usage['headers']['status-code']);
+ $this->assertEquals(19, count($usage['body']));
+ $this->assertEquals('24h', $usage['body']['range']);
+ $this->assertIsNumeric($usage['body']['deploymentsTotal']);
+ $this->assertIsNumeric($usage['body']['deploymentsStorageTotal']);
+ $this->assertIsNumeric($usage['body']['buildsTotal']);
+ $this->assertIsNumeric($usage['body']['buildsStorageTotal']);
+ $this->assertIsNumeric($usage['body']['buildsTimeTotal']);
+ $this->assertIsNumeric($usage['body']['buildsMbSecondsTotal']);
+ $this->assertIsNumeric($usage['body']['executionsTotal']);
+ $this->assertIsNumeric($usage['body']['executionsTimeTotal']);
+ $this->assertIsNumeric($usage['body']['executionsMbSecondsTotal']);
+ $this->assertIsArray($usage['body']['deployments']);
+ $this->assertIsArray($usage['body']['deploymentsStorage']);
+ $this->assertIsArray($usage['body']['builds']);
+ $this->assertIsArray($usage['body']['buildsTime']);
+ $this->assertIsArray($usage['body']['buildsStorage']);
+ $this->assertIsArray($usage['body']['buildsTime']);
+ $this->assertIsArray($usage['body']['buildsMbSeconds']);
+ $this->assertIsArray($usage['body']['executions']);
+ $this->assertIsArray($usage['body']['executionsTime']);
+ $this->assertIsArray($usage['body']['executionsMbSeconds']);
- $this->assertEquals(200, $response['headers']['status-code']);
- $this->assertEquals(19, count($response['body']));
- $this->assertEquals('24h', $response['body']['range']);
- $this->assertIsNumeric($response['body']['deploymentsTotal']);
- $this->assertIsNumeric($response['body']['deploymentsStorageTotal']);
- $this->assertIsNumeric($response['body']['buildsTotal']);
- $this->assertIsNumeric($response['body']['buildsStorageTotal']);
- $this->assertIsNumeric($response['body']['buildsTimeTotal']);
- $this->assertIsNumeric($response['body']['buildsMbSecondsTotal']);
- $this->assertIsNumeric($response['body']['executionsTotal']);
- $this->assertIsNumeric($response['body']['executionsTimeTotal']);
- $this->assertIsNumeric($response['body']['executionsMbSecondsTotal']);
- $this->assertIsArray($response['body']['deployments']);
- $this->assertIsArray($response['body']['deploymentsStorage']);
- $this->assertIsArray($response['body']['builds']);
- $this->assertIsArray($response['body']['buildsTime']);
- $this->assertIsArray($response['body']['buildsStorage']);
- $this->assertIsArray($response['body']['buildsTime']);
- $this->assertIsArray($response['body']['buildsMbSeconds']);
- $this->assertIsArray($response['body']['executions']);
- $this->assertIsArray($response['body']['executionsTime']);
- $this->assertIsArray($response['body']['executionsMbSeconds']);
+ /**
+ * Test for FAILURE
+ */
+ $usage = $this->getFunctionUsage($data['functionId'], [
+ 'range' => '232h'
+ ]);
+ $this->assertEquals(400, $usage['headers']['status-code']);
+
+ $usage = $this->getFunctionUsage('randomFunctionId', [
+ 'range' => '24h'
+ ]);
+ $this->assertEquals(404, $usage['headers']['status-code']);
}
/**
@@ -123,31 +106,53 @@ class FunctionsConsoleClientTest extends Scope
/**
* Test for SUCCESS
*/
+ $variable = $this->createVariable(
+ $data['functionId'],
+ [
+ 'key' => 'APP_TEST',
+ 'value' => 'TESTINGVALUE'
+ ]
+ );
- $response = $this->client->call(Client::METHOD_POST, '/functions/' . $data['functionId'] . '/variables', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'key' => 'APP_TEST',
- 'value' => 'TESTINGVALUE'
- ]);
+ $this->assertEquals(201, $variable['headers']['status-code']);
- $this->assertEquals(201, $response['headers']['status-code']);
- $variableId = $response['body']['$id'];
+ $variableId = $variable['body']['$id'];
/**
* Test for FAILURE
*/
+ // Test for duplicate key
+ $variable = $this->createVariable(
+ $data['functionId'],
+ [
+ 'key' => 'APP_TEST',
+ 'value' => 'ANOTHERTESTINGVALUE'
+ ]
+ );
- $response = $this->client->call(Client::METHOD_POST, '/functions/' . $data['functionId'] . '/variables', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'key' => 'APP_TEST',
- 'value' => 'ANOTHER_TESTINGVALUE'
- ]);
+ $this->assertEquals(409, $variable['headers']['status-code']);
- $this->assertEquals(409, $response['headers']['status-code']);
+ // Test for invalid key
+ $variable = $this->createVariable(
+ $data['functionId'],
+ [
+ 'key' => str_repeat("A", 256),
+ 'value' => 'TESTINGVALUE'
+ ]
+ );
+
+ $this->assertEquals(400, $variable['headers']['status-code']);
+
+ // Test for invalid value
+ $variable = $this->createVariable(
+ $data['functionId'],
+ [
+ 'key' => 'LONGKEY',
+ 'value' => str_repeat("#", 8193),
+ ]
+ );
+
+ $this->assertEquals(400, $variable['headers']['status-code']);
return array_merge(
$data,
@@ -155,28 +160,6 @@ class FunctionsConsoleClientTest extends Scope
'variableId' => $variableId
]
);
-
- $longKey = str_repeat("A", 256);
- $response = $this->client->call(Client::METHOD_POST, '/functions/' . $data['functionId'] . '/variables', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'key' => $longKey,
- 'value' => 'TESTINGVALUE'
- ]);
-
- $this->assertEquals(400, $response['headers']['status-code']);
-
- $longValue = str_repeat("#", 8193);
- $response = $this->client->call(Client::METHOD_POST, '/functions/' . $data['functionId'] . '/variables', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'key' => 'LONGKEY',
- 'value' => $longValue
- ]);
-
- $this->assertEquals(400, $response['headers']['status-code']);
}
/**
diff --git a/tests/e2e/Services/Functions/FunctionsCustomClientTest.php b/tests/e2e/Services/Functions/FunctionsCustomClientTest.php
index 92b7c33034..914a255663 100644
--- a/tests/e2e/Services/Functions/FunctionsCustomClientTest.php
+++ b/tests/e2e/Services/Functions/FunctionsCustomClientTest.php
@@ -2,17 +2,12 @@
namespace Tests\E2E\Services\Functions;
-use Appwrite\Tests\Retry;
-use CURLFile;
use Tests\E2E\Client;
use Tests\E2E\Scopes\ProjectCustom;
use Tests\E2E\Scopes\Scope;
use Tests\E2E\Scopes\SideClient;
-use Utopia\Config\Config;
-use Utopia\Database\Document;
use Utopia\Database\Helpers\ID;
use Utopia\Database\Helpers\Role;
-use Utopia\Database\Query;
class FunctionsCustomClientTest extends Scope
{
@@ -20,15 +15,12 @@ class FunctionsCustomClientTest extends Scope
use ProjectCustom;
use SideClient;
- public function testCreate(): array
+ public function testCreateFunction()
{
/**
- * Test for SUCCESS
+ * Test for FAILURE
*/
- $response1 = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $function = $this->createFunction([
'functionId' => ID::unique(),
'name' => 'Test',
'events' => [
@@ -38,23 +30,15 @@ class FunctionsCustomClientTest extends Scope
'schedule' => '0 0 1 1 *',
'timeout' => 10,
]);
-
- $this->assertEquals(401, $response1['headers']['status-code']);
-
- return [];
+ $this->assertEquals(401, $function['headers']['status-code']);
}
- #[Retry(count: 2)]
- public function testCreateExecution(): array
+ public function testCreateExecution()
{
/**
* Test for SUCCESS
*/
- $function = $this->client->call(Client::METHOD_POST, '/functions', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], [
+ $functionId = $this->setupFunction([
'functionId' => ID::unique(),
'name' => 'Test',
'execute' => [Role::user($this->getUser()['$id'])->toString()],
@@ -64,291 +48,40 @@ class FunctionsCustomClientTest extends Scope
'users.*.create',
'users.*.delete',
],
- 'schedule' => '* * * * *', // execute every minute
'timeout' => 10,
]);
-
- $this->assertEquals(201, $function['headers']['status-code']);
-
- /** Create Variables */
- $variable = $this->client->call(Client::METHOD_POST, '/functions/' . $function['body']['$id'] . '/variables', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], [
- 'key' => 'funcKey1',
- 'value' => 'funcValue1',
- ]);
-
- $variable2 = $this->client->call(Client::METHOD_POST, '/functions/' . $function['body']['$id'] . '/variables', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], [
- 'key' => 'funcKey2',
- 'value' => 'funcValue2',
- ]);
-
- $variable3 = $this->client->call(Client::METHOD_POST, '/functions/' . $function['body']['$id'] . '/variables', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], [
- 'key' => 'funcKey3',
- 'value' => 'funcValue3',
- ]);
-
- $this->assertEquals(201, $variable['headers']['status-code']);
- $this->assertEquals(201, $variable2['headers']['status-code']);
- $this->assertEquals(201, $variable3['headers']['status-code']);
-
- $folder = 'php';
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/$folder/code.tar.gz";
- $this->packageCode($folder);
-
- $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $function['body']['$id'] . '/deployments', [
- 'content-type' => 'multipart/form-data',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], [
+ $this->setupDeployment($functionId, [
'entrypoint' => 'index.php',
- 'code' => new CURLFile($code, 'application/x-gzip', \basename($code)),
+ 'code' => $this->packageFunction('php'),
'activate' => true
]);
- $deploymentId = $deployment['body']['$id'] ?? '';
-
- $this->assertEquals(202, $deployment['headers']['status-code']);
-
- $this->awaitDeploymentIsBuilt($function['body']['$id'], $deploymentId);
-
- $function = $this->client->call(Client::METHOD_PATCH, '/functions/' . $function['body']['$id'] . '/deployments/' . $deploymentId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], []);
-
- $this->assertEquals(200, $function['headers']['status-code']);
-
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $function['body']['$id'] . '/executions', [
+ // Deny create async execution as guest
+ $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', [
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
], [
'async' => true,
]);
-
$this->assertEquals(401, $execution['headers']['status-code']);
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $function['body']['$id'] . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ // Allow create async execution as user
+ $execution = $this->createExecution($functionId, [
'async' => true,
]);
-
$this->assertEquals(202, $execution['headers']['status-code']);
- // Wait for the first scheduled execution to be created
- sleep(90);
-
- $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $function['body']['$id'] . '/executions', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ]);
-
- $this->assertEquals(200, $executions['headers']['status-code']);
- $this->assertCount(2, $executions['body']['executions']);
- $this->assertIsArray($executions['body']['executions']);
- $this->assertEquals($executions['body']['executions'][1]['trigger'], 'schedule');
- $this->assertEquals($executions['body']['executions'][1]['status'], 'completed');
- $this->assertEquals($executions['body']['executions'][1]['responseStatusCode'], 200);
- $this->assertEquals($executions['body']['executions'][1]['responseBody'], '');
- $this->assertNotEmpty($executions['body']['executions'][1]['logs'], '');
- $this->assertNotEmpty($executions['body']['executions'][1]['errors'], '');
- $this->assertGreaterThan(0, $executions['body']['executions'][1]['duration']);
-
- // Cleanup : Delete function
- $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $function['body']['$id'], [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], []);
-
- $this->assertEquals(204, $response['headers']['status-code']);
-
- return [];
+ $this->cleanupFunction($functionId);
}
- public function testCreateScheduledExecution(): void
- {
- /**
- * Test for SUCCESS
- */
- $function = $this->client->call(Client::METHOD_POST, '/functions', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], [
- 'functionId' => ID::unique(),
- 'name' => 'Test',
- 'execute' => [Role::user($this->getUser()['$id'])->toString()],
- 'runtime' => 'php-8.0',
- 'entrypoint' => 'index.php',
- 'timeout' => 10,
- ]);
- $this->assertEquals(201, $function['headers']['status-code']);
-
- $folder = 'php';
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/$folder/code.tar.gz";
- $this->packageCode($folder);
-
- $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $function['body']['$id'] . '/deployments', [
- 'content-type' => 'multipart/form-data',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], [
- 'entrypoint' => 'index.php',
- 'code' => new CURLFile($code, 'application/x-gzip', \basename($code)),
- 'activate' => true
- ]);
- $deploymentId = $deployment['body']['$id'] ?? '';
- $this->assertEquals(202, $deployment['headers']['status-code']);
-
- $this->awaitDeploymentIsBuilt($function['body']['$id'], $deploymentId, true);
-
- // Schedule execution for the future
- \date_default_timezone_set('UTC');
- $futureTime = (new \DateTime())->add(new \DateInterval('PT2M'));
- $futureTime->setTime($futureTime->format('H'), $futureTime->format('i'), 0, 0);
-
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $function['body']['$id'] . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'async' => true,
- 'scheduledAt' => $futureTime->format(\DateTime::ATOM),
- 'path' => '/custom-path',
- 'method' => 'PATCH',
- 'body' => 'custom-body',
- 'headers' => [
- 'x-custom-header' => 'custom-value'
- ]
- ]);
-
- $this->assertEquals(202, $execution['headers']['status-code']);
- $this->assertEquals('scheduled', $execution['body']['status']);
- $this->assertEquals('PATCH', $execution['body']['requestMethod']);
- $this->assertEquals('/custom-path', $execution['body']['requestPath']);
- $this->assertCount(0, $execution['body']['requestHeaders']);
-
- $executionId = $execution['body']['$id'];
-
- $start = \microtime(true);
- while (true) {
- $execution = $this->client->call(Client::METHOD_GET, '/functions/' . $function['body']['$id'] . '/executions/' . $executionId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ]);
-
- if ($execution['body']['status'] === 'completed') {
- break;
- }
-
- $timeout = 60 + 60 + 15; // up to 1 minute round up, 1 minute schedule postpone, 15s cold start safety
- if (\microtime(true) - $start > $timeout) {
- $this->fail('Scheduled execution did not complete with status ' . $execution['body']['status'] . ': ' . \json_encode($execution));
- }
-
- usleep(500000); // 0.5 seconds
- }
-
- $this->assertEquals(200, $execution['headers']['status-code']);
- $this->assertEquals(200, $execution['body']['responseStatusCode']);
- $this->assertEquals('completed', $execution['body']['status']);
- $this->assertEquals('/custom-path', $execution['body']['requestPath']);
- $this->assertEquals('PATCH', $execution['body']['requestMethod']);
- $this->assertStringContainsString('body-is-custom-body', $execution['body']['logs']);
- $this->assertStringContainsString('custom-header-is-custom-value', $execution['body']['logs']);
- $this->assertStringContainsString('method-is-patch', $execution['body']['logs']);
- $this->assertStringContainsString('path-is-/custom-path', $execution['body']['logs']);
- $this->assertStringContainsString('user-is-' . $this->getUser()['$id'], $execution['body']['logs']);
- $this->assertStringContainsString('jwt-is-valid', $execution['body']['logs']);
- $this->assertGreaterThan(0, $execution['body']['duration']);
-
- /* Test for FAILURE */
-
- // Schedule synchronous execution
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $function['body']['$id'] . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'async' => false,
- 'scheduledAt' => $futureTime->format(\DateTime::ATOM),
- ]);
-
- $this->assertEquals(400, $execution['headers']['status-code']);
-
- // Execution with seconds precision
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $function['body']['$id'] . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'async' => true,
- 'scheduledAt' => (new \DateTime("2100-12-08 16:12:02"))->format(\DateTime::ATOM)
- ]);
-
- $this->assertEquals(400, $execution['headers']['status-code']);
-
- // Execution with milliseconds precision
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $function['body']['$id'] . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'async' => true,
- 'scheduledAt' => (new \DateTime("2100-12-08 16:12:02.255"))->format(\DateTime::ATOM)
- ]);
-
- $this->assertEquals(400, $execution['headers']['status-code']);
-
- // Execution too soon
- $futureTime = (new \DateTime())->add(new \DateInterval('PT1M'));
- $futureTime->setTime($futureTime->format('H'), $futureTime->format('i'), 0, 0);
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $function['body']['$id'] . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'async' => true,
- 'scheduledAt' => $futureTime->format(\DateTime::ATOM),
- ]);
-
- $this->assertEquals(400, $execution['headers']['status-code']);
-
- // Cleanup : Delete function
- $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $function['body']['$id'], [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], []);
-
- $this->assertEquals(204, $response['headers']['status-code']);
- }
public function testCreateCustomExecution(): array
{
/**
* Test for SUCCESS
*/
- $projectId = $this->getProject()['$id'];
- $apikey = $this->getProject()['apiKey'];
-
- $function = $this->client->call(Client::METHOD_POST, '/functions', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ], [
+ $functionId = $this->setupFunction([
'functionId' => ID::unique(),
'name' => 'Test',
'execute' => [Role::any()->toString()],
@@ -356,77 +89,16 @@ class FunctionsCustomClientTest extends Scope
'entrypoint' => 'index.php',
'timeout' => 10,
]);
-
- $functionId = $function['body']['$id'] ?? '';
-
- $this->assertEquals(201, $function['headers']['status-code']);
-
- /** Create Variables */
- $variable = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/variables', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ], [
- 'key' => 'funcKey1',
- 'value' => 'funcValue1',
- ]);
-
- $variable2 = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/variables', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ], [
- 'key' => 'funcKey2',
- 'value' => 'funcValue2',
- ]);
-
- $variable3 = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/variables', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ], [
- 'key' => 'funcKey3',
- 'value' => 'funcValue3',
- ]);
-
- $this->assertEquals(201, $variable['headers']['status-code']);
- $this->assertEquals(201, $variable2['headers']['status-code']);
- $this->assertEquals(201, $variable3['headers']['status-code']);
-
- $folder = 'php-fn';
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/$folder/code.tar.gz";
- $this->packageCode($folder);
-
- $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', [
- 'content-type' => 'multipart/form-data',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ], [
+ $deploymentId = $this->setupDeployment($functionId, [
'entrypoint' => 'index.php',
- 'code' => new CURLFile($code, 'application/x-gzip', \basename($code)), //different tarball names intentional
+ 'code' => $this->packageFunction('php-fn'),
'activate' => true
]);
- $deploymentId = $deployment['body']['$id'] ?? '';
-
- $this->awaitDeploymentIsBuilt($function['body']['$id'], $deploymentId);
-
- $function = $this->client->call(Client::METHOD_PATCH, '/functions/' . $functionId . '/deployments/' . $deploymentId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ], []);
-
- $this->assertEquals(200, $function['headers']['status-code']);
-
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- ], $this->getHeaders()), [
+ $execution = $this->createExecution($functionId, [
'body' => 'foobar',
- 'async' => false
+ 'async' => 'false'
]);
-
$output = json_decode($execution['body']['responseBody'], true);
$this->assertEquals(201, $execution['headers']['status-code']);
$this->assertEquals(200, $execution['body']['responseStatusCode']);
@@ -444,31 +116,20 @@ class FunctionsCustomClientTest extends Scope
$this->assertEquals('foobar', $output['APPWRITE_FUNCTION_DATA']);
$this->assertEquals($this->getUser()['$id'], $output['APPWRITE_FUNCTION_USER_ID']);
$this->assertNotEmpty($output['APPWRITE_FUNCTION_JWT']);
- $this->assertEquals($projectId, $output['APPWRITE_FUNCTION_PROJECT_ID']);
+ $this->assertEquals($this->getProject()['$id'], $output['APPWRITE_FUNCTION_PROJECT_ID']);
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- ], $this->getHeaders()), [
+ $execution = $this->createExecution($functionId, [
'body' => 'foobar',
'async' => true
]);
-
+ $executionId = $execution['body']['$id'];
$this->assertEquals(202, $execution['headers']['status-code']);
- $executionId = $execution['body']['$id'] ?? '';
-
- sleep(5);
-
- $execution = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions/' . $executionId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ]);
-
- $this->assertEmpty($execution['body']['responseBody']);
- $this->assertEquals(200, $execution['headers']['status-code']);
- $this->assertEquals(200, $execution['body']['responseStatusCode']);
+ $this->assertEventually(function () use ($functionId, $executionId) {
+ $execution = $this->getExecution($functionId, $executionId);
+ $this->assertEquals('completed', $execution['body']['status']);
+ $this->assertEquals(200, $execution['body']['responseStatusCode']);
+ }, 10000, 500);
return [
'functionId' => $functionId
@@ -480,14 +141,7 @@ class FunctionsCustomClientTest extends Scope
/**
* Test for SUCCESS
*/
- $projectId = $this->getProject()['$id'];
- $apikey = $this->getProject()['apiKey'];
-
- $function = $this->client->call(Client::METHOD_POST, '/functions', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ], [
+ $functionId = $this->setupFunction([
'functionId' => ID::unique(),
'name' => 'Test',
'execute' => [Role::any()->toString()],
@@ -500,56 +154,25 @@ class FunctionsCustomClientTest extends Scope
],
'timeout' => 10,
]);
-
- $functionId = $function['body']['$id'] ?? '';
-
- $this->assertEquals(201, $function['headers']['status-code']);
-
- $folder = 'php-fn';
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/$folder/code.tar.gz";
- $this->packageCode($folder);
-
- $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', [
- 'content-type' => 'multipart/form-data',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ], [
+ $this->setupDeployment($functionId, [
'entrypoint' => 'index.php',
- 'code' => new CURLFile($code, 'application/x-gzip', \basename($code)), //different tarball names intentional
+ 'code' => $this->packageFunction('php-fn'),
'activate' => true
]);
- $deploymentId = $deployment['body']['$id'] ?? '';
-
- $this->awaitDeploymentIsBuilt($function['body']['$id'], $deploymentId);
-
- // Why do we have to do this?
- $function = $this->client->call(Client::METHOD_PATCH, '/functions/' . $functionId . '/deployments/' . $deploymentId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ], []);
-
- $this->assertEquals(200, $function['headers']['status-code']);
-
$execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', [
'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
+ 'x-appwrite-project' => $this->getProject()['$id'],
], [
'data' => 'foobar',
'async' => true,
]);
-
$this->assertEquals(202, $execution['headers']['status-code']);
}
- public function testCreateExecutionNoDeployment(): array
+ public function testCreateExecutionNoDeployment()
{
- $function = $this->client->call(Client::METHOD_POST, '/functions', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], [
+ $functionId = $this->setupFunction([
'functionId' => ID::unique(),
'name' => 'Test',
'execute' => [],
@@ -558,146 +181,18 @@ class FunctionsCustomClientTest extends Scope
'timeout' => 10,
]);
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $function['body']['$id'] . '/executions', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], [
- 'async' => true,
+ $execution = $this->createExecution($functionId, [
+ 'async' => true
]);
-
$this->assertEquals(404, $execution['headers']['status-code']);
-
- return [];
}
- /**
- * @depends testCreateCustomExecution
- */
- public function testListExecutions(array $data)
- {
- $functionId = $data['functionId'];
- $projectId = $this->getProject()['$id'];
- $apikey = $this->getProject()['apiKey'];
-
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- ], $this->getHeaders()), [
- 'data' => 'foobar'
- ]);
-
- $this->assertEquals(201, $execution['headers']['status-code']);
-
- $base = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ]);
-
- $this->assertEquals(200, $base['headers']['status-code']);
- $this->assertCount(3, $base['body']['executions']);
- $this->assertEquals('completed', $base['body']['executions'][0]['status']);
- $this->assertEquals('completed', $base['body']['executions'][1]['status']);
-
- $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ], [
- 'queries' => [
- Query::limit(1)->toString(),
- ],
- ]);
-
- $this->assertEquals(200, $executions['headers']['status-code']);
- $this->assertCount(1, $executions['body']['executions']);
-
- $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ], [
- 'queries' => [
- Query::offset(1)->toString(),
- ],
- ]);
-
- $this->assertEquals(200, $executions['headers']['status-code']);
- $this->assertCount(2, $executions['body']['executions']);
-
- $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ], [
- 'queries' => [
- Query::equal('status', ['completed'])->toString(),
- ],
- ]);
-
- $this->assertEquals(200, $executions['headers']['status-code']);
- $this->assertCount(3, $executions['body']['executions']);
-
- $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ], [
- 'queries' => [
- Query::equal('status', ['failed'])->toString(),
- ],
- ]);
-
- $this->assertEquals(200, $executions['headers']['status-code']);
- $this->assertCount(0, $executions['body']['executions']);
-
- $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ], [
- 'queries' => [
- Query::cursorAfter(new Document(['$id' => $base['body']['executions'][0]['$id']]))->toString(),
- ],
- ]);
-
- $this->assertCount(2, $executions['body']['executions']);
- $this->assertEquals($base['body']['executions'][1]['$id'], $executions['body']['executions'][0]['$id']);
-
- $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ], [
- 'queries' => [
- Query::cursorBefore(new Document(['$id' => $base['body']['executions'][1]['$id']]))->toString(),
- ],
- ]);
-
- // Cleanup : Delete function
- $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], []);
-
- $this->assertEquals(204, $response['headers']['status-code']);
- }
-
- public function testSynchronousExecution(): array
+ public function testSynchronousExecution()
{
/**
* Test for SUCCESS
*/
-
- $projectId = $this->getProject()['$id'];
- $apikey = $this->getProject()['apiKey'];
-
- $function = $this->client->call(Client::METHOD_POST, '/functions', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ], [
+ $functionId = $this->setupFunction([
'functionId' => ID::unique(),
'name' => 'Test',
'execute' => [Role::any()->toString()],
@@ -705,79 +200,16 @@ class FunctionsCustomClientTest extends Scope
'entrypoint' => 'index.php',
'timeout' => 10,
]);
-
- $functionId = $function['body']['$id'] ?? '';
-
- $this->assertEquals(201, $function['headers']['status-code']);
-
- /** Create Variables */
- $variable = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/variables', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ], [
- 'key' => 'funcKey1',
- 'value' => 'funcValue1',
- ]);
-
- $variable2 = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/variables', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ], [
- 'key' => 'funcKey2',
- 'value' => 'funcValue2',
- ]);
-
- $variable3 = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/variables', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ], [
- 'key' => 'funcKey3',
- 'value' => 'funcValue3',
- ]);
-
- $this->assertEquals(201, $variable['headers']['status-code']);
- $this->assertEquals(201, $variable2['headers']['status-code']);
- $this->assertEquals(201, $variable3['headers']['status-code']);
-
- $folder = 'php-fn';
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/$folder/code.tar.gz";
- $this->packageCode($folder);
-
- $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', [
- 'content-type' => 'multipart/form-data',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ], [
+ $deploymentId = $this->setupDeployment($functionId, [
'entrypoint' => 'index.php',
- 'code' => new CURLFile($code, 'application/x-gzip', \basename($code)), //different tarball names intentional
+ 'code' => $this->packageFunction('php-fn'),
'activate' => true
]);
- $deploymentId = $deployment['body']['$id'] ?? '';
-
- $this->assertEquals(202, $deployment['headers']['status-code']);
-
- $this->awaitDeploymentIsBuilt($function['body']['$id'], $deploymentId);
-
- $function = $this->client->call(Client::METHOD_PATCH, '/functions/' . $functionId . '/deployments/' . $deploymentId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ]);
-
- $this->assertEquals(200, $function['headers']['status-code']);
-
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- ], $this->getHeaders()), [
+ $execution = $this->createExecution($functionId, [
'body' => 'foobar',
- // Testing default value, should be 'async' => false
+ // Testing default value, should be 'async' => 'false'
]);
-
$output = json_decode($execution['body']['responseBody'], true);
$this->assertEquals(201, $execution['headers']['status-code']);
$this->assertEquals('completed', $execution['body']['status']);
@@ -794,67 +226,29 @@ class FunctionsCustomClientTest extends Scope
$this->assertEquals('foobar', $output['APPWRITE_FUNCTION_DATA']);
$this->assertEquals($this->getUser()['$id'], $output['APPWRITE_FUNCTION_USER_ID']);
$this->assertNotEmpty($output['APPWRITE_FUNCTION_JWT']);
- $this->assertEquals($projectId, $output['APPWRITE_FUNCTION_PROJECT_ID']);
+ $this->assertEquals($this->getProject()['$id'], $output['APPWRITE_FUNCTION_PROJECT_ID']);
// Client should never see logs and errors
$this->assertEmpty($execution['body']['logs']);
$this->assertEmpty($execution['body']['errors']);
- // Cleanup : Delete function
- $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], []);
-
- $this->assertEquals(204, $response['headers']['status-code']);
-
- return [];
+ $this->cleanupFunction($functionId);
}
- public function testNonOverrideOfHeaders(): array
+ public function testNonOverrideOfHeaders()
{
- /**
- * Test for SUCCESS
- */
- $projectId = $this->getProject()['$id'];
- $apikey = $this->getProject()['apiKey'];
-
- $function = $this->client->call(Client::METHOD_POST, '/functions', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ], [
+ $functionId = $this->setupFunction([
'functionId' => ID::unique(),
'name' => 'Test',
'execute' => [Role::any()->toString()],
'runtime' => 'node-18.0',
'entrypoint' => 'index.js'
]);
-
- $functionId = $function['body']['$id'] ?? '';
-
- $this->assertEquals(201, $function['headers']['status-code']);
-
- $folder = 'node';
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/$folder/code.tar.gz";
- $this->packageCode($folder);
-
- $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', [
- 'content-type' => 'multipart/form-data',
- 'x-appwrite-project' => $projectId,
- 'x-appwrite-key' => $apikey,
- ], [
+ $this->setupDeployment($functionId, [
'entrypoint' => 'index.js',
- 'code' => new CURLFile($code, 'application/x-gzip', \basename($code)), //different tarball names intentional
+ 'code' => $this->packageFunction('node'),
'activate' => true
]);
- $deploymentId = $deployment['body']['$id'] ?? '';
-
- $this->assertEquals(202, $deployment['headers']['status-code']);
-
- $this->awaitDeploymentIsBuilt($function['body']['$id'], $deploymentId);
-
$execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
@@ -871,16 +265,8 @@ class FunctionsCustomClientTest extends Scope
$this->assertNotEquals('OVERRIDDEN', $output['APPWRITE_FUNCTION_TRIGGER']);
$this->assertNotEquals('OVERRIDDEN', $output['APPWRITE_FUNCTION_USER_ID']);
- // Cleanup : Delete function
- $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], []);
- $this->assertEquals(204, $response['headers']['status-code']);
-
- return [];
+ $this->cleanupFunction($functionId);
}
public function testListTemplates()
@@ -888,7 +274,7 @@ class FunctionsCustomClientTest extends Scope
/**
* Test for SUCCESS
*/
- $expectedTemplates = array_slice(Config::getParam('function-templates', []), 0, 25);
+ // List all templates
$templates = $this->client->call(Client::METHOD_GET, '/functions/templates', array_merge([
'content-type' => 'application/json',
], $this->getHeaders()));
@@ -897,41 +283,35 @@ class FunctionsCustomClientTest extends Scope
$this->assertGreaterThan(0, $templates['body']['total']);
$this->assertIsArray($templates['body']['templates']);
- $this->assertArrayHasKey('runtimes', $templates['body']['templates'][0]);
- $this->assertArrayHasKey('useCases', $templates['body']['templates'][0]);
- for ($i = 0; $i < 25; $i++) {
- $this->assertEquals($expectedTemplates[$i]['name'], $templates['body']['templates'][$i]['name']);
- $this->assertEquals($expectedTemplates[$i]['id'], $templates['body']['templates'][$i]['id']);
- $this->assertEquals($expectedTemplates[$i]['icon'], $templates['body']['templates'][$i]['icon']);
- $this->assertEquals($expectedTemplates[$i]['tagline'], $templates['body']['templates'][$i]['tagline']);
- $this->assertEquals($expectedTemplates[$i]['useCases'], $templates['body']['templates'][$i]['useCases']);
- $this->assertEquals($expectedTemplates[$i]['vcsProvider'], $templates['body']['templates'][$i]['vcsProvider']);
- $this->assertEquals($expectedTemplates[$i]['runtimes'], $templates['body']['templates'][$i]['runtimes']);
- $this->assertEquals($expectedTemplates[$i]['variables'], $templates['body']['templates'][$i]['variables']);
- if (array_key_exists('scopes', $expectedTemplates[$i])) {
- $this->assertEquals($expectedTemplates[$i]['scopes'], $templates['body']['templates'][$i]['scopes']);
- }
+ foreach ($templates['body']['templates'] as $template) {
+ $this->assertArrayHasKey('name', $template);
+ $this->assertArrayHasKey('id', $template);
+ $this->assertArrayHasKey('icon', $template);
+ $this->assertArrayHasKey('tagline', $template);
+ $this->assertArrayHasKey('useCases', $template);
+ $this->assertArrayHasKey('vcsProvider', $template);
+ $this->assertArrayHasKey('runtimes', $template);
+ $this->assertArrayHasKey('variables', $template);
}
- $templates_offset = $this->client->call(Client::METHOD_GET, '/functions/templates', array_merge([
+ // List templates with pagination
+ $templatesOffset = $this->client->call(Client::METHOD_GET, '/functions/templates', array_merge([
'content-type' => 'application/json',
], $this->getHeaders()), [
'limit' => 1,
'offset' => 2
]);
+ $this->assertEquals(200, $templatesOffset['headers']['status-code']);
+ $this->assertEquals(1, $templatesOffset['body']['total']);
+ $this->assertEquals($templates['body']['templates'][2]['id'], $templatesOffset['body']['templates'][0]['id']);
- $this->assertEquals(200, $templates_offset['headers']['status-code']);
- $this->assertEquals(1, $templates_offset['body']['total']);
- // assert that offset works as expected
- $this->assertEquals($templates['body']['templates'][2]['id'], $templates_offset['body']['templates'][0]['id']);
-
+ // List templates with filters
$templates = $this->client->call(Client::METHOD_GET, '/functions/templates', array_merge([
'content-type' => 'application/json',
], $this->getHeaders()), [
'useCases' => ['starter', 'ai'],
'runtimes' => ['bun-1.0', 'dart-2.16']
]);
-
$this->assertEquals(200, $templates['headers']['status-code']);
$this->assertGreaterThanOrEqual(3, $templates['body']['total']);
$this->assertIsArray($templates['body']['templates']);
@@ -941,6 +321,7 @@ class FunctionsCustomClientTest extends Scope
$this->assertArrayHasKey('runtimes', $templates['body']['templates'][0]);
$this->assertContains('bun-1.0', array_column($templates['body']['templates'][0]['runtimes'], 'name'));
+ // List templates with pagination and filters
$templates = $this->client->call(Client::METHOD_GET, '/functions/templates', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
@@ -955,24 +336,26 @@ class FunctionsCustomClientTest extends Scope
$this->assertEquals(5, $templates['body']['total']);
$this->assertIsArray($templates['body']['templates']);
$this->assertArrayHasKey('runtimes', $templates['body']['templates'][0]);
+
foreach ($templates['body']['templates'] as $template) {
$this->assertContains($template['useCases'][0], ['databases']);
}
+
$this->assertContains('node-16.0', array_column($templates['body']['templates'][0]['runtimes'], 'name'));
/**
* Test for FAILURE
*/
+ // List templates with invalid limit
$templates = $this->client->call(Client::METHOD_GET, '/functions/templates', array_merge([
'content-type' => 'application/json',
], $this->getHeaders()), [
'limit' => 5001,
'offset' => 10,
]);
-
$this->assertEquals(400, $templates['headers']['status-code']);
- $this->assertEquals('Invalid `limit` param: Value must be a valid range between 1 and 5,000', $templates['body']['message']);
+ // List templates with invalid offset
$templates = $this->client->call(Client::METHOD_GET, '/functions/templates', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
@@ -980,9 +363,7 @@ class FunctionsCustomClientTest extends Scope
'limit' => 5,
'offset' => 5001,
]);
-
$this->assertEquals(400, $templates['headers']['status-code']);
- $this->assertEquals('Invalid `offset` param: Value must be a valid range between 0 and 5,000', $templates['body']['message']);
}
public function testGetTemplate()
@@ -990,10 +371,7 @@ class FunctionsCustomClientTest extends Scope
/**
* Test for SUCCESS
*/
- $template = $this->client->call(Client::METHOD_GET, '/functions/templates/query-neo4j-auradb', array_merge([
- 'content-type' => 'application/json',
- ], $this->getHeaders()), []);
-
+ $template = $this->getTemplate('query-neo4j-auradb');
$this->assertEquals(200, $template['headers']['status-code']);
$this->assertIsArray($template['body']);
$this->assertEquals('query-neo4j-auradb', $template['body']['id']);
@@ -1002,15 +380,13 @@ class FunctionsCustomClientTest extends Scope
$this->assertEquals('Graph database with focus on relations between data.', $template['body']['tagline']);
$this->assertEquals(['databases'], $template['body']['useCases']);
$this->assertEquals('github', $template['body']['vcsProvider']);
+ $this->assertIsArray($template['body']['runtimes']);
+ $this->assertIsArray($template['body']['scopes']);
/**
* Test for FAILURE
*/
- $template = $this->client->call(Client::METHOD_GET, '/functions/templates/invalid-template-id', array_merge([
- 'content-type' => 'application/json',
- ], $this->getHeaders()), []);
-
+ $template = $this->getTemplate('invalid-template-id');
$this->assertEquals(404, $template['headers']['status-code']);
- $this->assertEquals('Function Template with the requested ID could not be found.', $template['body']['message']);
}
}
diff --git a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
index 2958e6cb5f..9b9f03a100 100644
--- a/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
+++ b/tests/e2e/Services/Functions/FunctionsCustomServerTest.php
@@ -3,19 +3,17 @@
namespace Tests\E2E\Services\Functions;
use Appwrite\Functions\Specification;
-use Appwrite\Tests\Retry;
-use CURLFile;
-use PHPUnit\Framework\ExpectationFailedException;
use Tests\E2E\Client;
use Tests\E2E\Scopes\ProjectCustom;
use Tests\E2E\Scopes\Scope;
use Tests\E2E\Scopes\SideServer;
-use Utopia\App;
+use Utopia\CLI\Console;
use Utopia\Database\Document;
use Utopia\Database\Helpers\ID;
use Utopia\Database\Helpers\Role;
use Utopia\Database\Query;
use Utopia\Database\Validator\Datetime as DatetimeValidator;
+use Utopia\System\System;
class FunctionsCustomServerTest extends Scope
{
@@ -23,15 +21,12 @@ class FunctionsCustomServerTest extends Scope
use ProjectCustom;
use SideServer;
- public function testCreate(): array
+ public function testCreateFunction(): array
{
/**
* Test for SUCCESS
*/
- $response1 = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $function = $this->createFunction([
'functionId' => ID::unique(),
'name' => 'Test',
'runtime' => 'php-8.0',
@@ -40,48 +35,35 @@ class FunctionsCustomServerTest extends Scope
'buckets.*.create',
'buckets.*.delete',
],
- 'schedule' => '0 0 1 1 *',
'timeout' => 10,
]);
- $functionId = $response1['body']['$id'] ?? '';
+ $functionId = $functionId = $function['body']['$id'] ?? '';
- $this->assertEquals(201, $response1['headers']['status-code']);
- $this->assertNotEmpty($response1['body']['$id']);
- $this->assertEquals('Test', $response1['body']['name']);
- $this->assertEquals('php-8.0', $response1['body']['runtime']);
$dateValidator = new DatetimeValidator();
- $this->assertEquals(true, $dateValidator->isValid($response1['body']['$createdAt']));
- $this->assertEquals(true, $dateValidator->isValid($response1['body']['$updatedAt']));
- $this->assertEquals('', $response1['body']['deployment']);
+ $this->assertEquals(201, $function['headers']['status-code']);
+ $this->assertNotEmpty($function['body']['$id']);
+ $this->assertEquals('Test', $function['body']['name']);
+ $this->assertEquals('php-8.0', $function['body']['runtime']);
+ $this->assertEquals(true, $dateValidator->isValid($function['body']['$createdAt']));
+ $this->assertEquals(true, $dateValidator->isValid($function['body']['$updatedAt']));
+ $this->assertEquals('', $function['body']['deployment']);
$this->assertEquals([
'buckets.*.create',
'buckets.*.delete',
- ], $response1['body']['events']);
- $this->assertEquals('0 0 1 1 *', $response1['body']['schedule']);
- $this->assertEquals(10, $response1['body']['timeout']);
+ ], $function['body']['events']);
+ $this->assertEmpty($function['body']['schedule']);
+ $this->assertEquals(10, $function['body']['timeout']);
- /** Create Variables */
- $variable = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/variables', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $variable = $this->createVariable($functionId, [
'key' => 'funcKey1',
'value' => 'funcValue1',
]);
-
- $variable2 = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/variables', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $variable2 = $this->createVariable($functionId, [
'key' => 'funcKey2',
'value' => 'funcValue2',
]);
-
- $variable3 = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/variables', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $variable3 = $this->createVariable($functionId, [
'key' => 'funcKey3',
'value' => 'funcValue3',
]);
@@ -90,115 +72,90 @@ class FunctionsCustomServerTest extends Scope
$this->assertEquals(201, $variable2['headers']['status-code']);
$this->assertEquals(201, $variable3['headers']['status-code']);
- /**
- * Test for FAILURE
- */
-
return [
'functionId' => $functionId,
];
}
/**
- * @depends testCreate
+ * @depends testCreateFunction
*/
- public function testList(array $data): array
+ public function testListFunctions(array $data): array
{
/**
* Test for SUCCESS
*/
-
- /**
- * Test search queries
- */
- $response = $this->client->call(Client::METHOD_GET, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ // Test search id
+ $functions = $this->listFunctions([
'search' => $data['functionId']
]);
- $this->assertEquals($response['headers']['status-code'], 200);
- $this->assertCount(1, $response['body']['functions']);
- $this->assertEquals($response['body']['functions'][0]['name'], 'Test');
+ $this->assertEquals($functions['headers']['status-code'], 200);
+ $this->assertCount(1, $functions['body']['functions']);
+ $this->assertEquals($functions['body']['functions'][0]['name'], 'Test');
- $response = $this->client->call(Client::METHOD_GET, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ // Test pagination limit
+ $functions = $this->listFunctions([
'queries' => [
Query::limit(1)->toString(),
],
]);
- $this->assertEquals($response['headers']['status-code'], 200);
- $this->assertCount(1, $response['body']['functions']);
+ $this->assertEquals($functions['headers']['status-code'], 200);
+ $this->assertCount(1, $functions['body']['functions']);
- $response = $this->client->call(Client::METHOD_GET, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ // Test pagination offset
+ $functions = $this->listFunctions([
'queries' => [
Query::offset(1)->toString(),
],
]);
- $this->assertEquals($response['headers']['status-code'], 200);
- $this->assertCount(0, $response['body']['functions']);
+ $this->assertEquals($functions['headers']['status-code'], 200);
+ $this->assertCount(0, $functions['body']['functions']);
- $response = $this->client->call(Client::METHOD_GET, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ // Test filter enabled
+ $functions = $this->listFunctions([
'queries' => [
Query::equal('enabled', [true])->toString(),
],
]);
- $this->assertEquals($response['headers']['status-code'], 200);
- $this->assertCount(1, $response['body']['functions']);
+ $this->assertEquals($functions['headers']['status-code'], 200);
+ $this->assertCount(1, $functions['body']['functions']);
- $response = $this->client->call(Client::METHOD_GET, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ // Test filter disabled
+ $functions = $this->listFunctions([
'queries' => [
Query::equal('enabled', [false])->toString(),
],
]);
- $this->assertEquals($response['headers']['status-code'], 200);
- $this->assertCount(0, $response['body']['functions']);
+ $this->assertEquals($functions['headers']['status-code'], 200);
+ $this->assertCount(0, $functions['body']['functions']);
- $response = $this->client->call(Client::METHOD_GET, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ // Test search name
+ $functions = $this->listFunctions([
'search' => 'Test'
]);
- $this->assertEquals($response['headers']['status-code'], 200);
- $this->assertCount(1, $response['body']['functions']);
- $this->assertEquals($response['body']['functions'][0]['$id'], $data['functionId']);
+ $this->assertEquals($functions['headers']['status-code'], 200);
+ $this->assertCount(1, $functions['body']['functions']);
+ $this->assertEquals($functions['body']['functions'][0]['$id'], $data['functionId']);
- $response = $this->client->call(Client::METHOD_GET, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ // Test search runtime
+ $functions = $this->listFunctions([
'search' => 'php-8.0'
]);
- $this->assertEquals($response['headers']['status-code'], 200);
- $this->assertCount(1, $response['body']['functions']);
- $this->assertEquals($response['body']['functions'][0]['$id'], $data['functionId']);
+ $this->assertEquals($functions['headers']['status-code'], 200);
+ $this->assertCount(1, $functions['body']['functions']);
+ $this->assertEquals($functions['body']['functions'][0]['$id'], $data['functionId']);
/**
* Test pagination
*/
- $response = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $this->setupFunction([
'functionId' => ID::unique(),
'name' => 'Test 2',
'runtime' => 'php-8.0',
@@ -207,44 +164,10 @@ class FunctionsCustomServerTest extends Scope
'buckets.*.create',
'buckets.*.delete',
],
- 'schedule' => '0 0 1 1 *',
'timeout' => 10,
]);
- $this->assertNotEmpty($response['body']['$id']);
- /** Create Variables */
- $variable = $this->client->call(Client::METHOD_POST, '/functions/' . $response['body']['$id'] . '/variables', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'key' => 'funcKey1',
- 'value' => 'funcValue1',
- ]);
-
- $variable2 = $this->client->call(Client::METHOD_POST, '/functions/' . $response['body']['$id'] . '/variables', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'key' => 'funcKey2',
- 'value' => 'funcValue2',
- ]);
-
- $variable3 = $this->client->call(Client::METHOD_POST, '/functions/' . $response['body']['$id'] . '/variables', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'key' => 'funcKey3',
- 'value' => 'funcValue3',
- ]);
-
- $this->assertEquals(201, $variable['headers']['status-code']);
- $this->assertEquals(201, $variable2['headers']['status-code']);
- $this->assertEquals(201, $variable3['headers']['status-code']);
-
- $functions = $this->client->call(Client::METHOD_GET, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()));
+ $functions = $this->listFunctions();
$this->assertEquals($functions['headers']['status-code'], 200);
$this->assertEquals($functions['body']['total'], 2);
@@ -253,61 +176,48 @@ class FunctionsCustomServerTest extends Scope
$this->assertEquals($functions['body']['functions'][0]['name'], 'Test');
$this->assertEquals($functions['body']['functions'][1]['name'], 'Test 2');
- $response = $this->client->call(Client::METHOD_GET, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $functions1 = $this->listFunctions([
'queries' => [
Query::cursorAfter(new Document(['$id' => $functions['body']['functions'][0]['$id']]))->toString(),
],
]);
- $this->assertEquals($response['headers']['status-code'], 200);
- $this->assertCount(1, $response['body']['functions']);
- $this->assertEquals($response['body']['functions'][0]['name'], 'Test 2');
+ $this->assertEquals($functions1['headers']['status-code'], 200);
+ $this->assertCount(1, $functions1['body']['functions']);
+ $this->assertEquals($functions1['body']['functions'][0]['name'], 'Test 2');
- $response = $this->client->call(Client::METHOD_GET, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $functions2 = $this->listFunctions([
'queries' => [
Query::cursorBefore(new Document(['$id' => $functions['body']['functions'][1]['$id']]))->toString(),
],
]);
- $this->assertEquals($response['headers']['status-code'], 200);
- $this->assertCount(1, $response['body']['functions']);
- $this->assertEquals($response['body']['functions'][0]['name'], 'Test');
+ $this->assertEquals($functions2['headers']['status-code'], 200);
+ $this->assertCount(1, $functions2['body']['functions']);
+ $this->assertEquals($functions2['body']['functions'][0]['name'], 'Test');
/**
* Test for FAILURE
*/
- $response = $this->client->call(Client::METHOD_GET, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $functions = $this->listFunctions([
'queries' => [
Query::cursorAfter(new Document(['$id' => 'unknown']))->toString(),
],
]);
-
- $this->assertEquals($response['headers']['status-code'], 400);
+ $this->assertEquals($functions['headers']['status-code'], 400);
return $data;
}
/**
- * @depends testList
+ * @depends testListFunctions
*/
- public function testGet(array $data): array
+ public function testGetFunction(array $data): array
{
/**
* Test for SUCCESS
*/
- $function = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'], array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()));
+ $function = $this->getFunction($data['functionId']);
$this->assertEquals($function['headers']['status-code'], 200);
$this->assertEquals($function['body']['name'], 'Test');
@@ -315,10 +225,7 @@ class FunctionsCustomServerTest extends Scope
/**
* Test for FAILURE
*/
- $function = $this->client->call(Client::METHOD_GET, '/functions/x', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()));
+ $function = $this->getFunction('x');
$this->assertEquals($function['headers']['status-code'], 404);
@@ -326,14 +233,14 @@ class FunctionsCustomServerTest extends Scope
}
/**
- * @depends testGet
+ * @depends testGetFunction
*/
- public function testUpdate($data): array
+ public function testUpdateFunction($data): array
{
/**
* Test for SUCCESS
*/
- $response1 = $this->client->call(Client::METHOD_PUT, '/functions/' . $data['functionId'], array_merge([
+ $function = $this->client->call(Client::METHOD_PUT, '/functions/' . $data['functionId'], array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()), [
@@ -348,51 +255,35 @@ class FunctionsCustomServerTest extends Scope
'entrypoint' => 'index.php',
]);
- $this->assertEquals(200, $response1['headers']['status-code']);
- $this->assertNotEmpty($response1['body']['$id']);
- $this->assertEquals('Test1', $response1['body']['name']);
$dateValidator = new DatetimeValidator();
- $this->assertEquals(true, $dateValidator->isValid($response1['body']['$createdAt']));
- $this->assertEquals(true, $dateValidator->isValid($response1['body']['$updatedAt']));
- $this->assertEquals('', $response1['body']['deployment']);
+
+ $this->assertEquals(200, $function['headers']['status-code']);
+ $this->assertNotEmpty($function['body']['$id']);
+ $this->assertEquals('Test1', $function['body']['name']);
+ $this->assertEquals(true, $dateValidator->isValid($function['body']['$createdAt']));
+ $this->assertEquals(true, $dateValidator->isValid($function['body']['$updatedAt']));
+ $this->assertEquals('', $function['body']['deployment']);
$this->assertEquals([
'users.*.update.name',
'users.*.update.email',
- ], $response1['body']['events']);
- $this->assertEquals('0 0 1 1 *', $response1['body']['schedule']);
- $this->assertEquals(15, $response1['body']['timeout']);
+ ], $function['body']['events']);
+ $this->assertEquals('0 0 1 1 *', $function['body']['schedule']);
+ $this->assertEquals(15, $function['body']['timeout']);
- /**
- * Create global variable to test in execution later
- */
- $headers = [
- 'content-type' => 'application/json',
- 'origin' => 'http://localhost',
- 'cookie' => 'a_session_console=' . $this->getRoot()['session'],
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-mode' => 'admin',
- ];
-
- $variable = $this->client->call(Client::METHOD_POST, '/project/variables', $headers, [
+ // Create a variable for later tests
+ $variable = $this->createVariable($data['functionId'], [
'key' => 'GLOBAL_VARIABLE',
'value' => 'Global Variable Value',
]);
$this->assertEquals(201, $variable['headers']['status-code']);
- /**
- * Test for FAILURE
- */
-
return $data;
}
public function testCreateDeploymentFromCLI()
{
- $function = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $functionId = $this->setupFunction([
'functionId' => ID::unique(),
'name' => 'Test',
'execute' => [Role::user($this->getUser()['$id'])->toString()],
@@ -402,150 +293,98 @@ class FunctionsCustomServerTest extends Scope
'users.*.create',
'users.*.delete',
],
- 'schedule' => '0 0 1 1 *',
+ 'schedule' => '0 0 1 1 *', // Once a year
'timeout' => 10,
]);
- $this->assertEquals(201, $function['headers']['status-code']);
-
- $functionId = $function['body']['$id'];
-
- $folder = 'php';
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/$folder/code.tar.gz";
- $this->packageCode($folder);
-
- $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $function['body']['$id'] . '/deployments', [
+ $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', [
'content-type' => 'multipart/form-data',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey'],
'x-sdk-language' => 'cli',
], [
'entrypoint' => 'index.php',
- 'code' => new CURLFile($code, 'application/x-gzip', \basename($code)),
+ 'code' => $this->packageFunction('php'),
'activate' => true
]);
- $deploymentId = $deployment['body']['$id'] ?? '';
-
$this->assertEquals(202, $deployment['headers']['status-code']);
- $this->awaitDeploymentIsBuilt($function['body']['$id'], $deploymentId);
+ $deploymentId = $deployment['body']['$id'] ?? '';
- $functionDetails = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/deployments/' . $deploymentId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], []);
+ $this->assertEventually(function () use ($functionId, $deploymentId) {
+ $deployment = $this->getDeployment($functionId, $deploymentId);
- $this->assertEquals(200, $functionDetails['headers']['status-code']);
- $this->assertEquals('cli', $functionDetails['body']['type']);
+ $this->assertEquals(200, $deployment['headers']['status-code']);
+ $this->assertEquals('ready', $deployment['body']['status']);
+ $this->assertEquals('cli', $deployment['body']['type']);
+ }, 500000, 1000);
}
- public function testCreateDeploymentFromTemplate()
+ public function testCreateFunctionAndDeploymentFromTemplate()
{
- $runtimeName = 'php-8.0';
- // Fetch starter template (used to create function later)
- $template = $this->client->call(Client::METHOD_GET, '/functions/templates/starter', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()));
+ $starterTemplate = $this->getTemplate('starter');
+ $this->assertEquals(200, $starterTemplate['headers']['status-code']);
- $this->assertEquals(200, $template['headers']['status-code']);
+ $phpRuntime = array_values(array_filter($starterTemplate['body']['runtimes'], function ($runtime) {
+ return $runtime['name'] === 'php-8.0';
+ }))[0];
- $entrypoint = null;
- $rootDirectory = null;
- $commands = null;
- foreach ($template['body']['runtimes'] as $runtime) {
- if ($runtime["name"] !== $runtimeName) {
- continue;
- }
+ // If this fails, the template has variables, and this test needs to be updated
+ $this->assertEmpty($starterTemplate['body']['variables']);
- $entrypoint = $runtime["entrypoint"];
- $rootDirectory = $runtime["providerRootDirectory"];
- $commands = $runtime["commands"];
- break;
- }
-
- $this->assertNotNull($entrypoint);
-
- /**
- * If below test ever starts failing, it means temaplate used in
- * this test now has some variables. This test currently doesnt test variables.
- * Remove bellow assertion and update test to crete variable,
- * and ensure variable works as expected in execution.
- */
- $this->assertEmpty($template['body']['variables']);
-
- // Create function using settings from template.
- // Deployment is automatically created from template inside endpoint
- $function = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], $this->getHeaders()), [
- 'functionId' => ID::unique(),
- 'name' => $template['body']['name'],
- 'runtime' => $runtimeName,
- 'execute' => $template['body']['permissions'],
- 'entrypoint' => $entrypoint,
- 'events' => $template['body']['events'],
- 'schedule' => $template['body']['cron'],
- 'timeout' => $template['body']['timeout'],
- 'commands' => $commands,
- 'scopes' => $template['body']['scopes'],
- 'templateRepository' => $template['body']['providerRepositoryId'],
- 'templateOwner' => $template['body']['providerOwner'],
- 'templateRootDirectory' => $rootDirectory,
- 'templateVersion' => $template['body']['providerVersion'],
- ]);
+ $function = $this->createFunction(
+ [
+ 'functionId' => ID::unique(),
+ 'name' => $starterTemplate['body']['name'],
+ 'runtime' => 'php-8.0',
+ 'execute' => $starterTemplate['body']['permissions'],
+ 'entrypoint' => $phpRuntime['entrypoint'],
+ 'events' => $starterTemplate['body']['events'],
+ 'schedule' => $starterTemplate['body']['cron'],
+ 'timeout' => $starterTemplate['body']['timeout'],
+ 'commands' => $phpRuntime['commands'],
+ 'scopes' => $starterTemplate['body']['scopes'],
+ 'templateRepository' => $starterTemplate['body']['providerRepositoryId'],
+ 'templateOwner' => $starterTemplate['body']['providerOwner'],
+ 'templateRootDirectory' => $phpRuntime['providerRootDirectory'],
+ 'templateVersion' => $starterTemplate['body']['providerVersion'],
+ ]
+ );
$this->assertEquals(201, $function['headers']['status-code']);
$this->assertNotEmpty($function['body']['$id']);
- $functionId = $function['body']['$id'];
+ $functionId = $functionId = $function['body']['$id'] ?? '';
- // List deployments so we can await deployment build
- $deployments = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/deployments', [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], []);
+ $deployments = $this->listDeployments($functionId);
$this->assertEquals(200, $deployments['headers']['status-code']);
$this->assertEquals(1, $deployments['body']['total']);
- $this->assertNotEmpty($deployments['body']['deployments'][0]['$id']);
- $this->assertEquals(0, $deployments['body']['deployments'][0]['size']);
- $deploymentId = $deployments['body']['deployments'][0]['$id'];
+ $lastDeployment = $deployments['body']['deployments'][0];
- // Wait for deployment build to finish
- // Deployment is automatically activated
- $this->awaitDeploymentIsBuilt($function['body']['$id'], $deploymentId);
+ $this->assertNotEmpty($lastDeployment['$id']);
+ $this->assertEquals(0, $lastDeployment['size']);
- $deployments = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/deployments/' . $deploymentId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], []);
- $this->assertGreaterThan(0, $deployments['body']['size']);
+ $deploymentId = $lastDeployment['$id'];
- $function = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId, array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], $this->getHeaders()), []);
+ $this->assertEventually(function () use ($functionId, $deploymentId) {
+ $deployment = $this->getDeployment($functionId, $deploymentId);
+
+ $this->assertEquals(200, $deployment['headers']['status-code']);
+ $this->assertEquals('ready', $deployment['body']['status']);
+ }, 500000, 1000);
+
+ $function = $this->getFunction($functionId);
$this->assertEquals(200, $function['headers']['status-code']);
$this->assertEquals($deploymentId, $function['body']['deployment']);
- // Execute function to ensure starter code is used
- // Also tests if dynamic keys works as expected
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'path' => '/ping'
+ // Test starter code is used and that dynamic keys work
+ $execution = $this->createExecution($functionId, [
+ 'path' => '/ping',
]);
$this->assertEquals(201, $execution['headers']['status-code']);
@@ -554,7 +393,7 @@ class FunctionsCustomServerTest extends Scope
$this->assertEquals("Pong", $execution['body']['responseBody']);
$this->assertEmpty($execution['body']['errors']);
- // Get users to ensure execution logged correct total users
+ // Test execution logged correct total users
$users = $this->client->call(Client::METHOD_GET, '/users', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
@@ -564,15 +403,12 @@ class FunctionsCustomServerTest extends Scope
$this->assertEquals(200, $users['headers']['status-code']);
$this->assertIsInt($users['body']['total']);
- $totalusers = $users['body']['total'];
+ $totalUsers = $users['body']['total'];
- $this->assertStringContainsString("Total users: " . $totalusers, $execution['body']['logs']);
+ $this->assertStringContainsString("Total users: " . $totalUsers, $execution['body']['logs']);
// Execute function again but async
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $execution = $this->createExecution($functionId, [
'path' => '/ping',
'async' => true
]);
@@ -580,113 +416,93 @@ class FunctionsCustomServerTest extends Scope
$this->assertEquals(202, $execution['headers']['status-code']);
$this->assertNotEmpty($execution['body']['$id']);
$this->assertEquals('waiting', $execution['body']['status']);
- $executionId = $execution['body']['$id'];
- // Wait for async execuntion to finish
- sleep(5);
+ $executionId = $execution['body']['$id'] ?? '';
- // Ensure execution was successful
- $execution = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions/' . $executionId, array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), []);
+ $this->assertEventually(function () use ($functionId, $executionId, $totalUsers) {
+ $execution = $this->getExecution($functionId, $executionId);
- $this->assertEquals(200, $execution['headers']['status-code']);
- $this->assertEquals("completed", $execution['body']['status']);
- $this->assertEquals(200, $execution['body']['responseStatusCode']);
- $this->assertEmpty($execution['body']['responseBody']);
- $this->assertEmpty($execution['body']['errors']);
- $this->assertStringContainsString("Total users: " . $totalusers, $execution['body']['logs']);
+ $this->assertEquals(200, $execution['headers']['status-code']);
+ $this->assertEquals(200, $execution['body']['responseStatusCode']);
+ $this->assertEquals('completed', $execution['body']['status']);
+ $this->assertEmpty($execution['body']['responseBody']);
+ $this->assertEmpty($execution['body']['errors']);
+ $this->assertStringContainsString("Total users: " . $totalUsers, $execution['body']['logs']);
+ }, 10000, 500);
- // Cleanup : Delete function
- $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], []);
-
- $this->assertEquals(204, $response['headers']['status-code']);
+ $function = $this->deleteFunction($functionId);
}
/**
- * @depends testUpdate
+ * @depends testUpdateFunction
*/
public function testCreateDeployment($data): array
{
/**
* Test for SUCCESS
*/
- $folder = 'php';
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/$folder/code.tar.gz";
- $this->packageCode($folder);
+ $functionId = $data['functionId'];
- $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $data['functionId'] . '/deployments', array_merge([
- 'content-type' => 'multipart/form-data',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'code' => new CURLFile($code, 'application/x-gzip', \basename($code)),
+ $deployment = $this->createDeployment($functionId, [
+ 'code' => $this->packageFunction('php'),
'activate' => true
]);
- $deploymentId = $deployment['body']['$id'] ?? '';
-
$this->assertEquals(202, $deployment['headers']['status-code']);
$this->assertNotEmpty($deployment['body']['$id']);
$this->assertEquals(true, (new DatetimeValidator())->isValid($deployment['body']['$createdAt']));
$this->assertEquals('index.php', $deployment['body']['entrypoint']);
- $this->awaitDeploymentIsBuilt($data['functionId'], $deploymentId);
+ $deploymentIdActive = $deployment['body']['$id'] ?? '';
- $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $data['functionId'] . '/deployments', array_merge([
- 'content-type' => 'multipart/form-data',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'code' => new CURLFile($code, 'application/x-gzip', \basename($code)),
+ $this->assertEventually(function () use ($functionId, $deploymentIdActive) {
+ $deployment = $this->getDeployment($functionId, $deploymentIdActive);
+
+ $this->assertEquals('ready', $deployment['body']['status']);
+ }, 50000, 500);
+
+ $deployment = $this->createDeployment($functionId, [
+ 'code' => $this->packageFunction('php'),
'activate' => 'false'
]);
$this->assertEquals(202, $deployment['headers']['status-code']);
$this->assertNotEmpty($deployment['body']['$id']);
- $deploymentIdInactive = $deployment['body']['$id'];
+ $deploymentIdInactive = $deployment['body']['$id'] ?? '';
- $this->awaitDeploymentIsBuilt($data['functionId'], $deploymentIdInactive);
+ $this->assertEventually(function () use ($functionId, $deploymentIdInactive) {
+ $deployment = $this->getDeployment($functionId, $deploymentIdInactive);
- $function = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'], array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()));
+ $this->assertEquals('ready', $deployment['body']['status']);
+ }, 50000, 500);
+
+ $function = $this->getFunction($functionId);
$this->assertEquals(200, $function['headers']['status-code']);
- $this->assertEquals($deploymentId, $function['body']['deployment']);
+ $this->assertEquals($deploymentIdActive, $function['body']['deployment']);
$this->assertNotEquals($deploymentIdInactive, $function['body']['deployment']);
- $deployment = $this->client->call(Client::METHOD_DELETE, '/functions/' . $data['functionId'] . '/deployments/' . $deploymentIdInactive, array_merge([
+ $deployment = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId . '/deployments/' . $deploymentIdInactive, array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()), []);
$this->assertEquals(204, $deployment['headers']['status-code']);
- return array_merge($data, ['deploymentId' => $deploymentId]);
+ return array_merge($data, ['deploymentId' => $deploymentIdActive]);
}
/**
- * @depends testUpdate
+ * @depends testUpdateFunction
*/
public function testCancelDeploymentBuild($data): void
{
- // Create a new deployment to cancel
- $folder = 'php';
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/$folder/code.tar.gz";
- $this->packageCode($folder);
+ $functionId = $data['functionId'];
- $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $data['functionId'] . '/deployments', array_merge([
- 'content-type' => 'multipart/form-data',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'code' => new CURLFile($code, 'application/x-gzip', \basename($code)),
- 'activate' => true
+ $deployment = $this->createDeployment($functionId, [
+ 'code' => $this->packageFunction('php'),
+ 'activate' => 'false'
]);
$deploymentId = $deployment['body']['$id'] ?? '';
@@ -696,33 +512,18 @@ class FunctionsCustomServerTest extends Scope
$this->assertEquals(true, (new DatetimeValidator())->isValid($deployment['body']['$createdAt']));
$this->assertEquals('index.php', $deployment['body']['entrypoint']);
- // Poll until deployment is in progress
- while (true) {
- $deployment = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/deployments/' . $deploymentId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ]);
+ $this->assertEventually(function () use ($functionId, $deploymentId) {
+ $deployment = $this->getDeployment($functionId, $deploymentId);
- if (
- $deployment['headers']['status-code'] >= 400
- || $deployment['body']['status'] === 'building'
- ) {
- break;
- }
+ $this->assertEquals(200, $deployment['headers']['status-code']);
+ $this->assertEquals('building', $deployment['body']['status']);
+ }, 100000, 250);
- \sleep(1);
- }
-
- $this->assertEquals(200, $deployment['headers']['status-code']);
- $this->assertEquals('building', $deployment['body']['status']);
-
- // Cancel the deployment build
- $cancel = $this->client->call(Client::METHOD_PATCH, '/functions/' . $data['functionId'] . '/deployments/' . $deploymentId . '/build', [
+ // Cancel the deployment
+ $cancel = $this->client->call(Client::METHOD_PATCH, '/functions/' . $functionId . '/deployments/' . $deploymentId . '/build', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ]);
+ ], $this->getHeaders()));
$this->assertEquals(200, $cancel['headers']['status-code']);
$this->assertEquals('canceled', $cancel['body']['status']);
@@ -733,28 +534,26 @@ class FunctionsCustomServerTest extends Scope
* After build finished, it should still be canceled, not ready.
*/
\sleep(30);
- $deployment = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/deployments/' . $deploymentId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ]);
+
+ $deployment = $this->getDeployment($functionId, $deploymentId);
$this->assertEquals(200, $deployment['headers']['status-code']);
$this->assertEquals('canceled', $deployment['body']['status']);
}
/**
- * @depends testUpdate
+ * @depends testUpdateFunction
*/
public function testCreateDeploymentLarge($data): array
{
/**
* Test for Large Code File SUCCESS
*/
+ $functionId = $data['functionId'];
$folder = 'php-large';
$code = realpath(__DIR__ . '/../../../resources/functions') . "/$folder/code.tar.gz";
- $this->packageCode($folder);
+ Console::execute('cd ' . realpath(__DIR__ . "/../../../resources/functions") . "/$folder && tar --exclude code.tar.gz -czf code.tar.gz .", '', $this->stdout, $this->stderr);
$chunkSize = 5 * 1024 * 1024;
$handle = @fopen($code, "rb");
@@ -772,7 +571,7 @@ class FunctionsCustomServerTest extends Scope
if (!empty($id)) {
$headers['x-appwrite-id'] = $id;
}
- $largeTag = $this->client->call(Client::METHOD_POST, '/functions/' . $data['functionId'] . '/deployments', array_merge($headers, $this->getHeaders()), [
+ $largeTag = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', array_merge($headers, $this->getHeaders()), [
'entrypoint' => 'index.php',
'code' => $curlFile,
'activate' => true,
@@ -791,19 +590,16 @@ class FunctionsCustomServerTest extends Scope
$this->assertLessThan(1024 * 1024 * 10, $largeTag['body']['size']); // ~7MB video file
$deploymentSize = $largeTag['body']['size'];
-
$deploymentId = $largeTag['body']['$id'];
- $this->awaitDeploymentIsBuilt($data['functionId'], $deploymentId, true);
+ $this->assertEventually(function () use ($functionId, $deploymentId, $deploymentSize) {
+ $deployment = $this->getDeployment($functionId, $deploymentId);
- $response = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/deployments/' . $deploymentId, array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), []);
-
- $this->assertEquals(200, $response['headers']['status-code']);
- $this->assertEquals($deploymentSize, $response['body']['size']);
- $this->assertGreaterThan(1024 * 1024 * 10, $response['body']['buildSize']); // ~7MB video file + 10MB sample file
+ $this->assertEquals(200, $deployment['headers']['status-code']);
+ $this->assertEquals('ready', $deployment['body']['status']);
+ $this->assertEquals($deploymentSize, $deployment['body']['size']);
+ $this->assertGreaterThan(1024 * 1024 * 10, $deployment['body']['buildSize']); // ~7MB video file + 10MB sample file
+ }, 500000, 1000);
return $data;
}
@@ -816,6 +612,8 @@ class FunctionsCustomServerTest extends Scope
/**
* Test for SUCCESS
*/
+ $dateValidator = new DatetimeValidator();
+
$response = $this->client->call(Client::METHOD_PATCH, '/functions/' . $data['functionId'] . '/deployments/' . $data['deploymentId'], array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
@@ -823,15 +621,10 @@ class FunctionsCustomServerTest extends Scope
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertNotEmpty($response['body']['$id']);
- $dateValidator = new DatetimeValidator();
$this->assertEquals(true, $dateValidator->isValid($response['body']['$createdAt']));
$this->assertEquals(true, $dateValidator->isValid($response['body']['$updatedAt']));
$this->assertEquals($data['deploymentId'], $response['body']['deployment']);
- /**
- * Test for FAILURE
- */
-
return $data;
}
@@ -843,127 +636,64 @@ class FunctionsCustomServerTest extends Scope
/**
* Test for SUCCESS
*/
- $function = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/deployments', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()));
+ $functionId = $data['functionId'];
+ $deployments = $this->listDeployments($functionId);
- $this->assertEquals($function['headers']['status-code'], 200);
- $this->assertEquals($function['body']['total'], 3);
- $this->assertIsArray($function['body']['deployments']);
- $this->assertCount(3, $function['body']['deployments']);
- $this->assertArrayHasKey('size', $function['body']['deployments'][0]);
- $this->assertArrayHasKey('buildSize', $function['body']['deployments'][0]);
+ $this->assertEquals($deployments['headers']['status-code'], 200);
+ $this->assertEquals($deployments['body']['total'], 3);
+ $this->assertIsArray($deployments['body']['deployments']);
+ $this->assertCount(3, $deployments['body']['deployments']);
+ $this->assertArrayHasKey('size', $deployments['body']['deployments'][0]);
+ $this->assertArrayHasKey('buildSize', $deployments['body']['deployments'][0]);
- /**
- * Test search queries
- */
- $function = $this->client->call(
- Client::METHOD_GET,
- '/functions/' . $data['functionId'] . '/deployments',
- array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders(), [
- 'search' => $data['functionId']
- ])
- );
-
- $this->assertEquals($function['headers']['status-code'], 200);
- $this->assertEquals(3, $function['body']['total']);
- $this->assertIsArray($function['body']['deployments']);
- $this->assertCount(3, $function['body']['deployments']);
- $this->assertEquals($function['body']['deployments'][0]['$id'], $data['deploymentId']);
-
- $function = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/deployments', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $deployments = $this->listDeployments($functionId, [
'queries' => [
Query::limit(1)->toString(),
],
]);
- $this->assertEquals($function['headers']['status-code'], 200);
- $this->assertCount(1, $function['body']['deployments']);
+ $this->assertEquals($deployments['headers']['status-code'], 200);
+ $this->assertCount(1, $deployments['body']['deployments']);
- $function = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/deployments', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $deployments = $this->listDeployments($functionId, [
'queries' => [
Query::offset(1)->toString(),
],
]);
- $this->assertEquals($function['headers']['status-code'], 200);
- $this->assertCount(2, $function['body']['deployments']);
+ $this->assertEquals($deployments['headers']['status-code'], 200);
+ $this->assertCount(2, $deployments['body']['deployments']);
- $function = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/deployments', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $deployments = $this->listDeployments($functionId, [
'queries' => [
Query::equal('entrypoint', ['index.php'])->toString(),
],
]);
- $this->assertEquals($function['headers']['status-code'], 200);
- $this->assertCount(3, $function['body']['deployments']);
+ $this->assertEquals($deployments['headers']['status-code'], 200);
+ $this->assertCount(3, $deployments['body']['deployments']);
- $function = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/deployments', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $deployments = $this->listDeployments($functionId, [
'queries' => [
Query::equal('entrypoint', ['index.js'])->toString(),
],
]);
- $this->assertEquals($function['headers']['status-code'], 200);
- $this->assertCount(0, $function['body']['deployments']);
+ $this->assertEquals($deployments['headers']['status-code'], 200);
+ $this->assertCount(0, $deployments['body']['deployments']);
- $function = $this->client->call(
- Client::METHOD_GET,
- '/functions/' . $data['functionId'] . '/deployments',
- array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders(), [
- 'search' => 'Test'
- ])
- );
+ $deployments = $this->listDeployments($functionId, [
+ 'search' => 'php-8.0'
+ ]);
- $this->assertEquals($function['headers']['status-code'], 200);
- $this->assertEquals(3, $function['body']['total']);
- $this->assertIsArray($function['body']['deployments']);
- $this->assertCount(3, $function['body']['deployments']);
- $this->assertEquals($function['body']['deployments'][0]['$id'], $data['deploymentId']);
+ $this->assertEquals($deployments['headers']['status-code'], 200);
+ $this->assertEquals(3, $deployments['body']['total']);
+ $this->assertIsArray($deployments['body']['deployments']);
+ $this->assertCount(3, $deployments['body']['deployments']);
+ $this->assertEquals($deployments['body']['deployments'][0]['$id'], $data['deploymentId']);
- $function = $this->client->call(
- Client::METHOD_GET,
- '/functions/' . $data['functionId'] . '/deployments',
- array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders(), [
- 'search' => 'php-8.0'
- ])
- );
-
- $this->assertEquals($function['headers']['status-code'], 200);
- $this->assertEquals(3, $function['body']['total']);
- $this->assertIsArray($function['body']['deployments']);
- $this->assertCount(3, $function['body']['deployments']);
- $this->assertEquals($function['body']['deployments'][0]['$id'], $data['deploymentId']);
-
- $function = $this->client->call(
- Client::METHOD_GET,
- '/functions/' . $data['functionId'] . '/deployments',
- array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()),
+ $deployments = $this->listDeployments(
+ $functionId,
[
'queries' => [
Query::equal('type', ['manual'])->toString(),
@@ -971,16 +701,11 @@ class FunctionsCustomServerTest extends Scope
]
);
- $this->assertEquals($function['headers']['status-code'], 200);
- $this->assertEquals(3, $function['body']['total']);
+ $this->assertEquals($deployments['headers']['status-code'], 200);
+ $this->assertEquals(3, $deployments['body']['total']);
- $function = $this->client->call(
- Client::METHOD_GET,
- '/functions/' . $data['functionId'] . '/deployments',
- array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()),
+ $deployments = $this->listDeployments(
+ $functionId,
[
'queries' => [
Query::equal('type', ['vcs'])->toString(),
@@ -988,16 +713,11 @@ class FunctionsCustomServerTest extends Scope
]
);
- $this->assertEquals($function['headers']['status-code'], 200);
- $this->assertEquals(0, $function['body']['total']);
+ $this->assertEquals($deployments['headers']['status-code'], 200);
+ $this->assertEquals(0, $deployments['body']['total']);
- $function = $this->client->call(
- Client::METHOD_GET,
- '/functions/' . $data['functionId'] . '/deployments',
- array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()),
+ $deployments = $this->listDeployments(
+ $functionId,
[
'queries' => [
Query::equal('type', ['invalid-string'])->toString(),
@@ -1005,16 +725,11 @@ class FunctionsCustomServerTest extends Scope
]
);
- $this->assertEquals($function['headers']['status-code'], 200);
- $this->assertEquals(0, $function['body']['total']);
+ $this->assertEquals($deployments['headers']['status-code'], 200);
+ $this->assertEquals(0, $deployments['body']['total']);
- $function = $this->client->call(
- Client::METHOD_GET,
- '/functions/' . $data['functionId'] . '/deployments',
- array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()),
+ $deployments = $this->listDeployments(
+ $functionId,
[
'queries' => [
Query::greaterThan('size', 10000)->toString(),
@@ -1022,16 +737,11 @@ class FunctionsCustomServerTest extends Scope
]
);
- $this->assertEquals($function['headers']['status-code'], 200);
- $this->assertEquals(1, $function['body']['total']);
+ $this->assertEquals($deployments['headers']['status-code'], 200);
+ $this->assertEquals(1, $deployments['body']['total']);
- $function = $this->client->call(
- Client::METHOD_GET,
- '/functions/' . $data['functionId'] . '/deployments',
- array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()),
+ $deployments = $this->listDeployments(
+ $functionId,
[
'queries' => [
Query::greaterThan('size', 0)->toString(),
@@ -1039,57 +749,41 @@ class FunctionsCustomServerTest extends Scope
]
);
- $this->assertEquals($function['headers']['status-code'], 200);
- $this->assertEquals(3, $function['body']['total']);
+ $this->assertEquals($deployments['headers']['status-code'], 200);
+ $this->assertEquals(3, $deployments['body']['total']);
- $function = $this->client->call(
- Client::METHOD_GET,
- '/functions/' . $data['functionId'] . '/deployments',
- array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()),
+ $deployments = $this->listDeployments(
+ $functionId,
[
'queries' => [
Query::greaterThan('size', -100)->toString(),
],
]
);
-
- $this->assertEquals($function['headers']['status-code'], 200);
- $this->assertEquals(3, $function['body']['total']);
+ $this->assertEquals($deployments['headers']['status-code'], 200);
+ $this->assertEquals(3, $deployments['body']['total']);
/**
* Ensure size output and size filters work exactly.
* Prevents buildSize being counted towards deployemtn size
*/
- $response = $this->client->call(
- Client::METHOD_GET,
- '/functions/' . $data['functionId'] . '/deployments',
- array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()),
+ $deployments = $this->listDeployments(
+ $functionId,
[
Query::limit(1)->toString(),
]
);
- $this->assertEquals(200, $response['headers']['status-code']);
- $this->assertGreaterThanOrEqual(1, $response['body']['total']);
- $this->assertNotEmpty($response['body']['deployments'][0]['$id']);
- $this->assertNotEmpty($response['body']['deployments'][0]['size']);
+ $this->assertEquals(200, $deployments['headers']['status-code']);
+ $this->assertGreaterThanOrEqual(1, $deployments['body']['total']);
+ $this->assertNotEmpty($deployments['body']['deployments'][0]['$id']);
+ $this->assertNotEmpty($deployments['body']['deployments'][0]['size']);
- $deploymentId = $function['body']['deployments'][0]['$id'];
- $deploymentSize = $function['body']['deployments'][0]['size'];
+ $deploymentId = $deployments['body']['deployments'][0]['$id'];
+ $deploymentSize = $deployments['body']['deployments'][0]['size'];
- $response = $this->client->call(
- Client::METHOD_GET,
- '/functions/' . $data['functionId'] . '/deployments',
- array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()),
+ $deployments = $this->listDeployments(
+ $functionId,
[
'queries' => [
Query::equal('size', [$deploymentSize])->toString(),
@@ -1097,20 +791,21 @@ class FunctionsCustomServerTest extends Scope
]
);
- $this->assertEquals(200, $response['headers']['status-code']);
- $this->assertGreaterThan(0, $response['body']['total']);
+ $this->assertEquals(200, $deployments['headers']['status-code']);
+ $this->assertGreaterThan(0, $deployments['body']['total']);
- $found = false;
- foreach ($response['body']['deployments'] as $deployment) {
- if ($deployment['$id'] === $deploymentId) {
- $found = true;
- $this->assertEquals($deploymentSize, $deployment['size']);
- break;
- }
+ $matchingDeployment = array_filter(
+ $deployments['body']['deployments'],
+ fn ($deployment) => $deployment['$id'] === $deploymentId
+ );
+
+ $this->assertNotEmpty($matchingDeployment, "Deployment with ID {$deploymentId} not found");
+
+ if (!empty($matchingDeployment)) {
+ $deployment = reset($matchingDeployment);
+ $this->assertEquals($deploymentSize, $deployment['size']);
}
- $this->assertTrue($found);
-
return $data;
}
@@ -1122,27 +817,21 @@ class FunctionsCustomServerTest extends Scope
/**
* Test for SUCCESS
*/
- $function = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/deployments/' . $data['deploymentId'], array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()));
+ $deployment = $this->getDeployment($data['functionId'], $data['deploymentId']);
- $this->assertEquals(200, $function['headers']['status-code']);
- $this->assertGreaterThan(0, $function['body']['buildTime']);
- $this->assertNotEmpty($function['body']['status']);
- $this->assertNotEmpty($function['body']['buildLogs']);
- $this->assertArrayHasKey('size', $function['body']);
- $this->assertArrayHasKey('buildSize', $function['body']);
+ $this->assertEquals(200, $deployment['headers']['status-code']);
+ $this->assertGreaterThan(0, $deployment['body']['buildTime']);
+ $this->assertNotEmpty($deployment['body']['status']);
+ $this->assertNotEmpty($deployment['body']['buildLogs']);
+ $this->assertArrayHasKey('size', $deployment['body']);
+ $this->assertArrayHasKey('buildSize', $deployment['body']);
/**
* Test for FAILURE
*/
- $function = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/deployments/x', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()));
+ $deployment = $this->getDeployment($data['functionId'], 'x');
- $this->assertEquals($function['headers']['status-code'], 404);
+ $this->assertEquals($deployment['headers']['status-code'], 404);
return $data;
}
@@ -1155,15 +844,10 @@ class FunctionsCustomServerTest extends Scope
/**
* Test for SUCCESS
*/
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $data['functionId'] . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'async' => false,
+ $execution = $this->createExecution($data['functionId'], [
+ 'async' => 'false',
]);
- $executionId = $execution['body']['$id'] ?? '';
-
$this->assertEquals(201, $execution['headers']['status-code']);
$this->assertNotEmpty($execution['body']['$id']);
$this->assertNotEmpty($execution['body']['functionId']);
@@ -1183,13 +867,13 @@ class FunctionsCustomServerTest extends Scope
$this->assertNotEmpty($execution['body']['logs']);
$this->assertLessThan(10, $execution['body']['duration']);
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $data['functionId'] . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'async' => false,
+ $executionId = $execution['body']['$id'] ?? '';
+
+ $execution = $this->createExecution($data['functionId'], [
+ 'async' => 'false',
'path' => '/?code=400'
]);
+
$this->assertEquals(201, $execution['headers']['status-code']);
$this->assertEquals('completed', $execution['body']['status']);
$this->assertEquals(400, $execution['body']['responseStatusCode']);
@@ -1198,6 +882,7 @@ class FunctionsCustomServerTest extends Scope
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()), []);
+
$this->assertEquals(204, $execution['headers']['status-code']);
return array_merge($data, ['executionId' => $executionId]);
@@ -1211,82 +896,62 @@ class FunctionsCustomServerTest extends Scope
/**
* Test for SUCCESS
*/
- $function = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()));
+ $executions = $this->listExecutions($data['functionId']);
- $this->assertEquals($function['headers']['status-code'], 200);
- $this->assertEquals($function['body']['total'], 1);
- $this->assertIsArray($function['body']['executions']);
- $this->assertCount(1, $function['body']['executions']);
- $this->assertEquals($function['body']['executions'][0]['$id'], $data['executionId']);
+ $this->assertEquals(200, $executions['headers']['status-code']);
+ $this->assertEquals(1, $executions['body']['total']);
+ $this->assertIsArray($executions['body']['executions']);
+ $this->assertCount(1, $executions['body']['executions']);
- $response = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $executions = $this->listExecutions($data['functionId'], [
'queries' => [
Query::limit(1)->toString(),
],
]);
- $this->assertEquals(200, $response['headers']['status-code']);
- $this->assertCount(1, $response['body']['executions']);
+ $this->assertEquals(200, $executions['headers']['status-code']);
+ $this->assertCount(1, $executions['body']['executions']);
- $response = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $executions = $this->listExecutions($data['functionId'], [
'queries' => [
- Query::offset(1)->toString(),
+ Query::offset(0)->toString(),
],
]);
- $this->assertEquals(200, $response['headers']['status-code']);
- $this->assertCount(0, $response['body']['executions']);
+ $this->assertEquals(200, $executions['headers']['status-code']);
+ $this->assertCount(1, $executions['body']['executions']);
- $response = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $executions = $this->listExecutions($data['functionId'], [
'queries' => [
Query::equal('trigger', ['http'])->toString(),
],
]);
- $this->assertEquals(200, $response['headers']['status-code']);
- $this->assertCount(1, $response['body']['executions']);
+ $this->assertEquals(200, $executions['headers']['status-code']);
+ $this->assertCount(1, $executions['body']['executions']);
/**
* Test search queries
*/
-
- $response = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $executions = $this->listExecutions($data['functionId'], [
'search' => $data['executionId'],
]);
- $this->assertEquals(200, $response['headers']['status-code']);
- $this->assertEquals(1, $response['body']['total']);
- $this->assertIsInt($response['body']['total']);
- $this->assertCount(1, $response['body']['executions']);
- $this->assertEquals($data['functionId'], $response['body']['executions'][0]['functionId']);
+ $this->assertEquals(200, $executions['headers']['status-code']);
+ $this->assertEquals(1, $executions['body']['total']);
+ $this->assertIsInt($executions['body']['total']);
+ $this->assertCount(1, $executions['body']['executions']);
+ $this->assertEquals($data['functionId'], $executions['body']['executions'][0]['functionId']);
- $response = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $executions = $this->listExecutions($data['functionId'], [
'search' => $data['functionId'],
]);
- $this->assertEquals(200, $response['headers']['status-code']);
- $this->assertEquals(1, $response['body']['total']);
- $this->assertIsInt($response['body']['total']);
- $this->assertCount(1, $response['body']['executions']);
- $this->assertEquals($data['executionId'], $response['body']['executions'][0]['$id']);
+ $this->assertEquals(200, $executions['headers']['status-code']);
+ $this->assertEquals(1, $executions['body']['total']);
+ $this->assertIsInt($executions['body']['total']);
+ $this->assertCount(1, $executions['body']['executions']);
+ $this->assertEquals($data['executionId'], $executions['body']['executions'][0]['$id']);
return $data;
}
@@ -1294,17 +959,13 @@ class FunctionsCustomServerTest extends Scope
/**
* @depends testUpdateDeployment
*/
- #[Retry(count: 2)]
public function testSyncCreateExecution($data): array
{
/**
* Test for SUCCESS
*/
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $data['functionId'] . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- // Testing default value, should be 'async' => false
+ $execution = $this->createExecution($data['functionId'], [
+ // Testing default value, should be 'async' => 'false'
]);
$this->assertEquals(201, $execution['headers']['status-code']);
@@ -1328,21 +989,15 @@ class FunctionsCustomServerTest extends Scope
/**
* Test for SUCCESS
*/
- $function = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/executions/' . $data['executionId'], array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()));
+ $execution = $this->getExecution($data['functionId'], $data['executionId']);
- $this->assertEquals($function['headers']['status-code'], 200);
- $this->assertEquals($function['body']['$id'], $data['executionId']);
+ $this->assertEquals($execution['headers']['status-code'], 200);
+ $this->assertEquals($execution['body']['$id'], $data['executionId']);
/**
* Test for FAILURE
*/
- $function = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/executions/x', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()));
+ $function = $this->getExecution($data['functionId'], 'x');
$this->assertEquals($function['headers']['status-code'], 404);
@@ -1385,6 +1040,7 @@ class FunctionsCustomServerTest extends Scope
]);
$executionId = $execution['body']['$id'] ?? '';
+
$this->assertEquals(202, $execution['headers']['status-code']);
$execution = $this->client->call(Client::METHOD_DELETE, '/functions/' . $data['functionId'] . '/executions/' . $executionId, array_merge([
@@ -1399,46 +1055,18 @@ class FunctionsCustomServerTest extends Scope
return $data;
}
- /**
- * @depends testGetExecution
- */
- public function testDeleteScheduledExecution($data): array
- {
- $futureTime = (new \DateTime())->add(new \DateInterval('PT10H'));
- $futureTime->setTime($futureTime->format('H'), $futureTime->format('i'), 0, 0);
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $data['functionId'] . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'async' => true,
- 'scheduledAt' => $futureTime->format('Y-m-d H:i:s'),
- ]);
-
- $executionId = $execution['body']['$id'] ?? '';
- $this->assertEquals(202, $execution['headers']['status-code']);
- sleep(5);
- $execution = $this->client->call(Client::METHOD_DELETE, '/functions/' . $data['functionId'] . '/executions/' . $executionId, array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()));
-
- $this->assertEquals(204, $execution['headers']['status-code']);
- $this->assertEmpty($execution['body']);
-
- return $data;
- }
/**
* @depends testGetExecution
*/
- #[Retry(count: 2)]
public function testUpdateSpecs($data): array
{
/**
* Test for SUCCESS
*/
- $response1 = $this->client->call(Client::METHOD_PUT, '/functions/' . $data['functionId'], array_merge([
+ // Change the function specs
+ $function = $this->client->call(Client::METHOD_PUT, '/functions/' . $data['functionId'], array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()), [
@@ -1453,22 +1081,20 @@ class FunctionsCustomServerTest extends Scope
'specification' => Specification::S_1VCPU_1GB,
]);
- $this->assertEquals(200, $response1['headers']['status-code']);
- $this->assertNotEmpty($response1['body']['$id']);
- $this->assertEquals(Specification::S_1VCPU_1GB, $response1['body']['specification']);
+ $this->assertEquals(200, $function['headers']['status-code']);
+ $this->assertNotEmpty($function['body']['$id']);
+ $this->assertEquals(Specification::S_1VCPU_1GB, $function['body']['specification']);
- // Test Execution
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $data['functionId'] . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()));
+ // Verify the updated specs
+ $execution = $this->createExecution($data['functionId']);
$output = json_decode($execution['body']['responseBody'], true);
$this->assertEquals(1, $output['APPWRITE_FUNCTION_CPUS']);
$this->assertEquals(1024, $output['APPWRITE_FUNCTION_MEMORY']);
- $response2 = $this->client->call(Client::METHOD_PUT, '/functions/' . $data['functionId'], array_merge([
+ // Change the specs to 1vcpu 512mb
+ $function = $this->client->call(Client::METHOD_PUT, '/functions/' . $data['functionId'], array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()), [
@@ -1483,15 +1109,12 @@ class FunctionsCustomServerTest extends Scope
'specification' => Specification::S_1VCPU_512MB,
]);
- $this->assertEquals(200, $response2['headers']['status-code']);
- $this->assertNotEmpty($response2['body']['$id']);
- $this->assertEquals(Specification::S_1VCPU_512MB, $response2['body']['specification']);
+ $this->assertEquals(200, $function['headers']['status-code']);
+ $this->assertNotEmpty($function['body']['$id']);
+ $this->assertEquals(Specification::S_1VCPU_512MB, $function['body']['specification']);
- // Test Execution
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $data['functionId'] . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()));
+ // Verify the updated specs
+ $execution = $this->createExecution($data['functionId']);
$output = json_decode($execution['body']['responseBody'], true);
@@ -1501,7 +1124,7 @@ class FunctionsCustomServerTest extends Scope
/**
* Test for FAILURE
*/
- $response3 = $this->client->call(Client::METHOD_PUT, '/functions/' . $data['functionId'], array_merge([
+ $function = $this->client->call(Client::METHOD_PUT, '/functions/' . $data['functionId'], array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()), [
@@ -1516,8 +1139,8 @@ class FunctionsCustomServerTest extends Scope
'specification' => 's-2vcpu-512mb', // Invalid specification
]);
- $this->assertEquals(400, $response3['headers']['status-code']);
- $this->assertStringStartsWith('Invalid `specification` param: Specification must be one of:', $response3['body']['message']);
+ $this->assertEquals(400, $function['headers']['status-code']);
+ $this->assertStringStartsWith('Invalid `specification` param: Specification must be one of:', $function['body']['message']);
return $data;
}
@@ -1530,24 +1153,17 @@ class FunctionsCustomServerTest extends Scope
/**
* Test for SUCCESS
*/
- $function = $this->client->call(Client::METHOD_DELETE, '/functions/' . $data['functionId'] . '/deployments/' . $data['deploymentId'], array_merge([
+ $deployment = $this->client->call(Client::METHOD_DELETE, '/functions/' . $data['functionId'] . '/deployments/' . $data['deploymentId'], array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()));
- $this->assertEquals(204, $function['headers']['status-code']);
- $this->assertEmpty($function['body']);
+ $this->assertEquals(204, $deployment['headers']['status-code']);
+ $this->assertEmpty($deployment['body']);
- $function = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'] . '/deployments/' . $data['deploymentId'], array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()));
+ $deployment = $this->getDeployment($data['functionId'], $data['deploymentId']);
- $this->assertEquals(404, $function['headers']['status-code']);
-
- /**
- * Test for FAILURE
- */
+ $this->assertEquals(404, $deployment['headers']['status-code']);
return $data;
}
@@ -1555,153 +1171,63 @@ class FunctionsCustomServerTest extends Scope
/**
* @depends testCreateDeployment
*/
- public function testDelete($data): array
+ public function testDeleteFunction($data): array
{
/**
* Test for SUCCESS
*/
- $function = $this->client->call(Client::METHOD_DELETE, '/functions/' . $data['functionId'], array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()));
+ $function = $this->deleteFunction($data['functionId']);
$this->assertEquals(204, $function['headers']['status-code']);
$this->assertEmpty($function['body']);
- $function = $this->client->call(Client::METHOD_GET, '/functions/' . $data['functionId'], array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()));
+ $function = $this->getFunction($data['functionId']);
$this->assertEquals(404, $function['headers']['status-code']);
- /**
- * Test for FAILURE
- */
-
return $data;
}
- public function testTimeout()
+ public function testExecutionTimeout()
{
- $name = 'php-8.0';
- $entrypoint = 'index.php';
- $timeout = 15;
- $folder = 'timeout';
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/$folder/code.tar.gz";
- $this->packageCode($folder);
-
- $function = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $functionId = $this->setupFunction([
'functionId' => ID::unique(),
- 'name' => 'Test ' . $name,
- 'runtime' => $name,
- 'entrypoint' => $entrypoint,
+ 'name' => 'Test php-8.0',
+ 'runtime' => 'php-8.0',
+ 'entrypoint' => 'index.php',
'events' => [],
- 'schedule' => '* * * * *', // execute every minute
- 'timeout' => $timeout,
+ 'schedule' => '',
+ 'timeout' => 5, // Should timeout after 5 seconds
]);
-
- $functionId = $function['body']['$id'] ?? '';
-
- $this->assertEquals(201, $function['headers']['status-code']);
- $this->assertEquals('* * * * *', $function['body']['schedule']);
-
- $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', array_merge([
- 'content-type' => 'multipart/form-data',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'entrypoint' => $entrypoint,
- 'code' => new CURLFile($code, 'application/x-gzip', basename($code)),
+ $this->setupDeployment($functionId, [
+ 'code' => $this->packageFunction('timeout'),
'activate' => true,
]);
- $deploymentId = $deployment['body']['$id'] ?? '';
-
- $this->assertEquals(202, $deployment['headers']['status-code']);
-
- $this->awaitDeploymentIsBuilt($functionId, $deploymentId);
-
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'async' => true,
+ $execution = $this->createExecution($functionId, [
+ 'async' => true
]);
- $executionId = $execution['body']['$id'] ?? '';
-
$this->assertEquals(202, $execution['headers']['status-code']);
- sleep(20);
+ $executionId = $execution['body']['$id'] ?? '';
- $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'queries' => [
- Query::equal('trigger', ['http'])->toString(),
- ],
- ]);
+ \sleep(5); // Wait for the function to timeout
- $this->assertEquals($executions['headers']['status-code'], 200);
- $this->assertEquals($executions['body']['total'], 1);
- $this->assertIsArray($executions['body']['executions']);
- $this->assertCount(1, $executions['body']['executions']);
- $this->assertEquals($executions['body']['executions'][0]['$id'], $executionId);
- $this->assertEquals($executions['body']['executions'][0]['trigger'], 'http');
- $this->assertEquals($executions['body']['executions'][0]['status'], 'failed');
- $this->assertEquals($executions['body']['executions'][0]['responseStatusCode'], 500);
- $this->assertGreaterThan(2, $executions['body']['executions'][0]['duration']);
- $this->assertLessThan(20, $executions['body']['executions'][0]['duration']);
- $this->assertEquals($executions['body']['executions'][0]['responseBody'], '');
- $this->assertEquals($executions['body']['executions'][0]['logs'], '');
- $this->assertStringContainsString('timed out', $executions['body']['executions'][0]['errors']);
+ $this->assertEventually(function () use ($functionId, $executionId) {
+ $execution = $this->getExecution($functionId, $executionId);
- $start = \microtime(true);
- while (true) {
- $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'queries' => [
- Query::equal('trigger', ['schedule'])->toString(),
- ],
- ]);
+ $this->assertEquals(200, $execution['headers']['status-code']);
+ $this->assertEquals('failed', $execution['body']['status']);
+ $this->assertEquals(500, $execution['body']['responseStatusCode']);
+ $this->assertGreaterThan(2, $execution['body']['duration']);
+ $this->assertLessThan(20, $execution['body']['duration']);
+ $this->assertEquals('', $execution['body']['responseBody']);
+ $this->assertEquals('', $execution['body']['logs']);
+ $this->assertStringContainsString('timed out', $execution['body']['errors']);
+ }, 10000, 500);
- $this->assertEquals(200, $executions['headers']['status-code']);
-
- if (\count($executions['body']['executions']) > 0) {
- break;
- }
-
- // 0s would mean instant execution
- // +60 seconds, maximum possible waiting time before next minute
- // +10 seconds, maximum update interval time
- // +60 seconds, possible overlap between update and schedule tick
- // +10 seconds, maximum execution time including cold-start
- // Result: We allow maximum
- if (\microtime(true) - $start > 140) {
- $this->fail('Execution did not create within 140 seconds of schedule: ' . \json_encode($executions));
- }
-
- usleep(1000000); // 1 second
- }
-
- $this->assertEquals(200, $executions['headers']['status-code']);
- $this->assertGreaterThanOrEqual(1, \count($executions['body']['executions']));
- $this->assertEquals($executions['body']['executions'][0]['trigger'], 'schedule');
-
- // Cleanup : Delete function
- $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], []);
-
- $this->assertEquals(204, $response['headers']['status-code']);
+ $this->cleanupFunction($functionId);
}
/**
@@ -1727,72 +1253,38 @@ class FunctionsCustomServerTest extends Scope
* @param string $entrypoint
*
* @dataProvider provideCustomExecutions
- * @depends testTimeout
+ * @depends testExecutionTimeout
*/
public function testCreateCustomExecution(string $folder, string $name, string $entrypoint, string $runtimeName, string $runtimeVersion)
{
- $timeout = 15;
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/$folder/code.tar.gz";
- $this->packageCode($folder);
-
- $function = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $functionId = $this->setupFunction([
'functionId' => ID::unique(),
'name' => 'Test ' . $name,
'runtime' => $name,
'entrypoint' => $entrypoint,
'events' => [],
- 'timeout' => $timeout,
+ 'timeout' => 15,
]);
- $functionId = $function['body']['$id'] ?? '';
-
- $this->assertEquals(201, $function['headers']['status-code']);
-
- $variable = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/variables', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $variable = $this->createVariable($functionId, [
'key' => 'CUSTOM_VARIABLE',
- 'value' => 'variable',
+ 'value' => 'variable'
]);
$this->assertEquals(201, $variable['headers']['status-code']);
- $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', array_merge([
- 'content-type' => 'multipart/form-data',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $deploymentId = $this->setupDeployment($functionId, [
'entrypoint' => $entrypoint,
- 'code' => new CURLFile($code, 'application/x-gzip', basename($code)),
+ 'code' => $this->packageFunction($folder),
'activate' => true
]);
- $deploymentId = $deployment['body']['$id'] ?? '';
- $this->assertEquals(202, $deployment['headers']['status-code']);
-
- $this->awaitDeploymentIsBuilt($function['body']['$id'], $deploymentId, checkForSuccess: false);
-
- $deployment = $this->client->call(Client::METHOD_PATCH, '/functions/' . $functionId . '/deployments/' . $deploymentId, array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), []);
-
- $this->assertEquals(200, $deployment['headers']['status-code']);
-
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $execution = $this->createExecution($functionId, [
'body' => 'foobar',
- 'async' => false
+ 'async' => 'false'
]);
- $executionId = $execution['body']['$id'] ?? '';
$output = json_decode($execution['body']['responseBody'], true);
-
$this->assertEquals(201, $execution['headers']['status-code']);
$this->assertEquals('completed', $execution['body']['status']);
$this->assertEquals(200, $execution['body']['responseStatusCode']);
@@ -1811,10 +1303,9 @@ class FunctionsCustomServerTest extends Scope
$this->assertStringContainsString('Amazing Function Log', $execution['body']['logs']);
$this->assertEmpty($execution['body']['errors']);
- $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()));
+ $executionId = $execution['body']['$id'] ?? '';
+
+ $executions = $this->listExecutions($functionId);
$this->assertEquals($executions['headers']['status-code'], 200);
$this->assertEquals($executions['body']['total'], 1);
@@ -1824,65 +1315,28 @@ class FunctionsCustomServerTest extends Scope
$this->assertEquals($executions['body']['executions'][0]['trigger'], 'http');
$this->assertStringContainsString('Amazing Function Log', $executions['body']['executions'][0]['logs']);
- // Cleanup : Delete function
- $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], []);
-
- $this->assertEquals(204, $response['headers']['status-code']);
+ $this->cleanupFunction($functionId);
}
public function testCreateCustomExecutionBinaryResponse()
{
- $timeout = 15;
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/php-binary-response/code.tar.gz";
- $this->packageCode('php-binary-response');
-
- $function = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $functionId = $this->setupFunction([
'functionId' => ID::unique(),
'name' => 'Test PHP Binary executions',
'runtime' => 'php-8.0',
'entrypoint' => 'index.php',
- 'timeout' => $timeout,
+ 'timeout' => 15,
'execute' => ['any']
]);
-
- $functionId = $function['body']['$id'] ?? '';
-
- $this->assertEquals(201, $function['headers']['status-code']);
-
- $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', array_merge([
- 'content-type' => 'multipart/form-data',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $this->setupDeployment($functionId, [
'entrypoint' => 'index.php',
- 'code' => new CURLFile($code, 'application/x-gzip', basename($code)),
+ 'code' => $this->packageFunction('php-binary-response'),
'activate' => true
]);
- $deploymentId = $deployment['body']['$id'] ?? '';
- $this->assertEquals(202, $deployment['headers']['status-code']);
-
- $this->awaitDeploymentIsBuilt($function['body']['$id'], $deploymentId, checkForSuccess: false);
-
- $deployment = $this->client->call(Client::METHOD_PATCH, '/functions/' . $functionId . '/deployments/' . $deploymentId, array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), []);
-
- $this->assertEquals(200, $deployment['headers']['status-code']);
-
- // Wait a little for activation to finish
- sleep(5);
-
$execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
'x-appwrite-project' => $this->getProject()['$id'],
- 'accept' => 'multipart/form-data',
+ 'accept' => 'multipart/form-data', // Accept binary response
], $this->getHeaders()), [
'body' => null,
]);
@@ -1902,7 +1356,7 @@ class FunctionsCustomServerTest extends Scope
*/
$execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
'x-appwrite-project' => $this->getProject()['$id'],
- 'accept' => 'application/json',
+ 'accept' => 'application/json', // Accept JSON response
], $this->getHeaders()), [
'body' => null,
]);
@@ -1910,66 +1364,29 @@ class FunctionsCustomServerTest extends Scope
$this->assertEquals(400, $execution['headers']['status-code']);
$this->assertStringContainsString('Failed to parse response', $execution['body']['message']);
- // Cleanup : Delete function
- $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], []);
-
- $this->assertEquals(204, $response['headers']['status-code']);
+ $this->cleanupFunction($functionId);
}
public function testCreateCustomExecutionBinaryRequest()
{
- $timeout = 15;
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/php-binary-request/code.tar.gz";
- $this->packageCode('php-binary-request');
-
- $function = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $functionId = $this->setupFunction([
'functionId' => ID::unique(),
'name' => 'Test PHP Binary executions',
'runtime' => 'php-8.0',
'entrypoint' => 'index.php',
- 'timeout' => $timeout,
+ 'timeout' => 15,
'execute' => ['any']
]);
-
- $functionId = $function['body']['$id'] ?? '';
-
- $this->assertEquals(201, $function['headers']['status-code']);
-
- $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', array_merge([
- 'content-type' => 'multipart/form-data',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $this->setupDeployment($functionId, [
'entrypoint' => 'index.php',
- 'code' => new CURLFile($code, 'application/x-gzip', basename($code)),
+ 'code' => $this->packageFunction('php-binary-request'),
'activate' => true
]);
- $deploymentId = $deployment['body']['$id'] ?? '';
- $this->assertEquals(202, $deployment['headers']['status-code']);
-
- $this->awaitDeploymentIsBuilt($function['body']['$id'], $deploymentId, checkForSuccess: false);
-
- $deployment = $this->client->call(Client::METHOD_PATCH, '/functions/' . $functionId . '/deployments/' . $deploymentId, array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), []);
-
- $this->assertEquals(200, $deployment['headers']['status-code']);
-
- // Wait a little for activation to finish
- sleep(5);
-
$bytes = pack('C*', ...[0, 20, 255]);
$execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
- 'content-type' => 'multipart/form-data',
+ 'content-type' => 'multipart/form-data', // Send binary request
'x-appwrite-project' => $this->getProject()['$id'],
'accept' => 'application/json',
], $this->getHeaders()), [
@@ -1986,7 +1403,7 @@ class FunctionsCustomServerTest extends Scope
* Test for FAILURE
*/
$execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
- 'content-type' => 'application/json',
+ 'content-type' => 'application/json', // Send JSON headers
'x-appwrite-project' => $this->getProject()['$id'],
'accept' => 'application/json',
], $this->getHeaders()), [
@@ -1994,98 +1411,53 @@ class FunctionsCustomServerTest extends Scope
], false);
$executionBody = json_decode($execution['body'], true);
+
$this->assertNotEquals(\md5($bytes), $executionBody['responseBody']);
- // Cleanup : Delete function
- $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], []);
-
- $this->assertEquals(204, $response['headers']['status-code']);
+ $this->cleanupFunction($functionId);
}
public function testv2Function()
{
- $timeout = 15;
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/php-v2/code.tar.gz";
- $this->packageCode('php-v2');
-
- $function = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $functionId = $this->setupFunction([
'functionId' => ID::unique(),
'name' => 'Test PHP V2',
'runtime' => 'php-8.0',
'entrypoint' => 'index.php',
'events' => [],
- 'timeout' => $timeout,
+ 'timeout' => 15,
]);
- $functionId = $function['body']['$id'] ?? '';
-
- $this->assertEquals(201, $function['headers']['status-code']);
-
- $headers = [
+ $variable = $this->client->call(Client::METHOD_PATCH, '/mock/functions-v2', [
'content-type' => 'application/json',
'origin' => 'http://localhost',
'cookie' => 'a_session_console=' . $this->getRoot()['session'],
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-mode' => 'admin',
- ];
-
- $variable = $this->client->call(Client::METHOD_PATCH, '/mock/functions-v2', $headers, [
+ ], [
'functionId' => $functionId
]);
-
$this->assertEquals(204, $variable['headers']['status-code']);
- $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', array_merge([
- 'content-type' => 'multipart/form-data',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $this->setupDeployment($functionId, [
'entrypoint' => 'index.php',
- 'code' => new CURLFile($code, 'application/x-gzip', basename($code)),
+ 'code' => $this->packageFunction('php-v2'),
'activate' => true
]);
- $deploymentId = $deployment['body']['$id'] ?? '';
- $this->assertEquals(202, $deployment['headers']['status-code']);
-
- $this->awaitDeploymentIsBuilt($function['body']['$id'], $deploymentId, checkForSuccess: false);
-
- $deployment = $this->client->call(Client::METHOD_PATCH, '/functions/' . $functionId . '/deployments/' . $deploymentId, array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), []);
-
- $this->assertEquals(200, $deployment['headers']['status-code']);
-
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $execution = $this->createExecution($functionId, [
'body' => 'foobar',
- 'async' => false
+ 'async' => 'false'
]);
- $output = json_decode($execution['body']['responseBody'], true);
-
$this->assertEquals(201, $execution['headers']['status-code']);
$this->assertEquals('completed', $execution['body']['status']);
$this->assertEquals(200, $execution['body']['responseStatusCode']);
+
+ $output = json_decode($execution['body']['responseBody'], true);
$this->assertEquals(true, $output['v2Woks']);
- // Cleanup : Delete function
- $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], []);
-
- $this->assertEquals(204, $response['headers']['status-code']);
+ $this->cleanupFunction($functionId);
}
public function testGetRuntimes()
@@ -2113,14 +1485,7 @@ class FunctionsCustomServerTest extends Scope
public function testEventTrigger()
{
- $timeout = 15;
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/php-event/code.tar.gz";
- $this->packageCode('php-event');
-
- $function = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $functionId = $this->setupFunction([
'functionId' => ID::unique(),
'name' => 'Test PHP Event executions',
'runtime' => 'php-8.0',
@@ -2128,38 +1493,15 @@ class FunctionsCustomServerTest extends Scope
'events' => [
'users.*.create',
],
- 'timeout' => $timeout,
+ 'timeout' => 15,
]);
-
- $functionId = $function['body']['$id'] ?? '';
-
- $this->assertEquals(201, $function['headers']['status-code']);
-
- $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', array_merge([
- 'content-type' => 'multipart/form-data',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $this->setupDeployment($functionId, [
'entrypoint' => 'index.php',
- 'code' => new CURLFile($code, 'application/x-gzip', basename($code)),
+ 'code' => $this->packageFunction('php-event'),
'activate' => true
]);
- $deploymentId = $deployment['body']['$id'] ?? '';
- $this->assertEquals(202, $deployment['headers']['status-code']);
-
- $this->awaitDeploymentIsBuilt($function['body']['$id'], $deploymentId, checkForSuccess: false);
-
- $deployment = $this->client->call(Client::METHOD_PATCH, '/functions/' . $functionId . '/deployments/' . $deploymentId, array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), []);
-
- $this->assertEquals(200, $deployment['headers']['status-code']);
-
- // Wait a little for activation to finish
- sleep(5);
-
- // Create user to trigger event
+ // Create user as an event trigger
$user = $this->client->call(Client::METHOD_POST, '/users', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
@@ -2168,108 +1510,59 @@ class FunctionsCustomServerTest extends Scope
'name' => 'Event User'
]);
- $userId = $user['body']['$id'];
-
$this->assertEquals(201, $user['headers']['status-code']);
- // Wait for execution to occur
- sleep(15);
+ $userId = $user['body']['$id'] ?? '';
- $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()));
+ $this->assertEventually(function () use ($functionId, $userId) {
+ $executions = $this->listExecutions($functionId);
- $execution = $executions['body']['executions'][0];
+ $lastExecution = $executions['body']['executions'][0];
- $this->assertEquals(200, $executions['headers']['status-code']);
- $this->assertEquals('completed', $execution['status']);
- $this->assertEquals(204, $execution['responseStatusCode']);
- $this->assertStringContainsString($userId, $execution['logs']);
- $this->assertStringContainsString('Event User', $execution['logs']);
+ $this->assertEquals('completed', $lastExecution['status']);
+ $this->assertEquals(204, $lastExecution['responseStatusCode']);
+ $this->assertStringContainsString($userId, $lastExecution['logs']);
+ $this->assertStringContainsString('Event User', $lastExecution['logs']);
+ }, 10000, 500);
- // Cleanup : Delete function
- $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, [
+ $this->cleanupFunction($functionId);
+
+ // Cleanup user
+ $user = $this->client->call(Client::METHOD_DELETE, '/users/' . $userId, [
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey'],
], []);
-
- $this->assertEquals(204, $response['headers']['status-code']);
-
- // Cleanup : Delete user
- $response = $this->client->call(Client::METHOD_DELETE, '/users/' . $userId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], []);
-
- $this->assertEquals(204, $response['headers']['status-code']);
+ $this->assertEquals(204, $user['headers']['status-code']);
}
public function testScopes()
{
- $timeout = 15;
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/php-scopes/code.tar.gz";
- $this->packageCode('php-scopes');
-
- $function = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $functionId = $this->setupFunction([
'functionId' => ID::unique(),
'name' => 'Test PHP Scopes executions',
- 'commands' => 'composer update --no-interaction --ignore-platform-reqs --optimize-autoloader --prefer-dist --no-dev',
+ 'commands' => 'sh setup.sh && composer install',
'runtime' => 'php-8.0',
'entrypoint' => 'index.php',
'scopes' => ['users.read'],
- 'timeout' => $timeout,
+ 'timeout' => 15,
]);
- $functionId = $function['body']['$id'] ?? '';
-
- $this->assertEquals(201, $function['headers']['status-code']);
-
- $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', array_merge([
- 'content-type' => 'multipart/form-data',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $deploymentId = $this->setupDeployment($functionId, [
'entrypoint' => 'index.php',
- 'commands' => 'sh setup.sh && composer install',
- 'code' => new CURLFile($code, 'application/x-gzip', basename($code)),
- 'activate' => true
+ 'code' => $this->packageFunction('php-scopes'),
+ 'activate' => true,
]);
- $deploymentId = $deployment['body']['$id'] ?? '';
- $this->assertEquals(202, $deployment['headers']['status-code']);
-
- $this->awaitDeploymentIsBuilt($function['body']['$id'], $deploymentId, checkForSuccess: false);
-
- $deployment = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/deployments/' . $deploymentId, array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), []);
+ $deployment = $this->getDeployment($functionId, $deploymentId);
$this->assertEquals(200, $deployment['headers']['status-code']);
$this->assertStringContainsStringIgnoringCase("200 OK", $deployment['body']['buildLogs']);
$this->assertStringContainsStringIgnoringCase('"total":', $deployment['body']['buildLogs']);
$this->assertStringContainsStringIgnoringCase('"users":', $deployment['body']['buildLogs']);
- $deployment = $this->client->call(Client::METHOD_PATCH, '/functions/' . $functionId . '/deployments/' . $deploymentId, array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), []);
-
- $this->assertEquals(200, $deployment['headers']['status-code']);
-
- // Wait a little for activation to finish
- sleep(5);
-
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'async' => false
+ $execution = $this->createExecution($functionId, [
+ 'async' => 'false',
]);
$this->assertEquals(201, $execution['headers']['status-code']);
@@ -2279,92 +1572,47 @@ class FunctionsCustomServerTest extends Scope
$this->assertNotEmpty($execution['body']['responseBody']);
$this->assertStringContainsString("total", $execution['body']['responseBody']);
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'async' => true
+ $execution = $this->createExecution($functionId, [
+ 'async' => true,
]);
$this->assertEquals(202, $execution['headers']['status-code']);
$this->assertNotEmpty($execution['body']['$id']);
- \sleep(10);
+ $executionId = $execution['body']['$id'] ?? '';
- $execution = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions/' . $execution['body']['$id'], array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), []);
+ $this->assertEventually(function () use ($functionId, $executionId) {
+ $execution = $this->getExecution($functionId, $executionId);
- $this->assertEquals(200, $execution['headers']['status-code']);
- $this->assertEquals('completed', $execution['body']['status']);
- $this->assertEquals(200, $execution['body']['responseStatusCode']);
- $this->assertGreaterThan(0, $execution['body']['duration']);
- $this->assertNotEmpty($execution['body']['logs']);
- $this->assertStringContainsString("total", $execution['body']['logs']);
+ $this->assertEquals(200, $execution['headers']['status-code']);
+ $this->assertEquals('completed', $execution['body']['status']);
+ $this->assertEquals(200, $execution['body']['responseStatusCode']);
+ $this->assertGreaterThan(0, $execution['body']['duration']);
+ $this->assertNotEmpty($execution['body']['logs']);
+ $this->assertStringContainsString("total", $execution['body']['logs']);
+ }, 10000, 500);
- // Cleanup : Delete function
- $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], []);
-
- $this->assertEquals(204, $response['headers']['status-code']);
+ $this->cleanupFunction($functionId);
}
public function testCookieExecution()
{
- $timeout = 15;
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/php-cookie/code.tar.gz";
- $this->packageCode('php-cookie');
-
- $function = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $functionId = $this->setupFunction([
'functionId' => ID::unique(),
'name' => 'Test PHP Cookie executions',
'runtime' => 'php-8.0',
'entrypoint' => 'index.php',
- 'timeout' => $timeout,
+ 'timeout' => 15,
]);
-
- $functionId = $function['body']['$id'] ?? '';
-
- $this->assertEquals(201, $function['headers']['status-code']);
-
- $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', array_merge([
- 'content-type' => 'multipart/form-data',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $this->setupDeployment($functionId, [
'entrypoint' => 'index.php',
- 'code' => new CURLFile($code, 'application/x-gzip', basename($code)),
+ 'code' => $this->packageFunction('php-cookie'),
'activate' => true
]);
- $deploymentId = $deployment['body']['$id'] ?? '';
- $this->assertEquals(202, $deployment['headers']['status-code']);
-
- $this->awaitDeploymentIsBuilt($function['body']['$id'], $deploymentId, checkForSuccess: false);
-
- $deployment = $this->client->call(Client::METHOD_PATCH, '/functions/' . $functionId . '/deployments/' . $deploymentId, array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), []);
-
- $this->assertEquals(200, $deployment['headers']['status-code']);
-
- // Wait a little for activation to finish
- sleep(5);
-
$cookie = 'cookieName=cookieValue; cookie2=value2; cookie3=value=3; cookie4=val:ue4; cookie5=value5';
-
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'async' => false,
+ $execution = $this->createExecution($functionId, [
+ 'async' => 'false',
'headers' => [
'cookie' => $cookie
]
@@ -2376,38 +1624,20 @@ class FunctionsCustomServerTest extends Scope
$this->assertEquals($cookie, $execution['body']['responseBody']);
$this->assertGreaterThan(0, $execution['body']['duration']);
- // Cleanup : Delete function
- $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], []);
-
- $this->assertEquals(204, $response['headers']['status-code']);
+ $this->cleanupFunction($functionId);
}
public function testFunctionsDomain()
{
- $timeout = 15;
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/php-cookie/code.tar.gz";
- $this->packageCode('php-cookie');
-
- $function = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $functionId = $this->setupFunction([
'functionId' => ID::unique(),
'name' => 'Test PHP Cookie executions',
'runtime' => 'php-8.0',
'entrypoint' => 'index.php',
- 'timeout' => $timeout,
+ 'timeout' => 15,
'execute' => ['any']
]);
- $functionId = $function['body']['$id'] ?? '';
-
- $this->assertEquals(201, $function['headers']['status-code']);
-
$rules = $this->client->call(Client::METHOD_GET, '/proxy/rules', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
@@ -2425,30 +1655,12 @@ class FunctionsCustomServerTest extends Scope
$domain = $rules['body']['rules'][0]['domain'];
- $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', array_merge([
- 'content-type' => 'multipart/form-data',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $this->setupDeployment($functionId, [
'entrypoint' => 'index.php',
- 'code' => new CURLFile($code, 'application/x-gzip', basename($code)),
+ 'code' => $this->packageFunction('php-cookie'),
'activate' => true
]);
- $deploymentId = $deployment['body']['$id'] ?? '';
- $this->assertEquals(202, $deployment['headers']['status-code']);
-
- $this->awaitDeploymentIsBuilt($function['body']['$id'], $deploymentId, checkForSuccess: false);
-
- $deployment = $this->client->call(Client::METHOD_PATCH, '/functions/' . $functionId . '/deployments/' . $deploymentId, array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), []);
-
- $this->assertEquals(200, $deployment['headers']['status-code']);
-
- // Wait a little for activation to finish
- sleep(5);
-
$cookie = 'cookieName=cookieValue; cookie2=value2; cookie3=value=3; cookie4=val:ue4; cookie5=value5';
$proxyClient = new Client();
@@ -2463,67 +1675,45 @@ class FunctionsCustomServerTest extends Scope
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertEquals($cookie, $response['body']);
+ // Async execution document creation
+ $this->assertEventually(function () use ($functionId) {
+ $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), []);
+
+ $this->assertEquals(200, $executions['headers']['status-code']);
+ $this->assertEquals(1, count($executions['body']['executions']));
+ });
+
// Await Aggregation
- sleep(App::getEnv('_APP_USAGE_AGGREGATION_INTERVAL', 30));
+ sleep(System::getEnv('_APP_USAGE_AGGREGATION_INTERVAL', 30));
- $tries = 0;
- while (true) {
- try {
- $response = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/usage', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id']
- ], $this->getHeaders()), [
- 'range' => '24h'
- ]);
+ $this->assertEventually(function () use ($functionId) {
+ $response = $this->getFunctionUsage($functionId, [
+ 'range' => '24h'
+ ]);
- $this->assertEquals(200, $response['headers']['status-code']);
- $this->assertEquals(19, count($response['body']));
- $this->assertEquals('24h', $response['body']['range']);
- $this->assertEquals(1, $response['body']['executionsTotal']);
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertEquals(19, count($response['body']));
+ $this->assertEquals('24h', $response['body']['range']);
+ $this->assertEquals(1, $response['body']['executionsTotal']);
+ }, 25000, 1000);
- break;
- } catch (ExpectationFailedException $th) {
- if ($tries >= 5) {
- throw $th;
- } else {
- $tries++;
- sleep(5);
- }
- }
- }
-
- // Cleanup : Delete function
- $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], []);
-
- $this->assertEquals(204, $response['headers']['status-code']);
+ $this->cleanupFunction($functionId);
}
public function testFunctionsDomainBinaryResponse()
{
- $timeout = 15;
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/php-binary-response/code.tar.gz";
- $this->packageCode('php-binary-response');
-
- $function = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $functionId = $this->setupFunction([
'functionId' => ID::unique(),
'name' => 'Test PHP Binary executions',
'runtime' => 'php-8.0',
'entrypoint' => 'index.php',
- 'timeout' => $timeout,
+ 'timeout' => 15,
'execute' => ['any']
]);
- $functionId = $function['body']['$id'] ?? '';
-
- $this->assertEquals(201, $function['headers']['status-code']);
-
$rules = $this->client->call(Client::METHOD_GET, '/proxy/rules', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
@@ -2541,30 +1731,12 @@ class FunctionsCustomServerTest extends Scope
$domain = $rules['body']['rules'][0]['domain'];
- $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', array_merge([
- 'content-type' => 'multipart/form-data',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $this->setupDeployment($functionId, [
'entrypoint' => 'index.php',
- 'code' => new CURLFile($code, 'application/x-gzip', basename($code)),
+ 'code' => $this->packageFunction('php-binary-response'),
'activate' => true
]);
- $deploymentId = $deployment['body']['$id'] ?? '';
- $this->assertEquals(202, $deployment['headers']['status-code']);
-
- $this->awaitDeploymentIsBuilt($function['body']['$id'], $deploymentId, checkForSuccess: false);
-
- $deployment = $this->client->call(Client::METHOD_PATCH, '/functions/' . $functionId . '/deployments/' . $deploymentId, array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), []);
-
- $this->assertEquals(200, $deployment['headers']['status-code']);
-
- // Wait a little for activation to finish
- sleep(5);
-
$proxyClient = new Client();
$proxyClient->setEndpoint('http://' . $domain);
@@ -2578,38 +1750,20 @@ class FunctionsCustomServerTest extends Scope
$this->assertEquals(10, $bytes['byte2']);
$this->assertEquals(255, $bytes['byte3']);
- // Cleanup : Delete function
- $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], []);
-
- $this->assertEquals(204, $response['headers']['status-code']);
+ $this->cleanupFunction($functionId);
}
public function testFunctionsDomainBinaryRequest()
{
- $timeout = 15;
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/php-binary-request/code.tar.gz";
- $this->packageCode('php-binary-request');
-
- $function = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $functionId = $this->setupFunction([
'functionId' => ID::unique(),
'name' => 'Test PHP Binary executions',
'runtime' => 'php-8.0',
'entrypoint' => 'index.php',
- 'timeout' => $timeout,
+ 'timeout' => 15,
'execute' => ['any']
]);
- $functionId = $function['body']['$id'] ?? '';
-
- $this->assertEquals(201, $function['headers']['status-code']);
-
$rules = $this->client->call(Client::METHOD_GET, '/proxy/rules', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
@@ -2627,30 +1781,12 @@ class FunctionsCustomServerTest extends Scope
$domain = $rules['body']['rules'][0]['domain'];
- $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', array_merge([
- 'content-type' => 'multipart/form-data',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $this->setupDeployment($functionId, [
'entrypoint' => 'index.php',
- 'code' => new CURLFile($code, 'application/x-gzip', basename($code)),
+ 'code' => $this->packageFunction('php-binary-request'),
'activate' => true
]);
- $deploymentId = $deployment['body']['$id'] ?? '';
- $this->assertEquals(202, $deployment['headers']['status-code']);
-
- $this->awaitDeploymentIsBuilt($function['body']['$id'], $deploymentId, checkForSuccess: false);
-
- $deployment = $this->client->call(Client::METHOD_PATCH, '/functions/' . $functionId . '/deployments/' . $deploymentId, array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), []);
-
- $this->assertEquals(200, $deployment['headers']['status-code']);
-
- // Wait a little for activation to finish
- sleep(5);
-
$proxyClient = new Client();
$proxyClient->setEndpoint('http://' . $domain);
@@ -2661,18 +1797,12 @@ class FunctionsCustomServerTest extends Scope
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertEquals(\md5($bytes), $response['body']);
- // Cleanup : Delete function
- $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], []);
-
- $this->assertEquals(204, $response['headers']['status-code']);
+ $this->cleanupFunction($functionId);
}
- public function testCreateFunctionWithResponseFormatHeader()
+ public function testResponseFilters()
{
+ // create function with 1.5.0 response format
$response = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
@@ -2686,28 +1816,75 @@ class FunctionsCustomServerTest extends Scope
]);
$this->assertEquals(201, $response['headers']['status-code']);
+ $this->assertArrayNotHasKey('scopes', $response['body']);
+ $this->assertArrayNotHasKey('specification', $response['body']);
- // Cleanup : Delete function
- $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $response['body']['$id'], [
+ // get function with 1.5.0 response format header
+ $function = $this->client->call(Client::METHOD_GET, '/functions/' . $response['body']['$id'], array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], []);
+ 'x-appwrite-response-format' => '1.5.0', // add response format header
+ ], $this->getHeaders()));
- $this->assertEquals(204, $response['headers']['status-code']);
+ $this->assertEquals(200, $function['headers']['status-code']);
+ $this->assertArrayNotHasKey('scopes', $function['body']);
+ $this->assertArrayNotHasKey('specification', $function['body']);
+
+ $function = $this->getFunction($function['body']['$id']);
+
+ $this->assertEquals(200, $function['headers']['status-code']);
+ $this->assertArrayHasKey('scopes', $function['body']);
+ $this->assertArrayHasKey('specification', $function['body']);
+
+ $functionId = $function['body']['$id'] ?? '';
+ $this->cleanupFunction($functionId);
+ }
+
+ public function testRequestFilters()
+ {
+ $function1Id = $this->setupFunction([
+ 'functionId' => ID::unique(),
+ 'name' => 'Test',
+ 'runtime' => 'php-8.0',
+ 'entrypoint' => 'index.php',
+ 'timeout' => 15,
+ 'execute' => ['any']
+ ]);
+
+ $function2Id = $this->setupFunction([
+ 'functionId' => ID::unique(),
+ 'name' => 'Test2',
+ 'runtime' => 'php-8.0',
+ 'entrypoint' => 'index.php',
+ 'timeout' => 15,
+ 'execute' => ['any']
+ ]);
+
+ // list functions using request filters
+ $response = $this->client->call(
+ Client::METHOD_GET,
+ '/functions',
+ array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-response-format' => '1.4.0', // Set response format for 1.4 syntax
+ ], $this->getHeaders()),
+ [
+ 'queries' => [ 'equal("name", ["Test2"])' ]
+ ]
+ );
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertCount(1, $response['body']['functions']);
+ $this->assertEquals('Test2', $response['body']['functions'][0]['name']);
+
+ $this->cleanupFunction($function1Id);
+ $this->cleanupFunction($function2Id);
}
public function testFunctionLogging()
{
- // Preparations: Create Function
- $folder = 'node';
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/$folder/code.tar.gz";
- $this->packageCode($folder);
-
- $function = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $function = $this->createFunction([
'functionId' => ID::unique(),
'runtime' => 'node-18.0',
'name' => 'Logging Test',
@@ -2720,38 +1897,22 @@ class FunctionsCustomServerTest extends Scope
$this->assertFalse($function['body']['logging']);
$this->assertNotEmpty($function['body']['$id']);
- $functionId = $function['body']['$id'];
+ $functionId = $functionId = $function['body']['$id'] ?? '';
- $deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', array_merge([
- 'content-type' => 'multipart/form-data',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
- 'code' => new CURLFile($code, 'application/x-gzip', basename($code)),
+ $this->setupDeployment($functionId, [
+ 'code' => $this->packageFunction('node'),
'activate' => true
]);
- $this->assertEquals(202, $deployment['headers']['status-code']);
- $this->assertNotEmpty($deployment['body']['$id']);
-
- $deploymentId = $deployment['body']['$id'] ?? '';
-
- $this->awaitDeploymentIsBuilt($functionId, $deploymentId, checkForSuccess: false);
-
// Sync Executions test
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), []);
+ $execution = $this->createExecution($functionId);
$this->assertEquals(201, $execution['headers']['status-code']);
$this->assertEmpty($execution['body']['logs']);
$this->assertEmpty($execution['body']['errors']);
// Async Executions test
- $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $execution = $this->createExecution($functionId, [
'async' => true
]);
@@ -2760,19 +1921,16 @@ class FunctionsCustomServerTest extends Scope
$this->assertEmpty($execution['body']['errors']);
$this->assertNotEmpty($execution['body']['$id']);
- $executionId = $execution['body']['$id'];
+ $executionId = $execution['body']['$id'] ?? '';
- sleep(5);
+ $this->assertEventually(function () use ($functionId, $executionId) {
+ $execution = $this->getExecution($functionId, $executionId);
- $execution = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions/' . $executionId, array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()));
-
- $this->assertEquals(200, $execution['headers']['status-code']);
- $this->assertEquals('completed', $execution['body']['status']);
- $this->assertEmpty($execution['body']['logs']);
- $this->assertEmpty($execution['body']['errors']);
+ $this->assertEquals(200, $execution['headers']['status-code']);
+ $this->assertEquals('completed', $execution['body']['status']);
+ $this->assertEmpty($execution['body']['logs']);
+ $this->assertEmpty($execution['body']['errors']);
+ }, 10000, 500);
// Domain Executions test
$rules = $this->client->call(Client::METHOD_GET, '/proxy/rules', array_merge([
@@ -2800,10 +1958,7 @@ class FunctionsCustomServerTest extends Scope
$this->assertEquals(200, $response['headers']['status-code']);
- $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()), [
+ $executions = $this->listExecutions($functionId, [
'queries' => [
Query::limit(1)->toString(),
Query::orderDesc('$id')->toString(),
@@ -2816,10 +1971,7 @@ class FunctionsCustomServerTest extends Scope
$this->assertEmpty($executions['body']['executions'][0]['errors']);
// Ensure executions count
- $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', array_merge([
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- ], $this->getHeaders()));
+ $executions = $this->listExecutions($functionId);
$this->assertEquals(200, $executions['headers']['status-code']);
$this->assertCount(3, $executions['body']['executions']);
@@ -2830,13 +1982,6 @@ class FunctionsCustomServerTest extends Scope
$this->assertEmpty($execution['errors']);
}
- // Cleanup : Delete function
- $response = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, [
- 'content-type' => 'application/json',
- 'x-appwrite-project' => $this->getProject()['$id'],
- 'x-appwrite-key' => $this->getProject()['apiKey'],
- ], []);
-
- $this->assertEquals(204, $response['headers']['status-code']);
+ $this->cleanupFunction($functionId);
}
}
diff --git a/tests/e2e/Services/FunctionsSchedule/FunctionsScheduleTest.php b/tests/e2e/Services/FunctionsSchedule/FunctionsScheduleTest.php
new file mode 100644
index 0000000000..4f4b0c960d
--- /dev/null
+++ b/tests/e2e/Services/FunctionsSchedule/FunctionsScheduleTest.php
@@ -0,0 +1,215 @@
+setupFunction([
+ 'functionId' => ID::unique(),
+ 'name' => 'Test',
+ 'execute' => [Role::user($this->getUser()['$id'])->toString()],
+ 'runtime' => 'php-8.0',
+ 'entrypoint' => 'index.php',
+ 'events' => [
+ 'users.*.create',
+ 'users.*.delete',
+ ],
+ 'schedule' => '* * * * *', // Execute every 60 seconds
+ 'timeout' => 10,
+ ]);
+
+ $this->setupDeployment($functionId, [
+ 'entrypoint' => 'index.php',
+ 'code' => $this->packageFunction('php'),
+ 'activate' => true
+ ]);
+
+ // Wait for scheduled execution
+ \sleep(60);
+
+ $this->assertEventually(function () use ($functionId) {
+ $executions = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/executions', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ]);
+
+ $this->assertEquals(200, $executions['headers']['status-code']);
+ $this->assertCount(1, $executions['body']['executions']);
+
+ $asyncExecution = $executions['body']['executions'][0];
+
+ $this->assertEquals('schedule', $asyncExecution['trigger']);
+ $this->assertEquals('completed', $asyncExecution['status']);
+ $this->assertEquals(200, $asyncExecution['responseStatusCode']);
+ $this->assertEquals('', $asyncExecution['responseBody']);
+ $this->assertNotEmpty($asyncExecution['logs']);
+ $this->assertNotEmpty($asyncExecution['errors']);
+ $this->assertGreaterThan(0, $asyncExecution['duration']);
+ }, 60000, 500);
+
+ $this->cleanupFunction($functionId);
+ }
+
+ public function testCreateScheduledAtExecution(): void
+ {
+ /**
+ * Test for SUCCESS
+ */
+ $functionId = $this->setupFunction([
+ 'functionId' => ID::unique(),
+ 'name' => 'Test',
+ 'execute' => [Role::user($this->getUser()['$id'])->toString()],
+ 'runtime' => 'php-8.0',
+ 'entrypoint' => 'index.php',
+ 'timeout' => 10,
+ 'logging' => true,
+ ]);
+ $this->setupDeployment($functionId, [
+ 'entrypoint' => 'index.php',
+ 'code' => $this->packageFunction('php'),
+ 'activate' => true
+ ]);
+
+ // Schedule execution for the future
+ \date_default_timezone_set('UTC');
+ $futureTime = (new \DateTime())->add(new \DateInterval('PT2M')); // 2 minute in the future
+ $futureTime->setTime($futureTime->format('H'), $futureTime->format('i'), 0, 0);
+
+
+ $execution = $this->client->call(
+ Client::METHOD_POST,
+ '/functions/' . $functionId . '/executions',
+ [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'origin' => 'http://localhost',
+ 'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $this->getUser()['session'],
+ ],
+ [
+ 'async' => true,
+ 'scheduledAt' => $futureTime->format(\DateTime::ATOM),
+ 'path' => '/custom-path',
+ 'method' => 'PATCH',
+ 'body' => 'custom-body',
+ 'headers' => [
+ 'x-custom-header' => 'custom-value'
+ ]
+ ]
+ );
+ $executionId = $execution['body']['$id'];
+
+ $this->assertEquals(202, $execution['headers']['status-code']);
+ $this->assertEquals('scheduled', $execution['body']['status']);
+ $this->assertEquals('PATCH', $execution['body']['requestMethod']);
+ $this->assertEquals('/custom-path', $execution['body']['requestPath']);
+ $this->assertCount(0, $execution['body']['requestHeaders']);
+
+ \sleep(120);
+
+ $this->assertEventually(function () use ($functionId, $executionId) {
+ $execution = $this->getExecution($functionId, $executionId);
+
+ $this->assertEquals(200, $execution['headers']['status-code']);
+ $this->assertEquals(200, $execution['body']['responseStatusCode']);
+ $this->assertEquals('completed', $execution['body']['status']);
+ $this->assertEquals('/custom-path', $execution['body']['requestPath']);
+ $this->assertEquals('PATCH', $execution['body']['requestMethod']);
+ $this->assertStringContainsString('body-is-custom-body', $execution['body']['logs']);
+ $this->assertStringContainsString('custom-header-is-custom-value', $execution['body']['logs']);
+ $this->assertStringContainsString('method-is-patch', $execution['body']['logs']);
+ $this->assertStringContainsString('path-is-/custom-path', $execution['body']['logs']);
+ $this->assertStringContainsString('user-is-' . $this->getUser()['$id'], $execution['body']['logs']);
+ $this->assertStringContainsString('jwt-is-valid', $execution['body']['logs']);
+ $this->assertGreaterThan(0, $execution['body']['duration']);
+ }, 10000, 500);
+
+ /* Test for FAILURE */
+ // Schedule synchronous execution
+ $execution = $this->createExecution($functionId, [
+ 'async' => 'false',
+ 'scheduledAt' => $futureTime->format(\DateTime::ATOM),
+ ]);
+ $this->assertEquals(400, $execution['headers']['status-code']);
+
+ // Execution with seconds precision
+ $execution = $this->createExecution($functionId, [
+ 'async' => true,
+ 'scheduledAt' => (new \DateTime("2100-12-08 16:12:02"))->format(\DateTime::ATOM)
+ ]);
+ $this->assertEquals(400, $execution['headers']['status-code']);
+
+ // Execution with milliseconds precision
+ $execution = $this->createExecution($functionId, [
+ 'async' => true,
+ 'scheduledAt' => (new \DateTime("2100-12-08 16:12:02.255"))->format(\DateTime::ATOM)
+ ]);
+ $this->assertEquals(400, $execution['headers']['status-code']);
+
+ // Execution too soon
+ $execution = $this->createExecution($functionId, [
+ 'async' => true,
+ 'scheduledAt' => (new \DateTime())->add(new \DateInterval('PT1S'))->format(\DateTime::ATOM)
+ ]);
+ $this->assertEquals(400, $execution['headers']['status-code']);
+
+ $this->cleanupFunction($functionId, $executionId);
+ }
+
+ public function testDeleteScheduledExecution()
+ {
+ $functionId = $this->setupFunction([
+ 'functionId' => ID::unique(),
+ 'name' => 'Test',
+ 'execute' => [Role::user($this->getUser()['$id'])->toString()],
+ 'runtime' => 'php-8.0',
+ 'entrypoint' => 'index.php',
+ 'timeout' => 10,
+ 'logging' => true,
+ ]);
+
+ $this->setupDeployment($functionId, [
+ 'entrypoint' => 'index.php',
+ 'code' => $this->packageFunction('php'),
+ 'activate' => true
+ ]);
+
+ $futureTime = (new \DateTime())->add(new \DateInterval('PT10H'));
+ $futureTime->setTime($futureTime->format('H'), $futureTime->format('i'), 0, 0);
+
+ $execution = $this->createExecution($functionId, [
+ 'async' => true,
+ 'scheduledAt' => $futureTime->format('Y-m-d H:i:s'),
+ ]);
+
+ $this->assertEquals(202, $execution['headers']['status-code']);
+
+ $executionId = $execution['body']['$id'] ?? '';
+
+ $execution = $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId . '/executions/' . $executionId, array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()));
+
+ $this->assertEquals(204, $execution['headers']['status-code']);
+
+ $this->cleanupFunction($functionId);
+ }
+}
diff --git a/tests/e2e/Services/GraphQL/Base.php b/tests/e2e/Services/GraphQL/Base.php
index 735e4eced5..0b3250cecf 100644
--- a/tests/e2e/Services/GraphQL/Base.php
+++ b/tests/e2e/Services/GraphQL/Base.php
@@ -2,6 +2,7 @@
namespace Tests\E2E\Services\GraphQL;
+use CURLFile;
use Utopia\CLI\Console;
trait Base
@@ -2496,8 +2497,17 @@ trait Base
protected string $stdout = '';
protected string $stderr = '';
- protected function packageCode($folder): void
+ protected function packageFunction(string $function): CURLFile
{
- Console::execute('cd ' . realpath(__DIR__ . "/../../../resources/functions") . "/$folder && tar --exclude code.tar.gz -czf code.tar.gz .", '', $this->stdout, $this->stderr);
+ $folderPath = realpath(__DIR__ . '/../../../resources/functions') . "/$function";
+ $tarPath = "$folderPath/code.tar.gz";
+
+ Console::execute("cd $folderPath && tar --exclude code.tar.gz -czf code.tar.gz .", '', $this->stdout, $this->stderr);
+
+ if (filesize($tarPath) > 1024 * 1024 * 5) {
+ throw new \Exception('Code package is too large. Use the chunked upload method instead.');
+ }
+
+ return new CURLFile($tarPath, 'application/x-gzip', \basename($tarPath));
}
}
diff --git a/tests/e2e/Services/GraphQL/FunctionsClientTest.php b/tests/e2e/Services/GraphQL/FunctionsClientTest.php
index 3f0ee1966a..e7e8421254 100644
--- a/tests/e2e/Services/GraphQL/FunctionsClientTest.php
+++ b/tests/e2e/Services/GraphQL/FunctionsClientTest.php
@@ -2,7 +2,6 @@
namespace Tests\E2E\Services\GraphQL;
-use CURLFile;
use Tests\E2E\Client;
use Tests\E2E\Scopes\ProjectCustom;
use Tests\E2E\Scopes\Scope;
@@ -83,10 +82,6 @@ class FunctionsClientTest extends Scope
$projectId = $this->getProject()['$id'];
$query = $this->getQuery(self::$CREATE_DEPLOYMENT);
- $folder = 'php';
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/$folder/code.tar.gz";
- $this->packageCode($folder);
-
$gqlPayload = [
'operations' => \json_encode([
'query' => $query,
@@ -99,7 +94,7 @@ class FunctionsClientTest extends Scope
'map' => \json_encode([
'code' => ["variables.code"]
]),
- 'code' => new CURLFile($code, 'application/gzip', 'code.tar.gz'),
+ 'code' => $this->packageFunction('php')
];
$deployment = $this->client->call(Client::METHOD_POST, '/graphql', [
diff --git a/tests/e2e/Services/GraphQL/FunctionsServerTest.php b/tests/e2e/Services/GraphQL/FunctionsServerTest.php
index 25a671fa1c..c3606244c4 100644
--- a/tests/e2e/Services/GraphQL/FunctionsServerTest.php
+++ b/tests/e2e/Services/GraphQL/FunctionsServerTest.php
@@ -2,7 +2,6 @@
namespace Tests\E2E\Services\GraphQL;
-use CURLFile;
use Tests\E2E\Client;
use Tests\E2E\Scopes\ProjectCustom;
use Tests\E2E\Scopes\Scope;
@@ -82,10 +81,6 @@ class FunctionsServerTest extends Scope
$projectId = $this->getProject()['$id'];
$query = $this->getQuery(self::$CREATE_DEPLOYMENT);
- $folder = 'php';
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/$folder/code.tar.gz";
- $this->packageCode($folder);
-
$gqlPayload = [
'operations' => \json_encode([
'query' => $query,
@@ -98,7 +93,7 @@ class FunctionsServerTest extends Scope
'map' => \json_encode([
'code' => ["variables.code"]
]),
- 'code' => new CURLFile($code, 'application/gzip', 'code.tar.gz'),
+ 'code' => $this->packageFunction('php'),
];
$deployment = $this->client->call(Client::METHOD_POST, '/graphql', \array_merge([
diff --git a/tests/e2e/Services/Health/HealthCustomServerTest.php b/tests/e2e/Services/Health/HealthCustomServerTest.php
index 8360af542e..9d6a04abe6 100644
--- a/tests/e2e/Services/Health/HealthCustomServerTest.php
+++ b/tests/e2e/Services/Health/HealthCustomServerTest.php
@@ -455,7 +455,7 @@ class HealthCustomServerTest extends Scope
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertEquals('/CN=www.google.com', $response['body']['name']);
$this->assertEquals('www.google.com', $response['body']['subjectSN']);
- $this->assertStringContainsString('Google Trust Services', $response['body']['issuerOrganisation']);
+ $this->assertContains($response['body']['issuerOrganisation'], ['Let\'s Encrypt', 'Google Trust Services']);
$this->assertIsInt($response['body']['validFrom']);
$this->assertIsInt($response['body']['validTo']);
@@ -467,7 +467,7 @@ class HealthCustomServerTest extends Scope
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertEquals('/CN=appwrite.io', $response['body']['name']);
$this->assertEquals('appwrite.io', $response['body']['subjectSN']);
- $this->assertEquals("Let's Encrypt", $response['body']['issuerOrganisation']);
+ $this->assertContains($response['body']['issuerOrganisation'], ['Let\'s Encrypt', 'Google Trust Services']);
$this->assertIsInt($response['body']['validFrom']);
$this->assertIsInt($response['body']['validTo']);
diff --git a/tests/e2e/Services/Migrations/MigrationsBase.php b/tests/e2e/Services/Migrations/MigrationsBase.php
new file mode 100644
index 0000000000..e4c7ba7712
--- /dev/null
+++ b/tests/e2e/Services/Migrations/MigrationsBase.php
@@ -0,0 +1,895 @@
+getProject(true);
+ self::$project = $projectBackup;
+
+ return self::$destinationProject;
+ }
+
+ public function performMigrationSync(
+ array $body,
+ ): array {
+ $migration = $this->client->call(Client::METHOD_POST, '/migrations/appwrite', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ], $body);
+
+ $this->assertEquals(202, $migration['headers']['status-code']);
+ $this->assertNotEmpty($migration['body']);
+ $this->assertNotEmpty($migration['body']['$id']);
+
+ $attempts = 0;
+ while ($attempts < 5) {
+ $response = $this->client->call(Client::METHOD_GET, '/migrations/' . $migration['body']['$id'], [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertNotEmpty($response['body']);
+ $this->assertNotEmpty($response['body']['$id']);
+
+ if ($response['body']['status'] === 'failed') {
+ $this->fail('Migration failed', json_encode($response['body'], JSON_PRETTY_PRINT));
+ }
+
+ $this->assertNotEquals('failed', $response['body']['status']);
+
+ if ($response['body']['status'] === 'completed') {
+ return $response['body'];
+ }
+
+ if ($attempts === 4) {
+ $this->assertEquals('completed', $response['body']['status']);
+ }
+
+ $attempts++;
+ sleep(5);
+ }
+ }
+
+ /**
+ * Appwrite E2E Migration Tests
+ */
+ public function testCreateAppwriteMigration()
+ {
+ $response = $this->performMigrationSync([
+ 'resources' => Appwrite::getSupportedResources(),
+ 'endpoint' => 'http://localhost/v1',
+ 'projectId' => $this->getProject()['$id'],
+ 'apiKey' => $this->getProject()['apiKey'],
+ ]);
+
+ $this->assertEquals(Appwrite::getSupportedResources(), $response['resources']);
+ $this->assertEquals('Appwrite', $response['source']);
+ $this->assertEquals('Appwrite', $response['destination']);
+ $this->assertEmpty($response['statusCounters']);
+ }
+
+ /**
+ * Auth
+ */
+ public function testAppwriteMigrationAuthUserPassword()
+ {
+ $response = $this->client->call(Client::METHOD_POST, '/users', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ], [
+ 'userId' => ID::unique(),
+ 'email' => 'test@test.com',
+ 'password' => 'password',
+ ]);
+
+ $this->assertEquals(201, $response['headers']['status-code']);
+ $this->assertNotEmpty($response['body']);
+ $this->assertNotEmpty($response['body']['$id']);
+ $this->assertEquals('test@test.com', $response['body']['email']);
+
+ $user = $response['body'];
+
+ $result = $this->performMigrationSync([
+ 'resources' => [
+ Resource::TYPE_USER,
+ ],
+ 'endpoint' => 'http://localhost/v1',
+ 'projectId' => $this->getProject()['$id'],
+ 'apiKey' => $this->getProject()['apiKey'],
+ ]);
+
+ $this->assertEquals('completed', $result['status']);
+ $this->assertEquals([Resource::TYPE_USER], $result['resources']);
+ $this->assertArrayHasKey(Resource::TYPE_USER, $result['statusCounters']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_USER]['error']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_USER]['pending']);
+ $this->assertEquals(1, $result['statusCounters'][Resource::TYPE_USER]['success']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_USER]['processing']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_USER]['warning']);
+
+ $response = $this->client->call(Client::METHOD_GET, '/users/' . $user['$id'], [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertNotEmpty($response['body']);
+ $this->assertNotEmpty($response['body']['$id']);
+ $this->assertEquals($user['email'], $response['body']['email']);
+ $this->assertEquals($user['password'], $response['body']['password']);
+
+ // Cleanup
+ $this->client->call(Client::METHOD_DELETE, '/users/' . $user['$id'], [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ]);
+
+ $this->client->call(Client::METHOD_DELETE, '/users/' . $user['$id'], [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ]);
+ }
+
+ public function testAppwriteMigrationAuthUserPhone()
+ {
+ $response = $this->client->call(Client::METHOD_POST, '/users', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ], [
+ 'userId' => ID::unique(),
+ 'phone' => '+12065550100',
+ ]);
+
+ $this->assertEquals(201, $response['headers']['status-code']);
+ $this->assertNotEmpty($response['body']);
+ $this->assertNotEmpty($response['body']['$id']);
+ $this->assertEquals('+12065550100', $response['body']['phone']);
+
+ $user = $response['body'];
+
+ $result = $this->performMigrationSync([
+ 'resources' => [
+ Resource::TYPE_USER,
+ ],
+ 'endpoint' => 'http://localhost/v1',
+ 'projectId' => $this->getProject()['$id'],
+ 'apiKey' => $this->getProject()['apiKey'],
+ ]);
+
+ $this->assertEquals('completed', $result['status']);
+ $this->assertEquals([Resource::TYPE_USER], $result['resources']);
+ $this->assertArrayHasKey(Resource::TYPE_USER, $result['statusCounters']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_USER]['error']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_USER]['pending']);
+ $this->assertEquals(1, $result['statusCounters'][Resource::TYPE_USER]['success']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_USER]['processing']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_USER]['warning']);
+
+ $response = $this->client->call(Client::METHOD_GET, '/users/' . $user['$id'], [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertNotEmpty($response['body']);
+ $this->assertNotEmpty($response['body']['$id']);
+ $this->assertEquals($user['phone'], $response['body']['phone']);
+
+ // Cleanup
+ $this->client->call(Client::METHOD_DELETE, '/users/' . $user['$id'], [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ]);
+
+ $this->client->call(Client::METHOD_DELETE, '/users/' . $user['$id'], [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ]);
+ }
+
+ public function testAppwriteMigrationAuthTeam()
+ {
+ $user = $this->client->call(Client::METHOD_POST, '/users', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ], [
+ 'userId' => ID::unique(),
+ 'email' => 'test@test.com',
+ 'password' => 'password',
+ ]);
+
+ $this->assertEquals(201, $user['headers']['status-code']);
+ $this->assertNotEmpty($user['body']);
+ $this->assertNotEmpty($user['body']['$id']);
+ $this->assertEquals('test@test.com', $user['body']['email']);
+
+ $team = $this->client->call(Client::METHOD_POST, '/teams', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ], [
+ 'teamId' => ID::unique(),
+ 'name' => 'Test Team',
+ ]);
+
+ $this->assertEquals(201, $team['headers']['status-code']);
+ $this->assertNotEmpty($team['body']);
+ $this->assertNotEmpty($team['body']['$id']);
+
+ $membership = $this->client->call(Client::METHOD_POST, '/teams/' . $team['body']['$id'] . '/memberships', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ], [
+ 'teamId' => $team['body']['$id'],
+ 'userId' => $user['body']['$id'],
+ 'roles' => ['owner'],
+ ]);
+
+ $this->assertEquals(201, $membership['headers']['status-code']);
+ $this->assertNotEmpty($membership['body']);
+ $this->assertNotEmpty($membership['body']['$id']);
+
+ $result = $this->performMigrationSync([
+ 'resources' => [
+ Resource::TYPE_USER,
+ Resource::TYPE_TEAM,
+ Resource::TYPE_MEMBERSHIP,
+ ],
+ 'endpoint' => 'http://localhost/v1',
+ 'projectId' => $this->getProject()['$id'],
+ 'apiKey' => $this->getProject()['apiKey'],
+ ]);
+
+ $this->assertEquals('completed', $result['status']);
+ $this->assertEquals([Resource::TYPE_USER, Resource::TYPE_TEAM, Resource::TYPE_MEMBERSHIP], $result['resources']);
+ $this->assertArrayHasKey(Resource::TYPE_USER, $result['statusCounters']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_USER]['error']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_USER]['pending']);
+ $this->assertEquals(1, $result['statusCounters'][Resource::TYPE_USER]['success']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_USER]['processing']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_USER]['warning']);
+
+ $this->assertArrayHasKey(Resource::TYPE_TEAM, $result['statusCounters']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_TEAM]['error']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_TEAM]['pending']);
+ $this->assertEquals(1, $result['statusCounters'][Resource::TYPE_TEAM]['success']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_TEAM]['processing']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_TEAM]['warning']);
+
+ $this->assertArrayHasKey(Resource::TYPE_MEMBERSHIP, $result['statusCounters']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_MEMBERSHIP]['error']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_MEMBERSHIP]['pending']);
+ $this->assertEquals(1, $result['statusCounters'][Resource::TYPE_MEMBERSHIP]['success']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_MEMBERSHIP]['processing']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_MEMBERSHIP]['warning']);
+
+ $response = $this->client->call(Client::METHOD_GET, '/teams/' . $team['body']['$id'], [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertNotEmpty($response['body']);
+ $this->assertNotEmpty($response['body']['$id']);
+ $this->assertEquals($team['body']['name'], $response['body']['name']);
+
+ $response = $this->client->call(Client::METHOD_GET, '/teams/' . $team['body']['$id'] . '/memberships', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertNotEmpty($response['body']);
+
+ $membership = $response['body']['memberships'][0];
+
+ $this->assertEquals($user['body']['$id'], $membership['userId']);
+ $this->assertEquals($team['body']['$id'], $membership['teamId']);
+ $this->assertEquals(['owner'], $membership['roles']);
+
+ // Cleanup
+ $this->client->call(Client::METHOD_DELETE, '/teams/' . $team['body']['$id'], [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ]);
+
+ $this->client->call(Client::METHOD_DELETE, '/teams/' . $team['body']['$id'], [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ]);
+
+ $this->client->call(Client::METHOD_DELETE, '/users/' . $user['body']['$id'], [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ]);
+
+ $this->client->call(Client::METHOD_DELETE, '/users/' . $user['body']['$id'], [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ]);
+
+ $this->client->call(Client::METHOD_DELETE, '/teams/' . $team['body']['$id'], [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ]);
+
+ $this->client->call(Client::METHOD_DELETE, '/teams/' . $team['body']['$id'], [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ]);
+ }
+
+ /**
+ * Databases
+ */
+ public function testAppwriteMigrationDatabase()
+ {
+ $response = $this->client->call(Client::METHOD_POST, '/databases', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ], [
+ 'databaseId' => ID::unique(),
+ 'name' => 'Test Database'
+ ]);
+
+ $this->assertEquals(201, $response['headers']['status-code']);
+ $this->assertNotEmpty($response['body']);
+ $this->assertNotEmpty($response['body']['$id']);
+
+ $databaseId = $response['body']['$id'];
+
+ $result = $this->performMigrationSync([
+ 'resources' => [
+ Resource::TYPE_DATABASE,
+ ],
+ 'endpoint' => 'http://localhost/v1',
+ 'projectId' => $this->getProject()['$id'],
+ 'apiKey' => $this->getProject()['apiKey'],
+ ]);
+
+
+ $this->assertEquals('completed', $result['status']);
+ $this->assertEquals([Resource::TYPE_DATABASE], $result['resources']);
+ $this->assertArrayHasKey(Resource::TYPE_DATABASE, $result['statusCounters']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_DATABASE]['error']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_DATABASE]['pending']);
+ $this->assertEquals(1, $result['statusCounters'][Resource::TYPE_DATABASE]['success']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_DATABASE]['processing']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_DATABASE]['warning']);
+
+ $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId, [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertNotEmpty($response['body']);
+ $this->assertNotEmpty($response['body']['$id']);
+
+ $this->assertEquals($databaseId, $response['body']['$id']);
+ $this->assertEquals('Test Database', $response['body']['name']);
+
+ // Cleanup on destination
+ $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId, [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ]);
+
+ return [
+ 'databaseId' => $databaseId,
+ ];
+ }
+
+ /**
+ * @depends testAppwriteMigrationDatabase
+ */
+ public function testAppwriteMigrationDatabasesCollection(array $data)
+ {
+ $databaseId = $data['databaseId'];
+
+ $collection = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ], [
+ 'collectionId' => ID::unique(),
+ 'name' => 'Test Collection',
+ ]);
+
+ $this->assertEquals(201, $collection['headers']['status-code']);
+
+ $collectionId = $collection['body']['$id'];
+
+ // Create Attribute
+ $response = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections/' . $collectionId . '/attributes/string', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ], [
+ 'key' => 'name',
+ 'size' => 100,
+ 'encrypt' => false,
+ 'required' => true
+ ]);
+
+ $this->assertEquals(202, $response['headers']['status-code']);
+
+ // Wait for attribute to be ready
+ $this->assertEventually(function () use ($databaseId, $collectionId) {
+ $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections/' . $collectionId . '/attributes/name', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertEquals('available', $response['body']['status']);
+ }, 5000, 500);
+
+ $result = $this->performMigrationSync([
+ 'resources' => [
+ Resource::TYPE_DATABASE,
+ Resource::TYPE_COLLECTION,
+ Resource::TYPE_ATTRIBUTE,
+ ],
+ 'endpoint' => 'http://localhost/v1',
+ 'projectId' => $this->getProject()['$id'],
+ 'apiKey' => $this->getProject()['apiKey'],
+ ]);
+
+ $this->assertEquals('completed', $result['status']);
+ $this->assertEquals([Resource::TYPE_DATABASE, Resource::TYPE_COLLECTION, Resource::TYPE_ATTRIBUTE], $result['resources']);
+
+ foreach ([Resource::TYPE_DATABASE, Resource::TYPE_COLLECTION, Resource::TYPE_ATTRIBUTE] as $resource) {
+ $this->assertArrayHasKey($resource, $result['statusCounters']);
+ $this->assertEquals(0, $result['statusCounters'][$resource]['error']);
+ $this->assertEquals(0, $result['statusCounters'][$resource]['pending']);
+ $this->assertEquals(1, $result['statusCounters'][$resource]['success']);
+ $this->assertEquals(0, $result['statusCounters'][$resource]['processing']);
+ $this->assertEquals(0, $result['statusCounters'][$resource]['warning']);
+ }
+
+ $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections/' . $collectionId, [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertNotEmpty($response['body']);
+
+ $this->assertEquals($collectionId, $response['body']['$id']);
+ $this->assertEquals('Test Collection', $response['body']['name']);
+
+ $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections/' . $collectionId . '/attributes/name', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertNotEmpty($response['body']);
+
+ $this->assertEquals('name', $response['body']['key']);
+ $this->assertEquals(100, $response['body']['size']);
+ $this->assertEquals(true, $response['body']['required']);
+
+ // Cleanup
+ $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId, [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ]);
+
+ return [
+ 'databaseId' => $databaseId,
+ 'collectionId' => $collectionId,
+ ];
+ }
+
+ /**
+ * @depends testAppwriteMigrationDatabasesCollection
+ */
+ public function testAppwriteMigrationDatabasesDocument(array $data)
+ {
+ $databaseId = $data['databaseId'];
+ $collectionId = $data['collectionId'];
+
+ $document = $this->client->call(Client::METHOD_POST, '/databases/' . $databaseId . '/collections/' . $collectionId . '/documents', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ], [
+ 'documentId' => ID::unique(),
+ 'data' => [
+ 'name' => 'Test Document',
+ ]
+ ]);
+
+ $this->assertEquals(201, $document['headers']['status-code']);
+ $this->assertNotEmpty($document['body']);
+ $this->assertNotEmpty($document['body']['$id']);
+
+ $documentId = $document['body']['$id'];
+
+ $result = $this->performMigrationSync([
+ 'resources' => [
+ Resource::TYPE_DATABASE,
+ Resource::TYPE_COLLECTION,
+ Resource::TYPE_ATTRIBUTE,
+ Resource::TYPE_DOCUMENT,
+ ],
+ 'endpoint' => 'http://localhost/v1',
+ 'projectId' => $this->getProject()['$id'],
+ 'apiKey' => $this->getProject()['apiKey'],
+ ]);
+
+ $this->assertEquals('completed', $result['status']);
+ $this->assertEquals([Resource::TYPE_DATABASE, Resource::TYPE_COLLECTION, Resource::TYPE_ATTRIBUTE, Resource::TYPE_DOCUMENT], $result['resources']);
+
+ //TODO: Add TYPE_DOCUMENT to the migration status counters once pending issue is resolved
+ foreach ([Resource::TYPE_DATABASE, Resource::TYPE_COLLECTION, Resource::TYPE_ATTRIBUTE] as $resource) {
+ $this->assertArrayHasKey($resource, $result['statusCounters']);
+ $this->assertEquals(0, $result['statusCounters'][$resource]['error']);
+ $this->assertEquals(0, $result['statusCounters'][$resource]['pending']);
+ $this->assertEquals(1, $result['statusCounters'][$resource]['success']);
+ $this->assertEquals(0, $result['statusCounters'][$resource]['processing']);
+ $this->assertEquals(0, $result['statusCounters'][$resource]['warning']);
+ }
+
+ $response = $this->client->call(Client::METHOD_GET, '/databases/' . $databaseId . '/collections/' . $collectionId . '/documents/' . $documentId, [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertNotEmpty($response['body']);
+
+ $this->assertEquals($documentId, $response['body']['$id']);
+ $this->assertEquals('Test Document', $response['body']['name']);
+
+ // Cleanup
+ $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId, [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ]);
+ }
+
+ /**
+ * Storage
+ */
+ public function testAppwriteMigrationStorageBucket()
+ {
+ $bucket = $this->client->call(Client::METHOD_POST, '/storage/buckets', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ], [
+ 'bucketId' => ID::unique(),
+ 'name' => 'Test Bucket',
+ 'permissions' => [
+ Permission::read(Role::any()),
+ Permission::create(Role::any()),
+ Permission::update(Role::any()),
+ Permission::delete(Role::any()),
+ ],
+ 'maximumFileSize' => 1000000,
+ 'allowedFileExtensions' => ['pdf'],
+ 'compression' => 'gzip',
+ 'encryption' => false,
+ 'antivirus' => false
+ ]);
+
+ $this->assertEquals(201, $bucket['headers']['status-code']);
+ $this->assertNotEmpty($bucket['body']);
+ $this->assertNotEmpty($bucket['body']['$id']);
+ $this->assertEquals('Test Bucket', $bucket['body']['name']);
+
+ $result = $this->performMigrationSync([
+ 'resources' => [
+ Resource::TYPE_BUCKET
+ ],
+ 'endpoint' => 'http://localhost/v1',
+ 'projectId' => $this->getProject()['$id'],
+ 'apiKey' => $this->getProject()['apiKey'],
+ ]);
+
+ $this->assertEquals('completed', $result['status']);
+ $this->assertEquals([Resource::TYPE_BUCKET], $result['resources']);
+ $this->assertArrayHasKey(Resource::TYPE_BUCKET, $result['statusCounters']);
+
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_BUCKET]['error']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_BUCKET]['pending']);
+ $this->assertEquals(1, $result['statusCounters'][Resource::TYPE_BUCKET]['success']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_BUCKET]['processing']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_BUCKET]['warning']);
+
+ $response = $this->client->call(Client::METHOD_GET, '/storage/buckets/' . $bucket['body']['$id'], [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertNotEmpty($response['body']);
+ $this->assertNotEmpty($response['body']['$id']);
+
+ $this->assertEquals($bucket['body']['$id'], $response['body']['$id']);
+ $this->assertEquals($bucket['body']['name'], $response['body']['name']);
+ $this->assertEquals($bucket['body']['$permissions'], $response['body']['$permissions']);
+ $this->assertEquals($bucket['body']['maximumFileSize'], $response['body']['maximumFileSize']);
+ $this->assertEquals($bucket['body']['allowedFileExtensions'], $response['body']['allowedFileExtensions']);
+ $this->assertEquals($bucket['body']['compression'], $response['body']['compression']);
+ $this->assertEquals($bucket['body']['encryption'], $response['body']['encryption']);
+ $this->assertEquals($bucket['body']['antivirus'], $response['body']['antivirus']);
+
+ // Cleanup
+ $this->client->call(Client::METHOD_DELETE, '/storage/buckets/' . $bucket['body']['$id'], [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ]);
+
+ $this->client->call(Client::METHOD_DELETE, '/storage/buckets/' . $bucket['body']['$id'], [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ]);
+ }
+
+ public function testAppwriteMigrationStorageFiles()
+ {
+ $bucket = $this->client->call(Client::METHOD_POST, '/storage/buckets', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ], [
+ 'bucketId' => ID::unique(),
+ 'name' => 'Test Bucket',
+ 'fileSecurity' => true,
+ 'maximumFileSize' => 2000000, //2MB
+ 'allowedFileExtensions' => ['jpg', 'png', 'jfif'],
+ 'permissions' => [
+ Permission::read(Role::any()),
+ Permission::create(Role::any()),
+ Permission::update(Role::any()),
+ Permission::delete(Role::any()),
+ ],
+ ]);
+ $this->assertEquals(201, $bucket['headers']['status-code']);
+ $this->assertNotEmpty($bucket['body']['$id']);
+
+ $bucketId = $bucket['body']['$id'];
+
+ $file = $this->client->call(Client::METHOD_POST, '/storage/buckets/' . $bucketId . '/files', [
+ 'content-type' => 'multipart/form-data',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ], [
+ 'fileId' => ID::unique(),
+ 'file' => new CURLFile(realpath(__DIR__ . '/../../../resources/logo.png'), 'image/png', 'logo.png'),
+ 'permissions' => [
+ Permission::read(Role::any()),
+ Permission::update(Role::any()),
+ Permission::delete(Role::any()),
+ ],
+ ]);
+
+ $this->assertEquals(201, $file['headers']['status-code']);
+ $this->assertNotEmpty($file['body']['$id']);
+
+ $fileId = $file['body']['$id'];
+
+ $result = $this->performMigrationSync([
+ 'resources' => [
+ Resource::TYPE_BUCKET,
+ Resource::TYPE_FILE
+ ],
+ 'endpoint' => 'http://localhost/v1',
+ 'projectId' => $this->getProject()['$id'],
+ 'apiKey' => $this->getProject()['apiKey'],
+ ]);
+
+ $this->assertEquals('completed', $result['status']);
+ $this->assertEquals([Resource::TYPE_BUCKET, Resource::TYPE_FILE], $result['resources']);
+ $this->assertArrayHasKey(Resource::TYPE_BUCKET, $result['statusCounters']);
+
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_BUCKET]['error']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_BUCKET]['pending']);
+ $this->assertEquals(1, $result['statusCounters'][Resource::TYPE_BUCKET]['success']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_BUCKET]['processing']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_BUCKET]['warning']);
+
+ $this->assertArrayHasKey(Resource::TYPE_FILE, $result['statusCounters']);
+
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_FILE]['error']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_FILE]['pending']);
+ $this->assertEquals(1, $result['statusCounters'][Resource::TYPE_FILE]['success']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_FILE]['processing']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_FILE]['warning']);
+
+ $response = $this->client->call(Client::METHOD_GET, '/storage/buckets/' . $bucketId . '/files/' . $fileId, [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertNotEmpty($response['body']);
+ $this->assertNotEmpty($response['body']['$id']);
+
+ $this->assertEquals($fileId, $response['body']['$id']);
+
+ // Cleanup
+ $this->client->call(Client::METHOD_DELETE, '/storage/buckets/' . $bucketId . '/files/' . $fileId, [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ]);
+
+ $this->client->call(Client::METHOD_DELETE, '/storage/buckets/' . $bucketId . '/files/' . $fileId, [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ]);
+ }
+
+ /**
+ * Functions
+ */
+ public function testAppwriteMigrationFunction()
+ {
+ $functionId = $this->setupFunction([
+ 'functionId' => ID::unique(),
+ 'name' => 'Test',
+ 'runtime' => 'php-8.0',
+ 'entrypoint' => 'index.php'
+ ]);
+
+ $deploymentId = $this->setupDeployment($functionId, [
+ 'entrypoint' => 'index.php',
+ 'code' => $this->packageFunction('php'),
+ 'activate' => true
+ ]);
+
+ $result = $this->performMigrationSync([
+ 'resources' => [
+ Resource::TYPE_FUNCTION,
+ Resource::TYPE_DEPLOYMENT
+ ],
+ 'endpoint' => 'http://localhost/v1',
+ 'projectId' => $this->getProject()['$id'],
+ 'apiKey' => $this->getProject()['apiKey'],
+ ]);
+
+ $this->assertEquals('completed', $result['status']);
+ $this->assertEquals([Resource::TYPE_FUNCTION, Resource::TYPE_DEPLOYMENT], $result['resources']);
+ $this->assertArrayHasKey(Resource::TYPE_FUNCTION, $result['statusCounters']);
+
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_FUNCTION]['error']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_FUNCTION]['pending']);
+ $this->assertEquals(1, $result['statusCounters'][Resource::TYPE_FUNCTION]['success']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_FUNCTION]['processing']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_FUNCTION]['warning']);
+
+ $this->assertArrayHasKey(Resource::TYPE_DEPLOYMENT, $result['statusCounters']);
+
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_DEPLOYMENT]['error']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_DEPLOYMENT]['pending']);
+ $this->assertEquals(1, $result['statusCounters'][Resource::TYPE_DEPLOYMENT]['success']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_DEPLOYMENT]['processing']);
+ $this->assertEquals(0, $result['statusCounters'][Resource::TYPE_DEPLOYMENT]['warning']);
+
+ $response = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId, [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertNotEmpty($response['body']);
+ $this->assertNotEmpty($response['body']['$id']);
+
+ $this->assertEquals($functionId, $response['body']['$id']);
+ $this->assertEquals('Test', $response['body']['name']);
+ $this->assertEquals('php-8.0', $response['body']['runtime']);
+ $this->assertEquals('index.php', $response['body']['entrypoint']);
+
+
+ $this->assertEventually(function () use ($functionId) {
+ $deployments = $this->client->call(Client::METHOD_GET, '/functions/' . $functionId . '/deployments/', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ]));
+
+ $this->assertEquals(200, $deployments['headers']['status-code']);
+ $this->assertNotEmpty($deployments['body']);
+ $this->assertEquals(1, $deployments['body']['total']);
+
+ $this->assertEquals('ready', $deployments['body']['deployments'][0]['status'], 'Deployment status is not ready, deployment: ' . json_encode($deployments['body']['deployments'][0], JSON_PRETTY_PRINT));
+ }, 50000, 500);
+
+ // Attempt execution
+ $execution = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/executions', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ], [
+ 'body' => 'test'
+ ]);
+
+ $this->assertEquals(201, $execution['headers']['status-code']);
+ $this->assertStringContainsString('body-is-test', $execution['body']['logs']);
+
+ // Cleanup
+ $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-key' => $this->getProject()['apiKey'],
+ ]);
+
+ $this->client->call(Client::METHOD_DELETE, '/functions/' . $functionId, [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getDesintationProject()['$id'],
+ 'x-appwrite-key' => $this->getDesintationProject()['apiKey'],
+ ]);
+ }
+}
diff --git a/tests/e2e/Services/Migrations/MigrationsConsoleClientTest.php b/tests/e2e/Services/Migrations/MigrationsConsoleClientTest.php
new file mode 100644
index 0000000000..2167ef9338
--- /dev/null
+++ b/tests/e2e/Services/Migrations/MigrationsConsoleClientTest.php
@@ -0,0 +1,12 @@
+ 'default'
]);
- $this->assertEquals(400, $response['headers']['status-code']);
+ $this->assertEquals(401, $response['headers']['status-code']);
return [
'projectId' => $projectId,
@@ -546,7 +546,7 @@ class ProjectsConsoleClientTest extends Scope
'name' => '',
]);
- $this->assertEquals(400, $response['headers']['status-code']);
+ $this->assertEquals(401, $response['headers']['status-code']);
return ['projectId' => $projectId];
}
@@ -3727,11 +3727,11 @@ class ProjectsConsoleClientTest extends Scope
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()), [
'teamId' => ID::unique(),
- 'name' => 'Amating Team',
+ 'name' => 'Amazing Team',
]);
$this->assertEquals(201, $team['headers']['status-code']);
- $this->assertEquals('Amating Team', $team['body']['name']);
+ $this->assertEquals('Amazing Team', $team['body']['name']);
$this->assertNotEmpty($team['body']['$id']);
$teamId = $team['body']['$id'];
@@ -3793,4 +3793,381 @@ class ProjectsConsoleClientTest extends Scope
return $data;
}
+
+ public function testDeleteSharedProject(): void
+ {
+ $team = $this->client->call(Client::METHOD_POST, '/teams', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), [
+ 'teamId' => ID::unique(),
+ 'name' => 'Amazing Team',
+ ]);
+
+ $teamId = $team['body']['$id'];
+
+ // Ensure deleting one project does not affect another project
+ $project1 = $this->client->call(Client::METHOD_POST, '/projects', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), [
+ 'projectId' => ID::unique(),
+ 'name' => 'Amazing Project 1',
+ 'teamId' => $teamId,
+ 'region' => 'default'
+ ]);
+
+ $project2 = $this->client->call(Client::METHOD_POST, '/projects', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), [
+ 'projectId' => ID::unique(),
+ 'name' => 'Amazing Project 2',
+ 'teamId' => $teamId,
+ 'region' => 'default'
+ ]);
+
+ $project1Id = $project1['body']['$id'];
+ $project2Id = $project2['body']['$id'];
+
+ // Create user in each project
+ $key1 = $this->client->call(Client::METHOD_POST, '/projects/' . $project1Id . '/keys', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), [
+ 'name' => 'Key Test',
+ 'scopes' => ['users.read', 'users.write'],
+ ]);
+
+ $user1 = $this->client->call(Client::METHOD_POST, '/users', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $project1Id,
+ 'x-appwrite-key' => $key1['body']['secret'],
+ ], [
+ 'userId' => ID::unique(),
+ 'email' => 'test1@appwrite.io',
+ 'password' => 'password',
+ ]);
+
+ $this->assertEquals(201, $user1['headers']['status-code']);
+
+ $key2 = $this->client->call(Client::METHOD_POST, '/projects/' . $project2Id . '/keys', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), [
+ 'name' => 'Key Test',
+ 'scopes' => ['users.read', 'users.write'],
+ ]);
+
+ $user2 = $this->client->call(Client::METHOD_POST, '/users', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $project2Id,
+ 'x-appwrite-key' => $key2['body']['secret'],
+ ], [
+ 'userId' => ID::unique(),
+ 'email' => 'test2@appwrite.io',
+ 'password' => 'password',
+ ]);
+
+ $this->assertEquals(201, $user2['headers']['status-code']);
+
+ // Delete project 1
+ $project1 = $this->client->call(Client::METHOD_DELETE, '/projects/' . $project1Id, array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()));
+
+ $this->assertEquals(204, $project1['headers']['status-code']);
+
+ \sleep(3);
+
+ // Ensure project 2 user is still there
+ $user2 = $this->client->call(Client::METHOD_GET, '/users/' . $user2['body']['$id'], [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $project2Id,
+ 'x-appwrite-key' => $key2['body']['secret'],
+ ]);
+
+ $this->assertEquals(200, $user2['headers']['status-code']);
+
+ // Create another user in project 2 in case read hits stale cache
+ $user3 = $this->client->call(Client::METHOD_POST, '/users', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $project2Id,
+ 'x-appwrite-key' => $key2['body']['secret'],
+ ], [
+ 'userId' => ID::unique(),
+ 'email' => 'test3@appwrite.io'
+ ]);
+
+ $this->assertEquals(201, $user3['headers']['status-code']);
+ }
+
+ /**
+ * @depends testCreateProject
+ */
+ public function testCreateProjectVariable(array $data)
+ {
+ /**
+ * Test for SUCCESS
+ */
+ $variable = $this->client->call(Client::METHOD_POST, '/project/variables', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $data['projectId'],
+ 'x-appwrite-mode' => 'admin',
+ ], $this->getHeaders()), [
+ 'key' => 'APP_TEST',
+ 'value' => 'TESTINGVALUE'
+ ]);
+
+ $this->assertEquals(201, $variable['headers']['status-code']);
+ $variableId = $variable['body']['$id'];
+
+ /**
+ * Test for FAILURE
+ */
+ // Test for duplicate key
+ $variable = $this->client->call(Client::METHOD_POST, '/project/variables', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $data['projectId'],
+ 'x-appwrite-mode' => 'admin',
+ ], $this->getHeaders()), [
+ 'key' => 'APP_TEST',
+ 'value' => 'ANOTHERTESTINGVALUE'
+ ]);
+
+ $this->assertEquals(409, $variable['headers']['status-code']);
+
+ // Test for invalid key
+ $variable = $this->client->call(Client::METHOD_POST, '/project/variables', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $data['projectId'],
+ 'x-appwrite-mode' => 'admin',
+ ], $this->getHeaders()), [
+ 'key' => str_repeat("A", 256),
+ 'value' => 'TESTINGVALUE'
+ ]);
+
+ $this->assertEquals(400, $variable['headers']['status-code']);
+
+ // Test for invalid value
+ $variable = $this->client->call(Client::METHOD_POST, '/project/variables', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $data['projectId'],
+ 'x-appwrite-mode' => 'admin',
+ ], $this->getHeaders()), [
+ 'key' => 'LONGKEY',
+ 'value' => str_repeat("#", 8193),
+ ]);
+
+ $this->assertEquals(400, $variable['headers']['status-code']);
+
+ return array_merge(
+ $data,
+ [
+ 'variableId' => $variableId,
+ ]
+ );
+ }
+
+ /**
+ * @depends testCreateProjectVariable
+ */
+ public function testListVariables(array $data)
+ {
+ /**
+ * Test for SUCCESS
+ */
+
+ $response = $this->client->call(Client::METHOD_GET, '/project/variables', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $data['projectId'],
+ 'x-appwrite-mode' => 'admin',
+ ], $this->getHeaders()));
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertCount(1, $response['body']['variables']);
+ $this->assertEquals(1, $response['body']['total']);
+ $this->assertEquals("APP_TEST", $response['body']['variables'][0]['key']);
+ $this->assertEquals("TESTINGVALUE", $response['body']['variables'][0]['value']);
+
+ return $data;
+ }
+
+ /**
+ * @depends testListVariables
+ */
+ public function testGetVariable(array $data)
+ {
+ /**
+ * Test for SUCCESS
+ */
+ $response = $this->client->call(Client::METHOD_GET, '/project/variables/' . $data['variableId'], array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $data['projectId'],
+ 'x-appwrite-mode' => 'admin',
+ ], $this->getHeaders()));
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertEquals("APP_TEST", $response['body']['key']);
+ $this->assertEquals("TESTINGVALUE", $response['body']['value']);
+
+ /**
+ * Test for FAILURE
+ */
+
+ $response = $this->client->call(Client::METHOD_GET, '/project/variables/NON_EXISTING_VARIABLE', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $data['projectId'],
+ 'x-appwrite-mode' => 'admin',
+ ], $this->getHeaders()));
+
+ $this->assertEquals(404, $response['headers']['status-code']);
+
+ return $data;
+ }
+
+ /**
+ * @depends testGetVariable
+ */
+ public function testUpdateVariable(array $data)
+ {
+ /**
+ * Test for SUCCESS
+ */
+
+ $response = $this->client->call(Client::METHOD_PUT, '/project/variables/' . $data['variableId'], array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $data['projectId'],
+ 'x-appwrite-mode' => 'admin',
+ ], $this->getHeaders()), [
+ 'key' => 'APP_TEST_UPDATE',
+ 'value' => 'TESTINGVALUEUPDATED'
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertEquals("APP_TEST_UPDATE", $response['body']['key']);
+ $this->assertEquals("TESTINGVALUEUPDATED", $response['body']['value']);
+
+ $variable = $this->client->call(Client::METHOD_GET, '/project/variables/' . $data['variableId'], array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $data['projectId'],
+ 'x-appwrite-mode' => 'admin',
+ ], $this->getHeaders()));
+
+ $this->assertEquals(200, $variable['headers']['status-code']);
+ $this->assertEquals("APP_TEST_UPDATE", $variable['body']['key']);
+ $this->assertEquals("TESTINGVALUEUPDATED", $variable['body']['value']);
+
+ $response = $this->client->call(Client::METHOD_GET, '/project/variables', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $data['projectId'],
+ 'x-appwrite-mode' => 'admin',
+ ], $this->getHeaders()));
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertCount(1, $response['body']['variables']);
+ $this->assertEquals("APP_TEST_UPDATE", $response['body']['variables'][0]['key']);
+
+ /**
+ * Test for FAILURE
+ */
+
+ $response = $this->client->call(Client::METHOD_PUT, '/project/variables/' . $data['variableId'], array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $data['projectId'],
+ 'x-appwrite-mode' => 'admin',
+ ], $this->getHeaders()));
+
+ $this->assertEquals(400, $response['headers']['status-code']);
+
+ $response = $this->client->call(Client::METHOD_PUT, '/project/variables/' . $data['variableId'], array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $data['projectId'],
+ 'x-appwrite-mode' => 'admin',
+ ], $this->getHeaders()), [
+ 'value' => 'TESTINGVALUEUPDATED_2'
+ ]);
+
+ $this->assertEquals(400, $response['headers']['status-code']);
+
+ $longKey = str_repeat("A", 256);
+ $response = $this->client->call(Client::METHOD_PUT, '/project/variables/' . $data['variableId'], array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $data['projectId'],
+ 'x-appwrite-mode' => 'admin',
+ ], $this->getHeaders()), [
+ 'key' => $longKey,
+ 'value' => 'TESTINGVALUEUPDATED'
+ ]);
+
+ $this->assertEquals(400, $response['headers']['status-code']);
+
+ $longValue = str_repeat("#", 8193);
+ $response = $this->client->call(Client::METHOD_PUT, '/project/variables/' . $data['variableId'], array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $data['projectId'],
+ 'x-appwrite-mode' => 'admin',
+ ], $this->getHeaders()), [
+ 'key' => 'APP_TEST_UPDATE',
+ 'value' => $longValue
+ ]);
+
+ $this->assertEquals(400, $response['headers']['status-code']);
+
+ $response = $this->client->call(Client::METHOD_PUT, '/project/variables/NON_EXISTING_VARIABLE', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $data['projectId'],
+ 'x-appwrite-mode' => 'admin',
+ ], $this->getHeaders()), [
+ 'key' => 'APP_TEST_UPDATE',
+ 'value' => 'TESTINGVALUEUPDATED'
+ ]);
+
+ $this->assertEquals(404, $response['headers']['status-code']);
+
+ return $data;
+ }
+
+ /**
+ * @depends testUpdateVariable
+ */
+ public function testDeleteVariable(array $data)
+ {
+ /**
+ * Test for SUCCESS
+ */
+
+ $response = $this->client->call(Client::METHOD_DELETE, '/project/variables/' . $data['variableId'], array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $data['projectId'],
+ 'x-appwrite-mode' => 'admin',
+ ], $this->getHeaders()));
+
+ $this->assertEquals(204, $response['headers']['status-code']);
+
+ $response = $this->client->call(Client::METHOD_GET, '/project/variables', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $data['projectId'],
+ 'x-appwrite-mode' => 'admin',
+ ], $this->getHeaders()));
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertCount(0, $response['body']['variables']);
+ $this->assertEquals(0, $response['body']['total']);
+
+ /**
+ * Test for FAILURE
+ */
+
+ $response = $this->client->call(Client::METHOD_DELETE, '/project/variables/NON_EXISTING_VARIABLE', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $data['projectId'],
+ 'x-appwrite-mode' => 'admin',
+ ], $this->getHeaders()));
+
+ $this->assertEquals(404, $response['headers']['status-code']);
+
+ return $data;
+ }
}
diff --git a/tests/e2e/Services/Realtime/RealtimeBase.php b/tests/e2e/Services/Realtime/RealtimeBase.php
index 30c411ba93..99f31134c0 100644
--- a/tests/e2e/Services/Realtime/RealtimeBase.php
+++ b/tests/e2e/Services/Realtime/RealtimeBase.php
@@ -7,25 +7,34 @@ use WebSocket\ConnectionException;
trait RealtimeBase
{
- private function getWebsocket($channels = [], $headers = [], $projectId = null): WebSocketClient
- {
+ private function getWebsocket(
+ array $channels = [],
+ array $headers = [],
+ string $projectId = null
+ ): WebSocketClient {
if (is_null($projectId)) {
$projectId = $this->getProject()['$id'];
}
- $headers = array_merge([
- 'Origin' => 'appwrite.test'
- ], $headers);
+ $headers = array_merge(
+ [
+ "Origin" => "appwrite.test",
+ ],
+ $headers
+ );
$query = [
- 'project' => $projectId,
- 'channels' => $channels
+ "project" => $projectId,
+ "channels" => $channels,
];
- return new WebSocketClient('ws://appwrite-traefik/v1/realtime?' . http_build_query($query), [
- 'headers' => $headers,
- 'timeout' => 30,
- ]);
+ return new WebSocketClient(
+ "ws://appwrite-traefik/v1/realtime?" . http_build_query($query),
+ [
+ "headers" => $headers,
+ "timeout" => 30,
+ ]
+ );
}
public function testConnection(): void
@@ -33,7 +42,7 @@ trait RealtimeBase
/**
* Test for SUCCESS
*/
- $client = $this->getWebsocket(['documents']);
+ $client = $this->getWebsocket(["documents"]);
$this->assertNotEmpty($client->receive());
$client->close();
}
@@ -43,11 +52,11 @@ trait RealtimeBase
$client = $this->getWebsocket();
$payload = json_decode($client->receive(), true);
- $this->assertArrayHasKey('type', $payload);
- $this->assertArrayHasKey('data', $payload);
- $this->assertEquals('error', $payload['type']);
- $this->assertEquals(1008, $payload['data']['code']);
- $this->assertEquals('Missing channels', $payload['data']['message']);
+ $this->assertArrayHasKey("type", $payload);
+ $this->assertArrayHasKey("data", $payload);
+ $this->assertEquals("error", $payload["type"]);
+ $this->assertEquals(1008, $payload["data"]["code"]);
+ $this->assertEquals("Missing channels", $payload["data"]["message"]);
\usleep(250000); // 250ms
$this->expectException(ConnectionException::class); // Check if server disconnnected client
$client->close();
@@ -55,18 +64,24 @@ trait RealtimeBase
public function testConnectionFailureUnknownProject(): void
{
- $client = new WebSocketClient('ws://appwrite-traefik/v1/realtime?project=123', [
- 'headers' => [
- 'Origin' => 'appwrite.test'
+ $client = new WebSocketClient(
+ "ws://appwrite-traefik/v1/realtime?project=123",
+ [
+ "headers" => [
+ "Origin" => "appwrite.test",
+ ],
]
- ]);
+ );
$payload = json_decode($client->receive(), true);
- $this->assertArrayHasKey('type', $payload);
- $this->assertArrayHasKey('data', $payload);
- $this->assertEquals('error', $payload['type']);
- $this->assertEquals(1008, $payload['data']['code']);
- $this->assertEquals('Missing or unknown project ID', $payload['data']['message']);
+ $this->assertArrayHasKey("type", $payload);
+ $this->assertArrayHasKey("data", $payload);
+ $this->assertEquals("error", $payload["type"]);
+ $this->assertEquals(1008, $payload["data"]["code"]);
+ $this->assertEquals(
+ "Missing or unknown project ID",
+ $payload["data"]["message"]
+ );
\usleep(250000); // 250ms
$this->expectException(ConnectionException::class); // Check if server disconnnected client
$client->close();
diff --git a/tests/e2e/Services/Realtime/RealtimeConsoleClientTest.php b/tests/e2e/Services/Realtime/RealtimeConsoleClientTest.php
index 6ab2874f8e..0155d251f2 100644
--- a/tests/e2e/Services/Realtime/RealtimeConsoleClientTest.php
+++ b/tests/e2e/Services/Realtime/RealtimeConsoleClientTest.php
@@ -2,7 +2,6 @@
namespace Tests\E2E\Services\Realtime;
-use CURLFile;
use Tests\E2E\Client;
use Tests\E2E\Scopes\ProjectCustom;
use Tests\E2E\Scopes\Scope;
@@ -19,7 +18,7 @@ class RealtimeConsoleClientTest extends Scope
use ProjectCustom;
use SideConsole;
- public function testManualAuthentication()
+ public function testManualAuthentication(): void
{
$user = $this->getUser();
$userId = $user['$id'] ?? '';
@@ -124,7 +123,7 @@ class RealtimeConsoleClientTest extends Scope
$client->close();
}
- public function testAttributes()
+ public function testAttributes(): array
{
$user = $this->getUser();
$projectId = 'console';
@@ -184,6 +183,7 @@ class RealtimeConsoleClientTest extends Scope
'required' => true,
]);
+ $projectId = $this->getProject()['$id'];
$attributeKey = $name['body']['key'];
$this->assertEquals($name['headers']['status-code'], 202);
@@ -198,8 +198,9 @@ class RealtimeConsoleClientTest extends Scope
$this->assertEquals('event', $response['type']);
$this->assertNotEmpty($response['data']);
$this->assertArrayHasKey('timestamp', $response['data']);
- $this->assertCount(1, $response['data']['channels']);
+ $this->assertCount(2, $response['data']['channels']);
$this->assertContains('console', $response['data']['channels']);
+ $this->assertContains("projects.{$projectId}", $response['data']['channels']);
$this->assertContains("databases.{$databaseId}.collections.{$actorsId}.attributes.*.create", $response['data']['events']);
$this->assertContains("databases.{$databaseId}.collections.{$actorsId}.attributes.*", $response['data']['events']);
$this->assertContains("databases.{$databaseId}.collections.{$actorsId}", $response['data']['events']);
@@ -218,8 +219,9 @@ class RealtimeConsoleClientTest extends Scope
$this->assertEquals('event', $response['type']);
$this->assertNotEmpty($response['data']);
$this->assertArrayHasKey('timestamp', $response['data']);
- $this->assertCount(1, $response['data']['channels']);
+ $this->assertCount(2, $response['data']['channels']);
$this->assertContains('console', $response['data']['channels']);
+ $this->assertContains("projects.{$projectId}", $response['data']['channels']);
$this->assertContains("databases.{$databaseId}.collections.{$actorsId}.attributes.*.update", $response['data']['events']);
$this->assertContains("databases.{$databaseId}.collections.{$actorsId}.attributes.*", $response['data']['events']);
$this->assertContains("databases.{$databaseId}.collections.{$actorsId}", $response['data']['events']);
@@ -276,6 +278,8 @@ class RealtimeConsoleClientTest extends Scope
]);
$this->assertEquals($index['headers']['status-code'], 202);
+
+ $projectId = $this->getProject()['$id'];
$indexKey = $index['body']['key'];
$response = json_decode($client->receive(), true);
@@ -285,8 +289,9 @@ class RealtimeConsoleClientTest extends Scope
$this->assertEquals('event', $response['type']);
$this->assertNotEmpty($response['data']);
$this->assertArrayHasKey('timestamp', $response['data']);
- $this->assertCount(1, $response['data']['channels']);
+ $this->assertCount(2, $response['data']['channels']);
$this->assertContains('console', $response['data']['channels']);
+ $this->assertContains("projects.{$projectId}", $response['data']['channels']);
$this->assertContains("databases.{$databaseId}.collections.{$actorsId}.indexes.*.create", $response['data']['events']);
$this->assertContains("databases.{$databaseId}.collections.{$actorsId}.indexes.*", $response['data']['events']);
$this->assertContains("databases.{$databaseId}.collections.{$actorsId}", $response['data']['events']);
@@ -303,8 +308,9 @@ class RealtimeConsoleClientTest extends Scope
$this->assertEquals('event', $response['type']);
$this->assertNotEmpty($response['data']);
$this->assertArrayHasKey('timestamp', $response['data']);
- $this->assertCount(1, $response['data']['channels']);
+ $this->assertCount(2, $response['data']['channels']);
$this->assertContains('console', $response['data']['channels']);
+ $this->assertContains("projects.{$projectId}", $response['data']['channels']);
$this->assertContains("databases.{$databaseId}.collections.{$actorsId}.indexes.*.update", $response['data']['events']);
$this->assertContains("databases.{$databaseId}.collections.{$actorsId}.indexes.*", $response['data']['events']);
$this->assertContains("databases.{$databaseId}.collections.{$actorsId}", $response['data']['events']);
@@ -343,6 +349,8 @@ class RealtimeConsoleClientTest extends Scope
$this->assertContains('console', $response['data']['channels']);
$this->assertNotEmpty($response['data']['user']);
+ $projectId = $this->getProject()['$id'];
+
/**
* Test Delete Index
*/
@@ -353,6 +361,7 @@ class RealtimeConsoleClientTest extends Scope
], $this->getHeaders()));
$this->assertEquals($attribute['headers']['status-code'], 204);
+
$response = json_decode($client->receive(), true);
$this->assertArrayHasKey('type', $response);
@@ -360,8 +369,9 @@ class RealtimeConsoleClientTest extends Scope
$this->assertEquals('event', $response['type']);
$this->assertNotEmpty($response['data']);
$this->assertArrayHasKey('timestamp', $response['data']);
- $this->assertCount(1, $response['data']['channels']);
+ $this->assertCount(2, $response['data']['channels']);
$this->assertContains('console', $response['data']['channels']);
+ $this->assertContains("projects.{$projectId}", $response['data']['channels']);
$this->assertContains("databases.{$databaseId}.collections.{$actorsId}.indexes.*.update", $response['data']['events']);
$this->assertContains("databases.{$databaseId}.collections.{$actorsId}.indexes.*", $response['data']['events']);
$this->assertContains("databases.{$databaseId}.collections.{$actorsId}", $response['data']['events']);
@@ -377,8 +387,9 @@ class RealtimeConsoleClientTest extends Scope
$this->assertEquals('event', $response['type']);
$this->assertNotEmpty($response['data']);
$this->assertArrayHasKey('timestamp', $response['data']);
- $this->assertCount(1, $response['data']['channels']);
+ $this->assertCount(2, $response['data']['channels']);
$this->assertContains('console', $response['data']['channels']);
+ $this->assertContains("projects.{$projectId}", $response['data']['channels']);
$this->assertContains("databases.{$databaseId}.collections.{$actorsId}.indexes.*.delete", $response['data']['events']);
$this->assertContains("databases.{$databaseId}.collections.{$actorsId}.indexes.*", $response['data']['events']);
$this->assertContains("databases.{$databaseId}.collections.{$actorsId}", $response['data']['events']);
@@ -416,10 +427,12 @@ class RealtimeConsoleClientTest extends Scope
$this->assertContains('console', $response['data']['channels']);
$this->assertNotEmpty($response['data']['user']);
+ $attributeKey = 'name';
+ $projectId = $this->getProject()['$id'];
+
/**
* Test Delete Attribute
*/
- $attributeKey = 'name';
$attribute = $this->client->call(Client::METHOD_DELETE, '/databases/' . $databaseId . '/collections/' . $data['actorsId'] . '/attributes/' . $attributeKey, array_merge([
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
@@ -433,8 +446,9 @@ class RealtimeConsoleClientTest extends Scope
$this->assertEquals('event', $response['type']);
$this->assertNotEmpty($response['data']);
$this->assertArrayHasKey('timestamp', $response['data']);
- $this->assertCount(1, $response['data']['channels']);
+ $this->assertCount(2, $response['data']['channels']);
$this->assertContains('console', $response['data']['channels']);
+ $this->assertContains("projects.{$projectId}", $response['data']['channels']);
$this->assertContains("databases.{$databaseId}.collections.{$actorsId}.attributes.*.update", $response['data']['events']);
$this->assertContains("databases.{$databaseId}.collections.{$actorsId}.attributes.*", $response['data']['events']);
$this->assertContains("databases.{$databaseId}.collections.{$actorsId}", $response['data']['events']);
@@ -450,8 +464,9 @@ class RealtimeConsoleClientTest extends Scope
$this->assertEquals('event', $response['type']);
$this->assertNotEmpty($response['data']);
$this->assertArrayHasKey('timestamp', $response['data']);
- $this->assertCount(1, $response['data']['channels']);
+ $this->assertCount(2, $response['data']['channels']);
$this->assertContains('console', $response['data']['channels']);
+ $this->assertContains("projects.{$projectId}", $response['data']['channels']);
$this->assertContains("databases.{$databaseId}.collections.{$actorsId}.attributes.*.delete", $response['data']['events']);
$this->assertContains("databases.{$databaseId}.collections.{$actorsId}.attributes.*", $response['data']['events']);
$this->assertContains("databases.{$databaseId}.collections.{$actorsId}", $response['data']['events']);
@@ -463,6 +478,44 @@ class RealtimeConsoleClientTest extends Scope
$client->close();
}
+ public function testPing()
+ {
+ $client = $this->getWebsocket(['console'], [
+ 'origin' => 'http://localhost',
+ 'cookie' => 'a_session_console=' . $this->getRoot()['session'],
+ ], 'console');
+
+ $response = json_decode($client->receive(), true);
+
+ $this->assertArrayHasKey('type', $response);
+ $this->assertEquals('connected', $response['type']);
+
+ $pong = $this->client->call(Client::METHOD_GET, '/ping', [
+ 'origin' => 'http://localhost',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ]);
+
+ $this->assertEquals(200, $pong['headers']['status-code']);
+ $this->assertEquals('Pong!', $pong['body']);
+
+ $response = json_decode($client->receive(), true);
+
+ $this->assertArrayHasKey('type', $response);
+ $this->assertEquals('event', $response['type']);
+ $this->assertNotEmpty($response['data']);
+ $this->assertArrayHasKey('timestamp', $response['data']);
+ $this->assertCount(2, $response['data']['channels']);
+ $this->assertContains('console', $response['data']['channels']);
+ $this->assertContains("projects.{$this->getProject()['$id']}", $response['data']['channels']);
+ $this->assertContains("projects.{$this->getProject()['$id']}.ping", $response['data']['events']);
+ $this->assertNotEmpty($response['data']['payload']);
+ $this->assertArrayHasKey('pingCount', $response['data']['payload']);
+ $this->assertArrayHasKey('pingedAt', $response['data']['payload']);
+ $this->assertEquals(1, $response['data']['payload']['pingCount']);
+
+ $client->close();
+ }
+
public function testCreateDeployment()
{
$response1 = $this->client->call(Client::METHOD_POST, '/functions', array_merge([
@@ -505,22 +558,16 @@ class RealtimeConsoleClientTest extends Scope
/**
* Test Create Deployment
*/
-
- $folder = 'php';
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/$folder/code.tar.gz";
- $this->packageCode($folder);
-
+ $projectId = $this->getProject()['$id'];
$deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', array_merge([
'content-type' => 'multipart/form-data',
- 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-project' => $projectId,
], $this->getHeaders()), [
'entrypoint' => 'index.php',
- 'code' => new CURLFile($code, 'application/x-gzip', \basename($code)),
+ 'code' => $this->packageFunction('php'),
'activate' => true
]);
- $deploymentId = $deployment['body']['$id'] ?? '';
-
$this->assertEquals(202, $deployment['headers']['status-code']);
$response = json_decode($client->receive(), true);
@@ -530,8 +577,9 @@ class RealtimeConsoleClientTest extends Scope
$this->assertEquals('event', $response['type']);
$this->assertNotEmpty($response['data']);
$this->assertArrayHasKey('timestamp', $response['data']);
- $this->assertCount(1, $response['data']['channels']);
+ $this->assertCount(2, $response['data']['channels']);
$this->assertContains('console', $response['data']['channels']);
+ $this->assertContains("projects.{$projectId}", $response['data']['channels']);
// $this->assertContains("functions.{$functionId}.deployments.{$deploymentId}.create", $response['data']['events']); TODO @christyjacob4 : enable test once we allow functions.* events
$this->assertNotEmpty($response['data']['payload']);
diff --git a/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php b/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php
index c3372b98c5..dda524fc7c 100644
--- a/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php
+++ b/tests/e2e/Services/Realtime/RealtimeCustomClientTest.php
@@ -7,7 +7,7 @@ use Tests\E2E\Client;
use Tests\E2E\Scopes\ProjectCustom;
use Tests\E2E\Scopes\Scope;
use Tests\E2E\Scopes\SideClient;
-use Utopia\CLI\Console;
+use Tests\E2E\Services\Functions\FunctionsBase;
use Utopia\Database\Helpers\ID;
use Utopia\Database\Helpers\Permission;
use Utopia\Database\Helpers\Role;
@@ -15,6 +15,7 @@ use WebSocket\ConnectionException;
class RealtimeCustomClientTest extends Scope
{
+ use FunctionsBase;
use RealtimeBase;
use ProjectCustom;
use SideClient;
@@ -110,6 +111,30 @@ class RealtimeCustomClientTest extends Scope
$client->close();
}
+ public function testPingPong()
+ {
+ $client = $this->getWebsocket(['files'], [
+ 'origin' => 'http://localhost'
+ ]);
+ $response = json_decode($client->receive(), true);
+
+ $this->assertArrayHasKey('type', $response);
+ $this->assertArrayHasKey('data', $response);
+ $this->assertEquals('connected', $response['type']);
+ $this->assertNotEmpty($response['data']);
+ $this->assertCount(1, $response['data']['channels']);
+ $this->assertContains('files', $response['data']['channels']);
+
+ $client->send(\json_encode([
+ 'type' => 'ping'
+ ]));
+
+ $response = json_decode($client->receive(), true);
+ $this->assertEquals('pong', $response['type']);
+
+ $client->close();
+ }
+
public function testManualAuthentication()
{
$user = $this->getUser();
@@ -1271,20 +1296,13 @@ class RealtimeCustomClientTest extends Scope
$this->assertEquals($function['headers']['status-code'], 201);
$this->assertNotEmpty($function['body']['$id']);
- $folder = 'timeout';
- $stderr = '';
- $stdout = '';
- $code = realpath(__DIR__ . '/../../../resources/functions') . "/{$folder}/code.tar.gz";
-
- Console::execute('cd ' . realpath(__DIR__ . "/../../../resources/functions") . "/{$folder} && tar --exclude code.tar.gz -czf code.tar.gz .", '', $stdout, $stderr);
-
$deployment = $this->client->call(Client::METHOD_POST, '/functions/' . $functionId . '/deployments', array_merge([
'content-type' => 'multipart/form-data',
'x-appwrite-project' => $this->getProject()['$id'],
'x-appwrite-key' => $this->getProject()['apiKey']
]), [
'entrypoint' => 'index.php',
- 'code' => new CURLFile($code, 'application/x-gzip', basename($code)),
+ 'code' => $this->packageFunction('timeout'),
'activate' => true
]);
@@ -1340,8 +1358,9 @@ class RealtimeCustomClientTest extends Scope
$this->assertEquals('event', $response['type']);
$this->assertNotEmpty($response['data']);
$this->assertArrayHasKey('timestamp', $response['data']);
- $this->assertCount(4, $response['data']['channels']);
+ $this->assertCount(5, $response['data']['channels']);
$this->assertContains('console', $response['data']['channels']);
+ $this->assertContains("projects.{$this->getProject()['$id']}", $response['data']['channels']);
$this->assertContains('executions', $response['data']['channels']);
$this->assertContains("executions.{$executionId}", $response['data']['channels']);
$this->assertContains("functions.{$functionId}", $response['data']['channels']);
@@ -1362,8 +1381,9 @@ class RealtimeCustomClientTest extends Scope
$this->assertEquals('event', $responseUpdate['type']);
$this->assertNotEmpty($responseUpdate['data']);
$this->assertArrayHasKey('timestamp', $responseUpdate['data']);
- $this->assertCount(4, $responseUpdate['data']['channels']);
+ $this->assertCount(5, $responseUpdate['data']['channels']);
$this->assertContains('console', $responseUpdate['data']['channels']);
+ $this->assertContains("projects.{$this->getProject()['$id']}", $response['data']['channels']);
$this->assertContains('executions', $responseUpdate['data']['channels']);
$this->assertContains("executions.{$executionId}", $responseUpdate['data']['channels']);
$this->assertContains("functions.{$functionId}", $responseUpdate['data']['channels']);
diff --git a/tests/e2e/Services/Teams/TeamsBaseClient.php b/tests/e2e/Services/Teams/TeamsBaseClient.php
index 03dffac6aa..ca6082f6d0 100644
--- a/tests/e2e/Services/Teams/TeamsBaseClient.php
+++ b/tests/e2e/Services/Teams/TeamsBaseClient.php
@@ -30,8 +30,8 @@ trait TeamsBaseClient
$this->assertIsInt($response['body']['total']);
$this->assertNotEmpty($response['body']['memberships'][0]['$id']);
$this->assertFalse($response['body']['memberships'][0]['mfa']);
- $this->assertEquals($this->getUser()['name'], $response['body']['memberships'][0]['userName']);
- $this->assertEquals($this->getUser()['email'], $response['body']['memberships'][0]['userEmail']);
+ $this->assertArrayHasKey('userName', $response['body']['memberships'][0]);
+ $this->assertArrayHasKey('userEmail', $response['body']['memberships'][0]);
$this->assertEquals($teamName, $response['body']['memberships'][0]['teamName']);
$this->assertContains('owner', $response['body']['memberships'][0]['roles']);
$this->assertContains('player', $response['body']['memberships'][0]['roles']);
@@ -96,8 +96,8 @@ trait TeamsBaseClient
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertIsInt($response['body']['total']);
$this->assertNotEmpty($response['body']['memberships'][0]);
- $this->assertEquals($this->getUser()['name'], $response['body']['memberships'][0]['userName']);
- $this->assertEquals($this->getUser()['email'], $response['body']['memberships'][0]['userEmail']);
+ $this->assertArrayHasKey('userName', $response['body']['memberships'][0]);
+ $this->assertArrayHasKey('userEmail', $response['body']['memberships'][0]);
$this->assertEquals($teamName, $response['body']['memberships'][0]['teamName']);
$this->assertContains('owner', $response['body']['memberships'][0]['roles']);
$this->assertContains('player', $response['body']['memberships'][0]['roles']);
@@ -112,8 +112,8 @@ trait TeamsBaseClient
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertIsInt($response['body']['total']);
$this->assertNotEmpty($response['body']['memberships'][0]);
- $this->assertEquals($this->getUser()['name'], $response['body']['memberships'][0]['userName']);
- $this->assertEquals($this->getUser()['email'], $response['body']['memberships'][0]['userEmail']);
+ $this->assertArrayHasKey('userName', $response['body']['memberships'][0]);
+ $this->assertArrayHasKey('userEmail', $response['body']['memberships'][0]);
$this->assertEquals($teamName, $response['body']['memberships'][0]['teamName']);
$this->assertContains('owner', $response['body']['memberships'][0]['roles']);
$this->assertContains('player', $response['body']['memberships'][0]['roles']);
@@ -157,11 +157,11 @@ trait TeamsBaseClient
$this->assertNotEmpty($response['body']['$id']);
$this->assertFalse($response['body']['mfa']);
$this->assertNotEmpty($response['body']['userId']);
- $this->assertNotEmpty($response['body']['userName']);
- $this->assertNotEmpty($response['body']['userEmail']);
+ $this->assertArrayHasKey('userName', $response['body']);
+ $this->assertArrayHasKey('userEmail', $response['body']);
$this->assertNotEmpty($response['body']['teamId']);
$this->assertNotEmpty($response['body']['teamName']);
- $this->assertCount(2, $response['body']['roles']);
+ $this->assertCount(1, $response['body']['roles']);
$this->assertEquals(false, (new DatetimeValidator())->isValid($response['body']['joined'])); // is null in DB
$this->assertEquals(false, $response['body']['confirm']);
@@ -203,7 +203,7 @@ trait TeamsBaseClient
], $this->getHeaders()), [
'email' => $email,
'name' => $name,
- 'roles' => ['admin', 'editor'],
+ 'roles' => ['developer'],
'url' => 'http://localhost:5000/join-us#title'
]);
@@ -214,7 +214,7 @@ trait TeamsBaseClient
$this->assertEquals($email, $response['body']['userEmail']);
$this->assertNotEmpty($response['body']['teamId']);
$this->assertNotEmpty($response['body']['teamName']);
- $this->assertCount(2, $response['body']['roles']);
+ $this->assertCount(1, $response['body']['roles']);
$this->assertEquals(false, (new DatetimeValidator())->isValid($response['body']['joined'])); // is null in DB
$this->assertEquals(false, $response['body']['confirm']);
@@ -255,7 +255,7 @@ trait TeamsBaseClient
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()), [
'userId' => 'abcdefdg',
- 'roles' => ['admin', 'editor'],
+ 'roles' => ['developer'],
'url' => 'http://localhost:5000/join-us#title'
]);
@@ -270,7 +270,7 @@ trait TeamsBaseClient
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()), [
'userId' => $userId,
- 'roles' => ['admin', 'editor'],
+ 'roles' => ['developer'],
'url' => 'http://localhost:5000/join-us#title'
]);
@@ -281,7 +281,7 @@ trait TeamsBaseClient
$this->assertEquals($secondEmail, $response['body']['userEmail']);
$this->assertNotEmpty($response['body']['teamId']);
$this->assertNotEmpty($response['body']['teamName']);
- $this->assertCount(2, $response['body']['roles']);
+ $this->assertCount(1, $response['body']['roles']);
$this->assertEquals(false, (new DateTimeValidator())->isValid($response['body']['joined'])); // is null in DB
$this->assertEquals(false, $response['body']['confirm']);
@@ -301,7 +301,7 @@ trait TeamsBaseClient
], $this->getHeaders()), [
'email' => $email,
'name' => 'Friend User',
- 'roles' => ['admin', 'editor'],
+ 'roles' => ['developer'],
'url' => 'http://localhost:5000/join-us#title'
]);
@@ -313,7 +313,7 @@ trait TeamsBaseClient
], $this->getHeaders()), [
'email' => 'dasdkaskdjaskdjasjkd',
'name' => $name,
- 'roles' => ['admin', 'editor'],
+ 'roles' => ['developer'],
'url' => 'http://localhost:5000/join-us#title'
]);
@@ -337,7 +337,7 @@ trait TeamsBaseClient
], $this->getHeaders()), [
'email' => $email,
'name' => $name,
- 'roles' => ['admin', 'editor'],
+ 'roles' => ['developer'],
'url' => 'http://example.com/join-us#title' // bad url
]);
@@ -413,7 +413,7 @@ trait TeamsBaseClient
$this->assertNotEmpty($response['body']['$id']);
$this->assertNotEmpty($response['body']['userId']);
$this->assertNotEmpty($response['body']['teamId']);
- $this->assertCount(2, $response['body']['roles']);
+ $this->assertCount(1, $response['body']['roles']);
$this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['joined']));
$this->assertEquals(true, $response['body']['confirm']);
$session = $response['cookies']['a_session_' . $this->getProject()['$id']];
@@ -559,6 +559,76 @@ trait TeamsBaseClient
return $data;
}
+
+ /**
+ * @depends testCreateTeam
+ */
+ public function testUpdateMembershipWithSession(array $data): void
+ {
+ $teamUid = $data['teamUid'] ?? '';
+
+ // create user
+ $response = $this->client->call(Client::METHOD_POST, '/account', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], [
+ 'userId' => 'unique()',
+ 'email' => uniqid() . 'foe@localhost.test',
+ 'password' => 'password',
+ 'name' => 'test'
+ ]);
+
+ $this->assertEquals(201, $response['headers']['status-code']);
+ $user = $response['body'];
+
+ // create session
+ $response = $this->client->call(Client::METHOD_POST, '/account/sessions', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], [
+ 'email' => $user['email'],
+ 'password' => 'password'
+ ]);
+
+ $this->assertEquals(201, $response['headers']['status-code']);
+
+ $session = $response['cookies']['a_session_' . $this->getProject()['$id']];
+
+ $response = $this->client->call(Client::METHOD_POST, '/teams/' . $teamUid . '/memberships', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), [
+ 'email' => $user['email'],
+ 'roles' => ['developer'],
+ 'url' => 'http://localhost:5000/join-us#title'
+ ]);
+
+ $this->assertEquals(201, $response['headers']['status-code']);
+
+ $lastEmail = $this->getLastEmail();
+
+ $secret = substr($lastEmail['text'], strpos($lastEmail['text'], '&secret=', 0) + 8, 256);
+ $membershipUid = substr($lastEmail['text'], strpos($lastEmail['text'], '?membershipId=', 0) + 14, 20);
+ $userUid = substr($lastEmail['text'], strpos($lastEmail['text'], '&userId=', 0) + 8, 20);
+
+ $response = $this->client->call(Client::METHOD_PATCH, '/teams/' . $teamUid . '/memberships/' . $membershipUid . '/status', [
+ 'origin' => 'http://localhost',
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
+ ], [
+ 'secret' => $secret,
+ 'userId' => $userUid,
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertNotEmpty($response['body']['$id']);
+ $this->assertNotEmpty($response['body']['userId']);
+ $this->assertNotEmpty($response['body']['teamId']);
+ $this->assertCount(1, $response['body']['roles']);
+ $this->assertEmpty($response['cookies']);
+ }
+
/**
* @depends testUpdateTeamMembership
*/
@@ -571,7 +641,7 @@ trait TeamsBaseClient
/**
* Test for SUCCESS
*/
- $roles = ['admin', 'editor', 'uncle'];
+ $roles = ['editor', 'uncle'];
$response = $this->client->call(Client::METHOD_PATCH, '/teams/' . $teamUid . '/memberships/' . $membershipUid, array_merge([
'origin' => 'http://localhost',
'content-type' => 'application/json',
@@ -587,7 +657,6 @@ trait TeamsBaseClient
$this->assertCount(count($roles), $response['body']['roles']);
$this->assertEquals($roles[0], $response['body']['roles'][0]);
$this->assertEquals($roles[1], $response['body']['roles'][1]);
- $this->assertEquals($roles[2], $response['body']['roles'][2]);
/**
* Test for unknown team
@@ -649,7 +718,7 @@ trait TeamsBaseClient
], $this->getHeaders()));
$this->assertEquals(200, $response['headers']['status-code']);
- $this->assertEquals(3, $response['body']['total']);
+ $this->assertEquals(4, $response['body']['total']);
$ownerMembershipUid = $response['body']['memberships'][0]['$id'];
@@ -704,7 +773,7 @@ trait TeamsBaseClient
], $this->getHeaders()));
$this->assertEquals(200, $response['headers']['status-code']);
- $this->assertEquals(2, $response['body']['total']);
+ $this->assertEquals(3, $response['body']['total']);
/**
* Test for when the owner tries to delete their membership
diff --git a/tests/e2e/Services/Teams/TeamsBaseServer.php b/tests/e2e/Services/Teams/TeamsBaseServer.php
index 4e9d0839ab..6a1d05e9d4 100644
--- a/tests/e2e/Services/Teams/TeamsBaseServer.php
+++ b/tests/e2e/Services/Teams/TeamsBaseServer.php
@@ -29,7 +29,7 @@ trait TeamsBaseServer
* Test for FAILURE
*/
- return [];
+ return $data;
}
/**
@@ -60,6 +60,67 @@ trait TeamsBaseServer
$this->assertEquals(true, (new DatetimeValidator())->isValid($response['body']['joined'])); // is null in DB
$this->assertEquals(true, $response['body']['confirm']);
+ $response = $this->client->call(Client::METHOD_PATCH, '/projects/' . $this->getProject()['$id'] . '/auth/memberships-privacy', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => 'console',
+ 'cookie' => 'a_session_console=' . $this->getRoot()['session'],
+ ]), [
+ 'userName' => false,
+ 'userEmail' => false,
+ 'mfa' => false,
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+
+ /**
+ * Test that sensitive fields are not hidden, as we are on console
+ */
+ $response = $this->client->call(Client::METHOD_GET, '/teams/' . $teamUid . '/memberships', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()));
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertIsInt($response['body']['total']);
+ $this->assertNotEmpty($response['body']['memberships'][0]['$id']);
+
+ // Assert that sensitive fields are present
+ $this->assertNotEmpty($response['body']['memberships'][0]['userName']);
+ $this->assertNotEmpty($response['body']['memberships'][0]['userEmail']);
+ $this->assertArrayHasKey('mfa', $response['body']['memberships'][0]);
+
+ /**
+ * Update project settings to show sensitive fields
+ */
+ $response = $this->client->call(Client::METHOD_PATCH, '/projects/' . $this->getProject()['$id'] . '/auth/memberships-privacy', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => 'console',
+ 'cookie' => 'a_session_console=' . $this->getRoot()['session'],
+ ]), [
+ 'userName' => true,
+ 'userEmail' => true,
+ 'mfa' => true,
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+
+ /**
+ * Test that sensitive fields are shown
+ */
+ $response = $this->client->call(Client::METHOD_GET, '/teams/' . $teamUid . '/memberships', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()));
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertIsInt($response['body']['total']);
+ $this->assertNotEmpty($response['body']['memberships'][0]['$id']);
+
+ // Assert that sensitive fields are present
+ $this->assertNotEmpty($response['body']['memberships'][0]['userName']);
+ $this->assertNotEmpty($response['body']['memberships'][0]['userEmail']);
+ $this->assertArrayHasKey('mfa', $response['body']['memberships'][0]);
+
/**
* Test for FAILURE
*/
diff --git a/tests/e2e/Services/Teams/TeamsConsoleClientTest.php b/tests/e2e/Services/Teams/TeamsConsoleClientTest.php
index 61d0f6a027..4b5ade7cbf 100644
--- a/tests/e2e/Services/Teams/TeamsConsoleClientTest.php
+++ b/tests/e2e/Services/Teams/TeamsConsoleClientTest.php
@@ -28,12 +28,13 @@ class TeamsConsoleClientTest extends Scope
// Create a user account before we create a invite so we can check if the user has permissions when it shouldn't
$user = $this->client->call(Client::METHOD_POST, '/account', [
'content-type' => 'application/json',
- 'x-appwrite-project' => 'console'], [
- 'userId' => 'unique()',
- 'email' => $email,
- 'password' => $password,
- 'name' => $name,
- ], false);
+ 'x-appwrite-project' => 'console'
+ ], [
+ 'userId' => 'unique()',
+ 'email' => $email,
+ 'password' => $password,
+ 'name' => $name,
+ ], false);
$this->assertEquals(201, $user['headers']['status-code']);
@@ -46,7 +47,7 @@ class TeamsConsoleClientTest extends Scope
], $this->getHeaders()), [
'email' => $email,
'name' => $name,
- 'roles' => ['admin', 'editor'],
+ 'roles' => ['developer'],
'url' => 'http://localhost:5000/join-us#title'
]);
@@ -76,4 +77,75 @@ class TeamsConsoleClientTest extends Scope
return $data;
}
+
+ /** @depends testUpdateTeamMembership */
+ public function testUpdateTeamMembershipRoles($data): array
+ {
+ $teamUid = $data['teamUid'] ?? '';
+ $membershipUid = $data['membershipUid'] ?? '';
+ $session = $data['session'] ?? '';
+
+ /**
+ * Test for SUCCESS
+ */
+ $roles = ['developer'];
+ $response = $this->client->call(Client::METHOD_PATCH, '/teams/' . $teamUid . '/memberships/' . $membershipUid, array_merge([
+ 'origin' => 'http://localhost',
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), [
+ 'roles' => $roles
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertNotEmpty($response['body']['$id']);
+ $this->assertNotEmpty($response['body']['userId']);
+ $this->assertNotEmpty($response['body']['teamId']);
+ $this->assertCount(count($roles), $response['body']['roles']);
+ $this->assertEquals($roles[0], $response['body']['roles'][0]);
+
+ /**
+ * Test for unknown team
+ */
+ $response = $this->client->call(Client::METHOD_PATCH, '/teams/' . 'abc' . '/memberships/' . $membershipUid, array_merge([
+ 'origin' => 'http://localhost',
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), [
+ 'roles' => $roles
+ ]);
+
+ $this->assertEquals(404, $response['headers']['status-code']);
+
+ /**
+ * Test for unknown membership ID
+ */
+ $response = $this->client->call(Client::METHOD_PATCH, '/teams/' . $teamUid . '/memberships/' . 'abc', array_merge([
+ 'origin' => 'http://localhost',
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), [
+ 'roles' => $roles
+ ]);
+
+ $this->assertEquals(404, $response['headers']['status-code']);
+
+
+ /**
+ * Test for when a user other than the owner tries to update membership
+ */
+ $response = $this->client->call(Client::METHOD_PATCH, '/teams/' . $teamUid . '/memberships/' . $membershipUid, [
+ 'origin' => 'http://localhost',
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'cookie' => 'a_session_' . $this->getProject()['$id'] . '=' . $session,
+ ], [
+ 'roles' => $roles
+ ]);
+
+ $this->assertEquals(401, $response['headers']['status-code']);
+ $this->assertEquals('User is not allowed to modify roles', $response['body']['message']);
+
+ return $data;
+ }
}
diff --git a/tests/e2e/Services/Teams/TeamsCustomClientTest.php b/tests/e2e/Services/Teams/TeamsCustomClientTest.php
index 1de22f743f..7286bb0827 100644
--- a/tests/e2e/Services/Teams/TeamsCustomClientTest.php
+++ b/tests/e2e/Services/Teams/TeamsCustomClientTest.php
@@ -14,6 +14,109 @@ class TeamsCustomClientTest extends Scope
use ProjectCustom;
use SideClient;
+ /**
+ * @depends testGetTeamMemberships
+ */
+ public function testGetMembershipPrivacy($data)
+ {
+ $teamUid = $data['teamUid'] ?? '';
+
+ $projectId = $this->getProject()['$id'];
+
+ $response = $this->client->call(Client::METHOD_PATCH, '/projects/' . $projectId . '/auth/memberships-privacy', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => 'console',
+ 'cookie' => 'a_session_console=' . $this->getRoot()['session'],
+ ]), [
+ 'userName' => false,
+ 'userEmail' => false,
+ 'mfa' => false,
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+
+ /**
+ * Test that sensitive fields are hidden
+ */
+ $response = $this->client->call(Client::METHOD_GET, '/teams/' . $teamUid . '/memberships', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $projectId,
+ ], $this->getHeaders()));
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertIsInt($response['body']['total']);
+ $this->assertNotEmpty($response['body']['memberships'][0]['$id']);
+
+ // Assert that sensitive fields are not present
+ $this->assertEmpty($response['body']['memberships'][0]['userName']);
+ $this->assertEmpty($response['body']['memberships'][0]['userEmail']);
+ $this->assertFalse($response['body']['memberships'][0]['mfa']);
+
+ /**
+ * Update project settings to show sensitive fields
+ */
+ $response = $this->client->call(Client::METHOD_PATCH, '/projects/' . $projectId . '/auth/memberships-privacy', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => 'console',
+ 'cookie' => 'a_session_console=' . $this->getRoot()['session'],
+ ]), [
+ 'userName' => true,
+ 'userEmail' => true,
+ 'mfa' => true,
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+
+ /**
+ * Test that sensitive fields are shown
+ */
+ $response = $this->client->call(Client::METHOD_GET, '/teams/' . $teamUid . '/memberships', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $projectId,
+ ], $this->getHeaders()));
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertIsInt($response['body']['total']);
+ $this->assertNotEmpty($response['body']['memberships'][0]['$id']);
+
+ // Assert that sensitive fields are present
+ $this->assertNotEmpty($response['body']['memberships'][0]['userName']);
+ $this->assertNotEmpty($response['body']['memberships'][0]['userEmail']);
+ $this->assertArrayHasKey('mfa', $response['body']['memberships'][0]);
+
+ /**
+ * Update project settings to show only MFA
+ */
+ $response = $this->client->call(Client::METHOD_PATCH, '/projects/' . $this->getProject()['$id'] . '/auth/memberships-privacy', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => 'console',
+ 'cookie' => 'a_session_console=' . $this->getRoot()['session'],
+ ]), [
+ 'userName' => false,
+ 'userEmail' => false,
+ 'mfa' => true,
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+
+ /**
+ * Test that sensitive fields are not shown
+ */
+ $response = $this->client->call(Client::METHOD_GET, '/teams/' . $teamUid . '/memberships', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $projectId,
+ ], $this->getHeaders()));
+
+ $this->assertEquals(200, $response['headers']['status-code']);
+ $this->assertIsInt($response['body']['total']);
+ $this->assertNotEmpty($response['body']['memberships'][0]['$id']);
+
+ // Assert that sensitive fields are present
+ $this->assertEmpty($response['body']['memberships'][0]['userName']);
+ $this->assertEmpty($response['body']['memberships'][0]['userEmail']);
+ $this->assertArrayHasKey('mfa', $response['body']['memberships'][0]);
+ }
+
/**
* @depends testUpdateTeamMembership
*/
diff --git a/tests/e2e/Services/Users/UsersBase.php b/tests/e2e/Services/Users/UsersBase.php
index d9105e0790..bbf9a5e2df 100644
--- a/tests/e2e/Services/Users/UsersBase.php
+++ b/tests/e2e/Services/Users/UsersBase.php
@@ -310,6 +310,14 @@ trait UsersBase
$this->assertNotEmpty($session['secret']);
$this->assertNotEmpty($session['expire']);
$this->assertEquals('server', $session['provider']);
+
+ $response = $this->client->call(Client::METHOD_GET, '/account', [
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ 'x-appwrite-session' => $session['secret']
+ ]);
+
+ $this->assertEquals(200, $response['headers']['status-code']);
}
@@ -1498,6 +1506,7 @@ trait UsersBase
]);
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertEquals('random-email1@mail.org', $response['body']['identifier']);
+ $this->assertEquals(false, $response['body']['expired']);
return $response['body'];
}
@@ -1510,6 +1519,7 @@ trait UsersBase
'content-type' => 'application/json',
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()));
+
$this->assertEquals(200, $response['headers']['status-code']);
$this->assertEquals(3, \count($response['body']['targets']));
}
diff --git a/tests/e2e/Services/Webhooks/WebhooksBase.php b/tests/e2e/Services/Webhooks/WebhooksBase.php
index 6be3e16c1f..2ef41003ee 100644
--- a/tests/e2e/Services/Webhooks/WebhooksBase.php
+++ b/tests/e2e/Services/Webhooks/WebhooksBase.php
@@ -901,6 +901,17 @@ trait WebhooksBase
$teamId = $data['teamId'] ?? '';
$email = uniqid() . 'friend@localhost.test';
+ // Create user to ensure team event is triggered after user event
+ $user = $this->client->call(Client::METHOD_POST, '/account', array_merge([
+ 'content-type' => 'application/json',
+ 'x-appwrite-project' => $this->getProject()['$id'],
+ ], $this->getHeaders()), [
+ 'userId' => ID::unique(),
+ 'email' => $email,
+ 'password' => 'password',
+ 'name' => 'Friend User',
+ ]);
+
/**
* Test for SUCCESS
*/
@@ -909,7 +920,6 @@ trait WebhooksBase
'x-appwrite-project' => $this->getProject()['$id'],
], $this->getHeaders()), [
'email' => $email,
- 'name' => 'Friend User',
'roles' => ['admin', 'editor'],
'url' => 'http://localhost:5000/join-us#title'
]);
diff --git a/tests/extensions/Async.php b/tests/extensions/Async.php
new file mode 100644
index 0000000000..48af24bc02
--- /dev/null
+++ b/tests/extensions/Async.php
@@ -0,0 +1,17 @@
+waitMs * 1000);
+ } while (microtime(true) - $start < $this->timeoutMs / 1000);
+
+ if ($returnResult) {
+ return false;
+ }
+
+ throw $lastException;
+ }
+
+ protected function failureDescription(mixed $other): string
+ {
+ return 'the given probe was satisfied within ' . $this->timeoutMs . 'ms.';
+ }
+
+ public function toString(): string
+ {
+ return 'Eventually';
+ }
+}
diff --git a/tests/resources/docker/docker-compose.yml b/tests/resources/docker/docker-compose.yml
index a34b4fcf88..94d506056c 100644
--- a/tests/resources/docker/docker-compose.yml
+++ b/tests/resources/docker/docker-compose.yml
@@ -62,6 +62,7 @@ services:
- redis
# - clamav
environment:
+ - _APP_COMPRESSION_MIN_SIZE_BYTES
- _APP_ENV
- _APP_OPTIONS_ABUSE
- _APP_OPTIONS_ROUTER_PROTECTION
diff --git a/tests/unit/Event/EventTest.php b/tests/unit/Event/EventTest.php
index dd9833378f..079bb47b65 100644
--- a/tests/unit/Event/EventTest.php
+++ b/tests/unit/Event/EventTest.php
@@ -3,13 +3,9 @@
namespace Tests\Unit\Event;
use Appwrite\Event\Event;
-use Appwrite\URL\URL;
use InvalidArgumentException;
use PHPUnit\Framework\TestCase;
-use Utopia\DSN\DSN;
-use Utopia\Queue;
use Utopia\Queue\Client;
-use Utopia\System\System;
require_once __DIR__ . '/../../../app/init.php';
@@ -20,19 +16,8 @@ class EventTest extends TestCase
public function setUp(): void
{
- $fallbackForRedis = 'redis_main=' . URL::unparse([
- 'scheme' => 'redis',
- 'host' => System::getEnv('_APP_REDIS_HOST', 'redis'),
- 'port' => System::getEnv('_APP_REDIS_PORT', '6379'),
- 'user' => System::getEnv('_APP_REDIS_USER', ''),
- 'pass' => System::getEnv('_APP_REDIS_PASS', ''),
- ]);
-
- $dsn = System::getEnv('_APP_CONNECTIONS_QUEUE', $fallbackForRedis);
- $dsn = explode('=', $dsn);
- $dsn = $dsn[1] ?? '';
- $dsn = new DSN($dsn);
- $connection = new Queue\Connection\Redis($dsn->getHost(), $dsn->getPort());
+ global $register;
+ $connection = $register->get('pools')->get('queue')->pop()->getResource();
$this->queue = 'v1-tests' . uniqid();
$this->object = new Event($connection);
$this->object->setClass('TestsV1');
diff --git a/tests/unit/Usage/StatsTest.php b/tests/unit/Usage/StatsTest.php
index 67e39d8974..79fa1f58ec 100644
--- a/tests/unit/Usage/StatsTest.php
+++ b/tests/unit/Usage/StatsTest.php
@@ -2,13 +2,9 @@
namespace Tests\Unit\Usage;
-use Appwrite\URL\URL as AppwriteURL;
use PHPUnit\Framework\TestCase;
-use Utopia\DSN\DSN;
-use Utopia\Queue;
use Utopia\Queue\Client;
use Utopia\Queue\Connection;
-use Utopia\System\System;
class StatsTest extends TestCase
{
@@ -19,18 +15,9 @@ class StatsTest extends TestCase
public function setUp(): void
{
- $env = System::getEnv('_APP_CONNECTIONS_QUEUE', 'redis_main=' . AppwriteURL::unparse([
- 'scheme' => 'redis',
- 'host' => System::getEnv('_APP_REDIS_HOST', 'redis'),
- 'port' => System::getEnv('_APP_REDIS_PORT', '6379'),
- 'user' => System::getEnv('_APP_REDIS_USER', ''),
- 'pass' => System::getEnv('_APP_REDIS_PASS', ''),
- ]));
-
- $dsn = explode('=', $env);
- $dsn = count($dsn) > 1 ? $dsn[1] : $dsn[0];
- $dsn = new DSN($dsn);
- $this->connection = new Queue\Connection\Redis($dsn->getHost(), $dsn->getPort());
+ global $register;
+ $connection = $register->get('pools')->get('queue')->pop()->getResource();
+ $this->connection = $connection;
$this->client = new Client(self::QUEUE_NAME, $this->connection);
}
diff --git a/tests/unit/Utopia/ResponseTest.php b/tests/unit/Utopia/ResponseTest.php
index cd111ec22c..452119fafb 100644
--- a/tests/unit/Utopia/ResponseTest.php
+++ b/tests/unit/Utopia/ResponseTest.php
@@ -55,12 +55,32 @@ class ResponseTest extends TestCase
'integer' => 123,
'boolean' => true,
'hidden' => 'secret',
+ 'array' => [
+ 'string 1',
+ 'string 2'
+ ],
]), 'single');
$this->assertArrayHasKey('string', $output);
$this->assertArrayHasKey('integer', $output);
$this->assertArrayHasKey('boolean', $output);
$this->assertArrayNotHasKey('hidden', $output);
+ $this->assertIsArray($output['array']);
+
+ // test optional array
+ $output = $this->response->output(new Document([
+ 'string' => 'lorem ipsum',
+ 'integer' => 123,
+ 'boolean' => true,
+ 'hidden' => 'secret',
+ ]), 'single');
+ $this->assertArrayHasKey('string', $output);
+ $this->assertArrayHasKey('integer', $output);
+ $this->assertArrayHasKey('boolean', $output);
+ $this->assertArrayNotHasKey('hidden', $output);
+ $this->assertArrayHasKey('array', $output);
+ $this->assertNull($output['array']);
+
}
public function testResponseModelRequired(): void
diff --git a/tests/unit/Utopia/Single.php b/tests/unit/Utopia/Single.php
index 3bd09ef6da..b7f36d10a8 100644
--- a/tests/unit/Utopia/Single.php
+++ b/tests/unit/Utopia/Single.php
@@ -28,6 +28,11 @@ class Single extends Model
'type' => self::TYPE_STRING,
'default' => 'default',
'required' => true
+ ])
+ ->addRule('array', [
+ 'type' => self::TYPE_STRING,
+ 'required' => false,
+ 'array' => true,
]);
}