Merge remote-tracking branch 'origin/master' into feat-graphql-support

# Conflicts: # CONTRIBUTING.md # composer.json # composer.lock # docs/references/teams/list-teams.md
2024-06-01 18:39:57 +12:00 · 2022-10-19 13:17:56 +13:00 · 2022-10-19 13:17:56 +13:00 · a2b1941a47
parent 61e5014ff0 0d0cacbf87
commit a2b1941a47
31 changed files with 184 additions and 177 deletions
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@ -28,8 +28,8 @@ jobs:
        export COMPOSE_DOCKER_CLI_BUILD=1
        export BUILDKIT_PROGRESS=plain
        docker pull composer:2.0
-        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
+        docker compose build appwrite
+        docker compose up -d
        sleep 30
    - name: Doctor
      run: docker compose exec -T appwrite doctor
--- a/CHANGES.md
+++ b/CHANGES.md
@ -1,3 +1,13 @@
+# 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)
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@ -12,7 +12,7 @@ Help us keep Appwrite open and inclusive. Please read and follow our [Code of Co

 ## Submit a Pull Request 🚀

-Branch naming convention is as following
+Branch naming convention is as follows

 `TYPE-ISSUE_ID-DESCRIPTION`

@ -30,7 +30,7 @@ When `TYPE` can be:
 - **fix** - a bug fix
 - **refactor** - code change that neither fixes a bug nor adds a feature

-**All PRs must include a commit message with the changes description!**
+**All PRs must include a commit message with the description of the changes made!**

 For the initial start, fork the project and use git clone command to download the repository to your computer. A standard procedure for working on an issue would be to:

@ -48,7 +48,7 @@ $ git checkout -b [name_of_your_new_branch]

 3. Work - commit - repeat ( be sure to be in your branch )

-4. Before you push your changes, make sure your code follows the `PSR12` coding standards , which is the standard Appwrite follows currently. You can easily do this by running the formatter.
+4. Before you push your changes, make sure your code follows the `PSR12` coding standards, which is the standard Appwrite follows currently. You can easily do this by running the formatter.

 ```bash
 docker run --rm --interactive --tty --volume $PWD:/app composer format <your file path>
@ -60,7 +60,7 @@ Now, go a step further by running the linter by the following command to manuall
 docker run --rm --interactive --tty --volume $PWD:/app composer lint <your file path>
 ```

-This will give you a list of errors for you to rectify , if there is an instance you need more information on the errors being displayed you can pass in additional command line arguments. More list of available arguments can be found [here](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Usage). A very useful command line argument is `--report=diff`. This will give you the expected changes by the linter for easy fixing of formatting issues.
+This will give you a list of errors for you to rectify, if there is an instance you need more information on the errors being displayed you can pass in additional command line arguments. More list of available arguments can be found [here](https://github.com/squizlabs/PHP_CodeSniffer/wiki/Usage). A very useful command line argument is `--report=diff`. This will give you the expected changes by the linter for easy fixing of formatting issues.

 ```bash
 docker run --rm --interactive --tty --volume $PWD:/app composer lint --report=diff <your file path>
@ -93,6 +93,7 @@ git clone git@github.com:[YOUR_FORK_HERE]/appwrite.git

 cd appwrite

+docker compose build
 docker compose up -d
 ```

@ -116,7 +117,7 @@ After finishing the installation process, you can start writing and editing code

 #### Advanced Topics

-We love to create issues that are good for beginners and label them as `good first issue` or `hacktoberfest`, but some more advanced topics might require extra knowledge. Below is a list of links you can use to learn more about some of the more advance topics that will help you master the Appwrite codebase.
+We love to create issues that are good for beginners and label them as `good first issue` or `hacktoberfest`, but some more advanced topics might require extra knowledge. Below is a list of links you can use to learn more about some of the more advanced topics that will help you master the Appwrite codebase.

 ##### Tools and Libs

--- a/README-CN.md
+++ b/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.2
+    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.2
+    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.2
+    appwrite/appwrite:1.0.3
 ```

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

 ### 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.0.2
+    appwrite/appwrite:1.0.3
 ```

 #### 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.0.2
+    appwrite/appwrite:1.0.3
 ```

 Once the Docker installation completes, 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 installation completes.
@ -145,7 +145,7 @@ Getting started with Appwrite is as easy as creating a new project, choosing you
 ### Services

 - [**Account**](https://appwrite.io/docs/client/account) - Manage current user authentication and account. Track and manage the user sessions, devices, sign-in methods, and security logs.
- [**Users**](https://appwrite.io/docs/server/users) - Manage and list all project users when in admin mode.
+- [**Users**](https://appwrite.io/docs/server/users) - Manage and list all project users when building backend integrations with Server SDKs.
 - [**Teams**](https://appwrite.io/docs/client/teams) - Manage and group users in teams. Manage memberships, invites, and user roles within a team.
 - [**Databases**](https://appwrite.io/docs/client/databases) - Manage databases, collections and documents. Read, create, update, and delete documents and filter lists of document collections using advanced filters.
 - [**Storage**](https://appwrite.io/docs/client/storage) - Manage storage files. Read, create, delete, and preview files. Manipulate the preview of your files to fit your app perfectly. All files are scanned by ClamAV and stored in a secure and encrypted way.
@ -206,7 +206,7 @@ For security issues, kindly email us at [security@appwrite.io](mailto:security@a

 ## Follow Us

-Join our growing community around the world! See our official [Blog](https://medium.com/appwrite-io). Follow us on [Twitter](https://twitter.com/appwrite), [Facebook Page](https://www.facebook.com/appwrite.io), [Facebook Group](https://www.facebook.com/groups/appwrite.developers/) , [Dev Community](https://dev.to/appwrite) or join our live [Discord server](https://discord.gg/GSeTUeA) for more help, ideas, and discussions.
+Join our growing community around the world! See our official [Blog](https://medium.com/appwrite-io). Follow us on [Twitter](https://twitter.com/appwrite), [Facebook Page](https://www.facebook.com/appwrite.io), [Facebook Group](https://www.facebook.com/groups/appwrite.developers/), [Dev Community](https://dev.to/appwrite) or join our live [Discord server](https://discord.gg/GSeTUeA) for more help, ideas, and discussions.

 ## License

--- a/app/controllers/api/databases.php
+++ b/app/controllers/api/databases.php
@ -1573,7 +1573,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/indexes')
            Query::equal('databaseInternalId', [$db->getInternalId()])
        ], 61);

-        $limit = 64 - MariaDB::getNumberOfDefaultIndexes();
+        $limit = 64 - MariaDB::getCountOfDefaultIndexes();

        if ($count >= $limit) {
            throw new Exception(Exception::INDEX_LIMIT_EXCEEDED, 'Index limit exceeded');
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@ -888,7 +888,7 @@ App::patch('/v1/users/:userId/phone')
        try {
            $user = $dbForProject->updateDocument('users', $user->getId(), $user);
        } catch (Duplicate $th) {
-            throw new Exception(Exception::USER_EMAIL_ALREADY_EXISTS);
+            throw new Exception(Exception::USER_PHONE_ALREADY_EXISTS);
        }

        $events->setParam('userId', $user->getId());
--- a/app/http.php
+++ b/app/http.php
@ -90,18 +90,11 @@ $http->on('start', function (Server $http) use ($payloadSize, $register) {
        /** @var array $collections */
        $collections = Config::getParam('collections', []);

-        if (!$dbForConsole->exists(App::getEnv('_APP_DB_SCHEMA', 'appwrite'))) {
-            $redis->flushAll();
-
-            Console::success('[Setup] - Creating database: appwrite...');
-
-            $dbForConsole->create(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
-        }
-
        try {
-            Console::success('[Setup] - Creating metadata table: appwrite...');
-            $dbForConsole->createMetadata();
-        } catch (\Throwable $th) {
+            $redis->flushAll();
+            Console::success('[Setup] - Creating database: appwrite...');
+            $dbForConsole->create(App::getEnv('_APP_DB_SCHEMA', 'appwrite'));
+        } catch (\Exception $e) {
            Console::success('[Setup] - Skip: metadata table already exists');
        }

--- a/app/init.php
+++ b/app/init.php
@ -98,7 +98,7 @@ const APP_LIMIT_LIST_DEFAULT = 25; // Default maximum number of items to return
 const APP_KEY_ACCCESS = 24 * 60 * 60; // 24 hours
 const APP_CACHE_UPDATE = 24 * 60 * 60; // 24 hours
 const APP_CACHE_BUSTER = 501;
-const APP_VERSION_STABLE = '1.0.2';
+const APP_VERSION_STABLE = '1.0.3';
 const APP_DATABASE_ATTRIBUTE_EMAIL = 'email';
 const APP_DATABASE_ATTRIBUTE_ENUM = 'enum';
 const APP_DATABASE_ATTRIBUTE_IP = 'ip';
@ -286,7 +286,7 @@ Database::addFilter(
            ->find('attributes', [
                Query::equal('collectionInternalId', [$document->getInternalId()]),
                Query::equal('databaseInternalId', [$document->getAttribute('databaseInternalId')]),
-                Query::limit($database->getAttributeLimit()),
+                Query::limit($database->getLimitForAttributes()),
            ]);
    }
 );
--- a/app/tasks/sdks.php
+++ b/app/tasks/sdks.php
@ -72,7 +72,7 @@ Redistribution and use in source and binary forms, with or without modification,

    2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.

-    3. Neither the name Appwrite nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+    3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.

 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.';

--- a/app/workers/deletes.php
+++ b/app/workers/deletes.php
@ -193,21 +193,24 @@ class DeletesV1 extends Worker
    protected function deleteCollection(Document $document, string $projectId): void
    {
        $collectionId = $document->getId();
-        $databaseId = str_replace('database_', '', $document->getCollection());
+        $databaseId = $document->getAttribute('databaseId');
+        $databaseInternalId = $document->getAttribute('databaseInternalId');

        $dbForProject = $this->getProjectDB($projectId);

-        $dbForProject->deleteCollection('database_' . $databaseId . '_collection_' . $document->getInternalId());
+        $dbForProject->deleteCollection('database_' . $databaseInternalId . '_collection_' . $document->getInternalId());

        $this->deleteByGroup('attributes', [
+            Query::equal('databaseId', [$databaseId]),
            Query::equal('collectionId', [$collectionId])
        ], $dbForProject);

        $this->deleteByGroup('indexes', [
+            Query::equal('databaseId', [$databaseId]),
            Query::equal('collectionId', [$collectionId])
        ], $dbForProject);

-        $this->deleteAuditLogsByResource('collection/' . $collectionId, $projectId);
+        $this->deleteAuditLogsByResource('database/' . $databaseId . '/collection/' . $collectionId, $projectId);
    }

    /**
--- a/composer.json
+++ b/composer.json
@ -43,13 +43,13 @@
        "ext-sockets": "*",
        "appwrite/php-clamav": "1.1.*",
        "appwrite/php-runtimes": "0.11.*",
-        "utopia-php/abuse": "0.13.*",
+        "utopia-php/abuse": "0.14.*",
        "utopia-php/analytics": "0.2.*",
-        "utopia-php/audit": "0.14.*",
+        "utopia-php/audit": "0.15.*",
        "utopia-php/cache": "0.6.*",
        "utopia-php/cli": "0.13.*",
        "utopia-php/config": "0.2.*",
-        "utopia-php/database": "0.25.*",
+        "utopia-php/database": "0.26.*",
        "utopia-php/domains": "1.1.*",
        "utopia-php/framework": "dev-feat-allow-mutations as 0.22.1",
        "utopia-php/image": "0.5.*",
--- a/composer.lock
+++ b/composer.lock
@ -1741,23 +1741,23 @@
        },
        {
            "name": "utopia-php/abuse",
-            "version": "0.13.1",
+            "version": "0.14.0",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/abuse.git",
-                "reference": "4c1b8fe742f17158c59550cdfd9074a94bf474ac"
+                "reference": "1a5da248e74c1bfc39bc440fa949de6935acceeb"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/abuse/zipball/4c1b8fe742f17158c59550cdfd9074a94bf474ac",
-                "reference": "4c1b8fe742f17158c59550cdfd9074a94bf474ac",
+                "url": "https://api.github.com/repos/utopia-php/abuse/zipball/1a5da248e74c1bfc39bc440fa949de6935acceeb",
+                "reference": "1a5da248e74c1bfc39bc440fa949de6935acceeb",
                "shasum": ""
            },
            "require": {
                "ext-curl": "*",
                "ext-pdo": "*",
                "php": ">=8.0",
-                "utopia-php/database": "0.25.*"
+                "utopia-php/database": "0.26.*"
            },
            "require-dev": {
                "phpunit/phpunit": "^9.4",
@ -1789,9 +1789,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/abuse/issues",
-                "source": "https://github.com/utopia-php/abuse/tree/0.13.1"
+                "source": "https://github.com/utopia-php/abuse/tree/0.14.0"
            },
-            "time": "2022-09-07T16:02:58+00:00"
+            "time": "2022-10-14T11:26:39+00:00"
        },
        {
            "name": "utopia-php/analytics",
@ -1850,22 +1850,22 @@
        },
        {
            "name": "utopia-php/audit",
-            "version": "0.14.1",
+            "version": "0.15.0",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/audit.git",
-                "reference": "b011224ed9bfef7e5c849938e65619af28f7cf41"
+                "reference": "937ffd13e7a5ac9ad220b329247569ef2a4881d9"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/audit/zipball/b011224ed9bfef7e5c849938e65619af28f7cf41",
-                "reference": "b011224ed9bfef7e5c849938e65619af28f7cf41",
+                "url": "https://api.github.com/repos/utopia-php/audit/zipball/937ffd13e7a5ac9ad220b329247569ef2a4881d9",
+                "reference": "937ffd13e7a5ac9ad220b329247569ef2a4881d9",
                "shasum": ""
            },
            "require": {
                "ext-pdo": "*",
                "php": ">=8.0",
-                "utopia-php/database": "0.25.*"
+                "utopia-php/database": "0.26.*"
            },
            "require-dev": {
                "phpunit/phpunit": "^9.3",
@ -1881,12 +1881,6 @@
            "license": [
                "MIT"
            ],
-            "authors": [
-                {
-                    "name": "Eldad Fux",
-                    "email": "eldad@appwrite.io"
-                }
-            ],
            "description": "A simple audit library to manage application users logs",
            "keywords": [
                "Audit",
@ -1897,9 +1891,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/audit/issues",
-                "source": "https://github.com/utopia-php/audit/tree/0.14.1"
+                "source": "https://github.com/utopia-php/audit/tree/0.15.0"
            },
-            "time": "2022-09-07T16:03:16+00:00"
+            "time": "2022-10-14T11:39:18+00:00"
        },
        {
            "name": "utopia-php/cache",
@ -2060,16 +2054,16 @@
        },
        {
            "name": "utopia-php/database",
-            "version": "0.25.5",
+            "version": "0.26.0",
            "source": {
                "type": "git",
                "url": "https://github.com/utopia-php/database.git",
-                "reference": "6d1c1d46d66553154975a3e8e72d30b5bd2413d9"
+                "reference": "d172af2541137c83a86d066f82f48914b5a3a610"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/utopia-php/database/zipball/6d1c1d46d66553154975a3e8e72d30b5bd2413d9",
-                "reference": "6d1c1d46d66553154975a3e8e72d30b5bd2413d9",
+                "url": "https://api.github.com/repos/utopia-php/database/zipball/d172af2541137c83a86d066f82f48914b5a3a610",
+                "reference": "d172af2541137c83a86d066f82f48914b5a3a610",
                "shasum": ""
            },
            "require": {
@ -2118,9 +2112,9 @@
            ],
            "support": {
                "issues": "https://github.com/utopia-php/database/issues",
-                "source": "https://github.com/utopia-php/database/tree/0.25.5"
+                "source": "https://github.com/utopia-php/database/tree/0.26.0"
            },
-            "time": "2022-09-30T15:01:32+00:00"
+            "time": "2022-10-03T17:12:01+00:00"
        },
        {
            "name": "utopia-php/domains",
--- a/docker-compose.ci.yml
+++ b/docker-compose.ci.yml
@ -1,48 +0,0 @@
-services:
-  appwrite:
-    image: appwrite-dev
-
-  appwrite-realtime:
-    image: appwrite-dev
-
-  appwrite-worker-audits:
-    image: appwrite-dev
-
-  appwrite-worker-webhooks:
-    image: appwrite-dev
-
-  appwrite-worker-deletes:
-    image: appwrite-dev
-
-  appwrite-worker-databases:
-    image: appwrite-dev
-
-  appwrite-worker-builds:
-    image: appwrite-dev
-
-  appwrite-worker-certificates:
-    image: appwrite-dev
-
-  appwrite-worker-functions:
-    image: appwrite-dev
-
-  appwrite-executor:
-    image: appwrite-dev
-
-  appwrite-worker-mails:
-    image: appwrite-dev
-
-  appwrite-worker-messaging:
-    image: appwrite-dev
-
-  appwrite-maintenance:
-    image: appwrite-dev
-
-  appwrite-usage-timeseries:
-    image: appwrite-dev
-
-  appwrite-usage-database:
-    image: appwrite-dev
-
-  appwrite-schedule:
-    image: appwrite-dev
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -70,6 +70,7 @@ services:
  appwrite:
    container_name: appwrite
    <<: *x-logging
+    image: appwrite-dev
    build:
      context: .
      args:
@ -184,8 +185,7 @@ services:
    entrypoint: realtime
    <<: *x-logging
    container_name: appwrite-realtime
-    build:
-      context: .
+    image: appwrite-dev
    restart: unless-stopped
    ports: 
      - 9505:80
@ -232,8 +232,7 @@ services:
    entrypoint: worker-audits
    <<: *x-logging
    container_name: appwrite-worker-audits
-    build:
-      context: .
+    image: appwrite-dev
    networks:
      - appwrite
    volumes:
@ -261,8 +260,7 @@ services:
    entrypoint: worker-webhooks
    <<: *x-logging
    container_name: appwrite-worker-webhooks
-    build:
-      context: .
+    image: appwrite-dev
    networks:
      - appwrite
    volumes:
@ -287,8 +285,7 @@ services:
    entrypoint: worker-deletes
    <<: *x-logging
    container_name: appwrite-worker-deletes
-    build:
-      context: .
+    image: appwrite-dev
    networks:
      - appwrite
    depends_on:
@ -324,8 +321,7 @@ services:
    entrypoint: worker-databases
    <<: *x-logging
    container_name: appwrite-worker-databases
-    build:
-      context: .
+    image: appwrite-dev
    networks:
      - appwrite
    volumes: 
@ -354,8 +350,7 @@ services:
    entrypoint: worker-builds
    <<: *x-logging
    container_name: appwrite-worker-builds
-    build:
-      context: .
+    image: appwrite-dev
    networks:
      - appwrite
    volumes: 
@ -385,8 +380,7 @@ services:
    entrypoint: worker-certificates
    <<: *x-logging
    container_name: appwrite-worker-certificates
-    build:
-      context: .
+    image: appwrite-dev
    networks:
      - appwrite
    depends_on:
@ -419,8 +413,7 @@ services:
    entrypoint: worker-functions
    <<: *x-logging
    container_name: appwrite-worker-functions
-    build:
-      context: .
+    image: appwrite-dev
    networks:
      - appwrite
    volumes:
@ -454,12 +447,7 @@ services:
    <<: *x-logging
    entrypoint: executor
    stop_signal: SIGINT
-    build:
-      context: .
-      args: 
-        - DEBUG=false
-        - TESTING=true
-        - VERSION=dev
+    image: appwrite-dev
    networks:
      appwrite:
      runtimes:
@ -499,8 +487,7 @@ services:
    entrypoint: worker-mails
    <<: *x-logging
    container_name: appwrite-worker-mails
-    build:
-      context: .
+    image: appwrite-dev
    networks:
      - appwrite
    volumes:
@ -531,8 +518,7 @@ services:
    entrypoint: worker-messaging
    <<: *x-logging
    container_name: appwrite-worker-messaging
-    build:
-      context: .
+    image: appwrite-dev
    networks:
      - appwrite
    volumes:
@ -555,8 +541,7 @@ services:
    entrypoint: maintenance
    <<: *x-logging
    container_name: appwrite-maintenance
-    build:
-      context: .
+    image: appwrite-dev
    networks:
      - appwrite
    volumes:
@ -591,10 +576,7 @@ services:
      - --type=timeseries
    <<: *x-logging
    container_name: appwrite-usage-timeseries
-    build:
-      context: .
-      args:
-        - DEBUG=false
+    image: appwrite-dev
    networks:
      - appwrite
    volumes:
@ -629,10 +611,7 @@ services:
      - --type=database
    <<: *x-logging
    container_name: appwrite-usage-database
-    build:
-      context: .
-      args:
-        - DEBUG=false
+    image: appwrite-dev
    networks:
      - appwrite
    volumes:
@ -665,8 +644,7 @@ services:
    entrypoint: schedule
    <<: *x-logging
    container_name: appwrite-schedule
-    build:
-      context: .
+    image: appwrite-dev
    networks:
      - appwrite
    volumes:
--- a/docs/references/databases/list-documents.md
+++ b/docs/references/databases/list-documents.md
@ -1 +1 @@
-Get a list of all the user's documents in a given collection. You can use the query params to filter your results. On admin mode, this endpoint will return a list of all of documents belonging to the provided collectionId. [Learn more about different API modes](/docs/admin).
+Get a list of all the user's documents in a given collection. You can use the query params to filter your results.
--- a/docs/references/functions/list-executions.md
+++ b/docs/references/functions/list-executions.md
@ -1 +1 @@
-Get a list of all the current user function execution logs. You can use the query params to filter your results. On admin mode, this endpoint will return a list of all of the project's executions. [Learn more about different API modes](/docs/admin).
+Get a list of all the current user function execution logs. You can use the query params to filter your results.
--- a/docs/references/storage/list-files.md
+++ b/docs/references/storage/list-files.md
@ -1 +1 @@
-Get a list of all the user files. You can use the query params to filter your results. On admin mode, this endpoint will return a list of all of the project's files. [Learn more about different API modes](/docs/admin).
+Get a list of all the user files. You can use the query params to filter your results.
--- a/docs/references/teams/list-teams.md
+++ b/docs/references/teams/list-teams.md
@ -1,3 +1 @@
 Get a list of all the teams in which the current user is a member. You can use the parameters to filter your results.
-
-In admin mode, this endpoint returns a list of all the teams in the current project. [Learn more about different API modes](/docs/admin).
--- a/docs/services/account.md
+++ b/docs/services/account.md
@ -2,9 +2,9 @@ The Account service allows you to authenticate and manage a user account. You ca

 Register new user accounts with the [Create Account](/docs/client/account#accountCreate), [Create Magic URL session](/docs/client/account#accountCreateMagicURLSession), or [Create Phone session](/docs/client/account#accountCreatePhoneSession) endpoint. You can authenticate the user account by using multiple sign-in methods available. Once the user is authenticated, a new session object will be created to allow the user to access his or her private data and settings.

-This service also exposes an endpoint to save and read the [user preferences](/docs/client/account#accountUpdatePrefs) as a key-value object. This feature is handy if you want to allow extra customization in your app. Common usage for this feature may include saving the user preferred locale, timezone, or custom app theme.
+This service also exposes an endpoint to save and read the [user preferences](/docs/client/account#accountUpdatePrefs) as a key-value object. This feature is handy if you want to allow extra customization in your app. Common usage for this feature may include saving the user's preferred locale, timezone, or custom app theme.

 > ## Account API vs Users API
 > While the Account API operates in the scope of the current logged-in user and usually using a client-side integration, the Users API is integrated from the server-side and operates in an admin scope with access to all your project users. 
 > 
-> Some of the Account API methods are available from the server SDK when you authenticate with JWT. This allows you to perform server-side actions on behalf of your project user.
+> Some of the Account API methods are available from the server SDK when you authenticate with JWT. This allows you to perform server-side actions on behalf of your project user.
--- a/docs/services/avatars.md
+++ b/docs/services/avatars.md
@ -1,5 +1,5 @@
 The Avatars service aims to help you complete everyday tasks related to your app image, icons, and avatars.

-The Avatars service allows you to fetch country flags, browser icons, payment methods logos, remote websites favicons, generate QR codes, and manipulate remote images URLs.
+The Avatars service allows you to fetch country flags, browser icons, payment methods logos, remote websites favicons, generate QR codes, and manipulate remote image URLs.

-All endpoints in this service allow you to resize, crop, and change the output image quality for maximum performance and visibility in your app.
+All endpoints in this service allow you to resize, crop, and change the output image quality for maximum performance and visibility in your app.
--- a/docs/tutorials/add-environment-variable.md
+++ b/docs/tutorials/add-environment-variable.md
@ -5,12 +5,12 @@ This document is part of the Appwrite contributors' guide. Before you continue r
 ## Getting Started

 ### Agenda
-Adding new features may require various configurations options to be set by the users. And for such options, we use environment variables in Appwrite.
+Adding new features may require various configuration options to be set by the users. And for such options, we use environment variables in Appwrite.

 This tutorial will cover how to properly add a new environment variable in Appwrite.

 ### Naming environment variable
-The environment variables in Appwrite are prefixed with `_APP_`. If it belongs to a specific category, the category name is appended as `_APP_REDIS` for the Redis category. The available categories are General, Redis, MariaDB, InfluxDB, StatsD, SMTP, Storage and Functions. Finally, a properly describing name is given to the variable. For example, `_APP_REDIS_HOST` is an environment variable for Redis connection host. You can find more information on available categories and existing environment variables in the [environment variables doc](https://appwrite.io/docs/environment-variables).
+The environment variables in Appwrite are prefixed with `_APP_`. If it belongs to a specific category, the category name is appended as `_APP_REDIS` for the Redis category. The available categories are General, Redis, MariaDB, InfluxDB, StatsD, SMTP, Storage, Functions and Maintenance. Finally, a properly describing name is given to the variable. For example, `_APP_REDIS_HOST` is an environment variable for the hostname of your Redis instance. You can find more information on available categories and existing environment variables in the [environment variables doc](https://appwrite.io/docs/environment-variables).

 ### Describe new environment variable
 First of all, we add the new environment variable to `app/config/variables.php` in the designated category. If none of the categories fit, add it to the General category. Copy the existing variable description to create a new one so that you will not miss any required fields.
--- a/docs/tutorials/add-translations.md
+++ b/docs/tutorials/add-translations.md
@ -62,7 +62,7 @@ We maintain a [`locale branch`](https://github.com/appwrite/appwrite/tree/locale

 2. **en.json**

-    [en.json]((https://github.com/appwrite/appwrite/blob/locale/app/config/locale/translations/en.json)) contains the English translation for all the terms that are present in **terms.json**. You can use this file as a reference when making a contribution for your language.
+    [en.json](https://github.com/appwrite/appwrite/blob/locale/app/config/locale/translations/en.json) contains the English translation for all the terms that are present in **terms.json**. You can use this file as a reference when making a contribution for your language.

    ```json
    {
--- a/public/dist/styles/default-ltr.css
+++ b/public/dist/styles/default-ltr.css
--- a/public/dist/styles/default-rtl.css
+++ b/public/dist/styles/default-rtl.css
--- a/public/styles/forms.less
+++ b/public/styles/forms.less
@ -836,6 +836,7 @@ label.switch {
  border-radius: 21px;
  background: var(--config-color-fade);
  display: inline-block;
+  overflow: visible;
  margin: 0;
  padding: 5px;
  .func-padding-start(5px);
--- a/src/Appwrite/Auth/Auth.php
+++ b/src/Appwrite/Auth/Auth.php
@ -14,6 +14,7 @@ use Utopia\Database\Document;
 use Utopia\Database\DateTime;
 use Utopia\Database\Role;
 use Utopia\Database\Validator\Authorization;
+use Utopia\Database\Validator\Roles;

 class Auth
 {
@ -427,11 +428,11 @@ class Auth
                $phoneVerified = $user->getAttribute('phoneVerification', false);

                if ($emailVerified || $phoneVerified) {
-                    $roles[] = Role::user($user->getId(), Database::DIMENSION_VERIFIED)->toString();
-                    $roles[] = Role::users(Database::DIMENSION_VERIFIED)->toString();
+                    $roles[] = Role::user($user->getId(), Roles::DIMENSION_VERIFIED)->toString();
+                    $roles[] = Role::users(Roles::DIMENSION_VERIFIED)->toString();
                } else {
-                    $roles[] = Role::user($user->getId(), Database::DIMENSION_UNVERIFIED)->toString();
-                    $roles[] = Role::users(Database::DIMENSION_UNVERIFIED)->toString();
+                    $roles[] = Role::user($user->getId(), Roles::DIMENSION_UNVERIFIED)->toString();
+                    $roles[] = Role::users(Roles::DIMENSION_UNVERIFIED)->toString();
                }
            } else {
                return [Role::guests()->toString()];
--- a/src/Appwrite/Migration/Migration.php
+++ b/src/Appwrite/Migration/Migration.php
@ -44,7 +44,7 @@ abstract class Migration
        '1.0.0-RC1' => 'V15',
        '1.0.0' => 'V15',
        '1.0.1' => 'V15',
-        '1.0.2' => 'V15'
+        '1.0.3' => 'V15'
    ];

    /**
--- a/src/Appwrite/Resque/Worker.php
+++ b/src/Appwrite/Resque/Worker.php
@ -229,7 +229,7 @@ abstract class Worker
                    throw new \Exception("Project does not exist: {$projectId}");
                }

-                if ($type === self::DATABASE_CONSOLE && !$database->exists($database->getDefaultDatabase(), '_metadata')) {
+                if ($type === self::DATABASE_CONSOLE && !$database->exists($database->getDefaultDatabase(), Database::METADATA)) {
                    throw new \Exception('Console project not ready');
                }

--- a/tests/e2e/Services/Users/UsersBase.php
+++ b/tests/e2e/Services/Users/UsersBase.php
@ -926,6 +926,81 @@ trait UsersBase
        return $data;
    }

+    /**
+     * @depends testGetUser
+     */
+    public function testUpdateUserNumber(array $data): array
+    {
+        /**
+         * Test for SUCCESS
+         */
+        $updatedNumber = "+910000000000"; //dummy number
+        $user = $this->client->call(Client::METHOD_PATCH, '/users/' . $data['userId'] . '/phone', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'number' => $updatedNumber,
+        ]);
+
+        $this->assertEquals($user['headers']['status-code'], 200);
+        $this->assertEquals($user['body']['phone'], $updatedNumber);
+
+        $user = $this->client->call(Client::METHOD_GET, '/users/' . $data['userId'], array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()));
+
+        $this->assertEquals($user['headers']['status-code'], 200);
+        $this->assertEquals($user['body']['phone'], $updatedNumber);
+
+         /**
+         * Test for FAILURE
+         */
+
+        $errorType = "user_phone_already_exists";
+        $user1Id = "user1";
+        $statusCodeForUserPhoneAlredyExists = 409;
+
+        // adding same number ($updatedNumber) to different user i.e user1
+        $response = $this->client->call(Client::METHOD_PATCH, '/users/' . $user1Id . '/phone', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'number' => $updatedNumber,
+        ]);
+        $this->assertEquals($response['headers']['status-code'], $statusCodeForUserPhoneAlredyExists);
+        $this->assertNotEmpty($response['body']);
+        $this->assertEquals($response['body']['type'], $errorType);
+
+        return $data;
+    }
+
+    /**
+     * @depends testUpdateUserNumber
+     */
+    public function testUpdateUserNumberSearch($data): void
+    {
+        $id = $data['userId'] ?? '';
+        $newNumber = "+910000000000"; //dummy number
+
+        /**
+         * Test for SUCCESS
+         */
+        $response = $this->client->call(Client::METHOD_GET, '/users', array_merge([
+            'content-type' => 'application/json',
+            'x-appwrite-project' => $this->getProject()['$id'],
+        ], $this->getHeaders()), [
+            'search' => $newNumber,
+        ]);
+
+        $this->assertEquals($response['headers']['status-code'], 200);
+        $this->assertNotEmpty($response['body']);
+        $this->assertNotEmpty($response['body']['users']);
+        $this->assertCount(1, $response['body']['users']);
+        $this->assertEquals($response['body']['users'][0]['$id'], $id);
+        $this->assertEquals($response['body']['users'][0]['phone'], $newNumber);
+    }
+

    /**
     * @depends testGetUser
--- a/tests/unit/Auth/AuthTest.php
+++ b/tests/unit/Auth/AuthTest.php
@ -10,6 +10,7 @@ use Utopia\Database\Role;
 use Utopia\Database\Validator\Authorization;
 use PHPUnit\Framework\TestCase;
 use Utopia\Database\Database;
+use Utopia\Database\Validator\Roles;

 class AuthTest extends TestCase
 {
@ -379,8 +380,8 @@ class AuthTest extends TestCase
        $this->assertCount(11, $roles);
        $this->assertContains(Role::users()->toString(), $roles);
        $this->assertContains(Role::user(ID::custom('123'))->toString(), $roles);
-        $this->assertContains(Role::users(Database::DIMENSION_VERIFIED)->toString(), $roles);
-        $this->assertContains(Role::user(ID::custom('123'), Database::DIMENSION_VERIFIED)->toString(), $roles);
+        $this->assertContains(Role::users(Roles::DIMENSION_VERIFIED)->toString(), $roles);
+        $this->assertContains(Role::user(ID::custom('123'), Roles::DIMENSION_VERIFIED)->toString(), $roles);
        $this->assertContains(Role::team(ID::custom('abc'))->toString(), $roles);
        $this->assertContains(Role::team(ID::custom('abc'), 'administrator')->toString(), $roles);
        $this->assertContains(Role::team(ID::custom('abc'), 'moderator')->toString(), $roles);
@ -394,15 +395,15 @@ class AuthTest extends TestCase
        $user['phoneVerification'] = false;

        $roles = Auth::getRoles($user);
-        $this->assertContains(Role::users(Database::DIMENSION_UNVERIFIED)->toString(), $roles);
-        $this->assertContains(Role::user(ID::custom('123'), Database::DIMENSION_UNVERIFIED)->toString(), $roles);
+        $this->assertContains(Role::users(Roles::DIMENSION_UNVERIFIED)->toString(), $roles);
+        $this->assertContains(Role::user(ID::custom('123'), Roles::DIMENSION_UNVERIFIED)->toString(), $roles);

        // Enable single verification type
        $user['emailVerification'] = true;

        $roles = Auth::getRoles($user);
-        $this->assertContains(Role::users(Database::DIMENSION_VERIFIED)->toString(), $roles);
-        $this->assertContains(Role::user(ID::custom('123'), Database::DIMENSION_VERIFIED)->toString(), $roles);
+        $this->assertContains(Role::users(Roles::DIMENSION_VERIFIED)->toString(), $roles);
+        $this->assertContains(Role::user(ID::custom('123'), Roles::DIMENSION_VERIFIED)->toString(), $roles);
    }

    public function testPrivilegedUserRoles(): void
@ -438,8 +439,8 @@ class AuthTest extends TestCase
        $this->assertCount(7, $roles);
        $this->assertNotContains(Role::users()->toString(), $roles);
        $this->assertNotContains(Role::user(ID::custom('123'))->toString(), $roles);
-        $this->assertNotContains(Role::users(Database::DIMENSION_VERIFIED)->toString(), $roles);
-        $this->assertNotContains(Role::user(ID::custom('123'), Database::DIMENSION_VERIFIED)->toString(), $roles);
+        $this->assertNotContains(Role::users(Roles::DIMENSION_VERIFIED)->toString(), $roles);
+        $this->assertNotContains(Role::user(ID::custom('123'), Roles::DIMENSION_VERIFIED)->toString(), $roles);
        $this->assertContains(Role::team(ID::custom('abc'))->toString(), $roles);
        $this->assertContains(Role::team(ID::custom('abc'), 'administrator')->toString(), $roles);
        $this->assertContains(Role::team(ID::custom('abc'), 'moderator')->toString(), $roles);