Merge branch 'master' of github.com:appwrite/appwrite into feat-redis…

…-sync

.env

@@ -56,7 +56,7 @@ _APP_SMTP_PORT=1025
 _APP_SMTP_SECURE=
 _APP_SMTP_USERNAME=
 _APP_SMTP_PASSWORD=
-_APP_SMS_PROVIDER=sms:https://mock
+_APP_SMS_PROVIDER=sms:https://username:password@mock
 _APP_SMS_FROM=+123456789
 _APP_STORAGE_LIMIT=30000000
 _APP_STORAGE_PREVIEW_LIMIT=20000000

.github/PULL_REQUEST_TEMPLATE.md

@@ -21,6 +21,11 @@ Happy contributing!
 
 (If this PR is related to any other PR or resolves any issue or related to any issue link all related PR and issues here.)
 
+### Have you added your change to the [Changelog](https://github.com/appwrite/appwrite/blob/master/CHANGES.md)?
+
+(The CHANGES.md file tracks all the changes that make it to the `main` branch. Add your change to this file in the following format)
+- One line description of your PR [#pr_number](Link to your PR)
+
 ### Have you read the [Contributing Guidelines on issues](https://github.com/appwrite/appwrite/blob/master/CONTRIBUTING.md)?
 
 (Write your answer here.)

.github/workflows/tests.yml

@@ -4,7 +4,7 @@ on: [pull_request]
 jobs:
  tests:
  name: Unit & E2E
- runs-on: self-hosted
+ runs-on: ubuntu-latest
 
  steps:
  - name: Checkout repository
@@ -23,12 +23,14 @@ jobs:
  # Upstream bug causes buildkit pulls to fail so prefetch base images
  # https://github.com/moby/moby/issues/41864
  run: |
- echo "_APP_FUNCTIONS_RUNTIMES=php-8.0" >> .env
+ export COMPOSE_INTERACTIVE_NO_CLI
+ export DOCKER_BUILDKIT=1
+ export COMPOSE_DOCKER_CLI_BUILD=1
+ export BUILDKIT_PROGRESS=plain
  docker pull composer:2.0
- docker pull php:8.0-cli-alpine
- docker compose build --progress=plain
- docker compose up -d
- sleep 10
+ docker compose -f docker-compose.yml -f docker-compose.ci.yml build appwrite
+ docker compose -f docker-compose.yml -f docker-compose.ci.yml up -d
+ sleep 30
  - name: Doctor
  run: docker compose exec -T appwrite doctor
 
@@ -37,10 +39,3 @@ jobs:
 
  - name: Run Tests
  run: docker compose exec -T appwrite test --debug
-
- - name: Teardown
- if: always()
- run: |
- docker ps -aq | xargs docker rm --force || true
- docker volume prune --force || true
- docker network prune --force || true

CHANGES.md

@@ -1,6 +1,28 @@
+# Version 1.1.0
+
+## Bugs
+- Fix license detection for Flutter and Dart SDKs [#4435](https://github.com/appwrite/appwrite/pull/4435)
+
+# Version 1.0.3
+## Bugs
+- Fix document audit deletion [#4429](https://github.com/appwrite/appwrite/pull/4429)
+- Fix attribute and index deletion when deleting a collection [#4429](https://github.com/appwrite/appwrite/pull/4429)
+
+# Version 1.0.2
+## Bugs
+- Fixed nullable values in functions variables [#3885](https://github.com/appwrite/appwrite/pull/3885)
+- Fixed migration for audit by migrating the `time` attribute [#4038](https://github.com/appwrite/appwrite/pull/4038)
+- Fixed default value for creating Boolean Attribute [#4040](https://github.com/appwrite/appwrite/pull/4040)
+- Fixed phone authentication code to be hashed in the internal database [#3906](https://github.com/appwrite/appwrite/pull/3906)
+- Fixed `/v1/teams/:teamId/memberships/:membershipId` response [#3883](https://github.com/appwrite/appwrite/pull/3883)
+- Fixed removing variables when function is deleted [#3884](https://github.com/appwrite/appwrite/pull/3884)
+- Fixed scheduled function not being triggered [#3908](https://github.com/appwrite/appwrite/pull/3908)
+- Fixed Phone Provider configuration [#3862](https://github.com/appwrite/appwrite/pull/3883)
+- Fixed Queries with `0` values [utopia-php/database#194](https://github.com/utopia-php/database/pull/194)
+
 # Version 1.0.1
 ## Bugs
-- Fixed migration for abuse by migrating the `time` attribute [3839](https://github.com/appwrite/appwrite/pull/3839)
+- Fixed migration for abuse by migrating the `time` attribute [#3839](https://github.com/appwrite/appwrite/pull/3839)
 
 # Version 1.0.0
 ## BREAKING CHANGES

README-CN.md

@@ -62,7 +62,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.0.1
+ appwrite/appwrite:1.0.3
 ```
 
 ### Windows
@@ -74,7 +74,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.0.1
+ appwrite/appwrite:1.0.3
 ```
 
 #### PowerShell
@@ -84,7 +84,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.0.1
+ appwrite/appwrite:1.0.3
 ```
 
 运行后，可以在浏览器上访问 http:https://localhost 找到 Appwrite 控制台。在非 Linux 的本机主机上完成安装后，服务器可能需要几分钟才能启动。

README.md

@@ -14,7 +14,7 @@
 
 <!-- [![Build Status](https://img.shields.io/travis/com/appwrite/appwrite?style=flat-square)](https://travis-ci.com/appwrite/appwrite) -->
 
-[![Hacktoberfest](https://img.shields.io/static/v1?label=hacktoberfest&message=friendly&color=191120&style=flat-square)](https://hacktoberfest.appwrite.io)
+[![Hacktoberfest](https://img.shields.io/static/v1?label=hacktoberfest&message=ready&color=191120&style=flat-square)](https://hacktoberfest.appwrite.io)
 [![Discord](https://img.shields.io/discord/564160730845151244?label=discord&style=flat-square)](https://appwrite.io/discord?r=Github)
 [![Build Status](https://img.shields.io/github/workflow/status/appwrite/appwrite/Tests?label=tests&style=flat-square)](https://github.com/appwrite/appwrite/actions)
 [![Twitter Account](https://img.shields.io/twitter/follow/appwrite?color=00acee&label=twitter&style=flat-square)](https://twitter.com/appwrite)
@@ -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.0.1
+ appwrite/appwrite:1.0.3
 ```
 
 ### Windows
@@ -87,17 +87,17 @@ 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.0.1
+ appwrite/appwrite:1.0.3
 ```
 
 #### PowerShell
 
 ```powershell
-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.0.1
+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.0.3
 ```
 
 Once the Docker installation completes, go to http:https://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 installation completes.

app/config/collections.php

@@ -523,17 +523,6 @@
  'array' => false,
  'filters' => [],
  ],
- [
- '$id' => ID::custom('region'),
- 'type' => Database::VAR_STRING,
- 'format' => '',
- 'size' => 128,
- 'signed' => true,
- 'required' => false,
- 'default' => null,
- 'array' => false,
- 'filters' => [],
- ],
  [
  '$id' => ID::custom('description'),
  'type' => Database::VAR_STRING,
@@ -3021,17 +3010,6 @@
  'array' => false,
  'filters' => [],
  ],
- [
- '$id' => ID::custom('region'),
- 'type' => Database::VAR_STRING,
- 'format' => '',
- 'size' => 255,
- 'signed' => true,
- 'required' => true,
- 'default' => null,
- 'array' => false,
- 'filters' => [],
- ],
  [
  '$id' => ID::custom('value'),
  'type' => Database::VAR_INTEGER,

app/controllers/api/account.php

@@ -2,7 +2,6 @@
 
 use Ahc\Jwt\JWT;
 use Appwrite\Auth\Auth;
-use Appwrite\SMS\Adapter\Mock;
 use Appwrite\Auth\Validator\Password;
 use Appwrite\Auth\Validator\Phone;
 use Appwrite\Detector\Detector;
@@ -930,7 +929,7 @@
  ])));
  }
 
- $secret = (App::getEnv('_APP_SMS_PROVIDER') === 'sms:https://mock') ? Mock::$digits : Auth::codeGenerator();
+ $secret = Auth::codeGenerator();
  $expire = DateTime::addSeconds(new \DateTime(), Auth::TOKEN_EXPIRATION_PHONE);
 
  $token = new Document([
@@ -1418,7 +1417,7 @@
  ->label('sdk.response.code', Response::STATUS_CODE_OK)
  ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
  ->label('sdk.response.model', Response::MODEL_SESSION)
- ->param('sessionId', null, new UID(), 'Session ID. Use the string \'current\' to get the current device session.')
+ ->param('sessionId', '', new UID(), 'Session ID. Use the string \'current\' to get the current device session.')
  ->inject('response')
  ->inject('user')
  ->inject('locale')
@@ -1696,7 +1695,7 @@
  ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
  ->label('sdk.response.model', Response::MODEL_NONE)
  ->label('abuse-limit', 100)
- ->param('sessionId', null, new UID(), 'Session ID. Use the string \'current\' to delete the current device session.')
+ ->param('sessionId', '', new UID(), 'Session ID. Use the string \'current\' to delete the current device session.')
  ->inject('request')
  ->inject('response')
  ->inject('user')
@@ -1769,7 +1768,7 @@
  ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
  ->label('sdk.response.model', Response::MODEL_SESSION)
  ->label('abuse-limit', 10)
- ->param('sessionId', null, new UID(), 'Session ID. Use the string \'current\' to update the current device session.')
+ ->param('sessionId', '', new UID(), 'Session ID. Use the string \'current\' to update the current device session.')
  ->inject('request')
  ->inject('response')
  ->inject('user')
@@ -2258,7 +2257,7 @@
  $isPrivilegedUser = Auth::isPrivilegedUser($roles);
  $isAppUser = Auth::isAppUser($roles);
  $verificationSecret = Auth::tokenGenerator();
- $secret = (App::getEnv('_APP_SMS_PROVIDER') === 'sms:https://mock') ? Mock::$digits : Auth::codeGenerator();
+ $secret = Auth::codeGenerator();
  $expire = DateTime::addSeconds(new \DateTime(), Auth::TOKEN_EXPIRATION_CONFIRM);
 
  $verification = new Document([

app/controllers/api/databases.php

@@ -89,11 +89,11 @@ function createAttribute(string $databaseId, string $collectionId, Document $att
  }
 
  // Must throw here since dbForProject->createAttribute is performed by db worker
- if ($required && $default) {
+ if ($required && isset($default)) {
  throw new Exception(Exception::ATTRIBUTE_DEFAULT_UNSUPPORTED, 'Cannot set default value for required attribute');
  }
 
- if ($array && $default) {
+ if ($array && isset($default)) {
  throw new Exception(Exception::ATTRIBUTE_DEFAULT_UNSUPPORTED, 'Cannot set default value for array attributes');
  }
 
@@ -1783,7 +1783,7 @@ function createAttribute(string $databaseId, string $collectionId, Document $att
  ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
  ->label('sdk.response.model', Response::MODEL_NONE)
  ->param('databaseId', '', new UID(), 'Database ID.')
- ->param('collectionId', null, new UID(), 'Collection ID. You can create a new collection using the Database service [server integration](https://appwrite.io/docs/server/databases#databasesCreateCollection).')
+ ->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(), 'Index Key.')
  ->inject('response')
  ->inject('dbForProject')
@@ -1856,7 +1856,7 @@ function createAttribute(string $databaseId, string $collectionId, Document $att
  ->label('sdk.response.model', Response::MODEL_DOCUMENT)
  ->param('databaseId', '', new UID(), 'Database ID.')
  ->param('documentId', '', new CustomId(), 'Document ID. Choose your own unique ID or pass the string "unique()" to auto generate it. Valid chars are a-z, A-Z, 0-9, period, hyphen, and underscore. Can\'t start with a special char. Max length is 36 chars.')
- ->param('collectionId', null, new UID(), 'Collection ID. You can create a new collection using the Database service [server integration](https://appwrite.io/docs/server/databases#databasesCreateCollection). Make sure to define attributes before creating documents.')
+ ->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). Make sure to define attributes before creating documents.')
  ->param('data', [], new JSON(), 'Document data as JSON object.')
  ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE, [Database::PERMISSION_READ, Database::PERMISSION_UPDATE, Database::PERMISSION_DELETE, Database::PERMISSION_WRITE]), 'An array of permissions strings. By default the current user is granted with all permissions. [Learn more about permissions](/docs/permissions).', true)
  ->inject('response')
@@ -2074,8 +2074,8 @@ function createAttribute(string $databaseId, string $collectionId, Document $att
  ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
  ->label('sdk.response.model', Response::MODEL_DOCUMENT)
  ->param('databaseId', '', new UID(), 'Database ID.')
- ->param('collectionId', null, new UID(), 'Collection ID. You can create a new collection using the Database service [server integration](https://appwrite.io/docs/server/databases#databasesCreateCollection).')
- ->param('documentId', null, new UID(), 'Document ID.')
+ ->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('documentId', '', new UID(), 'Document ID.')
  ->inject('response')
  ->inject('dbForProject')
  ->inject('mode')
@@ -2137,7 +2137,7 @@ function createAttribute(string $databaseId, string $collectionId, Document $att
  ->label('sdk.response.model', Response::MODEL_LOG_LIST)
  ->param('databaseId', '', new UID(), 'Database ID.')
  ->param('collectionId', '', new UID(), 'Collection ID.')
- ->param('documentId', null, new UID(), 'Document ID.')
+ ->param('documentId', '', new UID(), 'Document ID.')
  ->param('queries', [], new Queries(new Limit(), new Offset()), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/databases#querying-documents). Only supported methods are limit and offset', true)
  ->inject('response')
  ->inject('dbForProject')
@@ -2243,8 +2243,8 @@ function createAttribute(string $databaseId, string $collectionId, Document $att
  ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
  ->label('sdk.response.model', Response::MODEL_DOCUMENT)
  ->param('databaseId', '', new UID(), 'Database ID.')
- ->param('collectionId', null, new UID(), 'Collection ID.')
- ->param('documentId', null, new UID(), 'Document ID.')
+ ->param('collectionId', '', new UID(), 'Collection ID.')
+ ->param('documentId', '', new UID(), 'Document ID.')
  ->param('data', [], new JSON(), 'Document data as JSON object. Include only attribute and value pairs to be updated.', true)
  ->param('permissions', null, new Permissions(APP_LIMIT_ARRAY_PARAMS_SIZE, [Database::PERMISSION_READ, Database::PERMISSION_UPDATE, Database::PERMISSION_DELETE, Database::PERMISSION_WRITE]), 'An array of permissions strings. By default the current permissions are inherited. [Learn more about permissions](/docs/permissions).', true)
  ->inject('response')
@@ -2376,8 +2376,8 @@ function createAttribute(string $databaseId, string $collectionId, Document $att
  ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
  ->label('sdk.response.model', Response::MODEL_NONE)
  ->param('databaseId', '', new UID(), 'Database ID.')
- ->param('collectionId', null, new UID(), 'Collection ID. You can create a new collection using the Database service [server integration](https://appwrite.io/docs/server/databases#databasesCreateCollection).')
- ->param('documentId', null, new UID(), 'Document ID.')
+ ->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('documentId', '', new UID(), 'Document ID.')
  ->inject('response')
  ->inject('dbForProject')
  ->inject('events')
@@ -2534,7 +2534,7 @@ function createAttribute(string $databaseId, string $collectionId, Document $att
  };
  $stats[$metric][] = [
  'value' => 0,
- 'date' => DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff),
+ 'date' => DateTime::formatTz(DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff)),
  ];
  $backfill--;
  }
@@ -2648,7 +2648,7 @@ function createAttribute(string $databaseId, string $collectionId, Document $att
  };
  $stats[$metric][] = [
  'value' => 0,
- 'date' => DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff),
+ 'date' => DateTime::formatTz(DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff)),
  ];
  $backfill--;
  }
@@ -2763,7 +2763,7 @@ function createAttribute(string $databaseId, string $collectionId, Document $att
  };
  $stats[$metric][] = [
  'value' => 0,
- 'date' => DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff),
+ 'date' => DateTime::formatTz(DateTime::addSeconds(new \DateTime($stats[$metric][$last]['date'] ?? null), -1 * $diff)),
  ];
  $backfill--;
  }