From d238ec1d860b80e1f15133732f63076979432bc5 Mon Sep 17 00:00:00 2001
From: Everly Precia Suresh <77877486+everly-gif@users.noreply.github.com>
Date: Fri, 18 Mar 2022 01:54:50 +0530
Subject: [PATCH 01/24] fix spelling of default values for s3 and spaces
 regions

---
 app/config/variables.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/config/variables.php b/app/config/variables.php
index 5cae4aa564..f11cfedaf3 100644
--- a/app/config/variables.php
+++ b/app/config/variables.php
@@ -457,7 +457,7 @@ return [
                 'name' => '_APP_STORAGE_S3_REGION',
                 'description' => 'AWS S3 storage region. Required when storage adapter is set to S3. You can find your region info for your bucket from AWS console.',
                 'introduction' => '0.13.0',
-                'default' => 'us-eas-1',
+                'default' => 'us-east-1',
                 'required' => false,
                 'question' => '',
             ],
@@ -489,7 +489,7 @@ return [
                 'name' => '_APP_STORAGE_DO_SPACES_REGION',
                 'description' => 'DigitalOcean spaces region. Required when storage adapter is set to DOSpaces. You can find your region info for your space from DigitalOcean console.',
                 'introduction' => '0.13.0',
-                'default' => 'us-eas-1',
+                'default' => 'us-east-1',
                 'required' => false,
                 'question' => '',
             ],

From f6e8f082c945cf235bd45a7f0e677a7409d81a1f Mon Sep 17 00:00:00 2001
From: Wen Yu Ge <wenyu1999@hotmail.com>
Date: Mon, 18 Apr 2022 16:15:22 -0400
Subject: [PATCH 02/24] Updates create collection permission description to be
 clearer

---
 app/controllers/api/database.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/api/database.php b/app/controllers/api/database.php
index 1cf78b07e3..653097d12f 100644
--- a/app/controllers/api/database.php
+++ b/app/controllers/api/database.php
@@ -150,7 +150,7 @@ App::post('/v1/database/collections')
     ->label('sdk.response.model', Response::MODEL_COLLECTION)
     ->param('collectionId', '', new CustomId(), 'Unique 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('name', '', new Text(128), 'Collection name. Max length: 128 chars.')
-    ->param('permission', null, new WhiteList(['document', 'collection']), 'Permissions type model to use for reading documents in this collection. You can use collection-level permission set once on the collection using the `read` and `write` params, or you can set document-level permission where each document read and write params will decide who has access to read and write to each document individually. [learn more about permissions](https://appwrite.io/docs/permissions) and get a full list of available permissions.')
+    ->param('permission', null, new WhiteList(['document', 'collection']), 'Specifies the permissions model used in this collection, which accepts either \'collection\' or \'document\'. For \'collection\' level permission, the permissions specified in read and write params are applied to all documents in the collection. For \'document\' level permissions, read and write permissions are specified in each document. [learn more about permissions](https://appwrite.io/docs/permissions) and get a full list of available permissions.')
     ->param('read', null, new Permissions(), 'An array of strings with read permissions. By default no user is granted with any read permissions. [learn more about permissions](https://appwrite.io/docs/permissions) and get a full list of available permissions.')
     ->param('write', null, new Permissions(), 'An array of strings with write permissions. By default no user is granted with any write permissions. [learn more about permissions](https://appwrite.io/docs/permissions) and get a full list of available permissions.')
     ->inject('response')

From f3252fc3d3ba46c2c9338d8c05bcf9e290df0a22 Mon Sep 17 00:00:00 2001
From: Everly Precia Suresh <everlyprecia@gmail.com>
Date: Wed, 20 Apr 2022 16:19:50 +0000
Subject: [PATCH 03/24] cleanup code for locale

---
 app/controllers/api/locale.php | 34 ++++++++++------------------------
 1 file changed, 10 insertions(+), 24 deletions(-)

diff --git a/app/controllers/api/locale.php b/app/controllers/api/locale.php
index 34018f6e90..d3a0916960 100644
--- a/app/controllers/api/locale.php
+++ b/app/controllers/api/locale.php
@@ -20,12 +20,8 @@ App::get('/v1/locale')
     ->inject('response')
     ->inject('locale')
     ->inject('geodb')
-    ->action(function ($request, $response, $locale, $geodb) {
-        /** @var Appwrite\Utopia\Request $request */
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Locale\Locale $locale */
-        /** @var MaxMind\Db\Reader $geodb */
-
+    ->action(function (Request $request, Response $response, Locale $locale, Reader $geodb) {
+        
         $eu = Config::getParam('locale-eu');
         $currencies = Config::getParam('locale-currencies');
         $output = [];
@@ -82,10 +78,8 @@ App::get('/v1/locale/countries')
     ->label('sdk.response.model', Response::MODEL_COUNTRY_LIST)
     ->inject('response')
     ->inject('locale')
-    ->action(function ($response, $locale) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Locale\Locale $locale */
-
+    ->action(function (Response $response, Locale $locale) {
+       
         $list = Config::getParam('locale-countries'); /* @var $list array */
         $output = [];
 
@@ -116,9 +110,7 @@ App::get('/v1/locale/countries/eu')
     ->label('sdk.response.model', Response::MODEL_COUNTRY_LIST)
     ->inject('response')
     ->inject('locale')
-    ->action(function ($response, $locale) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Locale\Locale $locale */
+    ->action(function (Response $response, Locale $locale) {
 
         $eu = Config::getParam('locale-eu');
         $output = [];
@@ -152,10 +144,8 @@ App::get('/v1/locale/countries/phones')
     ->label('sdk.response.model', Response::MODEL_PHONE_LIST)
     ->inject('response')
     ->inject('locale')
-    ->action(function ($response, $locale) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Locale\Locale $locale */
-
+    ->action(function (Response $response, Locale $locale) {
+        
         $list = Config::getParam('locale-phones'); /* @var $list array */
         $output = [];
 
@@ -187,9 +177,7 @@ App::get('/v1/locale/continents')
     ->label('sdk.response.model', Response::MODEL_CONTINENT_LIST)
     ->inject('response')
     ->inject('locale')
-    ->action(function ($response, $locale) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Locale\Locale $locale */
+    ->action(function (Response $response,Locale $locale) {
 
         $list = Config::getParam('locale-continents'); /* @var $list array */
         
@@ -219,8 +207,7 @@ App::get('/v1/locale/currencies')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_CURRENCY_LIST)
     ->inject('response')
-    ->action(function ($response) {
-        /** @var Appwrite\Utopia\Response $response */
+    ->action(function (Response $response) {
 
         $list = Config::getParam('locale-currencies');
 
@@ -242,8 +229,7 @@ App::get('/v1/locale/languages')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_LANGUAGE_LIST)
     ->inject('response')
-    ->action(function ($response) {
-        /** @var Appwrite\Utopia\Response $response */
+    ->action(function (Response $response) {
 
         $list = Config::getParam('locale-languages');
 

From 277897eefca5c0989ee1f775348a8eff136acfba Mon Sep 17 00:00:00 2001
From: Everly Precia Suresh <everlyprecia@gmail.com>
Date: Wed, 20 Apr 2022 16:44:34 +0000
Subject: [PATCH 04/24] push changes

---
 app/controllers/api/locale.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app/controllers/api/locale.php b/app/controllers/api/locale.php
index d3a0916960..e97c50b16d 100644
--- a/app/controllers/api/locale.php
+++ b/app/controllers/api/locale.php
@@ -2,8 +2,11 @@
 
 use Utopia\Database\Document;
 use Appwrite\Utopia\Response;
+use Appwrite\Utopia\Request;
 use Utopia\App;
 use Utopia\Config\Config;
+use Utopia\Locale\Locale;
+use MaxMind\Db\Reader;
 
 App::get('/v1/locale')
     ->desc('Get User Locale')

From f5ca72b6122b26e8274d4ec8fdd83d61c6a1983a Mon Sep 17 00:00:00 2001
From: Everly Precia Suresh <everlyprecia@gmail.com>
Date: Thu, 21 Apr 2022 02:47:51 +0000
Subject: [PATCH 05/24] add space

---
 app/controllers/api/locale.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/api/locale.php b/app/controllers/api/locale.php
index e97c50b16d..6c8f7797a0 100644
--- a/app/controllers/api/locale.php
+++ b/app/controllers/api/locale.php
@@ -180,7 +180,7 @@ App::get('/v1/locale/continents')
     ->label('sdk.response.model', Response::MODEL_CONTINENT_LIST)
     ->inject('response')
     ->inject('locale')
-    ->action(function (Response $response,Locale $locale) {
+    ->action(function (Response $response, Locale $locale) {
 
         $list = Config::getParam('locale-continents'); /* @var $list array */
         

From ea4d3fb76b41f959e02b5f0a6d17ca52c0c3d171 Mon Sep 17 00:00:00 2001
From: Everly Precia Suresh <everlyprecia@gmail.com>
Date: Sun, 24 Apr 2022 04:51:28 +0000
Subject: [PATCH 06/24] regroup namespaces

---
 app/controllers/api/locale.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/api/locale.php b/app/controllers/api/locale.php
index 6c8f7797a0..bd3891a893 100644
--- a/app/controllers/api/locale.php
+++ b/app/controllers/api/locale.php
@@ -1,12 +1,12 @@
 <?php
 
-use Utopia\Database\Document;
 use Appwrite\Utopia\Response;
 use Appwrite\Utopia\Request;
+use MaxMind\Db\Reader;
 use Utopia\App;
 use Utopia\Config\Config;
+use Utopia\Database\Document;
 use Utopia\Locale\Locale;
-use MaxMind\Db\Reader;
 
 App::get('/v1/locale')
     ->desc('Get User Locale')

From 92d6ed6089c34739fa672f0e081cdb0bf7f1ff47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 27 Apr 2022 12:44:47 +0000
Subject: [PATCH 07/24] Implement memberships subquery

---
 app/config/collections.php      |  4 ++--
 app/controllers/api/account.php |  8 +++----
 app/controllers/api/teams.php   | 39 +++++++--------------------------
 app/controllers/api/users.php   |  2 +-
 app/init.php                    | 12 ++++++++++
 5 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/app/config/collections.php b/app/config/collections.php
index 3e3de4c7bd..dbff598476 100644
--- a/app/config/collections.php
+++ b/app/config/collections.php
@@ -1077,8 +1077,8 @@ $collections = [
                 'signed' => true,
                 'required' => false,
                 'default' => [],
-                'array' => true,
-                'filters' => ['json'],
+                'array' => false,
+                'filters' => ['subQueryMemberships'],
             ],
             [
                 '$id' => 'search',
diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index 200b845987..31bf7bf421 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -106,7 +106,7 @@ App::post('/v1/account')
                 'prefs' => new \stdClass(),
                 'sessions' => [],
                 'tokens' => [],
-                'memberships' => [],
+                'memberships' => null,
                 'search' => implode(' ', [$userId, $email, $name]),
                 'deleted' => false
             ])));
@@ -507,7 +507,7 @@ App::get('/v1/account/sessions/oauth2/:provider/redirect')
                         'prefs' => new \stdClass(),
                         'sessions' => [],
                         'tokens' => [],
-                        'memberships' => [],
+                        'memberships' => null,
                         'search' => implode(' ', [$userId, $email, $name]),
                         'deleted' => false
                     ])));
@@ -681,7 +681,7 @@ App::post('/v1/account/sessions/magic-url')
                 'prefs' => new \stdClass(),
                 'sessions' => [],
                 'tokens' => [],
-                'memberships' => [],
+                'memberships' => null,
                 'search' => implode(' ', [$userId, $email]),
                 'deleted' => false
             ])));
@@ -953,7 +953,7 @@ App::post('/v1/account/sessions/anonymous')
             'prefs' => new \stdClass(),
             'sessions' => [],
             'tokens' => [],
-            'memberships' => [],
+            'memberships' => null,
             'search' => $userId,
             'deleted' => false
         ])));
diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index 22705d3bf8..591bb82b1b 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -79,10 +79,7 @@ App::post('/v1/teams')
             ]);
 
             $membership = $dbForProject->createDocument('memberships', $membership);
-
-            // Attach user to team
-            $user->setAttribute('memberships', $membership, Document::SET_TYPE_APPEND);
-            $user = $dbForProject->updateDocument('users', $user->getId(), $user);
+            $dbForProject->deleteCachedDocument('users', $user->getId());
         }
 
         if (!empty($user->getId())) {
@@ -340,7 +337,7 @@ App::post('/v1/teams/:teamId/memberships')
                     'prefs' => new \stdClass(),
                     'sessions' => [],
                     'tokens' => [],
-                    'memberships' => [],
+                    'memberships' => null,
                     'search' => implode(' ', [$userId, $email, $name]),
                 ])));
             } catch (Duplicate $th) {
@@ -380,10 +377,7 @@ App::post('/v1/teams/:teamId/memberships')
             $team->setAttribute('total', $team->getAttribute('total', 0) + 1);
             $team = Authorization::skip(fn() => $dbForProject->updateDocument('teams', $team->getId(), $team));
 
-            // Attach user to team
-            $invitee->setAttribute('memberships', $membership, Document::SET_TYPE_APPEND);
-
-            $invitee = Authorization::skip(fn() => $dbForProject->updateDocument('users', $invitee->getId(), $invitee));
+            $dbForProject->deleteCachedDocument('users', $invitee->getId());
         } else {
             try {
                 $membership = $dbForProject->createDocument('memberships', $membership);
@@ -604,13 +598,8 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
         /**
          * Replace membership on profile
          */
-        $memberships = array_filter($profile->getAttribute('memberships'), fn (Document $m) => $m->getId() !== $membership->getId());
-
-        $profile
-            ->setAttribute('memberships', $memberships)
-            ->setAttribute('memberships', $membership, Document::SET_TYPE_APPEND);
-
-        Authorization::skip(fn () => $dbForProject->updateDocument('users', $profile->getId(), $profile));
+         
+        $dbForProject->deleteCachedDocument('users', $profile->getId());
 
         $audits
             ->setParam('userId', $user->getId())
@@ -700,7 +689,6 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
 
         $user
             ->setAttribute('emailVerification', true)
-            ->setAttribute('memberships', $membership, Document::SET_TYPE_APPEND)
         ;
 
         // Log user in
@@ -734,6 +722,8 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
 
         $user = $dbForProject->updateDocument('users', $user->getId(), $user);
         $membership = $dbForProject->updateDocument('memberships', $membership->getId(), $membership);
+        
+        $dbForProject->deleteCachedDocument('users', $user->getId());
 
         $team = Authorization::skip(fn() => $dbForProject->updateDocument('teams', $team->getId(), $team->setAttribute('total', $team->getAttribute('total', 0) + 1)));
 
@@ -813,20 +803,7 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
             throw new Exception('Failed to remove membership from DB', 500, Exception::GENERAL_SERVER_ERROR);
         }
 
-        $memberships = $user->getAttribute('memberships', []);
-
-        foreach ($memberships as $key => $child) { 
-            /** @var Document $child */
-
-            if ($membershipId == $child->getId()) {
-                unset($memberships[$key]);
-                break;
-            }
-        }
-
-        $user->setAttribute('memberships', $memberships);
-
-        Authorization::skip(fn() => $dbForProject->updateDocument('users', $user->getId(), $user));
+        $dbForProject->deleteCachedDocument('users', $user->getId());
 
         if ($membership->getAttribute('confirm')) { // Count only confirmed members
             $team->setAttribute('total', \max($team->getAttribute('total', 0) - 1, 0));
diff --git a/app/controllers/api/users.php b/app/controllers/api/users.php
index 6bb14c5003..bfb7d4d17a 100644
--- a/app/controllers/api/users.php
+++ b/app/controllers/api/users.php
@@ -65,7 +65,7 @@ App::post('/v1/users')
                 'prefs' => new \stdClass(),
                 'sessions' => [],
                 'tokens' => [],
-                'memberships' => [],
+                'memberships' => null,
                 'search' => implode(' ', [$userId, $email, $name]),
                 'deleted' => false
             ]));
diff --git a/app/init.php b/app/init.php
index fd509297f6..cac7a9701b 100644
--- a/app/init.php
+++ b/app/init.php
@@ -301,6 +301,18 @@ Database::addFilter('subQueryWebhooks',
     }
 );
 
+Database::addFilter('subQueryMemberships',
+    function($value) {
+        return null;
+    },
+    function($value, Document $document, Database $database) {
+        return Authorization::skip(fn() => $database
+            ->find('memberships', [
+                new Query('userId', Query::TYPE_EQUAL, [$document->getId()])
+            ], $database->getIndexLimit(), 0, []));
+    }
+);
+
 Database::addFilter('encrypt',
     function($value) {
         $key = App::getEnv('_APP_OPENSSL_KEY_V1');

From 4bc8ec11e0a79e4e811c604b5657042a1f301c46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 27 Apr 2022 12:57:23 +0000
Subject: [PATCH 08/24] Test fix

---
 app/workers/deletes.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/workers/deletes.php b/app/workers/deletes.php
index b8a44ebb82..f261002a3c 100644
--- a/app/workers/deletes.php
+++ b/app/workers/deletes.php
@@ -214,9 +214,6 @@ class DeletesV1 extends Worker
             new Query('userId', Query::TYPE_EQUAL, [$userId])
         ], $this->getProjectDB($projectId));
         
-        $user->setAttribute('sessions', []);
-        $updated = $this->getProjectDB($projectId)->updateDocument('users', $userId, $user);
-
         // Delete Memberships and decrement team membership counts
         $this->deleteByGroup('memberships', [
             new Query('userId', Query::TYPE_EQUAL, [$userId])
@@ -437,6 +434,7 @@ class DeletesV1 extends Worker
      */
     protected function deleteById(Document $document, Database $database, callable $callback = null): bool
     {
+        Authorization::disable();
         if ($database->deleteDocument($document->getCollection(), $document->getId())) {
             Console::success('Deleted document "' . $document->getId() . '" successfully');
 

From 2ab9c40b439b5e8939e8d823353aaee1e7fb3e8b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 27 Apr 2022 13:17:27 +0000
Subject: [PATCH 09/24] Code quality improvements

---
 app/workers/deletes.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/workers/deletes.php b/app/workers/deletes.php
index f261002a3c..52a5b16516 100644
--- a/app/workers/deletes.php
+++ b/app/workers/deletes.php
@@ -19,6 +19,7 @@ use Utopia\Audit\Audit;
 require_once __DIR__ . '/../init.php';
 
 Authorization::disable();
+Authorization::setDefaultStatus(false);
 
 Console::title('Deletes V1 Worker');
 Console::success(APP_NAME . ' deletes worker v1 has started' . "\n");

From 72f745982a5eb2119a4f06840202387eb249c079 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 27 Apr 2022 13:22:41 +0000
Subject: [PATCH 10/24] Code cleanup

---
 app/workers/deletes.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/workers/deletes.php b/app/workers/deletes.php
index 52a5b16516..6ec1acc7cd 100644
--- a/app/workers/deletes.php
+++ b/app/workers/deletes.php
@@ -435,7 +435,6 @@ class DeletesV1 extends Worker
      */
     protected function deleteById(Document $document, Database $database, callable $callback = null): bool
     {
-        Authorization::disable();
         if ($database->deleteDocument($document->getCollection(), $document->getId())) {
             Console::success('Deleted document "' . $document->getId() . '" successfully');
 

From d2008d33a5c49efeb39be158d6d826f03b97ef09 Mon Sep 17 00:00:00 2001
From: Everly Precia Suresh <everlyprecia@gmail.com>
Date: Mon, 2 May 2022 14:28:36 +0000
Subject: [PATCH 11/24] refactor health.php

---
 app/controllers/api/health.php | 48 ++++++++++++----------------------
 1 file changed, 16 insertions(+), 32 deletions(-)

diff --git a/app/controllers/api/health.php b/app/controllers/api/health.php
index bc57aa8ccb..b805958c14 100644
--- a/app/controllers/api/health.php
+++ b/app/controllers/api/health.php
@@ -1,6 +1,8 @@
 <?php
-
+        
+use Utopia\Storage\Device;
 use Appwrite\Utopia\Response;
+use Utopia\Registry\Registry;
 use Utopia\App;
 use Appwrite\Extend\Exception;
 use Utopia\Storage\Device\Local;
@@ -21,8 +23,7 @@ App::get('/v1/health')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_HEALTH_STATUS)
     ->inject('response')
-    ->action(function ($response) {
-        /** @var Appwrite\Utopia\Response $response */
+    ->action(function (Response $response) {
 
         $output = [
             'status' => 'pass',
@@ -40,8 +41,7 @@ App::get('/v1/health/version')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_HEALTH_VERSION)
     ->inject('response')
-    ->action(function ($response) {
-        /** @var Appwrite\Utopia\Response $response */
+    ->action(function (Response $response) {
 
         $response->dynamic(new Document([ 'version' => APP_VERSION_STABLE ]), Response::MODEL_HEALTH_VERSION);
     });
@@ -59,9 +59,7 @@ App::get('/v1/health/db')
     ->label('sdk.response.model', Response::MODEL_HEALTH_STATUS)
     ->inject('response')
     ->inject('utopia')
-    ->action(function ($response, $utopia) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\App $utopia */
+    ->action(function (Response $response, App $utopia) {
 
         $checkStart = \microtime(true);
 
@@ -99,10 +97,7 @@ App::get('/v1/health/cache')
     ->label('sdk.response.model', Response::MODEL_HEALTH_STATUS)
     ->inject('response')
     ->inject('utopia')
-    ->action(function ($response, $utopia) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\App $utopia */
-        /** @var Redis */
+    ->action(function (Response $response, App $utopia) {
 
         $checkStart = \microtime(true);
 
@@ -132,8 +127,7 @@ App::get('/v1/health/time')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_HEALTH_TIME)
     ->inject('response')
-    ->action(function ($response) {
-        /** @var Appwrite\Utopia\Response $response */
+    ->action(function (Response $response) {
 
         /*
          * Code from: @see https://www.beliefmedia.com.au/query-ntp-time-server
@@ -190,8 +184,7 @@ App::get('/v1/health/queue/webhooks')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
     ->inject('response')
-    ->action(function ($response) {
-        /** @var Appwrite\Utopia\Response $response */
+    ->action(function (Response $response) {
 
         $response->dynamic(new Document([ 'size' => Resque::size(Event::WEBHOOK_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
     }, ['response']);
@@ -208,8 +201,7 @@ App::get('/v1/health/queue/logs')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
     ->inject('response')
-    ->action(function ($response) {
-        /** @var Appwrite\Utopia\Response $response */
+    ->action(function (Response $response) {
 
         $response->dynamic(new Document([ 'size' => Resque::size(Event::AUDITS_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
     }, ['response']);
@@ -226,8 +218,7 @@ App::get('/v1/health/queue/usage')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
     ->inject('response')
-    ->action(function ($response) {
-        /** @var Appwrite\Utopia\Response $response */
+    ->action(function (Response $response) {
 
         $response->dynamic(new Document([ 'size' => Resque::size(Event::USAGE_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
     }, ['response']);
@@ -244,8 +235,7 @@ App::get('/v1/health/queue/certificates')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
     ->inject('response')
-    ->action(function ($response) {
-        /** @var Appwrite\Utopia\Response $response */
+    ->action(function (Response $response) {
 
         $response->dynamic(new Document([ 'size' => Resque::size(Event::CERTIFICATES_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
     }, ['response']);
@@ -262,8 +252,7 @@ App::get('/v1/health/queue/functions')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
     ->inject('response')
-    ->action(function ($response) {
-        /** @var Appwrite\Utopia\Response $response */
+    ->action(function (Response $response) {
 
         $response->dynamic(new Document([ 'size' => Resque::size(Event::FUNCTIONS_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
     }, ['response']);
@@ -280,8 +269,7 @@ App::get('/v1/health/storage/local')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_HEALTH_STATUS)
     ->inject('response')
-    ->action(function ($response) {
-        /** @var Appwrite\Utopia\Response $response */
+    ->action(function (Response $response) {
 
         $checkStart = \microtime(true);
 
@@ -322,8 +310,7 @@ App::get('/v1/health/anti-virus')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_HEALTH_ANTIVIRUS)
     ->inject('response')
-    ->action(function ($response) {
-        /** @var Appwrite\Utopia\Response $response */
+    ->action(function (Response $response) {
 
         $output = [
             'status' => '',
@@ -359,10 +346,7 @@ App::get('/v1/health/stats') // Currently only used internally
     ->inject('response')
     ->inject('register')
     ->inject('deviceFiles')
-    ->action(function ($response, $register, $deviceFiles) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Registry\Registry $register */
-        /** @var Utopia\Storage\Device $deviceFiles */
+    ->action(function (Response $response, Registry $register, Device $deviceFiles) {
 
         $cache = $register->get('cache');
 

From fd3a802a305c80993bd66b4dda04f699d13348e4 Mon Sep 17 00:00:00 2001
From: Everly Precia Suresh <everlyprecia@gmail.com>
Date: Mon, 2 May 2022 14:34:01 +0000
Subject: [PATCH 12/24] regroup namespaces

---
 app/controllers/api/health.php | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/controllers/api/health.php b/app/controllers/api/health.php
index b805958c14..d51ed6a458 100644
--- a/app/controllers/api/health.php
+++ b/app/controllers/api/health.php
@@ -1,15 +1,15 @@
 <?php
-        
-use Utopia\Storage\Device;
-use Appwrite\Utopia\Response;
-use Utopia\Registry\Registry;
-use Utopia\App;
-use Appwrite\Extend\Exception;
-use Utopia\Storage\Device\Local;
-use Utopia\Storage\Storage;
+
 use Appwrite\ClamAV\Network;
 use Appwrite\Event\Event;
+use Appwrite\Extend\Exception;
+use Appwrite\Utopia\Response;
+use Utopia\App;
 use Utopia\Database\Document;
+use Utopia\Registry\Registry;
+use Utopia\Storage\Device;
+use Utopia\Storage\Device\Local;
+use Utopia\Storage\Storage;
 
 App::get('/v1/health')
     ->desc('Get HTTP')

From 2729237edcbea31ec6cc9270be68a0dccf71cb80 Mon Sep 17 00:00:00 2001
From: Everly Precia Suresh <everlyprecia@gmail.com>
Date: Mon, 2 May 2022 15:04:14 +0000
Subject: [PATCH 13/24] retrigger build

---
 app/controllers/api/health.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/api/health.php b/app/controllers/api/health.php
index d51ed6a458..2ca66e24ba 100644
--- a/app/controllers/api/health.php
+++ b/app/controllers/api/health.php
@@ -9,7 +9,7 @@ use Utopia\Database\Document;
 use Utopia\Registry\Registry;
 use Utopia\Storage\Device;
 use Utopia\Storage\Device\Local;
-use Utopia\Storage\Storage;
+use Utopia\Storage\Storage; 
 
 App::get('/v1/health')
     ->desc('Get HTTP')

From 03b28fdb918c474a4aeac616aea40624f2a0e616 Mon Sep 17 00:00:00 2001
From: Everly Precia Suresh <everlyprecia@gmail.com>
Date: Mon, 2 May 2022 18:06:12 +0000
Subject: [PATCH 14/24] refactor avatars.php

---
 app/controllers/api/avatars.php | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/app/controllers/api/avatars.php b/app/controllers/api/avatars.php
index 9d483bf2b7..d501e791c8 100644
--- a/app/controllers/api/avatars.php
+++ b/app/controllers/api/avatars.php
@@ -1,5 +1,7 @@
 <?php
 
+use Appwrite\Extend\Exception;
+use Appwrite\Network\Validator\URL;
 use Appwrite\URL\URL as URLParse;
 use Appwrite\Utopia\Response;
 use chillerlan\QRCode\QRCode;
@@ -8,17 +10,15 @@ use Utopia\App;
 use Utopia\Cache\Adapter\Filesystem;
 use Utopia\Cache\Cache;
 use Utopia\Config\Config;
-use Appwrite\Extend\Exception;
+use Utopia\Database\Document;
 use Utopia\Image\Image;
 use Utopia\Validator\Boolean;
 use Utopia\Validator\HexColor;
 use Utopia\Validator\Range;
 use Utopia\Validator\Text;
-use Appwrite\Network\Validator\URL;
 use Utopia\Validator\WhiteList;
 
-$avatarCallback = function ($type, $code, $width, $height, $quality, $response) {
-    /** @var Appwrite\Utopia\Response $response */
+$avatarCallback = function ($type, $code, $width, $height, $quality, Response $response) {
 
     $code = \strtolower($code);
     $type = \strtolower($type);
@@ -148,8 +148,7 @@ App::get('/v1/avatars/image')
     ->param('width', 400, new Range(0, 2000), 'Resize preview image width, Pass an integer between 0 to 2000.', true)
     ->param('height', 400, new Range(0, 2000), 'Resize preview image height, Pass an integer between 0 to 2000.', true)
     ->inject('response')
-    ->action(function ($url, $width, $height, $response) {
-        /** @var Appwrite\Utopia\Response $response */
+    ->action(function ($url, $width, $height, Response $response) {
 
         $quality = 80;
         $output = 'png';
@@ -215,8 +214,7 @@ App::get('/v1/avatars/favicon')
     ->label('sdk.response.type', Response::CONTENT_TYPE_IMAGE)
     ->param('url', '', new URL(['http', 'https']), 'Website URL which you want to fetch the favicon from.')
     ->inject('response')
-    ->action(function ($url, $response) {
-        /** @var Appwrite\Utopia\Response $response */
+    ->action(function ($url, Response $response) {
 
         $width = 56;
         $height = 56;
@@ -371,8 +369,7 @@ App::get('/v1/avatars/qr')
     ->param('margin', 1, new Range(0, 10), 'Margin from edge. Pass an integer between 0 to 10. Defaults to 1.', true)
     ->param('download', false, new Boolean(true), 'Return resulting image with \'Content-Disposition: attachment \' headers for the browser to start downloading it. Pass 0 for no header, or 1 for otherwise. Default value is set to 0.', true)
     ->inject('response')
-    ->action(function ($text, $size, $margin, $download, $response) {
-        /** @var Appwrite\Utopia\Response $response */
+    ->action(function ($text, $size, $margin, $download, Response $response) {
 
         $download = ($download === '1' || $download === 'true' || $download === 1 || $download === true);
         $options = new QROptions([
@@ -416,9 +413,7 @@ App::get('/v1/avatars/initials')
     ->param('background', '', new HexColor(), 'Changes background color. By default a random color will be picked and stay will persistent to the given name.', true)
     ->inject('response')
     ->inject('user')
-    ->action(function ($name, $width, $height, $color, $background, $response, $user) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Document $user */
+    ->action(function ($name, $width, $height, $color, $background, Response $response, Document $user) {
 
         $themes = [
             ['color' => '#27005e', 'background' => '#e1d2f6'], // VIOLET

From 5950289083caf05ab89ffbd9afc7202727e98a45 Mon Sep 17 00:00:00 2001
From: Everly Precia Suresh <everlyprecia@gmail.com>
Date: Mon, 2 May 2022 18:30:13 +0000
Subject: [PATCH 15/24] retrigger build

---
 app/controllers/api/avatars.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/api/avatars.php b/app/controllers/api/avatars.php
index d501e791c8..e3b56cf588 100644
--- a/app/controllers/api/avatars.php
+++ b/app/controllers/api/avatars.php
@@ -16,7 +16,7 @@ use Utopia\Validator\Boolean;
 use Utopia\Validator\HexColor;
 use Utopia\Validator\Range;
 use Utopia\Validator\Text;
-use Utopia\Validator\WhiteList;
+use Utopia\Validator\WhiteList; 
 
 $avatarCallback = function ($type, $code, $width, $height, $quality, Response $response) {
 

From 76cd8251126ae81845cdbe8a7af99a8f9f29fe1d Mon Sep 17 00:00:00 2001
From: Everly Precia Suresh <everlyprecia@gmail.com>
Date: Tue, 3 May 2022 11:57:26 +0000
Subject: [PATCH 16/24] refactor teams.php

---
 app/controllers/api/teams.php | 66 ++++++++---------------------------
 1 file changed, 15 insertions(+), 51 deletions(-)

diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index 22705d3bf8..9d2723f3e3 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -2,13 +2,16 @@
 
 use Appwrite\Auth\Auth;
 use Appwrite\Detector\Detector;
+use Appwrite\Event\Event;
+use Appwrite\Extend\Exception;
 use Appwrite\Network\Validator\Email;
 use Appwrite\Network\Validator\Host;
 use Appwrite\Template\Template;
 use Appwrite\Utopia\Database\Validator\CustomId;
+use Appwrite\Utopia\Request;
 use Appwrite\Utopia\Response;
+use MaxMind\Db\Reader;
 use Utopia\App;
-use Appwrite\Extend\Exception;
 use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
@@ -42,11 +45,7 @@ App::post('/v1/teams')
     ->inject('user')
     ->inject('dbForProject')
     ->inject('events')
-    ->action(function ($teamId, $name, $roles, $response, $user, $dbForProject, $events) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Document $user */
-        /** @var Utopia\Database\Database $dbForProject */
-        /** @var Appwrite\Event\Event $events */
+    ->action(function ($teamId, $name, $roles, Response $response, Document $user, Database $dbForProject, Event $events) {
 
         $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
         $isAppUser = Auth::isAppUser(Authorization::getRoles());
@@ -112,9 +111,7 @@ App::get('/v1/teams')
     ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
     ->inject('response')
     ->inject('dbForProject')
-    ->action(function ($search, $limit, $offset, $cursor, $cursorDirection, $orderType, $response, $dbForProject) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForProject */
+    ->action(function ($search, $limit, $offset, $cursor, $cursorDirection, $orderType, Response $response, Database $dbForProject) {
 
         if (!empty($cursor)) {
             $cursorTeam = $dbForProject->getDocument('teams', $cursor);
@@ -153,9 +150,7 @@ App::get('/v1/teams/:teamId')
     ->param('teamId', '', new UID(), 'Team ID.')
     ->inject('response')
     ->inject('dbForProject')
-    ->action(function ($teamId, $response, $dbForProject) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForProject */
+    ->action(function ($teamId, Response $response, Database $dbForProject) {
 
         $team = $dbForProject->getDocument('teams', $teamId);
 
@@ -182,9 +177,7 @@ App::put('/v1/teams/:teamId')
     ->param('name', null, new Text(128), 'New team name. Max length: 128 chars.')
     ->inject('response')
     ->inject('dbForProject')
-    ->action(function ($teamId, $name, $response, $dbForProject) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForProject */
+    ->action(function ($teamId, $name, Response $response, Database $dbForProject) {
 
         $team = $dbForProject->getDocument('teams', $teamId);
 
@@ -216,11 +209,7 @@ App::delete('/v1/teams/:teamId')
     ->inject('dbForProject')
     ->inject('events')
     ->inject('deletes')
-    ->action(function ($teamId, $response, $dbForProject, $events, $deletes) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForProject */
-        /** @var Appwrite\Event\Event $events */
-        /** @var Appwrite\Event\Event $deletes */
+    ->action(function ($teamId, Response $response, Database $dbForProject, Event $events, Event $deletes) {
 
         $team = $dbForProject->getDocument('teams', $teamId);
 
@@ -281,13 +270,7 @@ App::post('/v1/teams/:teamId/memberships')
     ->inject('locale')
     ->inject('audits')
     ->inject('mails')
-    ->action(function ($teamId, $email, $roles, $url, $name, $response, $project, $user, $dbForProject, $locale, $audits, $mails) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Document $project */
-        /** @var Utopia\Database\Document $user */
-        /** @var Utopia\Database\Database $dbForProject */
-        /** @var Appwrite\Event\Event $audits */
-        /** @var Appwrite\Event\Event $mails */
+    ->action(function ($teamId, $email, $roles, $url, $name, Response $response, Document $project, Document $user, Database $dbForProject, $locale, Event $audits, Event $mails) {
 
         if(empty(App::getEnv('_APP_SMTP_HOST'))) {
             throw new Exception('SMTP Disabled', 503, Exception::GENERAL_SMTP_DISABLED);
@@ -445,9 +428,7 @@ App::get('/v1/teams/:teamId/memberships')
     ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
     ->inject('response')
     ->inject('dbForProject')
-    ->action(function ($teamId, $search, $limit, $offset, $cursor, $cursorDirection, $orderType, $response, $dbForProject) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForProject */
+    ->action(function ($teamId, $search, $limit, $offset, $cursor, $cursorDirection, $orderType, Response $response, Database $dbForProject) {
 
         $team = $dbForProject->getDocument('teams', $teamId);
 
@@ -519,9 +500,7 @@ App::get('/v1/teams/:teamId/memberships/:membershipId')
     ->param('membershipId', '', new UID(), 'Membership ID.')
     ->inject('response')
     ->inject('dbForProject')
-    ->action(function ($teamId, $membershipId, $response, $dbForProject) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForProject */
+    ->action(function ($teamId, $membershipId, Response $response, Database $dbForProject) {
 
         $team = $dbForProject->getDocument('teams', $teamId);
 
@@ -565,12 +544,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
     ->inject('user')
     ->inject('dbForProject')
     ->inject('audits')
-    ->action(function ($teamId, $membershipId, $roles, $request, $response, $user, $dbForProject, $audits) {
-        /** @var Appwrite\Utopia\Request $request */
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Document $user */
-        /** @var Utopia\Database\Database $dbForProject */
-        /** @var Appwrite\Event\Event $audits */
+    ->action(function ($teamId, $membershipId, $roles, Request $request, Response $response, Document $user, Database $dbForProject, Event $audits) {
 
         $team = $dbForProject->getDocument('teams', $teamId);
         if ($team->isEmpty()) {
@@ -647,13 +621,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
     ->inject('dbForProject')
     ->inject('geodb')
     ->inject('audits')
-    ->action(function ($teamId, $membershipId, $userId, $secret, $request, $response, $user, $dbForProject, $geodb, $audits) {
-        /** @var Appwrite\Utopia\Request $request */
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Document $user */
-        /** @var Utopia\Database\Database $dbForProject */
-        /** @var MaxMind\Db\Reader $geodb */
-        /** @var Appwrite\Event\Event $audits */
+    ->action(function ($teamId, $membershipId, $userId, $secret, Request $request, Response $response, Document $user, Database $dbForProject, Reader $geodb, Event $audits) {
 
         $protocol = $request->getProtocol();
 
@@ -777,11 +745,7 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
     ->inject('dbForProject')
     ->inject('audits')
     ->inject('events')
-    ->action(function ($teamId, $membershipId, $response, $dbForProject, $audits, $events) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForProject */
-        /** @var Appwrite\Event\Event $audits */
-        /** @var Appwrite\Event\Event $events */
+    ->action(function ($teamId, $membershipId, Response $response, Database $dbForProject, Event $audits, Event $events) {
 
         $membership = $dbForProject->getDocument('memberships', $membershipId);
 

From 20b4119ee988f5bf94ef673b91fa2e36f0e8a171 Mon Sep 17 00:00:00 2001
From: Everly Precia Suresh <everlyprecia@gmail.com>
Date: Tue, 3 May 2022 13:21:25 +0000
Subject: [PATCH 17/24] add primitive types to params

---
 app/controllers/api/teams.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index 9d2723f3e3..22ac091e6f 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -45,7 +45,7 @@ App::post('/v1/teams')
     ->inject('user')
     ->inject('dbForProject')
     ->inject('events')
-    ->action(function ($teamId, $name, $roles, Response $response, Document $user, Database $dbForProject, Event $events) {
+    ->action(function (string $teamId, string $name, array $roles, Response $response, Document $user, Database $dbForProject, Event $events) {
 
         $isPrivilegedUser = Auth::isPrivilegedUser(Authorization::getRoles());
         $isAppUser = Auth::isAppUser(Authorization::getRoles());
@@ -111,7 +111,7 @@ App::get('/v1/teams')
     ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
     ->inject('response')
     ->inject('dbForProject')
-    ->action(function ($search, $limit, $offset, $cursor, $cursorDirection, $orderType, Response $response, Database $dbForProject) {
+    ->action(function (string $search, int $limit, int $offset, string $cursor, string $cursorDirection, string $orderType, Response $response, Database $dbForProject) {
 
         if (!empty($cursor)) {
             $cursorTeam = $dbForProject->getDocument('teams', $cursor);
@@ -150,7 +150,7 @@ App::get('/v1/teams/:teamId')
     ->param('teamId', '', new UID(), 'Team ID.')
     ->inject('response')
     ->inject('dbForProject')
-    ->action(function ($teamId, Response $response, Database $dbForProject) {
+    ->action(function (string $teamId, Response $response, Database $dbForProject) {
 
         $team = $dbForProject->getDocument('teams', $teamId);
 
@@ -177,7 +177,7 @@ App::put('/v1/teams/:teamId')
     ->param('name', null, new Text(128), 'New team name. Max length: 128 chars.')
     ->inject('response')
     ->inject('dbForProject')
-    ->action(function ($teamId, $name, Response $response, Database $dbForProject) {
+    ->action(function (string $teamId, string $name, Response $response, Database $dbForProject) {
 
         $team = $dbForProject->getDocument('teams', $teamId);
 
@@ -209,7 +209,7 @@ App::delete('/v1/teams/:teamId')
     ->inject('dbForProject')
     ->inject('events')
     ->inject('deletes')
-    ->action(function ($teamId, Response $response, Database $dbForProject, Event $events, Event $deletes) {
+    ->action(function (string $teamId, Response $response, Database $dbForProject, Event $events, Event $deletes) {
 
         $team = $dbForProject->getDocument('teams', $teamId);
 
@@ -270,7 +270,7 @@ App::post('/v1/teams/:teamId/memberships')
     ->inject('locale')
     ->inject('audits')
     ->inject('mails')
-    ->action(function ($teamId, $email, $roles, $url, $name, Response $response, Document $project, Document $user, Database $dbForProject, $locale, Event $audits, Event $mails) {
+    ->action(function (string $teamId, string $email, array $roles, string $url, string $name, Response $response, Document $project, Document $user, Database $dbForProject, $locale, Event $audits, Event $mails) {
 
         if(empty(App::getEnv('_APP_SMTP_HOST'))) {
             throw new Exception('SMTP Disabled', 503, Exception::GENERAL_SMTP_DISABLED);
@@ -428,7 +428,7 @@ App::get('/v1/teams/:teamId/memberships')
     ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
     ->inject('response')
     ->inject('dbForProject')
-    ->action(function ($teamId, $search, $limit, $offset, $cursor, $cursorDirection, $orderType, Response $response, Database $dbForProject) {
+    ->action(function (string $teamId, string $search, int $limit, int $offset, string $cursor, string $cursorDirection, string $orderType, Response $response, Database $dbForProject) {
 
         $team = $dbForProject->getDocument('teams', $teamId);
 
@@ -500,7 +500,7 @@ App::get('/v1/teams/:teamId/memberships/:membershipId')
     ->param('membershipId', '', new UID(), 'Membership ID.')
     ->inject('response')
     ->inject('dbForProject')
-    ->action(function ($teamId, $membershipId, Response $response, Database $dbForProject) {
+    ->action(function (string $teamId, string $membershipId, Response $response, Database $dbForProject) {
 
         $team = $dbForProject->getDocument('teams', $teamId);
 
@@ -544,7 +544,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
     ->inject('user')
     ->inject('dbForProject')
     ->inject('audits')
-    ->action(function ($teamId, $membershipId, $roles, Request $request, Response $response, Document $user, Database $dbForProject, Event $audits) {
+    ->action(function (string $teamId, string $membershipId, array $roles, Request $request, Response $response, Document $user, Database $dbForProject, Event $audits) {
 
         $team = $dbForProject->getDocument('teams', $teamId);
         if ($team->isEmpty()) {
@@ -621,7 +621,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
     ->inject('dbForProject')
     ->inject('geodb')
     ->inject('audits')
-    ->action(function ($teamId, $membershipId, $userId, $secret, Request $request, Response $response, Document $user, Database $dbForProject, Reader $geodb, Event $audits) {
+    ->action(function (string $teamId, string $membershipId, string $userId, string $secret, Request $request, Response $response, Document $user, Database $dbForProject, Reader $geodb, Event $audits) {
 
         $protocol = $request->getProtocol();
 
@@ -745,7 +745,7 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
     ->inject('dbForProject')
     ->inject('audits')
     ->inject('events')
-    ->action(function ($teamId, $membershipId, Response $response, Database $dbForProject, Event $audits, Event $events) {
+    ->action(function (string $teamId, string $membershipId, Response $response, Database $dbForProject, Event $audits, Event $events) {
 
         $membership = $dbForProject->getDocument('memberships', $membershipId);
 

From 65a246bd218896ea3f4690855f6c00946e73bcf9 Mon Sep 17 00:00:00 2001
From: Everly Precia Suresh <everlyprecia@gmail.com>
Date: Wed, 4 May 2022 09:51:48 +0000
Subject: [PATCH 18/24] add type for locale

---
 app/controllers/api/teams.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/controllers/api/teams.php b/app/controllers/api/teams.php
index 22ac091e6f..f956d7e2ef 100644
--- a/app/controllers/api/teams.php
+++ b/app/controllers/api/teams.php
@@ -21,6 +21,7 @@ use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\Key;
 use Utopia\Database\Validator\UID;
+use Utopia\Locale\Locale;
 use Utopia\Validator\Text;
 use Utopia\Validator\Range;
 use Utopia\Validator\ArrayList;
@@ -270,7 +271,7 @@ App::post('/v1/teams/:teamId/memberships')
     ->inject('locale')
     ->inject('audits')
     ->inject('mails')
-    ->action(function (string $teamId, string $email, array $roles, string $url, string $name, Response $response, Document $project, Document $user, Database $dbForProject, $locale, Event $audits, Event $mails) {
+    ->action(function (string $teamId, string $email, array $roles, string $url, string $name, Response $response, Document $project, Document $user, Database $dbForProject, Locale $locale, Event $audits, Event $mails) {
 
         if(empty(App::getEnv('_APP_SMTP_HOST'))) {
             throw new Exception('SMTP Disabled', 503, Exception::GENERAL_SMTP_DISABLED);

From 4e8d9a1da791e07742a938c98b6232fd5d8d282b Mon Sep 17 00:00:00 2001
From: Everly Precia Suresh <everlyprecia@gmail.com>
Date: Wed, 4 May 2022 12:23:34 +0000
Subject: [PATCH 19/24] refactor storage.php

---
 app/controllers/api/storage.php | 111 ++++++--------------------------
 1 file changed, 19 insertions(+), 92 deletions(-)

diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
index 856e898113..3c307a7c71 100644
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@@ -2,8 +2,10 @@
 
 use Appwrite\Auth\Auth;
 use Appwrite\ClamAV\Network;
+use Appwrite\Event\Event;
 use Appwrite\Utopia\Database\Validator\CustomId;
 use Appwrite\OpenSSL\OpenSSL;
+use Appwrite\Stats\Stats;
 use Appwrite\Utopia\Response;
 use Utopia\App;
 use Utopia\Cache\Adapter\Filesystem;
@@ -21,6 +23,7 @@ use Utopia\Database\Validator\UID;
 use Appwrite\Extend\Exception;
 use Utopia\Image\Image;
 use Utopia\Storage\Compression\Algorithms\GZIP;
+use Utopia\Storage\Device;
 use Utopia\Storage\Device\Local;
 use Utopia\Storage\Storage;
 use Utopia\Storage\Validator\File;
@@ -34,6 +37,7 @@ use Utopia\Validator\Integer;
 use Utopia\Validator\Range;
 use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;
+use Utopia\Swoole\Request;
 
 App::post('/v1/storage/buckets')
     ->desc('Create bucket')
@@ -61,11 +65,7 @@ App::post('/v1/storage/buckets')
     ->inject('dbForProject')
     ->inject('audits')
     ->inject('usage')
-    ->action(function ($bucketId, $name, $permission, $read, $write, $enabled, $maximumFileSize, $allowedFileExtensions, $encryption, $antivirus, $response, $dbForProject, $audits, $usage) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForProject */
-        /** @var Appwrite\Event\Event $audits */
-        /** @var Appwrite\Stats\Stats $usage */
+    ->action(function (string $bucketId, string $name, string $permission, array $read, array $write, bool $enabled, int $maximumFileSize, array $allowedFileExtensions, bool $encryption, bool $antivirus, Response $response, Database $dbForProject, Event $audits, Stats $usage) {
 
         $bucketId = $bucketId === 'unique()' ? $dbForProject->getId() : $bucketId;
         try {
@@ -157,10 +157,7 @@ App::get('/v1/storage/buckets')
     ->inject('response')
     ->inject('dbForProject')
     ->inject('usage')
-    ->action(function ($search, $limit, $offset, $cursor, $cursorDirection, $orderType, $response, $dbForProject, $usage) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForProject */
-        /** @var Appwrite\Stats\Stats $usage */
+    ->action(function (array $search, int $limit, int $offset, string $cursor, string $cursorDirection, string $orderType, Response $response, Database $dbForProject, Stats $usage) {
 
         $queries = ($search) ? [new Query('name', Query::TYPE_SEARCH, $search)] : [];
 
@@ -195,10 +192,7 @@ App::get('/v1/storage/buckets/:bucketId')
     ->inject('response')
     ->inject('dbForProject')
     ->inject('usage')
-    ->action(function ($bucketId, $response, $dbForProject, $usage) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForProject */
-        /** @var Appwrite\Stats\Stats $usage */
+    ->action(function (string $bucketId, Response $response, Database $dbForProject, Stats $usage) {
 
         $bucket = $dbForProject->getDocument('buckets', $bucketId);
 
@@ -237,11 +231,7 @@ App::put('/v1/storage/buckets/:bucketId')
     ->inject('dbForProject')
     ->inject('audits')
     ->inject('usage')
-    ->action(function ($bucketId, $name, $permission, $read, $write, $enabled, $maximumFileSize, $allowedFileExtensions, $encryption, $antivirus, $response, $dbForProject, $audits, $usage) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForProject */
-        /** @var Appwrite\Event\Event $audits */
-        /** @var Appwrite\Stats\Stats $usage */
+    ->action(function (string $bucketId, string $name, string $permission, array $read, array $write, bool $enabled, int $maximumFileSize, array $allowedFileExtensions, bool $encryption, bool $antivirus, Response $response, Database $dbForProject, Event $audits, Stats $usage) {
 
         $bucket = $dbForProject->getDocument('buckets', $bucketId);
 
@@ -298,13 +288,7 @@ App::delete('/v1/storage/buckets/:bucketId')
     ->inject('deletes')
     ->inject('events')
     ->inject('usage')
-    ->action(function ($bucketId, $response, $dbForProject, $audits, $deletes, $events, $usage) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForProject */
-        /** @var Appwrite\Event\Event $audits */
-        /** @var Appwrite\Event\Event $deletes */
-        /** @var Appwrite\Event\Event $events */
-        /** @var Appwrite\Stats\Stats $usage */
+    ->action(function (string $bucketId, Response $response, Database $dbForProject, Event $audits, Event $deletes, Event $events, Stats $usage) {
 
         $bucket = $dbForProject->getDocument('buckets', $bucketId);
 
@@ -366,17 +350,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
     ->inject('mode')
     ->inject('deviceFiles')
     ->inject('deviceLocal')
-    ->action(function ($bucketId, $fileId, $file, $read, $write, $request, $response, $dbForProject, $user, $audits, $usage, $events, $mode, $deviceFiles, $deviceLocal) {
-        /** @var Utopia\Swoole\Request $request */
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForProject */
-        /** @var Utopia\Database\Document $user */
-        /** @var Appwrite\Event\Event $audits */
-        /** @var Appwrite\Event\Event $events */
-        /** @var Appwrite\Stats\Stats $usage */
-        /** @var Utopia\Storage\Device $deviceFiles */
-        /** @var Utopia\Storage\Device $deviceLocal */
-        /** @var string $mode */
+    ->action(function (string $bucketId, string $fileId, string $file, array $read, array $write, Request $request, Response $response, Database $dbForProject, Document $user, Event $audits, Stats $usage, Event $events, string $mode, Device $deviceFiles, Device $deviceLocal) {
 
         $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
 
@@ -711,11 +685,7 @@ App::get('/v1/storage/buckets/:bucketId/files')
     ->inject('dbForProject')
     ->inject('usage')
     ->inject('mode')
-    ->action(function ($bucketId, $search, $limit, $offset, $cursor, $cursorDirection, $orderType, $response, $dbForProject, $usage, $mode) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForProject */
-        /** @var Appwrite\Stats\Stats $usage */
-        /** @var string $mode */
+    ->action(function (string $bucketId, string $search, int $limit, int $offset, string $cursor, string $cursorDirection, string $orderType, Response $response, Database $dbForProject, Stats $usage, string $mode) {
 
         $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
 
@@ -791,11 +761,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId')
     ->inject('dbForProject')
     ->inject('usage')
     ->inject('mode')
-    ->action(function ($bucketId, $fileId, $response, $dbForProject, $usage, $mode) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForProject */
-        /** @var Appwrite\Stats\Stats $usage */
-        /** @var string $mode */
+    ->action(function (string $bucketId, string $fileId, Response $response, Database $dbForProject, Stats $usage, string $mode) {
 
         $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
 
@@ -863,15 +829,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
     ->inject('mode')
     ->inject('deviceFiles')
     ->inject('deviceLocal')
-    ->action(function ($bucketId, $fileId, $width, $height, $gravity, $quality, $borderWidth, $borderColor, $borderRadius, $opacity, $rotation, $background, $output, $request, $response, $project, $dbForProject, $usage, $mode, $deviceFiles, $deviceLocal) {
-        /** @var Utopia\Swoole\Request $request */
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Document $project */
-        /** @var Utopia\Database\Database $dbForProject */
-        /** @var Appwrite\Stats\Stats $usage */
-        /** @var Utopia\Storage\Device $deviceFiles */
-        /** @var Utopia\Storage\Device $deviceLocal */
-        /** @var string $mode */
+    ->action(function (string $bucketId, string $fileId, int $width, int $height, string $gravity, int $quality, int $borderWidth, string $borderColor, int $borderRadius, float $opacity, int $rotation, string $background, string $output, Request $request, Response $response, Document $project, Database $dbForProject, Stats $usage, string $mode, Device $deviceFiles, Device $deviceLocal) {
 
         if (!\extension_loaded('imagick')) {
             throw new Exception('Imagick extension is missing', 500, Exception::GENERAL_SERVER_ERROR);
@@ -1041,13 +999,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
     ->inject('usage')
     ->inject('mode')
     ->inject('deviceFiles')
-    ->action(function ($bucketId, $fileId, $request, $response, $dbForProject, $usage, $mode, $deviceFiles) {
-        /** @var Utopia\Swoole\Request $request */
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForProject */
-        /** @var Appwrite\Stats\Stats $usage */
-        /** @var Utopia\Storage\Device $deviceFiles */
-        /** @var string $mode */
+    ->action(function (string $bucketId, string $fileId, Request $request, Response $response, Database $dbForProject, Stats $usage, string $mode, Device $deviceFiles) {
 
         $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
 
@@ -1184,13 +1136,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
     ->inject('usage')
     ->inject('mode')
     ->inject('deviceFiles')
-    ->action(function ($bucketId, $fileId, $response, $request, $dbForProject, $usage, $mode, $deviceFiles) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Swoole\Request $request */
-        /** @var Utopia\Database\Database $dbForInternal */
-        /** @var Appwrite\Stats\Stats $usage */
-        /** @var Utopia\Storage\Device $deviceFiles */
-        /** @var string $mode */
+    ->action(function (string $bucketId, string $fileId, Response $response, Request $request, Database $dbForProject, Stats $usage, string $mode, Device $deviceFiles) {
 
         $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
 
@@ -1344,14 +1290,7 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
     ->inject('usage')
     ->inject('mode')
     ->inject('events')
-    ->action(function ($bucketId, $fileId, $read, $write, $response, $dbForProject, $user, $audits, $usage, $mode, $events) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForProject */
-        /** @var Utopia\Database\Document $user */
-        /** @var Appwrite\Event\Event $audits */
-        /** @var Appwrite\Stats\Stats $usage */
-        /** @var Appwrite\Event\Event $events */
-        /** @var string $mode */
+    ->action(function (string $bucketId, string $fileId, array $read, array $write,Response  $response, Database $dbForProject, Document $user, Event $audits, Stats $usage, string $mode, Event $events) {
 
         $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
         $read = (is_null($read) && !$user->isEmpty()) ? ['user:' . $user->getId()] : $read ?? []; // By default set read permissions for user
@@ -1444,15 +1383,7 @@ App::delete('/v1/storage/buckets/:bucketId/files/:fileId')
     ->inject('mode')
     ->inject('deviceFiles')
     ->inject('project')
-    ->action(function ($bucketId, $fileId, $response, $dbForProject, $events, $audits, $usage, $mode, $deviceFiles, $project) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForProject */
-        /** @var Utopia\Database\Database $dbForProject */
-        /** @var Appwrite\Event\Event $events */
-        /** @var Appwrite\Event\Event $audits */
-        /** @var Appwrite\Stats\Stats $usage */
-        /** @var Utopia\Storage\Device $deviceFiles */
-        /** @var string $mode */
+    ->action(function (string $bucketId, string $fileId, Response $response, Database $dbForProject, Event $events, Event $audits, Stats $usage, string $mode, Device $deviceFiles, Document $project) {
 
         $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
 
@@ -1539,9 +1470,7 @@ App::get('/v1/storage/usage')
     ->param('range', '30d', new WhiteList(['24h', '7d', '30d', '90d'], true), 'Date range.', true)
     ->inject('response')
     ->inject('dbForProject')
-    ->action(function ($range, $response, $dbForProject) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForProject */
+    ->action(function (string $range, Response $response, Database $dbForProject) {
 
         $usage = [];
         if (App::getEnv('_APP_USAGE_STATS', 'enabled') === 'enabled') {
@@ -1651,9 +1580,7 @@ App::get('/v1/storage/:bucketId/usage')
     ->param('range', '30d', new WhiteList(['24h', '7d', '30d', '90d'], true), 'Date range.', true)
     ->inject('response')
     ->inject('dbForProject')
-    ->action(function ($bucketId, $range, $response, $dbForProject) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForProject */
+    ->action(function (string $bucketId, string $range, Response $response, Database $dbForProject) {
 
         $bucket = $dbForProject->getDocument('buckets', $bucketId);
 

From 5b72d9d48d1a555c128d74d218d95ff88116b294 Mon Sep 17 00:00:00 2001
From: Everly Precia Suresh <everlyprecia@gmail.com>
Date: Wed, 4 May 2022 12:49:35 +0000
Subject: [PATCH 20/24] change file type

---
 app/controllers/api/storage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
index 3c307a7c71..b14e841b7a 100644
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@@ -350,7 +350,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
     ->inject('mode')
     ->inject('deviceFiles')
     ->inject('deviceLocal')
-    ->action(function (string $bucketId, string $fileId, string $file, array $read, array $write, Request $request, Response $response, Database $dbForProject, Document $user, Event $audits, Stats $usage, Event $events, string $mode, Device $deviceFiles, Device $deviceLocal) {
+    ->action(function (string $bucketId, string $fileId, File $file, array $read, array $write, Request $request, Response $response, Database $dbForProject, Document $user, Event $audits, Stats $usage, Event $events, string $mode, Device $deviceFiles, Device $deviceLocal) {
 
         $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
 

From ceea134579e8f80b8c79cafe71d71f9508d39dbe Mon Sep 17 00:00:00 2001
From: Everly Precia Suresh <everlyprecia@gmail.com>
Date: Wed, 4 May 2022 13:00:12 +0000
Subject: [PATCH 21/24] fix file param

---
 app/controllers/api/storage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
index b14e841b7a..dfd3b3a066 100644
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@@ -350,7 +350,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
     ->inject('mode')
     ->inject('deviceFiles')
     ->inject('deviceLocal')
-    ->action(function (string $bucketId, string $fileId, File $file, array $read, array $write, Request $request, Response $response, Database $dbForProject, Document $user, Event $audits, Stats $usage, Event $events, string $mode, Device $deviceFiles, Device $deviceLocal) {
+    ->action(function (string $bucketId, string $fileId, array $file, array $read, array $write, Request $request, Response $response, Database $dbForProject, Document $user, Event $audits, Stats $usage, Event $events, string $mode, Device $deviceFiles, Device $deviceLocal) {
 
         $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
 

From 8c4b035dd741980d701c78dcf3341284f850cb24 Mon Sep 17 00:00:00 2001
From: Everly Precia Suresh <everlyprecia@gmail.com>
Date: Fri, 6 May 2022 13:33:44 +0000
Subject: [PATCH 22/24] update storage.php with optional parameters

---
 app/controllers/api/storage.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
index dfd3b3a066..d8fcd3a95e 100644
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@@ -65,7 +65,7 @@ App::post('/v1/storage/buckets')
     ->inject('dbForProject')
     ->inject('audits')
     ->inject('usage')
-    ->action(function (string $bucketId, string $name, string $permission, array $read, array $write, bool $enabled, int $maximumFileSize, array $allowedFileExtensions, bool $encryption, bool $antivirus, Response $response, Database $dbForProject, Event $audits, Stats $usage) {
+    ->action(function (string $bucketId, string $name, string $permission, ?array $read, ?array $write, bool $enabled, int $maximumFileSize, array $allowedFileExtensions, bool $encryption, bool $antivirus, Response $response, Database $dbForProject, Event $audits, Stats $usage) {
 
         $bucketId = $bucketId === 'unique()' ? $dbForProject->getId() : $bucketId;
         try {
@@ -157,7 +157,7 @@ App::get('/v1/storage/buckets')
     ->inject('response')
     ->inject('dbForProject')
     ->inject('usage')
-    ->action(function (array $search, int $limit, int $offset, string $cursor, string $cursorDirection, string $orderType, Response $response, Database $dbForProject, Stats $usage) {
+    ->action(function (string $search, int $limit, int $offset, string $cursor, string $cursorDirection, string $orderType, Response $response, Database $dbForProject, Stats $usage) {
 
         $queries = ($search) ? [new Query('name', Query::TYPE_SEARCH, $search)] : [];
 
@@ -231,7 +231,7 @@ App::put('/v1/storage/buckets/:bucketId')
     ->inject('dbForProject')
     ->inject('audits')
     ->inject('usage')
-    ->action(function (string $bucketId, string $name, string $permission, array $read, array $write, bool $enabled, int $maximumFileSize, array $allowedFileExtensions, bool $encryption, bool $antivirus, Response $response, Database $dbForProject, Event $audits, Stats $usage) {
+    ->action(function (string $bucketId, string $name, string $permission, ?array $read, ?array $write, bool $enabled, ?int $maximumFileSize, array $allowedFileExtensions, bool $encryption, bool $antivirus, Response $response, Database $dbForProject, Event $audits, Stats $usage) {
 
         $bucket = $dbForProject->getDocument('buckets', $bucketId);
 
@@ -350,7 +350,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
     ->inject('mode')
     ->inject('deviceFiles')
     ->inject('deviceLocal')
-    ->action(function (string $bucketId, string $fileId, array $file, array $read, array $write, Request $request, Response $response, Database $dbForProject, Document $user, Event $audits, Stats $usage, Event $events, string $mode, Device $deviceFiles, Device $deviceLocal) {
+    ->action(function (string $bucketId, string $fileId, array $file, ?array $read, ?array $write, Request $request, Response $response, Database $dbForProject, Document $user, Event $audits, Stats $usage, Event $events, string $mode, Device $deviceFiles, Device $deviceLocal) {
 
         $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
 
@@ -1290,7 +1290,7 @@ App::put('/v1/storage/buckets/:bucketId/files/:fileId')
     ->inject('usage')
     ->inject('mode')
     ->inject('events')
-    ->action(function (string $bucketId, string $fileId, array $read, array $write,Response  $response, Database $dbForProject, Document $user, Event $audits, Stats $usage, string $mode, Event $events) {
+    ->action(function (string $bucketId, string $fileId, ?array $read, ?array $write,Response  $response, Database $dbForProject, Document $user, Event $audits, Stats $usage, string $mode, Event $events) {
 
         $bucket = Authorization::skip(fn () => $dbForProject->getDocument('buckets', $bucketId));
         $read = (is_null($read) && !$user->isEmpty()) ? ['user:' . $user->getId()] : $read ?? []; // By default set read permissions for user

From a2091a25725d96fcf97ddf77c9ea96d522425162 Mon Sep 17 00:00:00 2001
From: Everly Precia Suresh <everlyprecia@gmail.com>
Date: Fri, 6 May 2022 15:12:11 +0000
Subject: [PATCH 23/24] retrigger build

---
 app/controllers/api/storage.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/api/storage.php b/app/controllers/api/storage.php
index d8fcd3a95e..8d047f2e21 100644
--- a/app/controllers/api/storage.php
+++ b/app/controllers/api/storage.php
@@ -37,7 +37,7 @@ use Utopia\Validator\Integer;
 use Utopia\Validator\Range;
 use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;
-use Utopia\Swoole\Request;
+use Utopia\Swoole\Request; 
 
 App::post('/v1/storage/buckets')
     ->desc('Create bucket')

From f3608dd4fe721c152cf394c403db168af429077c Mon Sep 17 00:00:00 2001
From: Everly Precia Suresh <everlyprecia@gmail.com>
Date: Fri, 6 May 2022 16:51:02 +0000
Subject: [PATCH 24/24] refactor projects.php

---
 app/controllers/api/projects.php | 131 ++++++++-----------------------
 1 file changed, 33 insertions(+), 98 deletions(-)

diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php
index f7100a88a2..8c2392846f 100644
--- a/app/controllers/api/projects.php
+++ b/app/controllers/api/projects.php
@@ -2,6 +2,7 @@
 
 use Appwrite\Auth\Auth;
 use Appwrite\Auth\Validator\Password;
+use Appwrite\Event\Event;
 use Appwrite\Network\Validator\CNAME;
 use Appwrite\Network\Validator\Domain as DomainValidator;
 use Appwrite\Network\Validator\Origin;
@@ -18,6 +19,7 @@ use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\UID;
 use Utopia\Domains\Domain;
+use Utopia\Registry\Registry;
 use Appwrite\Extend\Exception;
 use Utopia\Validator\ArrayList;
 use Utopia\Validator\Boolean;
@@ -26,8 +28,7 @@ use Utopia\Validator\Range;
 use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;
 
-App::init(function ($project) {
-    /** @var Utopia\Database\Document $project */
+App::init(function (Document $project) {
 
     if ($project->getId() !== 'console') {
         throw new Exception('Access to this API is forbidden.', 401, Exception::GENERAL_ACCESS_FORBIDDEN);
@@ -59,10 +60,7 @@ App::post('/v1/projects')
     ->inject('response')
     ->inject('dbForConsole')
     ->inject('dbForProject')
-    ->action(function ($projectId, $name, $teamId, $description, $logo, $url, $legalName, $legalCountry, $legalState, $legalCity, $legalAddress, $legalTaxId, $response, $dbForConsole, $dbForProject) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
-        /** @var Utopia\Database\Database $dbForProject */
+    ->action(function (string $projectId, string $name, string $teamId, string $description, string $logo, string $url, string $legalName, string $legalCountry, string $legalState, string $legalCity, string $legalAddress, string $legalTaxId, Response $response, Database $dbForConsole, Database $dbForProject) {
 
         $team = $dbForConsole->getDocument('teams', $teamId);
 
@@ -170,9 +168,7 @@ App::get('/v1/projects')
     ->param('orderType', 'ASC', new WhiteList(['ASC', 'DESC'], true), 'Order result by ASC or DESC order.', true)
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($search, $limit, $offset, $cursor, $cursorDirection, $orderType, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $search, int $limit, int $offset, string $cursor, string $cursorDirection, string $orderType, Response $response, Database $dbForConsole) {
 
         if (!empty($cursor)) {
             $cursorProject = $dbForConsole->getDocument('projects', $cursor);
@@ -210,9 +206,7 @@ App::get('/v1/projects/:projectId')
     ->param('projectId', '', new UID(), 'Project unique ID.')
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -239,11 +233,7 @@ App::get('/v1/projects/:projectId/usage')
     ->inject('dbForConsole')
     ->inject('dbForProject')
     ->inject('register')
-    ->action(function ($projectId, $range, $response, $dbForConsole, $dbForProject, $register) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
-        /** @var Utopia\Database\Database $dbForProject */
-        /** @var Utopia\Registry\Registry $register */
+    ->action(function (string $projectId, string $range, Response $response, Database $dbForConsole, Database $dbForProject, Registry $register) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -360,9 +350,7 @@ App::patch('/v1/projects/:projectId')
     ->param('legalTaxId', '', new Text(256), 'Project legal tax ID. Max length: 256 chars.', true)
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $name, $description, $logo, $url, $legalName, $legalCountry, $legalState, $legalCity, $legalAddress, $legalTaxId, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, string $name, string $description, string $logo, string $url, string $legalName, string $legalCountry, string $legalState, string $legalCity, string $legalAddress, string $legalTaxId, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -402,10 +390,7 @@ App::patch('/v1/projects/:projectId/service')
     ->param('status', null, new Boolean(), 'Service status.')
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $service, $status, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
-        /** @var Boolean $status */
+    ->action(function (string $projectId, string $service, bool $status, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -437,9 +422,7 @@ App::patch('/v1/projects/:projectId/oauth2')
     ->param('secret', '', new text(512), 'Provider secret key. Max length: 512 chars.', true)
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $provider, $appId, $secret, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, string $provider, string $appId, string $secret, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -470,9 +453,7 @@ App::patch('/v1/projects/:projectId/auth/limit')
     ->param('limit', false, new Range(0, APP_LIMIT_USERS), 'Set the max number of users allowed in this project. Use 0 for unlimited.')
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $limit, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, int $limit, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -505,9 +486,7 @@ App::patch('/v1/projects/:projectId/auth/:method')
     ->param('status', false, new Boolean(true), 'Set the status of this auth method.')
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $method, $status, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, string $method, bool $status, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
         $auth = Config::getParam('auth')[$method] ?? [];
@@ -541,11 +520,7 @@ App::delete('/v1/projects/:projectId')
     ->inject('user')
     ->inject('dbForConsole')
     ->inject('deletes')
-    ->action(function ($projectId, $password, $response, $user, $dbForConsole, $deletes) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Document $user */
-        /** @var Utopia\Database\Database $dbForConsole */
-        /** @var Appwrite\Event\Event $deletes */
+    ->action(function (string $projectId, string $password, Response $response, Document $user, Database $dbForConsole, Event $deletes) {
 
         if (!Auth::passwordVerify($password, $user->getAttribute('password'))) { // Double check user password
             throw new Exception('Invalid credentials', 401, Exception::USER_INVALID_CREDENTIALS);
@@ -594,9 +569,7 @@ App::post('/v1/projects/:projectId/webhooks')
     ->param('httpPass', '', new Text(256), 'Webhook HTTP password. Max length: 256 chars.', true)
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $name, $events, $url, $security, $httpUser, $httpPass, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, string $name, array $events, string $url, bool $security, string $httpUser, string $httpPass, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -640,9 +613,7 @@ App::get('/v1/projects/:projectId/webhooks')
     ->param('projectId', '', new UID(), 'Project unique ID.')
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -674,9 +645,7 @@ App::get('/v1/projects/:projectId/webhooks/:webhookId')
     ->param('webhookId', null, new UID(), 'Webhook unique ID.')
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $webhookId, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, string $webhookId, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -716,9 +685,7 @@ App::put('/v1/projects/:projectId/webhooks/:webhookId')
     ->param('httpPass', '', new Text(256), 'Webhook HTTP password. Max length: 256 chars.', true)
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $webhookId, $name, $events, $url, $security, $httpUser, $httpPass, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, string $webhookId, string $name, array $events, string $url, bool $security, string $httpUser, string $httpPass, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -766,9 +733,7 @@ App::delete('/v1/projects/:projectId/webhooks/:webhookId')
     ->param('webhookId', null, new UID(), 'Webhook unique ID.')
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $webhookId, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, string $webhookId, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -809,9 +774,7 @@ App::post('/v1/projects/:projectId/keys')
     ->param('scopes', null, new ArrayList(new WhiteList(array_keys(Config::getParam('scopes')), true)), 'Key scopes list.')
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $name, $scopes, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, string $name, array $scopes, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -850,9 +813,7 @@ App::get('/v1/projects/:projectId/keys')
     ->param('projectId', null, new UID(), 'Project unique ID.')
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -884,9 +845,7 @@ App::get('/v1/projects/:projectId/keys/:keyId')
     ->param('keyId', null, new UID(), 'Key unique ID.')
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $keyId, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, string $keyId, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -922,9 +881,7 @@ App::put('/v1/projects/:projectId/keys/:keyId')
     ->param('scopes', null, new ArrayList(new WhiteList(array_keys(Config::getParam('scopes')), true)), 'Key scopes list')
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $keyId, $name, $scopes, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, string $keyId, string $name, array $scopes, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -966,9 +923,7 @@ App::delete('/v1/projects/:projectId/keys/:keyId')
     ->param('keyId', null, new UID(), 'Key unique ID.')
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $keyId, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, string $keyId, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -1012,9 +967,7 @@ App::post('/v1/projects/:projectId/platforms')
     ->param('hostname', '', new Text(256), 'Platform client hostname. Max length: 256 chars.', true)
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $type, $name, $key, $store, $hostname, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, string $type, string $name, string $key, string $store, string $hostname, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -1057,9 +1010,7 @@ App::get('/v1/projects/:projectId/platforms')
     ->param('projectId', '', new UID(), 'Project unique ID.')
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -1091,9 +1042,7 @@ App::get('/v1/projects/:projectId/platforms/:platformId')
     ->param('platformId', null, new UID(), 'Platform unique ID.')
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $platformId, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, string $platformId, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -1131,9 +1080,7 @@ App::put('/v1/projects/:projectId/platforms/:platformId')
     ->param('hostname', '', new Text(256), 'Platform client URL. Max length: 256 chars.', true)
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $platformId, $name, $key, $store, $hostname, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, string $platformId, string $name, string $key, string $store, string $hostname, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -1178,9 +1125,7 @@ App::delete('/v1/projects/:projectId/platforms/:platformId')
     ->param('platformId', null, new UID(), 'Platform unique ID.')
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $platformId, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, string $platformId, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -1220,9 +1165,7 @@ App::post('/v1/projects/:projectId/domains')
     ->param('domain', null, new DomainValidator(), 'Domain name.')
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $domain, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, string $domain, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -1281,9 +1224,7 @@ App::get('/v1/projects/:projectId/domains')
     ->param('projectId', '', new UID(), 'Project unique ID.')
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -1315,9 +1256,7 @@ App::get('/v1/projects/:projectId/domains/:domainId')
     ->param('domainId', null, new UID(), 'Domain unique ID.')
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $domainId, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, string $domainId, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -1351,9 +1290,7 @@ App::patch('/v1/projects/:projectId/domains/:domainId/verification')
     ->param('domainId', null, new UID(), 'Domain unique ID.')
     ->inject('response')
     ->inject('dbForConsole')
-    ->action(function ($projectId, $domainId, $response, $dbForConsole) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, string $domainId, Response $response, Database $dbForConsole) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);
 
@@ -1413,9 +1350,7 @@ App::delete('/v1/projects/:projectId/domains/:domainId')
     ->inject('response')
     ->inject('dbForConsole')
     ->inject('deletes')
-    ->action(function ($projectId, $domainId, $response, $dbForConsole, $deletes) {
-        /** @var Appwrite\Utopia\Response $response */
-        /** @var Utopia\Database\Database $dbForConsole */
+    ->action(function (string $projectId, string $domainId, Response $response, Database $dbForConsole, $deletes) {
 
         $project = $dbForConsole->getDocument('projects', $projectId);