Merge branch 'feat-mailgun-provider' of https://github.com/appwrite/appwrite into feat-topics-controller

app/controllers/api/account.php

@@ -50,7 +50,7 @@ $oauthDefaultSuccess = '/auth/oauth2/success';
 $oauthDefaultFailure = '/auth/oauth2/failure';
 
 App::post('/v1/account')
-    ->desc('Create Account')
+    ->desc('Create account')
     ->groups(['api', 'account', 'auth'])
     ->label('event', 'users.[userId].create')
     ->label('scope', 'public')
@@ -165,7 +165,7 @@ App::post('/v1/account')
 
 App::post('/v1/account/sessions/email')
     ->alias('/v1/account/sessions')
-    ->desc('Create Email Session')
+    ->desc('Create email session')
     ->groups(['api', 'account', 'auth', 'session'])
     ->label('event', 'users.[userId].sessions.[sessionId].create')
     ->label('scope', 'public')
@@ -285,7 +285,7 @@ App::post('/v1/account/sessions/email')
     });
 
 App::get('/v1/account/sessions/oauth2/:provider')
-    ->desc('Create OAuth2 Session')
+    ->desc('Create OAuth2 session')
     ->groups(['api', 'account'])
     ->label('error', __DIR__ . '/../../views/general/error.phtml')
     ->label('scope', 'public')
@@ -351,7 +351,7 @@ App::get('/v1/account/sessions/oauth2/:provider')
     });
 
 App::get('/v1/account/sessions/oauth2/callback/:provider/:projectId')
-    ->desc('OAuth2 Callback')
+    ->desc('OAuth2 callback')
     ->groups(['account'])
     ->label('error', __DIR__ . '/../../views/general/error.phtml')
     ->label('scope', 'public')
@@ -383,7 +383,7 @@ App::get('/v1/account/sessions/oauth2/callback/:provider/:projectId')
     });
 
 App::post('/v1/account/sessions/oauth2/callback/:provider/:projectId')
-    ->desc('OAuth2 Callback')
+    ->desc('OAuth2 callback')
     ->groups(['account'])
     ->label('error', __DIR__ . '/../../views/general/error.phtml')
     ->label('scope', 'public')
@@ -416,7 +416,7 @@ App::post('/v1/account/sessions/oauth2/callback/:provider/:projectId')
     });
 
 App::get('/v1/account/sessions/oauth2/:provider/redirect')
-    ->desc('OAuth2 Redirect')
+    ->desc('OAuth2 redirect')
     ->groups(['api', 'account', 'session'])
     ->label('error', __DIR__ . '/../../views/general/error.phtml')
     ->label('event', 'users.[userId].sessions.[sessionId].create')
@@ -872,7 +872,7 @@ App::delete('/v1/account/identities/:identityId')
     });
 
 App::post('/v1/account/sessions/magic-url')
-    ->desc('Create Magic URL session')
+    ->desc('Create magic URL session')
     ->groups(['api', 'account'])
     ->label('scope', 'public')
     ->label('auth.type', 'magic-url')
@@ -1090,7 +1090,7 @@ App::post('/v1/account/sessions/magic-url')
     });
 
 App::put('/v1/account/sessions/magic-url')
-    ->desc('Create Magic URL session (confirmation)')
+    ->desc('Create magic URL session (confirmation)')
     ->groups(['api', 'account', 'session'])
     ->label('scope', 'public')
     ->label('event', 'users.[userId].sessions.[sessionId].create')
@@ -1212,7 +1212,7 @@ App::put('/v1/account/sessions/magic-url')
     });
 
 App::post('/v1/account/sessions/phone')
-    ->desc('Create Phone session')
+    ->desc('Create phone session')
     ->groups(['api', 'account'])
     ->label('scope', 'public')
     ->label('auth.type', 'phone')
@@ -1355,9 +1355,9 @@ App::post('/v1/account/sessions/phone')
         ]));
 
         $messaging
-        ->setMessageId($messageDoc->getId())
-        ->setProject($project)
-        ->trigger();
+            ->setMessageId($messageDoc->getId())
+            ->setProject($project)
+            ->trigger();
 
         $events->setPayload(
             $response->output(
@@ -1376,7 +1376,7 @@ App::post('/v1/account/sessions/phone')
     });
 
 App::put('/v1/account/sessions/phone')
-    ->desc('Create Phone Session (confirmation)')
+    ->desc('Create phone session (confirmation)')
     ->groups(['api', 'account', 'session'])
     ->label('scope', 'public')
     ->label('event', 'users.[userId].sessions.[sessionId].create')
@@ -1492,7 +1492,7 @@ App::put('/v1/account/sessions/phone')
     });
 
 App::post('/v1/account/sessions/anonymous')
-    ->desc('Create Anonymous Session')
+    ->desc('Create anonymous session')
     ->groups(['api', 'account', 'auth', 'session'])
     ->label('event', 'users.[userId].sessions.[sessionId].create')
     ->label('scope', 'public')
@@ -1676,7 +1676,7 @@ App::post('/v1/account/jwt')
     });
 
 App::get('/v1/account')
-    ->desc('Get Account')
+    ->desc('Get account')
     ->groups(['api', 'account'])
     ->label('scope', 'account')
     ->label('usage.metric', 'users.{scope}.requests.read')
@@ -1697,7 +1697,7 @@ App::get('/v1/account')
     });
 
 App::get('/v1/account/prefs')
-    ->desc('Get Account Preferences')
+    ->desc('Get account preferences')
     ->groups(['api', 'account'])
     ->label('scope', 'account')
     ->label('usage.metric', 'users.{scope}.requests.read')
@@ -1720,7 +1720,7 @@ App::get('/v1/account/prefs')
     });
 
 App::get('/v1/account/sessions')
-    ->desc('List Sessions')
+    ->desc('List sessions')
     ->groups(['api', 'account'])
     ->label('scope', 'account')
     ->label('usage.metric', 'users.{scope}.requests.read')
@@ -1759,7 +1759,7 @@ App::get('/v1/account/sessions')
     });
 
 App::get('/v1/account/logs')
-    ->desc('List Logs')
+    ->desc('List logs')
     ->groups(['api', 'account'])
     ->label('scope', 'account')
     ->label('usage.metric', 'users.{scope}.requests.read')
@@ -1820,7 +1820,7 @@ App::get('/v1/account/logs')
     });
 
 App::get('/v1/account/sessions/:sessionId')
-    ->desc('Get Session')
+    ->desc('Get session')
     ->groups(['api', 'account'])
     ->label('scope', 'account')
     ->label('usage.metric', 'users.{scope}.requests.read')
@@ -1865,7 +1865,7 @@ App::get('/v1/account/sessions/:sessionId')
     });
 
 App::patch('/v1/account/name')
-    ->desc('Update Name')
+    ->desc('Update name')
     ->groups(['api', 'account'])
     ->label('event', 'users.[userId].update.name')
     ->label('scope', 'account')
@@ -1899,7 +1899,7 @@ App::patch('/v1/account/name')
     });
 
 App::patch('/v1/account/password')
-    ->desc('Update Password')
+    ->desc('Update password')
     ->groups(['api', 'account'])
     ->label('event', 'users.[userId].update.password')
     ->label('scope', 'account')
@@ -1966,7 +1966,7 @@ App::patch('/v1/account/password')
     });
 
 App::patch('/v1/account/email')
-    ->desc('Update Email')
+    ->desc('Update email')
     ->groups(['api', 'account'])
     ->label('event', 'users.[userId].update.email')
     ->label('scope', 'account')
@@ -2036,7 +2036,7 @@ App::patch('/v1/account/email')
     });
 
 App::patch('/v1/account/phone')
-    ->desc('Update Phone')
+    ->desc('Update phone')
     ->groups(['api', 'account'])
     ->label('event', 'users.[userId].update.phone')
     ->label('scope', 'account')
@@ -2095,7 +2095,7 @@ App::patch('/v1/account/phone')
     });
 
 App::patch('/v1/account/prefs')
-    ->desc('Update Preferences')
+    ->desc('Update preferences')
     ->groups(['api', 'account'])
     ->label('event', 'users.[userId].update.prefs')
     ->label('scope', 'account')
@@ -2129,7 +2129,7 @@ App::patch('/v1/account/prefs')
     });
 
 App::patch('/v1/account/status')
-    ->desc('Update Status')
+    ->desc('Update status')
     ->groups(['api', 'account'])
     ->label('event', 'users.[userId].update.status')
     ->label('scope', 'account')
@@ -2173,7 +2173,7 @@ App::patch('/v1/account/status')
     });
 
 App::delete('/v1/account/sessions/:sessionId')
-    ->desc('Delete Session')
+    ->desc('Delete session')
     ->groups(['api', 'account'])
     ->label('scope', 'account')
     ->label('event', 'users.[userId].sessions.[sessionId].delete')
@@ -2249,7 +2249,7 @@ App::delete('/v1/account/sessions/:sessionId')
     });
 
 App::patch('/v1/account/sessions/:sessionId')
-    ->desc('Update OAuth Session (Refresh Tokens)')
+    ->desc('Update OAuth session (refresh tokens)')
     ->groups(['api', 'account'])
     ->label('scope', 'account')
     ->label('event', 'users.[userId].sessions.[sessionId].update')
@@ -2335,7 +2335,7 @@ App::patch('/v1/account/sessions/:sessionId')
     });
 
 App::delete('/v1/account/sessions')
-    ->desc('Delete Sessions')
+    ->desc('Delete sessions')
     ->groups(['api', 'account'])
     ->label('scope', 'account')
     ->label('event', 'users.[userId].sessions.[sessionId].delete')
@@ -2396,7 +2396,7 @@ App::delete('/v1/account/sessions')
     });
 
 App::post('/v1/account/recovery')
-    ->desc('Create Password Recovery')
+    ->desc('Create password recovery')
     ->groups(['api', 'account'])
     ->label('scope', 'public')
     ->label('event', 'users.[userId].recovery.[tokenId].create')
@@ -2579,7 +2579,7 @@ App::post('/v1/account/recovery')
     });
 
 App::put('/v1/account/recovery')
-    ->desc('Create Password Recovery (confirmation)')
+    ->desc('Create password recovery (confirmation)')
     ->groups(['api', 'account'])
     ->label('scope', 'public')
     ->label('event', 'users.[userId].recovery.[tokenId].update')
@@ -2667,7 +2667,7 @@ App::put('/v1/account/recovery')
     });
 
 App::post('/v1/account/verification')
-    ->desc('Create Email Verification')
+    ->desc('Create email verification')
     ->groups(['api', 'account'])
     ->label('scope', 'account')
     ->label('event', 'users.[userId].verification.[tokenId].create')
@@ -2828,7 +2828,7 @@ App::post('/v1/account/verification')
     });
 
 App::put('/v1/account/verification')
-    ->desc('Create Email Verification (confirmation)')
+    ->desc('Create email verification (confirmation)')
     ->groups(['api', 'account'])
     ->label('scope', 'public')
     ->label('event', 'users.[userId].verification.[tokenId].update')
@@ -2889,7 +2889,7 @@ App::put('/v1/account/verification')
     });
 
 App::post('/v1/account/verification/phone')
-    ->desc('Create Phone Verification')
+    ->desc('Create phone verification')
     ->groups(['api', 'account'])
     ->label('scope', 'account')
     ->label('event', 'users.[userId].verification.[tokenId].create')
@@ -2964,7 +2964,10 @@ App::post('/v1/account/verification/phone')
         $message = $message->setParam('{{token}}', $secret);
         $message = $message->render();
 
-        $target = $dbForProject->findOne('targets', [Query::equal('identifier', [$user->getAttribute('phone')]), Query::equal('providerInternalId', [$provider->getInternalId()])]);
+        $target = $dbForProject->findOne('targets', [
+            Query::equal('identifier', [$user->getAttribute('phone')]),
+            Query::equal('providerInternalId', [$provider->getInternalId()])
+        ]);
 
         if (!$target) {
             $target = $dbForProject->createDocument('targets', new Document([
@@ -2987,9 +2990,9 @@ App::post('/v1/account/verification/phone')
         ]));
 
         $messaging
-        ->setMessageId($messageDoc->getId())
-        ->setProject($project)
-        ->trigger();
+            ->setMessageId($messageDoc->getId())
+            ->setProject($project)
+            ->trigger();
 
         $events
             ->setParam('userId', $user->getId())
@@ -3009,7 +3012,7 @@ App::post('/v1/account/verification/phone')
     });
 
 App::put('/v1/account/verification/phone')
-    ->desc('Create Phone Verification (confirmation)')
+    ->desc('Create phone verification (confirmation)')
     ->groups(['api', 'account'])
     ->label('scope', 'public')
     ->label('event', 'users.[userId].verification.[tokenId].update')

app/controllers/api/avatars.php

@@ -191,7 +191,7 @@ $getUserGitHub = function (string $userId, Document $project, Database $dbForPro
 };
 
 App::get('/v1/avatars/credit-cards/:code')
-    ->desc('Get Credit Card Icon')
+    ->desc('Get credit card icon')
     ->groups(['api', 'avatars'])
     ->label('scope', 'avatars.read')
     ->label('cache', true)
@@ -211,7 +211,7 @@ App::get('/v1/avatars/credit-cards/:code')
     ->action(fn (string $code, int $width, int $height, int $quality, Response $response) =>  $avatarCallback('credit-cards', $code, $width, $height, $quality, $response));
 
 App::get('/v1/avatars/browsers/:code')
-    ->desc('Get Browser Icon')
+    ->desc('Get browser icon')
     ->groups(['api', 'avatars'])
     ->label('scope', 'avatars.read')
     ->label('cache', true)
@@ -231,7 +231,7 @@ App::get('/v1/avatars/browsers/:code')
     ->action(fn (string $code, int $width, int $height, int $quality, Response $response) => $avatarCallback('browsers', $code, $width, $height, $quality, $response));
 
 App::get('/v1/avatars/flags/:code')
-    ->desc('Get Country Flag')
+    ->desc('Get country flag')
     ->groups(['api', 'avatars'])
     ->label('scope', 'avatars.read')
     ->label('cache', true)
@@ -251,7 +251,7 @@ App::get('/v1/avatars/flags/:code')
     ->action(fn (string $code, int $width, int $height, int $quality, Response $response) => $avatarCallback('flags', $code, $width, $height, $quality, $response));
 
 App::get('/v1/avatars/image')
-    ->desc('Get Image from URL')
+    ->desc('Get image from URL')
     ->groups(['api', 'avatars'])
     ->label('scope', 'avatars.read')
     ->label('cache', true)
@@ -307,7 +307,7 @@ App::get('/v1/avatars/image')
     });
 
 App::get('/v1/avatars/favicon')
-    ->desc('Get Favicon')
+    ->desc('Get favicon')
     ->groups(['api', 'avatars'])
     ->label('scope', 'avatars.read')
     ->label('cache', true)
@@ -449,7 +449,7 @@ App::get('/v1/avatars/favicon')
     });
 
 App::get('/v1/avatars/qr')
-    ->desc('Get QR Code')
+    ->desc('Get QR code')
     ->groups(['api', 'avatars'])
     ->label('scope', 'avatars.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
@@ -489,7 +489,7 @@ App::get('/v1/avatars/qr')
     });
 
 App::get('/v1/avatars/initials')
-    ->desc('Get User Initials')
+    ->desc('Get user initials')
     ->groups(['api', 'avatars'])
     ->label('scope', 'avatars.read')
     ->label('cache.resource', 'avatar/initials')
@@ -509,12 +509,11 @@ App::get('/v1/avatars/initials')
     ->action(function (string $name, int $width, int $height, string $background, Response $response, Document $user) {
 
         $themes = [
-            ['background' => '#FFA1CE'], // Default (Pink)
-            ['background' => '#FDC584'], // Orange
-            ['background' => '#94DBD1'], // Green
-            ['background' => '#A1C4FF'], // Blue
-            ['background' => '#FFA1CE'], // Pink
-            ['background' => '#CBB1FC'] // Purple
+            ['background' => '#FD366E'], // Default (Pink)
+            ['background' => '#FE9567'], // Orange
+            ['background' => '#7C67FE'], // Purple
+            ['background' => '#68A3FE'], // Blue
+            ['background' => '#85DBD8'], // Mint
         ];
 
         $name = (!empty($name)) ? $name : $user->getAttribute('name', $user->getAttribute('email', ''));
@@ -526,11 +525,13 @@ App::get('/v1/avatars/initials')
         $code = 0;
 
         foreach ($words as $key => $w) {
-            $initials .= $w[0] ?? '';
-            $code += (isset($w[0])) ? \ord($w[0]) : 0;
+            if (ctype_alnum($w[0] ?? '')) {
+                $initials .= $w[0];
+                $code += ord($w[0]);
 
-            if ($key == 1) {
-                break;
+                if ($key == 1) {
+                    break;
+                }
             }
         }
 
@@ -548,8 +549,8 @@ App::get('/v1/avatars/initials')
 
         $punch->newImage($width, $height, 'transparent');
 
-        $draw->setFont(__DIR__ . "/../../assets/fonts/poppins-v9-latin-500.ttf");
-        $image->setFont(__DIR__ . "/../../assets/fonts/poppins-v9-latin-500.ttf");
+        $draw->setFont(__DIR__ . "/../../assets/fonts/inter-v8-latin-regular.woff2");
+        $image->setFont(__DIR__ . "/../../assets/fonts/inter-v8-latin-regular.woff2");
 
         $draw->setFillColor(new ImagickPixel('black'));
         $draw->setFontSize($fontSize);
@@ -724,7 +725,7 @@ App::get('/v1/cards/cloud')
 
         $text = new \ImagickDraw();
         $text->setTextAlignment(Imagick::ALIGN_CENTER);
-        $text->setFont(__DIR__ . '/../../../public/fonts/Poppins-Bold.ttf');
+        $text->setFont(__DIR__ . '/../../../public/fonts/Inter-Bold.ttf');
         $text->setFillColor(new \ImagickPixel('#FFFFFF'));
 
         if (\strlen($name) > 32) {
@@ -1108,7 +1109,7 @@ App::get('/v1/cards/cloud-og')
 
         $textName = new \ImagickDraw();
         $textName->setTextAlignment(Imagick::ALIGN_CENTER);
-        $textName->setFont(__DIR__ . '/../../../public/fonts/Poppins-Bold.ttf');
+        $textName->setFont(__DIR__ . '/../../../public/fonts/Inter-Bold.ttf');
         $textName->setFillColor(new \ImagickPixel('#FFFFFF'));
 
         if (\strlen($name) > 32) {

app/controllers/api/console.php

@@ -17,7 +17,7 @@ App::init()
 
 
 App::get('/v1/console/variables')
-    ->desc('Get Variables')
+    ->desc('Get variables')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])

app/controllers/api/databases.php

@@ -371,7 +371,7 @@ function updateAttribute(
 }
 
 App::post('/v1/databases')
-    ->desc('Create Database')
+    ->desc('Create database')
     ->groups(['api', 'database'])
     ->label('event', 'databases.[databaseId].create')
     ->label('scope', 'databases.write')
@@ -448,7 +448,7 @@ App::post('/v1/databases')
     });
 
 App::get('/v1/databases')
-    ->desc('List Databases')
+    ->desc('List databases')
     ->groups(['api', 'database'])
     ->label('scope', 'databases.read')
     ->label('usage.metric', 'databases.{scope}.requests.read')
@@ -496,7 +496,7 @@ App::get('/v1/databases')
     });
 
 App::get('/v1/databases/:databaseId')
-    ->desc('Get Database')
+    ->desc('Get database')
     ->groups(['api', 'database'])
     ->label('scope', 'databases.read')
     ->label('usage.metric', 'databases.{scope}.requests.read')
@@ -522,7 +522,7 @@ App::get('/v1/databases/:databaseId')
     });
 
 App::get('/v1/databases/:databaseId/logs')
-    ->desc('List Database Logs')
+    ->desc('List database logs')
     ->groups(['api', 'database'])
     ->label('scope', 'databases.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -608,7 +608,7 @@ App::get('/v1/databases/:databaseId/logs')
 
 
 App::put('/v1/databases/:databaseId')
-    ->desc('Update Database')
+    ->desc('Update database')
     ->groups(['api', 'database', 'schema'])
     ->label('scope', 'databases.write')
     ->label('event', 'databases.[databaseId].update')
@@ -653,7 +653,7 @@ App::put('/v1/databases/:databaseId')
     });
 
 App::delete('/v1/databases/:databaseId')
-    ->desc('Delete Database')
+    ->desc('Delete database')
     ->groups(['api', 'database', 'schema'])
     ->label('scope', 'databases.write')
     ->label('event', 'databases.[databaseId].delete')
@@ -698,7 +698,7 @@ App::delete('/v1/databases/:databaseId')
     });
 
 App::post('/v1/databases/:databaseId/collections')
-    ->desc('Create Collection')
+    ->desc('Create collection')
     ->groups(['api', 'database'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].create')
     ->label('scope', 'collections.write')
@@ -768,7 +768,7 @@ App::post('/v1/databases/:databaseId/collections')
 
 App::get('/v1/databases/:databaseId/collections')
     ->alias('/v1/database/collections', ['databaseId' => 'default'])
-    ->desc('List Collections')
+    ->desc('List collections')
     ->groups(['api', 'database'])
     ->label('scope', 'collections.read')
     ->label('usage.metric', 'collections.{scope}.requests.read')
@@ -827,7 +827,7 @@ App::get('/v1/databases/:databaseId/collections')
 
 App::get('/v1/databases/:databaseId/collections/:collectionId')
     ->alias('/v1/database/collections/:collectionId', ['databaseId' => 'default'])
-    ->desc('Get Collection')
+    ->desc('Get collection')
     ->groups(['api', 'database'])
     ->label('scope', 'collections.read')
     ->label('usage.metric', 'collections.{scope}.requests.read')
@@ -863,7 +863,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId')
 
 App::get('/v1/databases/:databaseId/collections/:collectionId/logs')
     ->alias('/v1/database/collections/:collectionId/logs', ['databaseId' => 'default'])
-    ->desc('List Collection Logs')
+    ->desc('List collection logs')
     ->groups(['api', 'database'])
     ->label('scope', 'collections.read')
     ->label('usage.metric', 'collections.{scope}.requests.read')
@@ -959,7 +959,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/logs')
 
 App::put('/v1/databases/:databaseId/collections/:collectionId')
     ->alias('/v1/database/collections/:collectionId', ['databaseId' => 'default'])
-    ->desc('Update Collection')
+    ->desc('Update collection')
     ->groups(['api', 'database', 'schema'])
     ->label('scope', 'collections.write')
     ->label('event', 'databases.[databaseId].collections.[collectionId].update')
@@ -1029,7 +1029,7 @@ App::put('/v1/databases/:databaseId/collections/:collectionId')
 
 App::delete('/v1/databases/:databaseId/collections/:collectionId')
     ->alias('/v1/database/collections/:collectionId', ['databaseId' => 'default'])
-    ->desc('Delete Collection')
+    ->desc('Delete collection')
     ->groups(['api', 'database', 'schema'])
     ->label('scope', 'collections.write')
     ->label('event', 'databases.[databaseId].collections.[collectionId].delete')
@@ -1085,7 +1085,7 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId')
 
 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/string')
     ->alias('/v1/database/collections/:collectionId/attributes/string', ['databaseId' => 'default'])
-    ->desc('Create String Attribute')
+    ->desc('Create string attribute')
     ->groups(['api', 'database', 'schema'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
     ->label('scope', 'collections.write')
@@ -1143,7 +1143,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/string
 
 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/email')
     ->alias('/v1/database/collections/:collectionId/attributes/email', ['databaseId' => 'default'])
-    ->desc('Create Email Attribute')
+    ->desc('Create email attribute')
     ->groups(['api', 'database', 'schema'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
     ->label('scope', 'collections.write')
@@ -1187,7 +1187,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/email'
 
 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/enum')
     ->alias('/v1/database/collections/:collectionId/attributes/enum', ['databaseId' => 'default'])
-    ->desc('Create Enum Attribute')
+    ->desc('Create enum attribute')
     ->groups(['api', 'database', 'schema'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
     ->label('scope', 'collections.write')
@@ -1247,7 +1247,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/enum')
 
 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/ip')
     ->alias('/v1/database/collections/:collectionId/attributes/ip', ['databaseId' => 'default'])
-    ->desc('Create IP Address Attribute')
+    ->desc('Create IP address attribute')
     ->groups(['api', 'database', 'schema'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
     ->label('scope', 'collections.write')
@@ -1291,7 +1291,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/ip')
 
 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/url')
     ->alias('/v1/database/collections/:collectionId/attributes/url', ['databaseId' => 'default'])
-    ->desc('Create URL Attribute')
+    ->desc('Create URL attribute')
     ->groups(['api', 'database', 'schema'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
     ->label('scope', 'collections.write')
@@ -1335,7 +1335,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/url')
 
 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/integer')
     ->alias('/v1/database/collections/:collectionId/attributes/integer', ['databaseId' => 'default'])
-    ->desc('Create Integer Attribute')
+    ->desc('Create integer attribute')
     ->groups(['api', 'database', 'schema'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
     ->label('scope', 'collections.write')
@@ -1408,7 +1408,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/intege
 
 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/float')
     ->alias('/v1/database/collections/:collectionId/attributes/float', ['databaseId' => 'default'])
-    ->desc('Create Float Attribute')
+    ->desc('Create float attribute')
     ->groups(['api', 'database', 'schema'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
     ->label('scope', 'collections.write')
@@ -1484,7 +1484,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/float'
 
 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/boolean')
     ->alias('/v1/database/collections/:collectionId/attributes/boolean', ['databaseId' => 'default'])
-    ->desc('Create Boolean Attribute')
+    ->desc('Create boolean attribute')
     ->groups(['api', 'database', 'schema'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
     ->label('scope', 'collections.write')
@@ -1527,7 +1527,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/boolea
 
 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/datetime')
     ->alias('/v1/database/collections/:collectionId/attributes/datetime', ['databaseId' => 'default'])
-    ->desc('Create DateTime Attribute')
+    ->desc('Create datetime attribute')
     ->groups(['api', 'database'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
     ->label('scope', 'collections.write')
@@ -1573,7 +1573,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/dateti
 
 App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/relationship')
     ->alias('/v1/database/collections/:collectionId/attributes/relationship', ['databaseId' => 'default'])
-    ->desc('Create Relationship Attribute')
+    ->desc('Create relationship attribute')
     ->groups(['api', 'database'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].create')
     ->label('scope', 'collections.write')
@@ -1655,7 +1655,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/attributes/relati
 
 App::get('/v1/databases/:databaseId/collections/:collectionId/attributes')
     ->alias('/v1/database/collections/:collectionId/attributes', ['databaseId' => 'default'])
-    ->desc('List Attributes')
+    ->desc('List attributes')
     ->groups(['api', 'database'])
     ->label('scope', 'collections.read')
     ->label('usage.metric', 'collections.{scope}.requests.read')
@@ -1730,7 +1730,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/attributes')
 
 App::get('/v1/databases/:databaseId/collections/:collectionId/attributes/:key')
     ->alias('/v1/database/collections/:collectionId/attributes/:key', ['databaseId' => 'default'])
-    ->desc('Get Attribute')
+    ->desc('Get attribute')
     ->groups(['api', 'database'])
     ->label('scope', 'collections.read')
     ->label('usage.metric', 'collections.{scope}.requests.read')
@@ -1806,7 +1806,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/attributes/:key')
     });
 
 App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/string/:key')
-    ->desc('Update String Attribute')
+    ->desc('Update string attribute')
     ->groups(['api', 'database', 'schema'])
     ->label('scope', 'collections.write')
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
@@ -1847,7 +1847,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/strin
     });
 
 App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/email/:key')
-    ->desc('Update Email Attribute')
+    ->desc('Update email attribute')
     ->groups(['api', 'database', 'schema'])
     ->label('scope', 'collections.write')
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
@@ -1888,7 +1888,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/email
     });
 
 App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/enum/:key')
-    ->desc('Update Enum Attribute')
+    ->desc('Update enum attribute')
     ->groups(['api', 'database', 'schema'])
     ->label('scope', 'collections.write')
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
@@ -1931,7 +1931,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/enum/
     });
 
 App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/ip/:key')
-    ->desc('Update IP Address Attribute')
+    ->desc('Update IP address attribute')
     ->groups(['api', 'database', 'schema'])
     ->label('scope', 'collections.write')
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
@@ -1972,7 +1972,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/ip/:k
     });
 
 App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/url/:key')
-    ->desc('Update URL Attribute')
+    ->desc('Update URL attribute')
     ->groups(['api', 'database', 'schema'])
     ->label('scope', 'collections.write')
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
@@ -2013,7 +2013,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/url/:
     });
 
 App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/integer/:key')
-    ->desc('Update Integer Attribute')
+    ->desc('Update integer attribute')
     ->groups(['api', 'database', 'schema'])
     ->label('scope', 'collections.write')
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
@@ -2064,7 +2064,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/integ
     });
 
 App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/float/:key')
-    ->desc('Update Float Attribute')
+    ->desc('Update float attribute')
     ->groups(['api', 'database', 'schema'])
     ->label('scope', 'collections.write')
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
@@ -2115,7 +2115,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/float
     });
 
 App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/boolean/:key')
-    ->desc('Update Boolean Attribute')
+    ->desc('Update boolean attribute')
     ->groups(['api', 'database', 'schema'])
     ->label('scope', 'collections.write')
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
@@ -2155,7 +2155,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/boole
     });
 
 App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/datetime/:key')
-    ->desc('Update DateTime Attribute')
+    ->desc('Update dateTime attribute')
     ->groups(['api', 'database', 'schema'])
     ->label('scope', 'collections.write')
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
@@ -2195,7 +2195,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/datet
     });
 
 App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/:key/relationship')
-    ->desc('Update Relationship Attribute')
+    ->desc('Update relationship attribute')
     ->groups(['api', 'database', 'schema'])
     ->label('scope', 'collections.write')
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].update')
@@ -2251,7 +2251,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/attributes/:key/
 
 App::delete('/v1/databases/:databaseId/collections/:collectionId/attributes/:key')
     ->alias('/v1/database/collections/:collectionId/attributes/:key', ['databaseId' => 'default'])
-    ->desc('Delete Attribute')
+    ->desc('Delete attribute')
     ->groups(['api', 'database', 'schema'])
     ->label('scope', 'collections.write')
     ->label('event', 'databases.[databaseId].collections.[collectionId].attributes.[attributeId].delete')
@@ -2362,7 +2362,7 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/attributes/:key
 
 App::post('/v1/databases/:databaseId/collections/:collectionId/indexes')
     ->alias('/v1/database/collections/:collectionId/indexes', ['databaseId' => 'default'])
-    ->desc('Create Index')
+    ->desc('Create index')
     ->groups(['api', 'database'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].indexes.[indexId].create')
     ->label('scope', 'collections.write')
@@ -2522,7 +2522,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/indexes')
 
 App::get('/v1/databases/:databaseId/collections/:collectionId/indexes')
     ->alias('/v1/database/collections/:collectionId/indexes', ['databaseId' => 'default'])
-    ->desc('List Indexes')
+    ->desc('List indexes')
     ->groups(['api', 'database'])
     ->label('scope', 'collections.read')
     ->label('usage.metric', 'collections.{scope}.requests.read')
@@ -2587,7 +2587,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/indexes')
 
 App::get('/v1/databases/:databaseId/collections/:collectionId/indexes/:key')
     ->alias('/v1/database/collections/:collectionId/indexes/:key', ['databaseId' => 'default'])
-    ->desc('Get Index')
+    ->desc('Get index')
     ->groups(['api', 'database'])
     ->label('scope', 'collections.read')
     ->label('usage.metric', 'collections.{scope}.requests.read')
@@ -2628,7 +2628,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/indexes/:key')
 
 App::delete('/v1/databases/:databaseId/collections/:collectionId/indexes/:key')
     ->alias('/v1/database/collections/:collectionId/indexes/:key', ['databaseId' => 'default'])
-    ->desc('Delete Index')
+    ->desc('Delete index')
     ->groups(['api', 'database'])
     ->label('scope', 'collections.write')
     ->label('event', 'databases.[databaseId].collections.[collectionId].indexes.[indexId].delete')
@@ -2694,7 +2694,7 @@ App::delete('/v1/databases/:databaseId/collections/:collectionId/indexes/:key')
 
 App::post('/v1/databases/:databaseId/collections/:collectionId/documents')
     ->alias('/v1/database/collections/:collectionId/documents', ['databaseId' => 'default'])
-    ->desc('Create Document')
+    ->desc('Create document')
     ->groups(['api', 'database'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].documents.[documentId].create')
     ->label('scope', 'documents.write')
@@ -2934,7 +2934,7 @@ App::post('/v1/databases/:databaseId/collections/:collectionId/documents')
 
 App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
     ->alias('/v1/database/collections/:collectionId/documents', ['databaseId' => 'default'])
-    ->desc('List Documents')
+    ->desc('List documents')
     ->groups(['api', 'database'])
     ->label('scope', 'documents.read')
     ->label('usage.metric', 'documents.{scope}.requests.read')
@@ -3061,7 +3061,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents')
 
 App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documentId')
     ->alias('/v1/database/collections/:collectionId/documents/:documentId', ['databaseId' => 'default'])
-    ->desc('Get Document')
+    ->desc('Get document')
     ->groups(['api', 'database'])
     ->label('scope', 'documents.read')
     ->label('usage.metric', 'documents.{scope}.requests.read')
@@ -3156,7 +3156,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen
 
 App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documentId/logs')
     ->alias('/v1/database/collections/:collectionId/documents/:documentId/logs', ['databaseId' => 'default'])
-    ->desc('List Document Logs')
+    ->desc('List document logs')
     ->groups(['api', 'database'])
     ->label('scope', 'documents.read')
     ->label('usage.metric', 'documents.{scope}.requests.read')
@@ -3257,7 +3257,7 @@ App::get('/v1/databases/:databaseId/collections/:collectionId/documents/:documen
 
 App::patch('/v1/databases/:databaseId/collections/:collectionId/documents/:documentId')
     ->alias('/v1/database/collections/:collectionId/documents/:documentId', ['databaseId' => 'default'])
-    ->desc('Update Document')
+    ->desc('Update document')
     ->groups(['api', 'database'])
     ->label('event', 'databases.[databaseId].collections.[collectionId].documents.[documentId].update')
     ->label('scope', 'documents.write')
@@ -3486,7 +3486,7 @@ App::patch('/v1/databases/:databaseId/collections/:collectionId/documents/:docum
 
 App::delete('/v1/databases/:databaseId/collections/:collectionId/documents/:documentId')
     ->alias('/v1/database/collections/:collectionId/documents/:documentId', ['databaseId' => 'default'])
-    ->desc('Delete Document')
+    ->desc('Delete document')
     ->groups(['api', 'database'])
     ->label('scope', 'documents.write')
     ->label('event', 'databases.[databaseId].collections.[collectionId].documents.[documentId].delete')

app/controllers/api/functions.php

@@ -7,7 +7,7 @@ use Appwrite\Event\Delete;
 use Appwrite\Event\Event;
 use Appwrite\Event\Func;
 use Appwrite\Event\Usage;
-use Appwrite\Event\Validator\Event as ValidatorEvent;
+use Appwrite\Event\Validator\FunctionEvent;
 use Appwrite\Utopia\Response\Model\Rule;
 use Appwrite\Extend\Exception;
 use Appwrite\Utopia\Database\Validator\CustomId;
@@ -84,6 +84,7 @@ $redeployVcs = function (Request $request, Document $function, Document $project
             Permission::delete(Role::any()),
         ],
         'resourceId' => $function->getId(),
+        'resourceInternalId' => $function->getInternalId(),
         'resourceType' => 'functions',
         'entrypoint' => $entrypoint,
         'commands' => $function->getAttribute('commands', ''),
@@ -120,7 +121,7 @@ $redeployVcs = function (Request $request, Document $function, Document $project
 
 App::post('/v1/functions')
     ->groups(['api', 'functions'])
-    ->desc('Create Function')
+    ->desc('Create function')
     ->label('scope', 'functions.write')
     ->label('event', 'functions.[functionId].create')
     ->label('audits.event', 'function.create')
@@ -136,7 +137,7 @@ App::post('/v1/functions')
     ->param('name', '', new Text(128), 'Function name. Max length: 128 chars.')
     ->param('runtime', '', new WhiteList(array_keys(Config::getParam('runtimes')), true), 'Execution runtime.')
     ->param('execute', [], new Roles(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of role strings with execution permissions. By default no user is granted with any execute permissions. [learn more about roles](https://appwrite.io/docs/permissions#permission-roles). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 64 characters long.', true)
-    ->param('events', [], new ArrayList(new ValidatorEvent(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Events list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' events are allowed.', true)
+    ->param('events', [], new ArrayList(new FunctionEvent(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Events list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' events are allowed.', true)
     ->param('schedule', '', new Cron(), 'Schedule CRON syntax.', true)
     ->param('timeout', 15, new Range(1, (int) App::getEnv('_APP_FUNCTIONS_TIMEOUT', 900)), 'Function maximum execution time in seconds.', true)
     ->param('enabled', true, new Boolean(), 'Is function enabled? When set to \'disabled\', users cannot access the function but Server SDKs with and API key can still access the function. No data is lost when this is toggled.', true)
@@ -334,7 +335,7 @@ App::post('/v1/functions')
 
 App::get('/v1/functions')
     ->groups(['api', 'functions'])
-    ->desc('List Functions')
+    ->desc('List functions')
     ->label('scope', 'functions.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'functions')
@@ -409,7 +410,7 @@ App::get('/v1/functions/runtimes')
 
 App::get('/v1/functions/:functionId')
     ->groups(['api', 'functions'])
-    ->desc('Get Function')
+    ->desc('Get function')
     ->label('scope', 'functions.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'functions')
@@ -432,7 +433,7 @@ App::get('/v1/functions/:functionId')
     });
 
 App::get('/v1/functions/:functionId/usage')
-    ->desc('Get Function Usage')
+    ->desc('Get function usage')
     ->groups(['api', 'functions', 'usage'])
     ->label('scope', 'functions.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -542,7 +543,7 @@ App::get('/v1/functions/:functionId/usage')
     });
 
 App::get('/v1/functions/usage')
-    ->desc('Get Functions Usage')
+    ->desc('Get functions usage')
     ->groups(['api', 'functions', 'usage'])
     ->label('scope', 'functions.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -646,7 +647,7 @@ App::get('/v1/functions/usage')
 
 App::put('/v1/functions/:functionId')
     ->groups(['api', 'functions'])
-    ->desc('Update Function')
+    ->desc('Update function')
     ->label('scope', 'functions.write')
     ->label('event', 'functions.[functionId].update')
     ->label('audits.event', 'function.update')
@@ -662,7 +663,7 @@ App::put('/v1/functions/:functionId')
     ->param('name', '', new Text(128), 'Function name. Max length: 128 chars.')
     ->param('runtime', '', new WhiteList(array_keys(Config::getParam('runtimes')), true), 'Execution runtime.', true)
     ->param('execute', [], new Roles(APP_LIMIT_ARRAY_PARAMS_SIZE), 'An array of role strings with execution permissions. By default no user is granted with any execute permissions. [learn more about roles](https://appwrite.io/docs/permissions#permission-roles). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' roles are allowed, each 64 characters long.', true)
-    ->param('events', [], new ArrayList(new ValidatorEvent(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Events list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' events are allowed.', true)
+    ->param('events', [], new ArrayList(new FunctionEvent(), APP_LIMIT_ARRAY_PARAMS_SIZE), 'Events list. Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' events are allowed.', true)
     ->param('schedule', '', new Cron(), 'Schedule CRON syntax.', true)
     ->param('timeout', 15, new Range(1, (int) App::getEnv('_APP_FUNCTIONS_TIMEOUT', 900)), 'Maximum execution time in seconds.', true)
     ->param('enabled', true, new Boolean(), 'Is function enabled? When set to \'disabled\', users cannot access the function but Server SDKs with and API key can still access the function. No data is lost when this is toggled.', true)
@@ -911,7 +912,7 @@ App::get('/v1/functions/:functionId/deployments/:deploymentId/download')
 
 App::patch('/v1/functions/:functionId/deployments/:deploymentId')
     ->groups(['api', 'functions'])
-    ->desc('Update Function Deployment')
+    ->desc('Update function deployment')
     ->label('scope', 'functions.write')
     ->label('event', 'functions.[functionId].deployments.[deploymentId].update')
     ->label('audits.event', 'deployment.update')
@@ -973,7 +974,7 @@ App::patch('/v1/functions/:functionId/deployments/:deploymentId')
 
 App::delete('/v1/functions/:functionId')
     ->groups(['api', 'functions'])
-    ->desc('Delete Function')
+    ->desc('Delete function')
     ->label('scope', 'functions.write')
     ->label('event', 'functions.[functionId].delete')
     ->label('audits.event', 'function.delete')
@@ -1020,7 +1021,7 @@ App::delete('/v1/functions/:functionId')
 
 App::post('/v1/functions/:functionId/deployments')
     ->groups(['api', 'functions'])
-    ->desc('Create Deployment')
+    ->desc('Create deployment')
     ->label('scope', 'functions.write')
     ->label('event', 'functions.[functionId].deployments.[deploymentId].create')
     ->label('audits.event', 'deployment.create')
@@ -1079,7 +1080,7 @@ App::post('/v1/functions/:functionId/deployments')
         }
 
         $fileExt = new FileExt([FileExt::TYPE_GZIP]);
-        $fileSizeValidator = new FileSize(App::getEnv('_APP_FUNCTIONS_SIZE_LIMIT', 0));
+        $fileSizeValidator = new FileSize(App::getEnv('_APP_FUNCTIONS_SIZE_LIMIT', '30000000'));
         $upload = new Upload();
 
         // Make sure we handle a single file and multiple files the same way
@@ -1239,7 +1240,7 @@ App::post('/v1/functions/:functionId/deployments')
 
 App::get('/v1/functions/:functionId/deployments')
     ->groups(['api', 'functions'])
-    ->desc('List Deployments')
+    ->desc('List deployments')
     ->label('scope', 'functions.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'functions')
@@ -1309,7 +1310,7 @@ App::get('/v1/functions/:functionId/deployments')
 
 App::get('/v1/functions/:functionId/deployments/:deploymentId')
     ->groups(['api', 'functions'])
-    ->desc('Get Deployment')
+    ->desc('Get deployment')
     ->label('scope', 'functions.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'functions')
@@ -1351,7 +1352,7 @@ App::get('/v1/functions/:functionId/deployments/:deploymentId')
 
 App::delete('/v1/functions/:functionId/deployments/:deploymentId')
     ->groups(['api', 'functions'])
-    ->desc('Delete Deployment')
+    ->desc('Delete deployment')
     ->label('scope', 'functions.write')
     ->label('event', 'functions.[functionId].deployments.[deploymentId].delete')
     ->label('audits.event', 'deployment.delete')
@@ -1415,7 +1416,7 @@ App::delete('/v1/functions/:functionId/deployments/:deploymentId')
 
 App::post('/v1/functions/:functionId/deployments/:deploymentId/builds/:buildId')
     ->groups(['api', 'functions'])
-    ->desc('Create Build')
+    ->desc('Create build')
     ->label('scope', 'functions.write')
     ->label('event', 'functions.[functionId].deployments.[deploymentId].update')
     ->label('audits.event', 'deployment.update')
@@ -1484,7 +1485,7 @@ App::post('/v1/functions/:functionId/deployments/:deploymentId/builds/:buildId')
 
 App::post('/v1/functions/:functionId/executions')
     ->groups(['api', 'functions'])
-    ->desc('Create Execution')
+    ->desc('Create execution')
     ->label('scope', 'execution.write')
     ->label('event', 'functions.[functionId].executions.[executionId].create')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
@@ -1495,7 +1496,7 @@ App::post('/v1/functions/:functionId/executions')
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_EXECUTION)
     ->param('functionId', '', new UID(), 'Function ID.')
-    ->param('body', '', new Text(8192, 0), 'HTTP body of execution. Default value is empty string.', true)
+    ->param('body', '', new Text(0, 0), 'HTTP body of execution. Default value is empty string.', true)
     ->param('async', false, new Boolean(), 'Execute code in the background. Default value is false.', true)
     ->param('path', '/', new Text(2048), 'HTTP path of execution. Path can include query params. Default value is /', true)
     ->param('method', 'POST', new Whitelist(['GET', 'POST', 'PUT', 'PATCH', 'DELETE', 'OPTIONS'], true), 'HTTP method of execution. Default value is GET.', true)
@@ -1707,7 +1708,8 @@ App::post('/v1/functions/:functionId/executions')
                 path: $path,
                 method: $method,
                 headers: $headers,
-                runtimeEntrypoint: $command
+                runtimeEntrypoint: $command,
+                requestTimeout: 30
             );
 
             $headersFiltered = [];
@@ -1773,7 +1775,7 @@ App::post('/v1/functions/:functionId/executions')
 
 App::get('/v1/functions/:functionId/executions')
     ->groups(['api', 'functions'])
-    ->desc('List Executions')
+    ->desc('List executions')
     ->label('scope', 'execution.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'functions')
@@ -1848,7 +1850,7 @@ App::get('/v1/functions/:functionId/executions')
 
 App::get('/v1/functions/:functionId/executions/:executionId')
     ->groups(['api', 'functions'])
-    ->desc('Get Execution')
+    ->desc('Get execution')
     ->label('scope', 'execution.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
     ->label('sdk.namespace', 'functions')
@@ -1896,7 +1898,7 @@ App::get('/v1/functions/:functionId/executions/:executionId')
 // Variables
 
 App::post('/v1/functions/:functionId/variables')
-    ->desc('Create Variable')
+    ->desc('Create variable')
     ->groups(['api', 'functions'])
     ->label('scope', 'functions.write')
     ->label('audits.event', 'variable.create')
@@ -1960,7 +1962,7 @@ App::post('/v1/functions/:functionId/variables')
     });
 
 App::get('/v1/functions/:functionId/variables')
-    ->desc('List Variables')
+    ->desc('List variables')
     ->groups(['api', 'functions'])
     ->label('scope', 'functions.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -1987,7 +1989,7 @@ App::get('/v1/functions/:functionId/variables')
     });
 
 App::get('/v1/functions/:functionId/variables/:variableId')
-    ->desc('Get Variable')
+    ->desc('Get variable')
     ->groups(['api', 'functions'])
     ->label('scope', 'functions.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -2026,7 +2028,7 @@ App::get('/v1/functions/:functionId/variables/:variableId')
     });
 
 App::put('/v1/functions/:functionId/variables/:variableId')
-    ->desc('Update Variable')
+    ->desc('Update variable')
     ->groups(['api', 'functions'])
     ->label('scope', 'functions.write')
     ->label('audits.event', 'variable.update')
@@ -2087,7 +2089,7 @@ App::put('/v1/functions/:functionId/variables/:variableId')
     });
 
 App::delete('/v1/functions/:functionId/variables/:variableId')
-    ->desc('Delete Variable')
+    ->desc('Delete variable')
     ->groups(['api', 'functions'])
     ->label('scope', 'functions.write')
     ->label('audits.event', 'variable.delete')

app/controllers/api/graphql.php

@@ -18,7 +18,7 @@ use Utopia\Validator\JSON;
 use Utopia\Validator\Text;
 
 App::get('/v1/graphql')
-    ->desc('GraphQL Endpoint')
+    ->desc('GraphQL endpoint')
     ->groups(['graphql'])
     ->label('scope', 'graphql')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
@@ -58,7 +58,7 @@ App::get('/v1/graphql')
     });
 
 App::post('/v1/graphql/mutation')
-    ->desc('GraphQL Endpoint')
+    ->desc('GraphQL endpoint')
     ->groups(['graphql'])
     ->label('scope', 'graphql')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
@@ -103,7 +103,7 @@ App::post('/v1/graphql/mutation')
     });
 
 App::post('/v1/graphql')
-    ->desc('GraphQL Endpoint')
+    ->desc('GraphQL endpoint')
     ->groups(['graphql'])
     ->label('scope', 'graphql')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])

app/controllers/api/health.php

@@ -39,7 +39,7 @@ App::get('/v1/health')
     });
 
 App::get('/v1/health/version')
-    ->desc('Get Version')
+    ->desc('Get version')
     ->groups(['api', 'health'])
     ->label('scope', 'public')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
@@ -109,7 +109,7 @@ App::get('/v1/health/db')
     });
 
 App::get('/v1/health/cache')
-    ->desc('Get Cache')
+    ->desc('Get cache')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -166,7 +166,7 @@ App::get('/v1/health/cache')
     });
 
 App::get('/v1/health/queue')
-    ->desc('Get Queue')
+    ->desc('Get queue')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -223,7 +223,7 @@ App::get('/v1/health/queue')
     });
 
 App::get('/v1/health/pubsub')
-    ->desc('Get PubSub')
+    ->desc('Get pubsub')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -280,7 +280,7 @@ App::get('/v1/health/pubsub')
     });
 
 App::get('/v1/health/time')
-    ->desc('Get Time')
+    ->desc('Get time')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -337,7 +337,7 @@ App::get('/v1/health/time')
     });
 
 App::get('/v1/health/queue/webhooks')
-    ->desc('Get Webhooks Queue')
+    ->desc('Get webhooks queue')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -354,7 +354,7 @@ App::get('/v1/health/queue/webhooks')
     }, ['response']);
 
 App::get('/v1/health/queue/logs')
-    ->desc('Get Logs Queue')
+    ->desc('Get logs queue')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -371,7 +371,7 @@ App::get('/v1/health/queue/logs')
     }, ['response']);
 
 App::get('/v1/health/queue/certificates')
-    ->desc('Get Certificates Queue')
+    ->desc('Get certificates queue')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -387,8 +387,110 @@ App::get('/v1/health/queue/certificates')
         $response->dynamic(new Document([ 'size' => Resque::size(Event::CERTIFICATES_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
     }, ['response']);
 
+App::get('/v1/health/queue/builds')
+    ->desc('Get builds queue')
+    ->groups(['api', 'health'])
+    ->label('scope', 'health.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getQueueBuilds')
+    ->label('sdk.description', '/docs/references/health/get-queue-builds.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
+    ->inject('response')
+    ->action(function (Response $response) {
+
+        $response->dynamic(new Document([ 'size' => Resque::size(Event::BUILDS_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
+    }, ['response']);
+
+App::get('/v1/health/queue/databases')
+    ->desc('Get databases queue')
+    ->groups(['api', 'health'])
+    ->label('scope', 'health.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getQueueDatabases')
+    ->label('sdk.description', '/docs/references/health/get-queue-databases.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
+    ->inject('response')
+    ->action(function (Response $response) {
+
+        $response->dynamic(new Document([ 'size' => Resque::size(Event::DATABASE_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
+    }, ['response']);
+
+App::get('/v1/health/queue/deletes')
+    ->desc('Get deletes queue')
+    ->groups(['api', 'health'])
+    ->label('scope', 'health.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getQueueDeletes')
+    ->label('sdk.description', '/docs/references/health/get-queue-deletes.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
+    ->inject('response')
+    ->action(function (Response $response) {
+
+        $response->dynamic(new Document([ 'size' => Resque::size(Event::DELETE_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
+    }, ['response']);
+
+App::get('/v1/health/queue/mails')
+    ->desc('Get mails queue')
+    ->groups(['api', 'health'])
+    ->label('scope', 'health.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getQueueMails')
+    ->label('sdk.description', '/docs/references/health/get-queue-mails.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
+    ->inject('response')
+    ->action(function (Response $response) {
+
+        $response->dynamic(new Document([ 'size' => Resque::size(Event::MAILS_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
+    }, ['response']);
+
+App::get('/v1/health/queue/messaging')
+    ->desc('Get messaging queue')
+    ->groups(['api', 'health'])
+    ->label('scope', 'health.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getQueueMessaging')
+    ->label('sdk.description', '/docs/references/health/get-queue-messaging.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
+    ->inject('response')
+    ->action(function (Response $response) {
+
+        $response->dynamic(new Document([ 'size' => Resque::size(Event::MESSAGING_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
+    }, ['response']);
+
+App::get('/v1/health/queue/migrations')
+    ->desc('Get migrations queue')
+    ->groups(['api', 'health'])
+    ->label('scope', 'health.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'health')
+    ->label('sdk.method', 'getQueueMigrations')
+    ->label('sdk.description', '/docs/references/health/get-queue-migrations.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_HEALTH_QUEUE)
+    ->inject('response')
+    ->action(function (Response $response) {
+
+        $response->dynamic(new Document([ 'size' => Resque::size(Event::MIGRATIONS_QUEUE_NAME) ]), Response::MODEL_HEALTH_QUEUE);
+    }, ['response']);
+
 App::get('/v1/health/queue/functions')
-    ->desc('Get Functions Queue')
+    ->desc('Get functions queue')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -406,7 +508,7 @@ App::get('/v1/health/queue/functions')
     }, ['response']);
 
 App::get('/v1/health/storage/local')
-    ->desc('Get Local Storage')
+    ->desc('Get local storage')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -449,7 +551,7 @@ App::get('/v1/health/storage/local')
     });
 
 App::get('/v1/health/anti-virus')
-    ->desc('Get Antivirus')
+    ->desc('Get antivirus')
     ->groups(['api', 'health'])
     ->label('scope', 'health.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_KEY])
@@ -488,7 +590,7 @@ App::get('/v1/health/anti-virus')
     });
 
 App::get('/v1/health/stats') // Currently only used internally
-    ->desc('Get System Stats')
+    ->desc('Get system stats')
     ->groups(['api', 'health'])
     ->label('scope', 'root')
     // ->label('sdk.auth', [APP_AUTH_TYPE_KEY])

app/controllers/api/locale.php

@@ -9,7 +9,7 @@ use Utopia\Database\Document;
 use Utopia\Locale\Locale;
 
 App::get('/v1/locale')
-    ->desc('Get User Locale')
+    ->desc('Get user locale')
     ->groups(['api', 'locale'])
     ->label('scope', 'locale.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
@@ -91,7 +91,7 @@ App::get('/v1/locale/codes')
     });
 
 App::get('/v1/locale/countries')
-    ->desc('List Countries')
+    ->desc('List countries')
     ->groups(['api', 'locale'])
     ->label('scope', 'locale.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
@@ -124,7 +124,7 @@ App::get('/v1/locale/countries')
     });
 
 App::get('/v1/locale/countries/eu')
-    ->desc('List EU Countries')
+    ->desc('List EU countries')
     ->groups(['api', 'locale'])
     ->label('scope', 'locale.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
@@ -159,7 +159,7 @@ App::get('/v1/locale/countries/eu')
     });
 
 App::get('/v1/locale/countries/phones')
-    ->desc('List Countries Phone Codes')
+    ->desc('List countries phone codes')
     ->groups(['api', 'locale'])
     ->label('scope', 'locale.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
@@ -193,7 +193,7 @@ App::get('/v1/locale/countries/phones')
     });
 
 App::get('/v1/locale/continents')
-    ->desc('List Continents')
+    ->desc('List continents')
     ->groups(['api', 'locale'])
     ->label('scope', 'locale.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
@@ -225,7 +225,7 @@ App::get('/v1/locale/continents')
     });
 
 App::get('/v1/locale/currencies')
-    ->desc('List Currencies')
+    ->desc('List currencies')
     ->groups(['api', 'locale'])
     ->label('scope', 'locale.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
@@ -248,7 +248,7 @@ App::get('/v1/locale/currencies')
 
 
 App::get('/v1/locale/languages')
-    ->desc('List Languages')
+    ->desc('List languages')
     ->groups(['api', 'locale'])
     ->label('scope', 'locale.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])

app/controllers/api/messaging.php

@@ -22,6 +22,7 @@ use Utopia\Validator\Boolean;
 use Utopia\Validator\JSON;
 use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;
+use Utopia\Database\DateTime;
 
 App::post('/v1/messaging/providers/mailgun')
     ->desc('Create Mailgun Provider')
@@ -70,8 +71,8 @@ App::post('/v1/messaging/providers/mailgun')
         // Check if a default provider exists, if not, set this one as default
         if (
             empty($dbForProject->findOne('providers', [
-            Query::equal('default', [true]),
-            Query::equal('type', ['email'])
+                Query::equal('default', [true]),
+                Query::equal('type', ['email'])
             ]))
         ) {
             $provider->setAttribute('default', true);
@@ -80,7 +81,7 @@ App::post('/v1/messaging/providers/mailgun')
         try {
             $provider = $dbForProject->createDocument('providers', $provider);
         } catch (DuplicateException) {
-            throw new Exception(Exception::PROVIDER_ALREADY_EXISTS, 'Provider already exists.');
+            throw new Exception(Exception::PROVIDER_ALREADY_EXISTS);
         }
 
         $response
@@ -127,8 +128,8 @@ App::post('/v1/messaging/providers/sendgrid')
         // Check if a default provider exists, if not, set this one as default
         if (
             empty($dbForProject->findOne('providers', [
-            Query::equal('default', [true]),
-            Query::equal('type', ['sms'])
+                Query::equal('default', [true]),
+                Query::equal('type', ['sms'])
             ]))
         ) {
             $provider->setAttribute('default', true);
@@ -137,7 +138,7 @@ App::post('/v1/messaging/providers/sendgrid')
         try {
             $provider = $dbForProject->createDocument('providers', $provider);
         } catch (DuplicateException) {
-            throw new Exception(Exception::PROVIDER_ALREADY_EXISTS, 'Provider already exists.');
+            throw new Exception(Exception::PROVIDER_ALREADY_EXISTS);
         }
 
         $response
@@ -199,13 +200,14 @@ App::post('/v1/messaging/providers/msg91')
         try {
             $provider = $dbForProject->createDocument('providers', $provider);
         } catch (DuplicateException) {
-            throw new Exception(Exception::PROVIDER_ALREADY_EXISTS, 'Provider already exists.');
+            throw new Exception(Exception::PROVIDER_ALREADY_EXISTS);
         }
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
             ->dynamic($provider, Response::MODEL_PROVIDER);
     });
+
 App::post('/v1/messaging/providers/telesign')
     ->desc('Create Telesign Provider')
     ->groups(['api', 'messaging'])
@@ -246,8 +248,8 @@ App::post('/v1/messaging/providers/telesign')
         // Check if a default provider exists, if not, set this one as default
         if (
             empty($dbForProject->findOne('providers', [
-            Query::equal('default', [true]),
-            Query::equal('type', ['sms'])
+                Query::equal('default', [true]),
+                Query::equal('type', ['sms'])
             ]))
         ) {
             $provider->setAttribute('default', true);
@@ -256,7 +258,7 @@ App::post('/v1/messaging/providers/telesign')
         try {
             $provider = $dbForProject->createDocument('providers', $provider);
         } catch (DuplicateException) {
-            throw new Exception(Exception::PROVIDER_ALREADY_EXISTS, 'Provider already exists.');
+            throw new Exception(Exception::PROVIDER_ALREADY_EXISTS);
         }
 
         $response
@@ -304,8 +306,8 @@ App::post('/v1/messaging/providers/textmagic')
         // Check if a default provider exists, if not, set this one as default
         if (
             empty($dbForProject->findOne('providers', [
-            Query::equal('default', [true]),
-            Query::equal('type', ['sms'])
+                Query::equal('default', [true]),
+                Query::equal('type', ['sms'])
             ]))
         ) {
             $provider->setAttribute('default', true);
@@ -314,7 +316,7 @@ App::post('/v1/messaging/providers/textmagic')
         try {
             $provider = $dbForProject->createDocument('providers', $provider);
         } catch (DuplicateException) {
-            throw new Exception(Exception::PROVIDER_ALREADY_EXISTS, 'Provider already exists.');
+            throw new Exception(Exception::PROVIDER_ALREADY_EXISTS);
         }
 
         $response
@@ -362,8 +364,8 @@ App::post('/v1/messaging/providers/twilio')
         // Check if a default provider exists, if not, set this one as default
         if (
             empty($dbForProject->findOne('providers', [
-            Query::equal('default', [true]),
-            Query::equal('type', ['sms'])
+                Query::equal('default', [true]),
+                Query::equal('type', ['sms'])
             ]))
         ) {
             $provider->setAttribute('default', true);
@@ -372,7 +374,7 @@ App::post('/v1/messaging/providers/twilio')
         try {
             $provider = $dbForProject->createDocument('providers', $provider);
         } catch (DuplicateException) {
-            throw new Exception(Exception::PROVIDER_ALREADY_EXISTS, 'Provider already exists.');
+            throw new Exception(Exception::PROVIDER_ALREADY_EXISTS);
         }
 
         $response
@@ -420,7 +422,7 @@ App::post('/v1/messaging/providers/vonage')
         // Check if a default provider exists, if not, set this one as default
         if (
             empty($dbForProject->findOne('providers', [
-            Query::equal('default', [true]),
+                Query::equal('default', [true]),
                 Query::equal('type', ['sms'])
             ]))
         ) {
@@ -430,7 +432,7 @@ App::post('/v1/messaging/providers/vonage')
         try {
             $provider = $dbForProject->createDocument('providers', $provider);
         } catch (DuplicateException) {
-            throw new Exception(Exception::PROVIDER_ALREADY_EXISTS, 'Provider already exists.');
+            throw new Exception(Exception::PROVIDER_ALREADY_EXISTS);
         }
 
         $response
@@ -446,7 +448,7 @@ App::post('/v1/messaging/providers/fcm')
     ->label('scope', 'providers.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'messaging')
-    ->label('sdk.method', 'createFCMProvider')
+    ->label('sdk.method', 'createFcmProvider')
     ->label('sdk.description', '/docs/references/messaging/create-fcm-provider.md')
     ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
@@ -476,8 +478,8 @@ App::post('/v1/messaging/providers/fcm')
         // Check if a default provider exists, if not, set this one as default
         if (
             empty($dbForProject->findOne('providers', [
-            Query::equal('default', [true]),
-            Query::equal('type', ['push'])
+                Query::equal('default', [true]),
+                Query::equal('type', ['push'])
             ]))
         ) {
             $provider->setAttribute('default', true);
@@ -486,7 +488,7 @@ App::post('/v1/messaging/providers/fcm')
         try {
             $provider = $dbForProject->createDocument('providers', $provider);
         } catch (DuplicateException) {
-            throw new Exception(Exception::PROVIDER_ALREADY_EXISTS, 'Provider already exists.');
+            throw new Exception(Exception::PROVIDER_ALREADY_EXISTS);
         }
 
         $response
@@ -502,7 +504,7 @@ App::post('/v1/messaging/providers/apns')
     ->label('scope', 'providers.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'messaging')
-    ->label('sdk.method', 'createAPNSProvider')
+    ->label('sdk.method', 'createApnsProvider')
     ->label('sdk.description', '/docs/references/messaging/create-apns-provider.md')
     ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
@@ -540,8 +542,8 @@ App::post('/v1/messaging/providers/apns')
         // Check if a default provider exists, if not, set this one as default
         if (
             empty($dbForProject->findOne('providers', [
-            Query::equal('default', [true]),
-            Query::equal('type', ['push'])
+                Query::equal('default', [true]),
+                Query::equal('type', ['push'])
             ]))
         ) {
             $provider->setAttribute('default', true);
@@ -550,7 +552,7 @@ App::post('/v1/messaging/providers/apns')
         try {
             $provider = $dbForProject->createDocument('providers', $provider);
         } catch (DuplicateException) {
-            throw new Exception(Exception::PROVIDER_ALREADY_EXISTS, 'Provider already exists.');
+            throw new Exception(Exception::PROVIDER_ALREADY_EXISTS);
         }
 
         $response
@@ -585,11 +587,11 @@ App::get('/v1/messaging/providers')
                 Query::equal('$id', [$providerId]),
             ]));
 
-            if (empty($cursorDocument) || $cursorDocument[0]->isEmpty()) {
+            if ($cursorDocument === false || $cursorDocument->isEmpty()) {
                 throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Provider '{$providerId}' for the 'cursor' value not found.");
             }
 
-            $cursor->setValue($cursorDocument[0]);
+            $cursor->setValue($cursorDocument);
         }
 
         $filterQueries = Query::groupByType($queries)['filters'];
@@ -599,7 +601,7 @@ App::get('/v1/messaging/providers')
         ]), Response::MODEL_PROVIDER_LIST);
     });
 
-App::get('/v1/messaging/providers/:id')
+App::get('/v1/messaging/providers/:providerId')
     ->desc('Get Provider')
     ->groups(['api', 'messaging'])
     ->label('scope', 'providers.read')
@@ -610,11 +612,11 @@ App::get('/v1/messaging/providers/:id')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_PROVIDER)
-    ->param('id', '', new UID(), 'Provider ID.')
+    ->param('providerId', '', new UID(), 'Provider ID.')
     ->inject('dbForProject')
     ->inject('response')
-    ->action(function (string $id, Database $dbForProject, Response $response) {
-        $provider = $dbForProject->getDocument('providers', $id);
+    ->action(function (string $providerId, Database $dbForProject, Response $response) {
+        $provider = $dbForProject->getDocument('providers', $providerId);
 
         if ($provider->isEmpty()) {
             throw new Exception(Exception::PROVIDER_NOT_FOUND);
@@ -623,7 +625,7 @@ App::get('/v1/messaging/providers/:id')
         $response->dynamic($provider, Response::MODEL_PROVIDER);
     });
 
-App::patch('/v1/messaging/providers/mailgun/:id')
+App::patch('/v1/messaging/providers/mailgun/:providerId')
     ->desc('Update Mailgun Provider')
     ->groups(['api', 'messaging'])
     ->label('audits.event', 'providers.update')
@@ -636,7 +638,7 @@ App::patch('/v1/messaging/providers/mailgun/:id')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_PROVIDER)
-    ->param('id', '', new UID(), 'Provider ID.')
+    ->param('providerId', '', new UID(), 'Provider ID.')
     ->param('name', '', new Text(128), 'Provider name.', true)
     ->param('enabled', null, new Boolean(), 'Set as enabled.', true)
     ->param('isEuRegion', null, new Boolean(), 'Set as eu region.', true)
@@ -645,8 +647,8 @@ App::patch('/v1/messaging/providers/mailgun/:id')
     ->param('domain', '', new Text(0), 'Mailgun Domain.', true)
     ->inject('dbForProject')
     ->inject('response')
-    ->action(function (string $id, string $name, ?bool $enabled, ?bool $isEuRegion, string $from, string $apiKey, string $domain, Database $dbForProject, Response $response) {
-        $provider = $dbForProject->getDocument('providers', $id);
+    ->action(function (string $providerId, string $name, ?bool $enabled, ?bool $isEuRegion, string $from, string $apiKey, string $domain, Database $dbForProject, Response $response) {
+        $provider = $dbForProject->getDocument('providers', $providerId);
 
         if ($provider->isEmpty()) {
             throw new Exception(Exception::PROVIDER_NOT_FOUND);
@@ -654,7 +656,7 @@ App::patch('/v1/messaging/providers/mailgun/:id')
         $providerAttr = $provider->getAttribute('provider');
 
         if ($providerAttr !== 'mailgun') {
-            throw new Exception(Exception::PROVIDER_INCORRECT_TYPE . $providerAttr);
+            throw new Exception(Exception::PROVIDER_INCORRECT_TYPE);
         }
 
         if (!empty($name)) {
@@ -694,7 +696,7 @@ App::patch('/v1/messaging/providers/mailgun/:id')
             ->dynamic($provider, Response::MODEL_PROVIDER);
     });
 
-App::patch('/v1/messaging/providers/sendgrid/:id')
+App::patch('/v1/messaging/providers/sendgrid/:providerId')
     ->desc('Update Sendgrid Provider')
     ->groups(['api', 'messaging'])
     ->label('audits.event', 'providers.update')
@@ -707,14 +709,14 @@ App::patch('/v1/messaging/providers/sendgrid/:id')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_PROVIDER)
-    ->param('id', '', new UID(), 'Provider ID.')
+    ->param('providerId', '', new UID(), 'Provider ID.')
     ->param('name', '', new Text(128), 'Provider name.', true)
     ->param('enabled', null, new Boolean(), 'Set as enabled.', true)
     ->param('apiKey', '', new Text(0), 'Sendgrid API key.', true)
     ->inject('dbForProject')
     ->inject('response')
-    ->action(function (string $id, string $name, ?bool $enabled, string $apiKey, Database $dbForProject, Response $response) {
-        $provider = $dbForProject->getDocument('providers', $id);
+    ->action(function (string $providerId, string $name, ?bool $enabled, string $apiKey, Database $dbForProject, Response $response) {
+        $provider = $dbForProject->getDocument('providers', $providerId);
 
         if ($provider->isEmpty()) {
             throw new Exception(Exception::PROVIDER_NOT_FOUND);
@@ -722,7 +724,7 @@ App::patch('/v1/messaging/providers/sendgrid/:id')
         $providerAttr = $provider->getAttribute('provider');
 
         if ($providerAttr !== 'sendgrid') {
-            throw new Exception(Exception::PROVIDER_INCORRECT_TYPE . $providerAttr);
+            throw new Exception(Exception::PROVIDER_INCORRECT_TYPE);
         }
 
         if (!empty($name)) {
@@ -746,7 +748,7 @@ App::patch('/v1/messaging/providers/sendgrid/:id')
             ->dynamic($provider, Response::MODEL_PROVIDER);
     });
 
-App::patch('/v1/messaging/providers/msg91/:id')
+App::patch('/v1/messaging/providers/msg91/:providerId')
     ->desc('Update Msg91 Provider')
     ->groups(['api', 'messaging'])
     ->label('audits.event', 'providers.update')
@@ -759,15 +761,15 @@ App::patch('/v1/messaging/providers/msg91/:id')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_PROVIDER)
-    ->param('id', '', new UID(), 'Provider ID.')
+    ->param('providerId', '', new UID(), 'Provider ID.')
     ->param('name', '', new Text(128), 'Provider name.', true)
     ->param('enabled', null, new Boolean(), 'Set as enabled.', true)
     ->param('senderId', '', new Text(0), 'Msg91 Sender ID.', true)
     ->param('authKey', '', new Text(0), 'Msg91 Auth Key.', true)
     ->inject('dbForProject')
     ->inject('response')
-    ->action(function (string $id, string $name, ?bool $enabled, string $senderId, string $authKey, Database $dbForProject, Response $response) {
-        $provider = $dbForProject->getDocument('providers', $id);
+    ->action(function (string $providerId, string $name, ?bool $enabled, string $senderId, string $authKey, Database $dbForProject, Response $response) {
+        $provider = $dbForProject->getDocument('providers', $providerId);
 
         if ($provider->isEmpty()) {
             throw new Exception(Exception::PROVIDER_NOT_FOUND);
@@ -775,7 +777,7 @@ App::patch('/v1/messaging/providers/msg91/:id')
         $providerAttr = $provider->getAttribute('provider');
 
         if ($providerAttr !== 'msg91') {
-            throw new Exception(Exception::PROVIDER_INCORRECT_TYPE . $providerAttr);
+            throw new Exception(Exception::PROVIDER_INCORRECT_TYPE);
         }
 
         if (!empty($name)) {
@@ -805,7 +807,7 @@ App::patch('/v1/messaging/providers/msg91/:id')
             ->dynamic($provider, Response::MODEL_PROVIDER);
     });
 
-App::patch('/v1/messaging/providers/telesign/:id')
+App::patch('/v1/messaging/providers/telesign/:providerId')
     ->desc('Update Telesign Provider')
     ->groups(['api', 'messaging'])
     ->label('audits.event', 'providers.update')
@@ -818,15 +820,15 @@ App::patch('/v1/messaging/providers/telesign/:id')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_PROVIDER)
-    ->param('id', '', new UID(), 'Provider ID.')
+    ->param('providerId', '', new UID(), 'Provider ID.')
     ->param('name', '', new Text(128), 'Provider name.', true)
     ->param('enabled', null, new Boolean(), 'Set as enabled.', true)
     ->param('username', '', new Text(0), 'Telesign username.', true)
     ->param('password', '', new Text(0), 'Telesign password.', true)
     ->inject('dbForProject')
     ->inject('response')
-    ->action(function (string $id, string $name, ?bool $enabled, string $username, string $password, Database $dbForProject, Response $response) {
-        $provider = $dbForProject->getDocument('providers', $id);
+    ->action(function (string $providerId, string $name, ?bool $enabled, string $username, string $password, Database $dbForProject, Response $response) {
+        $provider = $dbForProject->getDocument('providers', $providerId);
 
         if ($provider->isEmpty()) {
             throw new Exception(Exception::PROVIDER_NOT_FOUND);
@@ -834,7 +836,7 @@ App::patch('/v1/messaging/providers/telesign/:id')
         $providerAttr = $provider->getAttribute('provider');
 
         if ($providerAttr !== 'telesign') {
-            throw new Exception(Exception::PROVIDER_INCORRECT_TYPE . $providerAttr);
+            throw new Exception(Exception::PROVIDER_INCORRECT_TYPE);
         }
 
         if (!empty($name)) {
@@ -864,7 +866,7 @@ App::patch('/v1/messaging/providers/telesign/:id')
             ->dynamic($provider, Response::MODEL_PROVIDER);
     });
 
-App::patch('/v1/messaging/providers/textmagic/:id')
+App::patch('/v1/messaging/providers/textmagic/:providerId')
     ->desc('Update Textmagic Provider')
     ->groups(['api', 'messaging'])
     ->label('audits.event', 'providers.update')
@@ -877,15 +879,15 @@ App::patch('/v1/messaging/providers/textmagic/:id')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_PROVIDER)
-    ->param('id', '', new UID(), 'Provider ID.')
+    ->param('providerId', '', new UID(), 'Provider ID.')
     ->param('name', '', new Text(128), 'Provider name.', true)
     ->param('enabled', null, new Boolean(), 'Set as enabled.', true)
     ->param('username', '', new Text(0), 'Textmagic username.', true)
     ->param('apiKey', '', new Text(0), 'Textmagic apiKey.', true)
     ->inject('dbForProject')
     ->inject('response')
-    ->action(function (string $id, string $name, ?bool $enabled, string $username, string $apiKey, Database $dbForProject, Response $response) {
-        $provider = $dbForProject->getDocument('providers', $id);
+    ->action(function (string $providerId, string $name, ?bool $enabled, string $username, string $apiKey, Database $dbForProject, Response $response) {
+        $provider = $dbForProject->getDocument('providers', $providerId);
 
         if ($provider->isEmpty()) {
             throw new Exception(Exception::PROVIDER_NOT_FOUND);
@@ -893,7 +895,7 @@ App::patch('/v1/messaging/providers/textmagic/:id')
         $providerAttr = $provider->getAttribute('provider');
 
         if ($providerAttr !== 'text-magic') {
-            throw new Exception(Exception::PROVIDER_INCORRECT_TYPE . $providerAttr);
+            throw new Exception(Exception::PROVIDER_INCORRECT_TYPE);
         }
 
         if (!empty($name)) {
@@ -923,7 +925,7 @@ App::patch('/v1/messaging/providers/textmagic/:id')
             ->dynamic($provider, Response::MODEL_PROVIDER);
     });
 
-App::patch('/v1/messaging/providers/twilio/:id')
+App::patch('/v1/messaging/providers/twilio/:providerId')
     ->desc('Update Twilio Provider')
     ->groups(['api', 'messaging'])
     ->label('audits.event', 'providers.update')
@@ -936,15 +938,15 @@ App::patch('/v1/messaging/providers/twilio/:id')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_PROVIDER)
-    ->param('id', '', new UID(), 'Provider ID.')
+    ->param('providerId', '', new UID(), 'Provider ID.')
     ->param('name', '', new Text(128), 'Provider name.', true)
     ->param('enabled', null, new Boolean(), 'Set as enabled.', true)
     ->param('accountSid', null, new Text(0), 'Twilio account secret ID.', true)
     ->param('authToken', null, new Text(0), 'Twilio authentication token.', true)
     ->inject('dbForProject')
     ->inject('response')
-    ->action(function (string $id, string $name, ?bool $enabled, string $accountSid, string $authToken, Database $dbForProject, Response $response) {
-        $provider = $dbForProject->getDocument('providers', $id);
+    ->action(function (string $providerId, string $name, ?bool $enabled, string $accountSid, string $authToken, Database $dbForProject, Response $response) {
+        $provider = $dbForProject->getDocument('providers', $providerId);
 
         if ($provider->isEmpty()) {
             throw new Exception(Exception::PROVIDER_NOT_FOUND);
@@ -952,7 +954,7 @@ App::patch('/v1/messaging/providers/twilio/:id')
         $providerAttr = $provider->getAttribute('provider');
 
         if ($providerAttr !== 'twilio') {
-            throw new Exception(Exception::PROVIDER_INCORRECT_TYPE . $providerAttr);
+            throw new Exception(Exception::PROVIDER_INCORRECT_TYPE);
         }
 
         if (!empty($name)) {
@@ -982,7 +984,7 @@ App::patch('/v1/messaging/providers/twilio/:id')
             ->dynamic($provider, Response::MODEL_PROVIDER);
     });
 
-App::patch('/v1/messaging/providers/vonage/:id')
+App::patch('/v1/messaging/providers/vonage/:providerId')
     ->desc('Update Vonage Provider')
     ->groups(['api', 'messaging'])
     ->label('audits.event', 'providers.update')
@@ -995,15 +997,15 @@ App::patch('/v1/messaging/providers/vonage/:id')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_PROVIDER)
-    ->param('id', '', new UID(), 'Provider ID.')
+    ->param('providerId', '', new UID(), 'Provider ID.')
     ->param('name', '', new Text(128), 'Provider name.', true)
     ->param('enabled', null, new Boolean(), 'Set as enabled.', true)
     ->param('apiKey', '', new Text(0), 'Vonage API key.', true)
     ->param('apiSecret', '', new Text(0), 'Vonage API secret.', true)
     ->inject('dbForProject')
     ->inject('response')
-    ->action(function (string $id, string $name, ?bool $enabled, string $apiKey, string $apiSecret, Database $dbForProject, Response $response) {
-        $provider = $dbForProject->getDocument('providers', $id);
+    ->action(function (string $providerId, string $name, ?bool $enabled, string $apiKey, string $apiSecret, Database $dbForProject, Response $response) {
+        $provider = $dbForProject->getDocument('providers', $providerId);
 
         if ($provider->isEmpty()) {
             throw new Exception(Exception::PROVIDER_NOT_FOUND);
@@ -1011,7 +1013,7 @@ App::patch('/v1/messaging/providers/vonage/:id')
         $providerAttr = $provider->getAttribute('provider');
 
         if ($providerAttr !== 'vonage') {
-            throw new Exception(Exception::PROVIDER_INCORRECT_TYPE . $providerAttr);
+            throw new Exception(Exception::PROVIDER_INCORRECT_TYPE);
         }
 
         if (!empty($name)) {
@@ -1041,7 +1043,7 @@ App::patch('/v1/messaging/providers/vonage/:id')
             ->dynamic($provider, Response::MODEL_PROVIDER);
     });
 
-App::patch('/v1/messaging/providers/fcm/:id')
+App::patch('/v1/messaging/providers/fcm/:providerId')
     ->desc('Update FCM Provider')
     ->groups(['api', 'messaging'])
     ->label('audits.event', 'providers.update')
@@ -1049,19 +1051,19 @@ App::patch('/v1/messaging/providers/fcm/:id')
     ->label('scope', 'providers.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'messaging')
-    ->label('sdk.method', 'updateFCMProvider')
+    ->label('sdk.method', 'updateFcmProvider')
     ->label('sdk.description', '/docs/references/messaging/update-fcm-provider.md')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_PROVIDER)
-    ->param('id', '', new UID(), 'Provider ID.')
+    ->param('providerId', '', new UID(), 'Provider ID.')
     ->param('name', '', new Text(128), 'Provider name.', true)
     ->param('enabled', null, new Boolean(), 'Set as enabled.', true)
     ->param('serverKey', '', new Text(0), 'FCM Server Key.', true)
     ->inject('dbForProject')
     ->inject('response')
-    ->action(function (string $id, string $name, ?bool $enabled, string $serverKey, Database $dbForProject, Response $response) {
-        $provider = $dbForProject->getDocument('providers', $id);
+    ->action(function (string $providerId, string $name, ?bool $enabled, string $serverKey, Database $dbForProject, Response $response) {
+        $provider = $dbForProject->getDocument('providers', $providerId);
 
         if ($provider->isEmpty()) {
             throw new Exception(Exception::PROVIDER_NOT_FOUND);
@@ -1069,7 +1071,7 @@ App::patch('/v1/messaging/providers/fcm/:id')
         $providerAttr = $provider->getAttribute('provider');
 
         if ($providerAttr !== 'fcm') {
-            throw new Exception(Exception::PROVIDER_INCORRECT_TYPE . $providerAttr);
+            throw new Exception(Exception::PROVIDER_INCORRECT_TYPE);
         }
 
         if (!empty($name)) {
@@ -1092,7 +1094,7 @@ App::patch('/v1/messaging/providers/fcm/:id')
     });
 
 
-App::patch('/v1/messaging/providers/apns/:id')
+App::patch('/v1/messaging/providers/apns/:providerId')
     ->desc('Update APNS Provider')
     ->groups(['api', 'messaging'])
     ->label('audits.event', 'providers.update')
@@ -1100,12 +1102,12 @@ App::patch('/v1/messaging/providers/apns/:id')
     ->label('scope', 'providers.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
     ->label('sdk.namespace', 'messaging')
-    ->label('sdk.method', 'updateAPNSProvider')
+    ->label('sdk.method', 'updateApnsProvider')
     ->label('sdk.description', '/docs/references/messaging/update-apns-provider.md')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_PROVIDER)
-    ->param('id', '', new UID(), 'Provider ID.')
+    ->param('providerId', '', new UID(), 'Provider ID.')
     ->param('name', '', new Text(128), 'Provider name.', true)
     ->param('enabled', null, new Boolean(), 'Set as enabled.', true)
     ->param('authKey', '', new Text(0), 'APNS authentication key.', true)
@@ -1115,8 +1117,8 @@ App::patch('/v1/messaging/providers/apns/:id')
     ->param('endpoint', '', new Text(0), 'APNS endpoint.', true)
     ->inject('dbForProject')
     ->inject('response')
-    ->action(function (string $id, string $name, ?bool $enabled, string $authKey, string $authKeyId, string $teamId, string $bundleId, string $endpoint, Database $dbForProject, Response $response) {
-        $provider = $dbForProject->getDocument('providers', $id);
+    ->action(function (string $providerId, string $name, ?bool $enabled, string $authKey, string $authKeyId, string $teamId, string $bundleId, string $endpoint, Database $dbForProject, Response $response) {
+        $provider = $dbForProject->getDocument('providers', $providerId);
 
         if ($provider->isEmpty()) {
             throw new Exception(Exception::PROVIDER_NOT_FOUND);
@@ -1124,7 +1126,7 @@ App::patch('/v1/messaging/providers/apns/:id')
         $providerAttr = $provider->getAttribute('provider');
 
         if ($providerAttr !== 'apns') {
-            throw new Exception(Exception::PROVIDER_INCORRECT_TYPE . $providerAttr);
+            throw new Exception(Exception::PROVIDER_INCORRECT_TYPE);
         }
 
         if (!empty($name)) {
@@ -1166,7 +1168,7 @@ App::patch('/v1/messaging/providers/apns/:id')
             ->dynamic($provider, Response::MODEL_PROVIDER);
     });
 
-App::delete('/v1/messaging/providers/:id')
+App::delete('/v1/messaging/providers/:providerId')
     ->desc('Delete Provider')
     ->groups(['api', 'messaging'])
     ->label('audits.event', 'providers.delete')
@@ -1179,11 +1181,11 @@ App::delete('/v1/messaging/providers/:id')
     ->label('sdk.response.code', Response::STATUS_CODE_NOCONTENT)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_NONE)
-    ->param('id', '', new UID(), 'Provider ID.')
+    ->param('providerId', '', new UID(), 'Provider ID.')
     ->inject('dbForProject')
     ->inject('response')
-    ->action(function (string $id, Database $dbForProject, Response $response) {
-        $provider = $dbForProject->getDocument('providers', $id);
+    ->action(function (string $providerId, Database $dbForProject, Response $response) {
+        $provider = $dbForProject->getDocument('providers', $providerId);
 
         if ($provider->isEmpty()) {
             throw new Exception(Exception::PROVIDER_NOT_FOUND);
@@ -1552,13 +1554,14 @@ App::post('/v1/messaging/messages/email')
     ->param('to', [], new ArrayList(new Text(Database::LENGTH_KEY)), 'List of Topic IDs or List of User IDs or List of Target IDs.')
     ->param('subject', '', new Text(998), 'Email Subject.')
     ->param('description', '', new Text(256), 'Description for Message.', true)
-    ->param('content', '', new Text(65407), 'Email Content.')
+    ->param('content', '', new Text(64230), 'Email Content.')
+    ->param('status', 'processing', new WhiteList(['draft', 'processing']), 'Message Status.', true)
     ->param('html', false, new Boolean(), 'Is content of type HTML', true)
     ->inject('dbForProject')
     ->inject('project')
     ->inject('messaging')
     ->inject('response')
-    ->action(function (string $messageId, string $providerId, array $to, string $subject, string $description, string $content, string $html, Database $dbForProject, Document $project, Messaging $messaging, Response $response) {
+    ->action(function (string $messageId, string $providerId, array $to, string $subject, string $description, string $content, string $status, bool $html, Database $dbForProject, Document $project, Messaging $messaging, Response $response) {
         $messageId = $messageId == 'unique()' ? ID::unique() : $messageId;
 
         $provider = $dbForProject->getDocument('providers', $providerId);
@@ -1578,21 +1581,64 @@ App::post('/v1/messaging/messages/email')
                 'html' => $html,
                 'description' => $description,
             ],
-            'status' => 'processing',
+            'status' => $status,
             'search' => $messageId . ' ' . $description . ' ' . $subject,
         ]));
 
-        $messaging
-            ->setMessageId($message->getId())
-            ->setProject($project)
-            ->trigger();
+        if ($status === 'processing') {
+            $messaging
+                ->setMessageId($message->getId())
+                ->setProject($project)
+                ->trigger();
+        }
 
         $response
             ->setStatusCode(Response::STATUS_CODE_CREATED)
             ->dynamic($message, Response::MODEL_MESSAGE);
     });
 
-App::get('/v1/messaging/messages/:id')
+App::get('/v1/messaging/messages')
+    ->desc('List Messages')
+    ->groups(['api', 'messaging'])
+    ->label('scope', 'messages.read')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'messaging')
+    ->label('sdk.method', 'listMessages')
+    ->label('sdk.description', '/docs/references/messaging/list-messages.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_OK)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_MESSAGE_LIST)
+    ->param('queries', [], new Providers(), 'Array of query strings generated using the Query class provided by the SDK. [Learn more about queries](https://appwrite.io/docs/queries). Maximum of ' . APP_LIMIT_ARRAY_PARAMS_SIZE . ' queries are allowed, each ' . APP_LIMIT_ARRAY_ELEMENT_SIZE . ' characters long. You may filter on the following attributes: ' . implode(', ', Providers::ALLOWED_ATTRIBUTES), true)
+    ->inject('dbForProject')
+    ->inject('response')
+    ->action(function (array $queries, Database $dbForProject, Response $response) {
+        $queries = Query::parseQueries($queries);
+
+        // Get cursor document if there was a cursor query
+        $cursor = Query::getByType($queries, [Query::TYPE_CURSORAFTER, Query::TYPE_CURSORBEFORE]);
+        $cursor = reset($cursor);
+
+        if ($cursor) {
+            $messageId = $cursor->getValue();
+            $cursorDocument = Authorization::skip(fn () => $dbForProject->findOne('messages', [
+                Query::equal('$id', [$messageId]),
+            ]));
+
+            if ($cursorDocument === false || $cursorDocument->isEmpty()) {
+                throw new Exception(Exception::GENERAL_CURSOR_NOT_FOUND, "Message '{$messageId}' for the 'cursor' value not found.");
+            }
+
+            $cursor->setValue($cursorDocument);
+        }
+
+        $filterQueries = Query::groupByType($queries)['filters'];
+        $response->dynamic(new Document([
+            'total' => $dbForProject->count('messages', $filterQueries, APP_LIMIT_COUNT),
+            'messages' => $dbForProject->find('messages', $queries),
+        ]), Response::MODEL_MESSAGE_LIST);
+    });
+
+App::get('/v1/messaging/messages/:messageId')
     ->desc('Get Message')
     ->groups(['api', 'messaging'])
     ->label('scope', 'messages.read')
@@ -1603,11 +1649,11 @@ App::get('/v1/messaging/messages/:id')
     ->label('sdk.response.code', Response::STATUS_CODE_OK)
     ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
     ->label('sdk.response.model', Response::MODEL_MESSAGE)
-    ->param('id', '', new UID(), 'Message ID.')
+    ->param('messageId', '', new UID(), 'Message ID.')
     ->inject('dbForProject')
     ->inject('response')
-    ->action(function (string $id, Database $dbForProject, Response $response) {
-        $message = $dbForProject->getDocument('messages', $id);
+    ->action(function (string $messageId, Database $dbForProject, Response $response) {
+        $message = $dbForProject->getDocument('messages', $messageId);
 
         if ($message->isEmpty()) {
             throw new Exception(Exception::MESSAGE_NOT_FOUND);
@@ -1615,3 +1661,79 @@ App::get('/v1/messaging/messages/:id')
 
         $response->dynamic($message, Response::MODEL_MESSAGE);
     });
+
+App::post('/v1/messaging/messages/email/:messageId')
+    ->desc('Update an email.')
+    ->groups(['api', 'messaging'])
+    ->label('audits.event', 'messages.update')
+    ->label('audits.resource', 'messages/{response.$id}')
+    ->label('scope', 'messages.write')
+    ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN, APP_AUTH_TYPE_KEY])
+    ->label('sdk.namespace', 'messaging')
+    ->label('sdk.method', 'updateEmail')
+    ->label('sdk.description', '/docs/references/messaging/update-email.md')
+    ->label('sdk.response.code', Response::STATUS_CODE_CREATED)
+    ->label('sdk.response.type', Response::CONTENT_TYPE_JSON)
+    ->label('sdk.response.model', Response::MODEL_MESSAGE)
+    ->param('messageId', '', new UID(), 'Message ID.')
+    ->param('to', [], new ArrayList(new Text(Database::LENGTH_KEY)), 'List of Topic IDs or List of User IDs or List of Target IDs.', true)
+    ->param('subject', '', new Text(998), 'Email Subject.', true)
+    ->param('description', '', new Text(256), 'Description for Message.', true)
+    ->param('content', '', new Text(64230), 'Email Content.', true)
+    ->param('status', '', new WhiteList(['draft', 'processing']), 'Message Status.', true)
+    ->param('html', false, new Boolean(), 'Is content of type HTML', true)
+    ->param('deliveryTime', DateTime::now(), new DatetimeValidator(), 'Delivery time for message.', true)
+    ->inject('dbForProject')
+    ->inject('project')
+    ->inject('messaging')
+    ->inject('response')
+    ->action(function (string $messageId, array $to, string $subject, string $description, string $content, string $status, bool $html, string $deliveryTime, Database $dbForProject, Document $project, Messaging $messaging, Response $response) {
+        $message = $dbForProject->getDocument('messages', $messageId);
+
+        if ($message->isEmpty()) {
+            throw new Exception(Exception::MESSAGE_NOT_FOUND);
+        }
+
+        if (\count($to) > 0) {
+            $message->setAttribute('to', $to);
+        }
+
+        $data = $message->getAttribute('data');
+
+        if (!empty($subject)) {
+            $data['subject'] = $subject;
+        }
+
+        if (!empty($content)) {
+            $data['content'] = $content;
+        }
+
+        if (!empty($description)) {
+            $data['description'] = $description;
+        }
+
+        if (!empty($html)) {
+            $data['html'] = $html;
+        }
+
+        $message->setAttribute('data', $data);
+        $message->setAttribute('search', $message->getId() . ' ' . $data['description'] . ' ' . $data['subject']);
+
+        if (!empty($status)) {
+            $message->setAttribute('status', $status);
+        }
+
+        $message = $dbForProject->updateDocument('messages', $message->getId(), $message);
+
+        if ($status === 'processing') {
+            $messaging
+                ->setMessageId($message->getId())
+                ->setDeliveryTime($deliveryTime)
+                ->setProject($project)
+                ->trigger();
+        }
+
+        $response
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($message, Response::MODEL_MESSAGE);
+    });

app/controllers/api/projects.php

@@ -49,7 +49,7 @@ App::init()
     });
 
 App::post('/v1/projects')
-    ->desc('Create Project')
+    ->desc('Create project')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -92,16 +92,17 @@ App::post('/v1/projects')
 
         $projectId = ($projectId == 'unique()') ? ID::unique() : $projectId;
 
-        $backups['database_db_fra1_02'] = ['from' => '7:30', 'to' => '8:15'];
-        $backups['database_db_fra1_03'] = ['from' => '10:30', 'to' => '11:15'];
-        $backups['database_db_fra1_04'] = ['from' => '13:30', 'to' => '14:15'];
-        $backups['database_db_fra1_05'] = ['from' => '4:30', 'to' => '5:15'];
-        $backups['database_db_fra1_06'] = ['from' => '16:30', 'to' => '17:15'];
+        $backups['database_db_fra1_v14x_02'] = ['from' => '7:30', 'to' => '8:15'];
+        $backups['database_db_fra1_v14x_03'] = ['from' => '10:30', 'to' => '11:15'];
+        $backups['database_db_fra1_v14x_04'] = ['from' => '13:30', 'to' => '14:15'];
+        $backups['database_db_fra1_v14x_05'] = ['from' => '4:30', 'to' => '5:15'];
+        $backups['database_db_fra1_v14x_06'] = ['from' => '16:30', 'to' => '17:15'];
+        $backups['database_db_fra1_v14x_07'] = ['from' => '19:30', 'to' => '20:15'];
 
         $databases = Config::getParam('pools-database', []);
 
         /**
-         * Extract db from list while backing
+         * Remove databases from the list that are currently undergoing an backup
          */
         if (count($databases) > 1) {
             $now = new \DateTime();
@@ -120,7 +121,9 @@ App::post('/v1/projects')
             }
         }
 
-        if ($index = array_search('database_db_fra1_06', $databases)) {
+        $databaseOverride = App::getEnv('_APP_DATABASE_OVERRIDE', null);
+        $index = array_search($databaseOverride, $databases);
+        if ($index) {
             $database = $databases[$index];
         } else {
             $database = $databases[array_rand($databases)];
@@ -220,7 +223,7 @@ App::post('/v1/projects')
     });
 
 App::get('/v1/projects')
-    ->desc('List Projects')
+    ->desc('List projects')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -267,7 +270,7 @@ App::get('/v1/projects')
     });
 
 App::get('/v1/projects/:projectId')
-    ->desc('Get Project')
+    ->desc('Get project')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -405,7 +408,7 @@ App::get('/v1/projects/:projectId/usage')
     });
 
 App::patch('/v1/projects/:projectId')
-    ->desc('Update Project')
+    ->desc('Update project')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -557,7 +560,7 @@ App::patch('/v1/projects/:projectId/service/all')
     });
 
 App::patch('/v1/projects/:projectId/oauth2')
-    ->desc('Update Project OAuth2')
+    ->desc('Update project OAuth2')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -601,7 +604,7 @@ App::patch('/v1/projects/:projectId/oauth2')
     });
 
 App::patch('/v1/projects/:projectId/auth/limit')
-    ->desc('Update Project users limit')
+    ->desc('Update project users limit')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -632,7 +635,7 @@ App::patch('/v1/projects/:projectId/auth/limit')
     });
 
 App::patch('/v1/projects/:projectId/auth/duration')
-    ->desc('Update Project Authentication Duration')
+    ->desc('Update project authentication duration')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -663,7 +666,7 @@ App::patch('/v1/projects/:projectId/auth/duration')
     });
 
 App::patch('/v1/projects/:projectId/auth/:method')
-    ->desc('Update Project auth method status. Use this endpoint to enable or disable a given auth method for this project.')
+    ->desc('Update project auth method status. Use this endpoint to enable or disable a given auth method for this project.')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -790,7 +793,7 @@ App::patch('/v1/projects/:projectId/auth/personal-data')
     });
 
 App::patch('/v1/projects/:projectId/auth/max-sessions')
-    ->desc('Update Project user sessions limit')
+    ->desc('Update project user sessions limit')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -821,7 +824,7 @@ App::patch('/v1/projects/:projectId/auth/max-sessions')
     });
 
 App::delete('/v1/projects/:projectId')
-    ->desc('Delete Project')
+    ->desc('Delete project')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -855,7 +858,7 @@ App::delete('/v1/projects/:projectId')
 // Webhooks
 
 App::post('/v1/projects/:projectId/webhooks')
-    ->desc('Create Webhook')
+    ->desc('Create webhook')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -911,7 +914,7 @@ App::post('/v1/projects/:projectId/webhooks')
     });
 
 App::get('/v1/projects/:projectId/webhooks')
-    ->desc('List Webhooks')
+    ->desc('List webhooks')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -943,7 +946,7 @@ App::get('/v1/projects/:projectId/webhooks')
     });
 
 App::get('/v1/projects/:projectId/webhooks/:webhookId')
-    ->desc('Get Webhook')
+    ->desc('Get webhook')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -977,7 +980,7 @@ App::get('/v1/projects/:projectId/webhooks/:webhookId')
     });
 
 App::put('/v1/projects/:projectId/webhooks/:webhookId')
-    ->desc('Update Webhook')
+    ->desc('Update webhook')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -1030,7 +1033,7 @@ App::put('/v1/projects/:projectId/webhooks/:webhookId')
     });
 
 App::patch('/v1/projects/:projectId/webhooks/:webhookId/signature')
-    ->desc('Update Webhook Signature Key')
+    ->desc('Update webhook signature key')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -1069,7 +1072,7 @@ App::patch('/v1/projects/:projectId/webhooks/:webhookId/signature')
     });
 
 App::delete('/v1/projects/:projectId/webhooks/:webhookId')
-    ->desc('Delete Webhook')
+    ->desc('Delete webhook')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -1108,7 +1111,7 @@ App::delete('/v1/projects/:projectId/webhooks/:webhookId')
 // Keys
 
 App::post('/v1/projects/:projectId/keys')
-    ->desc('Create Key')
+    ->desc('Create key')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -1158,7 +1161,7 @@ App::post('/v1/projects/:projectId/keys')
     });
 
 App::get('/v1/projects/:projectId/keys')
-    ->desc('List Keys')
+    ->desc('List keys')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -1190,7 +1193,7 @@ App::get('/v1/projects/:projectId/keys')
     });
 
 App::get('/v1/projects/:projectId/keys/:keyId')
-    ->desc('Get Key')
+    ->desc('Get key')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -1224,7 +1227,7 @@ App::get('/v1/projects/:projectId/keys/:keyId')
     });
 
 App::put('/v1/projects/:projectId/keys/:keyId')
-    ->desc('Update Key')
+    ->desc('Update key')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -1270,7 +1273,7 @@ App::put('/v1/projects/:projectId/keys/:keyId')
     });
 
 App::delete('/v1/projects/:projectId/keys/:keyId')
-    ->desc('Delete Key')
+    ->desc('Delete key')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -1309,7 +1312,7 @@ App::delete('/v1/projects/:projectId/keys/:keyId')
 // Platforms
 
 App::post('/v1/projects/:projectId/platforms')
-    ->desc('Create Platform')
+    ->desc('Create platform')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -1359,7 +1362,7 @@ App::post('/v1/projects/:projectId/platforms')
     });
 
 App::get('/v1/projects/:projectId/platforms')
-    ->desc('List Platforms')
+    ->desc('List platforms')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -1391,7 +1394,7 @@ App::get('/v1/projects/:projectId/platforms')
     });
 
 App::get('/v1/projects/:projectId/platforms/:platformId')
-    ->desc('Get Platform')
+    ->desc('Get platform')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -1425,7 +1428,7 @@ App::get('/v1/projects/:projectId/platforms/:platformId')
     });
 
 App::put('/v1/projects/:projectId/platforms/:platformId')
-    ->desc('Update Platform')
+    ->desc('Update platform')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -1472,7 +1475,7 @@ App::put('/v1/projects/:projectId/platforms/:platformId')
     });
 
 App::delete('/v1/projects/:projectId/platforms/:platformId')
-    ->desc('Delete Platform')
+    ->desc('Delete platform')
     ->groups(['api', 'projects'])
     ->label('scope', 'projects.write')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])
@@ -1508,6 +1511,7 @@ App::delete('/v1/projects/:projectId/platforms/:platformId')
         $response->noContent();
     });
 
+
 // CUSTOM SMTP and Templates
 App::patch('/v1/projects/:projectId/smtp')
     ->desc('Update SMTP configuration')
@@ -1639,6 +1643,7 @@ App::get('/v1/projects/:projectId/templates/sms/:type/:locale')
         $response->dynamic(new Document($template), Response::MODEL_SMS_TEMPLATE);
     });
 
+
 App::get('/v1/projects/:projectId/templates/email/:type/:locale')
     ->desc('Get custom email template')
     ->groups(['api', 'projects'])

app/controllers/api/storage.php

@@ -194,7 +194,7 @@ App::get('/v1/storage/buckets')
     });
 
 App::get('/v1/storage/buckets/:bucketId')
-    ->desc('Get Bucket')
+    ->desc('Get bucket')
     ->groups(['api', 'storage'])
     ->label('scope', 'buckets.read')
     ->label('usage.metric', 'buckets.{scope}.requests.read')
@@ -220,7 +220,7 @@ App::get('/v1/storage/buckets/:bucketId')
     });
 
 App::put('/v1/storage/buckets/:bucketId')
-    ->desc('Update Bucket')
+    ->desc('Update bucket')
     ->groups(['api', 'storage'])
     ->label('scope', 'buckets.write')
     ->label('event', 'buckets.[bucketId].update')
@@ -288,7 +288,7 @@ App::put('/v1/storage/buckets/:bucketId')
     });
 
 App::delete('/v1/storage/buckets/:bucketId')
-    ->desc('Delete Bucket')
+    ->desc('Delete bucket')
     ->groups(['api', 'storage'])
     ->label('scope', 'buckets.write')
     ->label('audits.event', 'bucket.delete')
@@ -331,7 +331,7 @@ App::delete('/v1/storage/buckets/:bucketId')
 
 App::post('/v1/storage/buckets/:bucketId/files')
     ->alias('/v1/storage/files', ['bucketId' => 'default'])
-    ->desc('Create File')
+    ->desc('Create file')
     ->groups(['api', 'storage'])
     ->label('scope', 'files.write')
     ->label('audits.event', 'file.create')
@@ -684,7 +684,7 @@ App::post('/v1/storage/buckets/:bucketId/files')
 
 App::get('/v1/storage/buckets/:bucketId/files')
     ->alias('/v1/storage/files', ['bucketId' => 'default'])
-    ->desc('List Files')
+    ->desc('List files')
     ->groups(['api', 'storage'])
     ->label('scope', 'files.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
@@ -765,7 +765,7 @@ App::get('/v1/storage/buckets/:bucketId/files')
 
 App::get('/v1/storage/buckets/:bucketId/files/:fileId')
     ->alias('/v1/storage/files/:fileId', ['bucketId' => 'default'])
-    ->desc('Get File')
+    ->desc('Get file')
     ->groups(['api', 'storage'])
     ->label('scope', 'files.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
@@ -814,7 +814,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId')
 
 App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
     ->alias('/v1/storage/files/:fileId/preview', ['bucketId' => 'default'])
-    ->desc('Get File Preview')
+    ->desc('Get file preview')
     ->groups(['api', 'storage'])
     ->label('scope', 'files.read')
     ->label('cache', true)
@@ -983,7 +983,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/preview')
 
 App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
     ->alias('/v1/storage/files/:fileId/download', ['bucketId' => 'default'])
-    ->desc('Get File for Download')
+    ->desc('Get file for download')
     ->groups(['api', 'storage'])
     ->label('scope', 'files.read')
     ->label('usage.metric', 'files.{scope}.requests.read')
@@ -1126,7 +1126,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/download')
 
 App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
     ->alias('/v1/storage/files/:fileId/view', ['bucketId' => 'default'])
-    ->desc('Get File for View')
+    ->desc('Get file for view')
     ->groups(['api', 'storage'])
     ->label('scope', 'files.read')
     ->label('usage.metric', 'files.{scope}.requests.read')
@@ -1279,7 +1279,7 @@ App::get('/v1/storage/buckets/:bucketId/files/:fileId/view')
 
 App::put('/v1/storage/buckets/:bucketId/files/:fileId')
     ->alias('/v1/storage/files/:fileId', ['bucketId' => 'default'])
-    ->desc('Update File')
+    ->desc('Update file')
     ->groups(['api', 'storage'])
     ->label('scope', 'files.write')
     ->label('event', 'buckets.[bucketId].files.[fileId].update')

app/controllers/api/teams.php

@@ -41,7 +41,7 @@ use Utopia\Validator\Assoc;
 use Utopia\Validator\Text;
 
 App::post('/v1/teams')
-    ->desc('Create Team')
+    ->desc('Create team')
     ->groups(['api', 'teams'])
     ->label('event', 'teams.[teamId].create')
     ->label('scope', 'teams.write')
@@ -129,7 +129,7 @@ App::post('/v1/teams')
     });
 
 App::get('/v1/teams')
-    ->desc('List Teams')
+    ->desc('List teams')
     ->groups(['api', 'teams'])
     ->label('scope', 'teams.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
@@ -181,7 +181,7 @@ App::get('/v1/teams')
     });
 
 App::get('/v1/teams/:teamId')
-    ->desc('Get Team')
+    ->desc('Get team')
     ->groups(['api', 'teams'])
     ->label('scope', 'teams.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
@@ -208,7 +208,7 @@ App::get('/v1/teams/:teamId')
     });
 
 App::get('/v1/teams/:teamId/prefs')
-    ->desc('Get Team Preferences')
+    ->desc('Get team preferences')
     ->groups(['api', 'teams'])
     ->label('scope', 'teams.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_JWT])
@@ -236,7 +236,7 @@ App::get('/v1/teams/:teamId/prefs')
     });
 
 App::put('/v1/teams/:teamId')
-    ->desc('Update Name')
+    ->desc('Update name')
     ->groups(['api', 'teams'])
     ->label('event', 'teams.[teamId].update')
     ->label('scope', 'teams.write')
@@ -279,7 +279,7 @@ App::put('/v1/teams/:teamId')
     });
 
 App::put('/v1/teams/:teamId/prefs')
-    ->desc('Update Preferences')
+    ->desc('Update preferences')
     ->groups(['api', 'teams'])
     ->label('event', 'teams.[teamId].update.prefs')
     ->label('scope', 'teams.write')
@@ -315,7 +315,7 @@ App::put('/v1/teams/:teamId/prefs')
     });
 
 App::delete('/v1/teams/:teamId')
-    ->desc('Delete Team')
+    ->desc('Delete team')
     ->groups(['api', 'teams'])
     ->label('event', 'teams.[teamId].delete')
     ->label('scope', 'teams.write')
@@ -357,7 +357,7 @@ App::delete('/v1/teams/:teamId')
     });
 
 App::post('/v1/teams/:teamId/memberships')
-    ->desc('Create Team Membership')
+    ->desc('Create team membership')
     ->groups(['api', 'teams', 'auth'])
     ->label('event', 'teams.[teamId].memberships.[membershipId].create')
     ->label('scope', 'teams.write')
@@ -696,7 +696,7 @@ App::post('/v1/teams/:teamId/memberships')
     });
 
 App::get('/v1/teams/:teamId/memberships')
-    ->desc('List Team Memberships')
+    ->desc('List team memberships')
     ->groups(['api', 'teams'])
     ->label('scope', 'teams.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
@@ -780,7 +780,7 @@ App::get('/v1/teams/:teamId/memberships')
     });
 
 App::get('/v1/teams/:teamId/memberships/:membershipId')
-    ->desc('Get Team Membership')
+    ->desc('Get team membership')
     ->groups(['api', 'teams'])
     ->label('scope', 'teams.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_SESSION, APP_AUTH_TYPE_KEY, APP_AUTH_TYPE_JWT])
@@ -822,7 +822,7 @@ App::get('/v1/teams/:teamId/memberships/:membershipId')
     });
 
 App::patch('/v1/teams/:teamId/memberships/:membershipId')
-    ->desc('Update Membership')
+    ->desc('Update membership')
     ->groups(['api', 'teams'])
     ->label('event', 'teams.[teamId].memberships.[membershipId].update')
     ->label('scope', 'teams.write')
@@ -893,7 +893,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId')
     });
 
 App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
-    ->desc('Update Team Membership Status')
+    ->desc('Update team membership status')
     ->groups(['api', 'teams'])
     ->label('event', 'teams.[teamId].memberships.[membershipId].update.status')
     ->label('scope', 'public')
@@ -1028,7 +1028,7 @@ App::patch('/v1/teams/:teamId/memberships/:membershipId/status')
     });
 
 App::delete('/v1/teams/:teamId/memberships/:membershipId')
-    ->desc('Delete Team Membership')
+    ->desc('Delete team membership')
     ->groups(['api', 'teams'])
     ->label('event', 'teams.[teamId].memberships.[membershipId].delete')
     ->label('scope', 'teams.write')
@@ -1094,7 +1094,7 @@ App::delete('/v1/teams/:teamId/memberships/:membershipId')
     });
 
 App::get('/v1/teams/:teamId/logs')
-    ->desc('List Team Logs')
+    ->desc('List team logs')
     ->groups(['api', 'teams'])
     ->label('scope', 'teams.read')
     ->label('sdk.auth', [APP_AUTH_TYPE_ADMIN])

app/controllers/api/users.php

@@ -108,7 +108,7 @@ function createUser(string $hash, mixed $hashOptions, string $userId, ?string $e
 }
 
 App::post('/v1/users')
-    ->desc('Create User')
+    ->desc('Create user')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].create')
     ->label('scope', 'users.write')
@@ -141,7 +141,7 @@ App::post('/v1/users')
     });
 
 App::post('/v1/users/bcrypt')
-    ->desc('Create User with Bcrypt Password')
+    ->desc('Create user with bcrypt password')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].create')
     ->label('scope', 'users.write')
@@ -172,7 +172,7 @@ App::post('/v1/users/bcrypt')
     });
 
 App::post('/v1/users/md5')
-    ->desc('Create User with MD5 Password')
+    ->desc('Create user with MD5 password')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].create')
     ->label('scope', 'users.write')
@@ -203,7 +203,7 @@ App::post('/v1/users/md5')
     });
 
 App::post('/v1/users/argon2')
-    ->desc('Create User with Argon2 Password')
+    ->desc('Create user with Argon2 password')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].create')
     ->label('scope', 'users.write')
@@ -234,7 +234,7 @@ App::post('/v1/users/argon2')
     });
 
 App::post('/v1/users/sha')
-    ->desc('Create User with SHA Password')
+    ->desc('Create user with SHA password')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].create')
     ->label('scope', 'users.write')
@@ -272,7 +272,7 @@ App::post('/v1/users/sha')
     });
 
 App::post('/v1/users/phpass')
-    ->desc('Create User with PHPass Password')
+    ->desc('Create user with PHPass password')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].create')
     ->label('scope', 'users.write')
@@ -303,7 +303,7 @@ App::post('/v1/users/phpass')
     });
 
 App::post('/v1/users/scrypt')
-    ->desc('Create User with Scrypt Password')
+    ->desc('Create user with Scrypt password')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].create')
     ->label('scope', 'users.write')
@@ -347,7 +347,7 @@ App::post('/v1/users/scrypt')
     });
 
 App::post('/v1/users/scrypt-modified')
-    ->desc('Create User with Scrypt Modified Password')
+    ->desc('Create user with Scrypt modified password')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].create')
     ->label('scope', 'users.write')
@@ -419,22 +419,27 @@ App::post('/v1/users/:userId/targets')
             throw new Exception(Exception::USER_TARGET_ALREADY_EXISTS);
         }
 
-        $target = $dbForProject->createDocument('targets', new Document([
-            '$id' => $targetId,
-            'providerId' => $providerId,
-            'providerInternalId' => $provider->getInternalId(),
-            'userId' => $userId,
-            'userInternalId' => $user->getInternalId(),
-            'identifier' => $identifier,
-        ]));
+        try {
+            $target = $dbForProject->createDocument('targets', new Document([
+                '$id' => $targetId,
+                'providerId' => $providerId,
+                'providerInternalId' => $provider->getInternalId(),
+                'userId' => $userId,
+                'userInternalId' => $user->getInternalId(),
+                'identifier' => $identifier,
+            ]));
+        } catch (Duplicate) {
+            throw new Exception(Exception::USER_TARGET_ALREADY_EXISTS);
+        }
         $dbForProject->deleteCachedDocument('users', $user->getId());
+
         $response
-        ->setStatusCode(Response::STATUS_CODE_CREATED)
-        ->dynamic($target, Response::MODEL_TARGET);
+            ->setStatusCode(Response::STATUS_CODE_CREATED)
+            ->dynamic($target, Response::MODEL_TARGET);
     });
 
 App::get('/v1/users')
-    ->desc('List Users')
+    ->desc('List users')
     ->groups(['api', 'users'])
     ->label('scope', 'users.read')
     ->label('usage.metric', 'users.{scope}.requests.read')
@@ -483,7 +488,7 @@ App::get('/v1/users')
     });
 
 App::get('/v1/users/:userId')
-    ->desc('Get User')
+    ->desc('Get user')
     ->groups(['api', 'users'])
     ->label('scope', 'users.read')
     ->label('usage.metric', 'users.{scope}.requests.read')
@@ -509,7 +514,7 @@ App::get('/v1/users/:userId')
     });
 
 App::get('/v1/users/:userId/prefs')
-    ->desc('Get User Preferences')
+    ->desc('Get user preferences')
     ->groups(['api', 'users'])
     ->label('scope', 'users.read')
     ->label('usage.metric', 'users.{scope}.requests.read')
@@ -569,7 +574,7 @@ App::get('/v1/users/:userId/targets/:targetId')
     });
 
 App::get('/v1/users/:userId/sessions')
-    ->desc('List User Sessions')
+    ->desc('List user sessions')
     ->groups(['api', 'users'])
     ->label('scope', 'users.read')
     ->label('usage.metric', 'users.{scope}.requests.read')
@@ -611,7 +616,7 @@ App::get('/v1/users/:userId/sessions')
     });
 
 App::get('/v1/users/:userId/memberships')
-    ->desc('List User Memberships')
+    ->desc('List user memberships')
     ->groups(['api', 'users'])
     ->label('scope', 'users.read')
     ->label('usage.metric', 'users.{scope}.requests.read')
@@ -651,7 +656,7 @@ App::get('/v1/users/:userId/memberships')
     });
 
 App::get('/v1/users/:userId/logs')
-    ->desc('List User Logs')
+    ->desc('List user logs')
     ->groups(['api', 'users'])
     ->label('scope', 'users.read')
     ->label('usage.metric', 'users.{scope}.requests.read')
@@ -811,7 +816,7 @@ App::get('/v1/users/identities')
     });
 
 App::patch('/v1/users/:userId/status')
-    ->desc('Update User Status')
+    ->desc('Update user status')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].update.status')
     ->label('scope', 'users.write')
@@ -848,7 +853,7 @@ App::patch('/v1/users/:userId/status')
     });
 
 App::put('/v1/users/:userId/labels')
-    ->desc('Update User Labels')
+    ->desc('Update user labels')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].update.labels')
     ->label('scope', 'users.write')
@@ -886,7 +891,7 @@ App::put('/v1/users/:userId/labels')
     });
 
 App::patch('/v1/users/:userId/verification/phone')
-    ->desc('Update Phone Verification')
+    ->desc('Update phone verification')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].update.verification')
     ->label('scope', 'users.write')
@@ -922,7 +927,7 @@ App::patch('/v1/users/:userId/verification/phone')
     });
 
 App::patch('/v1/users/:userId/name')
-    ->desc('Update Name')
+    ->desc('Update name')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].update.name')
     ->label('scope', 'users.write')
@@ -960,7 +965,7 @@ App::patch('/v1/users/:userId/name')
     });
 
 App::patch('/v1/users/:userId/password')
-    ->desc('Update Password')
+    ->desc('Update password')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].update.password')
     ->label('scope', 'users.write')
@@ -1025,7 +1030,7 @@ App::patch('/v1/users/:userId/password')
     });
 
 App::patch('/v1/users/:userId/email')
-    ->desc('Update Email')
+    ->desc('Update email')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].update.email')
     ->label('scope', 'users.write')
@@ -1082,7 +1087,7 @@ App::patch('/v1/users/:userId/email')
     });
 
 App::patch('/v1/users/:userId/phone')
-    ->desc('Update Phone')
+    ->desc('Update phone')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].update.phone')
     ->label('scope', 'users.write')
@@ -1126,7 +1131,7 @@ App::patch('/v1/users/:userId/phone')
     });
 
 App::patch('/v1/users/:userId/verification')
-    ->desc('Update Email Verification')
+    ->desc('Update email verification')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].update.verification')
     ->label('scope', 'users.write')
@@ -1162,7 +1167,7 @@ App::patch('/v1/users/:userId/verification')
     });
 
 App::patch('/v1/users/:userId/prefs')
-    ->desc('Update User Preferences')
+    ->desc('Update user preferences')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].update.prefs')
     ->label('scope', 'users.write')
@@ -1228,6 +1233,10 @@ App::patch('/v1/users/:userId/targets/:targetId/identifier')
             throw new Exception(Exception::USER_TARGET_NOT_FOUND);
         }
 
+        if ($user->getId() !== $target->getAttribute('userId')) {
+            throw new Exception(Exception::USER_TARGET_NOT_FOUND);
+        }
+
         $target->setAttribute('identifier', $identifier);
 
         $target = $dbForProject->updateDocument('targets', $target->getId(), $target);
@@ -1238,11 +1247,11 @@ App::patch('/v1/users/:userId/targets/:targetId/identifier')
             ->setParam('targetId', $targetId);
 
         $response
-        ->dynamic($target, Response::MODEL_TARGET);
+            ->dynamic($target, Response::MODEL_TARGET);
     });
 
 App::delete('/v1/users/:userId/sessions/:sessionId')
-    ->desc('Delete User Session')
+    ->desc('Delete user session')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].sessions.[sessionId].delete')
     ->label('scope', 'users.write')
@@ -1286,7 +1295,7 @@ App::delete('/v1/users/:userId/sessions/:sessionId')
     });
 
 App::delete('/v1/users/:userId/sessions')
-    ->desc('Delete User Sessions')
+    ->desc('Delete user sessions')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].sessions.[sessionId].delete')
     ->label('scope', 'users.write')
@@ -1329,7 +1338,7 @@ App::delete('/v1/users/:userId/sessions')
     });
 
 App::delete('/v1/users/:userId')
-    ->desc('Delete User')
+    ->desc('Delete user')
     ->groups(['api', 'users'])
     ->label('event', 'users.[userId].delete')
     ->label('scope', 'users.write')
@@ -1403,6 +1412,10 @@ App::delete('/v1/users/:userId/targets/:targetId')
             throw new Exception(Exception::USER_TARGET_NOT_FOUND);
         }
 
+        if ($user->getId() !== $target->getAttribute('userId')) {
+            throw new Exception(Exception::USER_TARGET_NOT_FOUND);
+        }
+
         $target = $dbForProject->deleteDocument('targets', $target->getId());
         $dbForProject->deleteCachedDocument('users', $user->getId());
 

app/controllers/api/vcs.php

@@ -23,6 +23,7 @@ use Utopia\Database\Helpers\Role;
 use Utopia\Database\Query;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Database\Validator\UID;
+use Utopia\Detector\Adapter\Bun;
 use Utopia\Detector\Adapter\CPP;
 use Utopia\Detector\Adapter\Dart;
 use Utopia\Detector\Adapter\Deno;
@@ -49,6 +50,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
 
             $functionId = $resource->getAttribute('resourceId');
             $function = Authorization::skip(fn () => $dbForProject->getDocument('functions', $functionId));
+            $functionInternalId = $function->getInternalId();
 
             $deploymentId = ID::unique();
             $repositoryId = $resource->getId();
@@ -172,6 +174,7 @@ $createGitDeployments = function (GitHub $github, string $providerInstallationId
                     Permission::delete(Role::any()),
                 ],
                 'resourceId' => $functionId,
+                'resourceInternalId' => $functionInternalId,
                 'resourceType' => 'functions',
                 'entrypoint' => $function->getAttribute('entrypoint'),
                 'commands' => $function->getAttribute('commands'),
@@ -469,6 +472,7 @@ App::post('/v1/vcs/github/installations/:installationId/providerRepositories/:pr
 
         $detectorFactory
             ->addDetector(new JavaScript())
+            ->addDetector(new Bun())
             ->addDetector(new PHP())
             ->addDetector(new Python())
             ->addDetector(new Dart())
@@ -549,6 +553,7 @@ App::get('/v1/vcs/github/installations/:installationId/providerRepositories')
 
                     $detectorFactory
                         ->addDetector(new JavaScript())
+                        ->addDetector(new Bun())
                         ->addDetector(new PHP())
                         ->addDetector(new Python())
                         ->addDetector(new Dart())