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

 Conflicts:

	composer.lock

.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

CONTRIBUTING.md

@@ -93,6 +93,7 @@ git clone git@github.com:[YOUR_FORK_HERE]/appwrite.git
 
 cd appwrite
 
+docker compose build
 docker compose up -d
 ```
 

app/controllers/api/databases.php

@@ -1574,7 +1574,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');

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());

app/http.php

@@ -91,18 +91,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');
         }
 

app/init.php

@@ -284,7 +284,7 @@ Database::addFilter(
             ->find('attributes', [
                 Query::equal('collectionInternalId', [$document->getInternalId()]),
                 Query::equal('databaseInternalId', [$document->getAttribute('databaseInternalId')]),
-                Query::limit($database->getAttributeLimit()),
+                Query::limit($database->getLimitForAttributes()),
             ]);
     }
 );

composer.json

@@ -45,13 +45,13 @@
         "appwrite/php-runtimes": "0.11.*",
         "utopia-php/framework": "0.21.*",
         "utopia-php/logger": "0.3.*",
-        "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/locale": "0.4.*",
         "utopia-php/registry": "0.5.*",
         "utopia-php/preloader": "0.2.*",

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

docker-compose.yml

@@ -70,6 +70,7 @@ services:
   appwrite:
     container_name: appwrite
     <<: *x-logging
+    image: appwrite-dev
     build:
       context: .
       args:
@@ -182,8 +183,7 @@ services:
     entrypoint: realtime
     <<: *x-logging
     container_name: appwrite-realtime
-    build:
-      context: .
+    image: appwrite-dev
     restart: unless-stopped
     ports: 
       - 9505:80
@@ -231,8 +231,7 @@ services:
     entrypoint: worker-audits
     <<: *x-logging
     container_name: appwrite-worker-audits
-    build:
-      context: .
+    image: appwrite-dev
     networks:
       - appwrite
     volumes:
@@ -302,8 +301,7 @@ services:
     entrypoint: worker-webhooks
     <<: *x-logging
     container_name: appwrite-worker-webhooks
-    build:
-      context: .
+    image: appwrite-dev
     networks:
       - appwrite
     volumes:
@@ -328,8 +326,7 @@ services:
     entrypoint: worker-deletes
     <<: *x-logging
     container_name: appwrite-worker-deletes
-    build:
-      context: .
+    image: appwrite-dev
     networks:
       - appwrite
     depends_on:
@@ -365,8 +362,7 @@ services:
     entrypoint: worker-databases
     <<: *x-logging
     container_name: appwrite-worker-databases
-    build:
-      context: .
+    image: appwrite-dev
     networks:
       - appwrite
     volumes: 
@@ -395,8 +391,7 @@ services:
     entrypoint: worker-builds
     <<: *x-logging
     container_name: appwrite-worker-builds
-    build:
-      context: .
+    image: appwrite-dev
     networks:
       - appwrite
     volumes: 
@@ -426,8 +421,7 @@ services:
     entrypoint: worker-certificates
     <<: *x-logging
     container_name: appwrite-worker-certificates
-    build:
-      context: .
+    image: appwrite-dev
     networks:
       - appwrite
     depends_on:
@@ -460,8 +454,7 @@ services:
     entrypoint: worker-functions
     <<: *x-logging
     container_name: appwrite-worker-functions
-    build:
-      context: .
+    image: appwrite-dev
     networks:
       - appwrite
     volumes:
@@ -495,12 +488,7 @@ services:
     <<: *x-logging
     entrypoint: executor
     stop_signal: SIGINT
-    build:
-      context: .
-      args: 
-        - DEBUG=false
-        - TESTING=true
-        - VERSION=dev
+    image: appwrite-dev
     networks:
       appwrite:
       runtimes:
@@ -540,8 +528,7 @@ services:
     entrypoint: worker-mails
     <<: *x-logging
     container_name: appwrite-worker-mails
-    build:
-      context: .
+    image: appwrite-dev
     networks:
       - appwrite
     volumes:
@@ -572,8 +559,7 @@ services:
     entrypoint: worker-messaging
     <<: *x-logging
     container_name: appwrite-worker-messaging
-    build:
-      context: .
+    image: appwrite-dev
     networks:
       - appwrite
     volumes:
@@ -596,8 +582,7 @@ services:
     entrypoint: maintenance
     <<: *x-logging
     container_name: appwrite-maintenance
-    build:
-      context: .
+    image: appwrite-dev
     networks:
       - appwrite
     volumes:
@@ -632,10 +617,7 @@ services:
       - --type=timeseries
     <<: *x-logging
     container_name: appwrite-usage-timeseries
-    build:
-      context: .
-      args:
-        - DEBUG=false
+    image: appwrite-dev
     networks:
       - appwrite
     volumes:
@@ -670,10 +652,7 @@ services:
       - --type=database
     <<: *x-logging
     container_name: appwrite-usage-database
-    build:
-      context: .
-      args:
-        - DEBUG=false
+    image: appwrite-dev
     networks:
       - appwrite
     volumes:
@@ -706,8 +685,7 @@ services:
     entrypoint: schedule
     <<: *x-logging
     container_name: appwrite-schedule
-    build:
-      context: .
+    image: appwrite-dev
     networks:
       - appwrite
     volumes:

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 and Functions. Finally, a properly describing name is given to the variable. For example, `_APP_REDIS_HOST` is an environment variable for the 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).
 
 ### 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.

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
     {

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()];

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');
                 }
 

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

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);