Merge branch 'master' of https://github.com/appwrite/appwrite into feat-refactor-tasks

app/controllers/api/projects.php

@@ -31,12 +31,14 @@ use Utopia\Validator\Range;
 use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;
 
-App::init(function (Document $project) {
-
+App::init()
+    ->groups(['projects'])
+    ->inject('project')
+    ->action(function (Document $project) {
         if ($project->getId() !== 'console') {
             throw new Exception('Access to this API is forbidden.', 401, Exception::GENERAL_ACCESS_FORBIDDEN);
         }
-}, ['project'], 'projects');
+    });
 
 App::post('/v1/projects')
     ->desc('Create Project')

app/controllers/general.php

@@ -35,8 +35,17 @@ Config::setParam('domainVerification', false);
 Config::setParam('cookieDomain', 'localhost');
 Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);
 
-App::init(function (App $utopia, Request $request, Response $response, Document $console, Document $project, Database $dbForConsole, Document $user, Locale $locale, array $clients) {
-
+App::init()
+    ->inject('utopia')
+    ->inject('request')
+    ->inject('response')
+    ->inject('console')
+    ->inject('project')
+    ->inject('dbForConsole')
+    ->inject('user')
+    ->inject('locale')
+    ->inject('clients')
+    ->action(function (App $utopia, Request $request, Response $response, Document $console, Document $project, Database $dbForConsole, Document $user, Locale $locale, array $clients) {
         /*
         * Request format
         */
@@ -326,9 +335,12 @@ App::init(function (App $utopia, Request $request, Response $response, Document
         if ($user->getAttribute('reset')) {
             throw new AppwriteException('Password reset is required', 412, AppwriteException::USER_PASSWORD_RESET_REQUIRED);
         }
-}, ['utopia', 'request', 'response', 'console', 'project', 'dbForConsole', 'user', 'locale', 'clients']);
+    });
 
-App::options(function (Request $request, Response $response) {
+App::options()
+    ->inject('request')
+    ->inject('response')
+    ->action(function (Request $request, Response $response) {
 
         $origin = $request->getOrigin();
 
@@ -340,9 +352,18 @@ App::options(function (Request $request, Response $response) {
             ->addHeader('Access-Control-Allow-Origin', $origin)
             ->addHeader('Access-Control-Allow-Credentials', 'true')
             ->noContent();
-}, ['request', 'response']);
+    });
 
-App::error(function (Throwable $error, App $utopia, Request $request, Response $response, View $layout, Document $project, ?Logger $logger, array $loggerBreadcrumbs) {
+App::error()
+    ->inject('error')
+    ->inject('utopia')
+    ->inject('request')
+    ->inject('response')
+    ->inject('layout')
+    ->inject('project')
+    ->inject('logger')
+    ->inject('loggerBreadcrumbs')
+    ->action(function (Throwable $error, App $utopia, Request $request, Response $response, View $layout, Document $project, ?Logger $logger, array $loggerBreadcrumbs) {
 
         $version = App::getEnv('_APP_VERSION', 'UNKNOWN');
         $route = $utopia->match($request);
@@ -513,7 +534,7 @@ App::error(function (Throwable $error, App $utopia, Request $request, Response $
             new Document($output),
             $utopia->isDevelopment() ? Response::MODEL_ERROR_DEV : Response::MODEL_ERROR
         );
-}, ['error', 'utopia', 'request', 'response', 'layout', 'project', 'logger', 'loggerBreadcrumbs']);
+    });
 
 App::get('/manifest.json')
     ->desc('Progressive app manifest file')

app/controllers/mock.php

@@ -558,7 +558,12 @@ App::get('/v1/mock/tests/general/oauth2/failure')
             ]);
     });
 
-App::shutdown(function (App $utopia, Response $response, Request $request) {
+App::shutdown()
+    ->groups(['mock'])
+    ->inject('utopia')
+    ->inject('response')
+    ->inject('request')
+    ->action(function (App $utopia, Response $response, Request $request) {
 
         $result = [];
         $route  = $utopia->match($request);
@@ -578,4 +583,4 @@ App::shutdown(function (App $utopia, Response $response, Request $request) {
         }
 
         $response->dynamic(new Document(['result' => $route->getMethod() . ':' . $route->getPath() . ':passed']), Response::MODEL_MOCK);
-}, ['utopia', 'response', 'request'], 'mock');
+    });

app/controllers/shared/api.php

@@ -19,7 +19,22 @@ use Utopia\Database\Document;
 use Utopia\Database\Validator\Authorization;
 use Utopia\Registry\Registry;
 
-App::init(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Event $events, Audit $audits, Mail $mails, Stats $usage, Delete $deletes, EventDatabase $database, Database $dbForProject, string $mode) {
+App::init()
+    ->groups(['api'])
+    ->inject('utopia')
+    ->inject('request')
+    ->inject('response')
+    ->inject('project')
+    ->inject('user')
+    ->inject('events')
+    ->inject('audits')
+    ->inject('mails')
+    ->inject('usage')
+    ->inject('deletes')
+    ->inject('database')
+    ->inject('dbForProject')
+    ->inject('mode')
+    ->action(function (App $utopia, Request $request, Response $response, Document $project, Document $user, Event $events, Audit $audits, Mail $mails, Stats $usage, Delete $deletes, EventDatabase $database, Database $dbForProject, string $mode) {
 
         $route = $utopia->match($request);
 
@@ -114,9 +129,14 @@ App::init(function (App $utopia, Request $request, Response $response, Document
 
         $deletes->setProject($project);
         $database->setProject($project);
-}, ['utopia', 'request', 'response', 'project', 'user', 'events', 'audits', 'mails', 'usage', 'deletes', 'database', 'dbForProject', 'mode'], 'api');
+    });
 
-App::init(function (App $utopia, Request $request, Document $project) {
+App::init()
+    ->groups(['auth'])
+    ->inject('utopia')
+    ->inject('request')
+    ->inject('project')
+    ->action(function (App $utopia, Request $request, Document $project) {
 
         $route = $utopia->match($request);
 
@@ -163,9 +183,22 @@ App::init(function (App $utopia, Request $request, Document $project) {
                 throw new Exception('Unsupported authentication route', 501, Exception::USER_AUTH_METHOD_UNSUPPORTED);
                 break;
         }
-}, ['utopia', 'request', 'project'], 'auth');
+    });
 
-App::shutdown(function (App $utopia, Request $request, Response $response, Document $project, Event $events, Audit $audits, Stats $usage, Delete $deletes, EventDatabase $database, string $mode, Database $dbForProject) {
+App::shutdown()
+    ->groups(['api'])
+    ->inject('utopia')
+    ->inject('request')
+    ->inject('response')
+    ->inject('project')
+    ->inject('events')
+    ->inject('audits')
+    ->inject('usage')
+    ->inject('deletes')
+    ->inject('database')
+    ->inject('mode')
+    ->inject('dbForProject')
+    ->action(function (App $utopia, Request $request, Response $response, Document $project, Event $events, Audit $audits, Stats $usage, Delete $deletes, EventDatabase $database, string $mode, Database $dbForProject) {
 
         if (!empty($events->getEvent())) {
             if (empty($events->getPayload())) {
@@ -249,4 +282,4 @@ App::shutdown(function (App $utopia, Request $request, Response $response, Docum
                 ->setParam('networkResponseSize', $response->getSize())
                 ->submit();
         }
-}, ['utopia', 'request', 'response', 'project', 'events', 'audits', 'usage', 'deletes', 'database', 'mode', 'dbForProject'], 'api');
+    });

app/controllers/shared/web.php

@@ -6,8 +6,13 @@ use Appwrite\Utopia\Response;
 use Appwrite\Utopia\Request;
 use Appwrite\Utopia\View;
 
-App::init(function (App $utopia, Request $request, Response $response, View $layout) {
-
+App::init()
+    ->groups(['web'])
+    ->inject('utopia')
+    ->inject('request')
+    ->inject('response')
+    ->inject('layout')
+    ->action(function (App $utopia, Request $request, Response $response, View $layout) {
         /* AJAX check  */
         if (!empty($request->getQuery('version', ''))) {
             $layout->setPath(__DIR__ . '/../../views/layouts/empty.phtml');
@@ -56,4 +61,4 @@ App::init(function (App $utopia, Request $request, Response $response, View $lay
             ->setParam('isDev', App::isDevelopment())
             ->setParam('class', $scope)
         ;
-}, ['utopia', 'request', 'response', 'layout'], 'web');
+    });

app/controllers/web/console.php

@@ -9,16 +9,21 @@ use Utopia\Domains\Domain;
 use Utopia\Database\Validator\UID;
 use Utopia\Storage\Storage;
 
-App::init(function (View $layout) {
-
+App::init()
+    ->groups(['console'])
+    ->inject('layout')
+    ->action(function (View $layout) {
         $layout
             ->setParam('description', 'Appwrite Console allows you to easily manage, monitor, and control your entire backend API and tools.')
             ->setParam('analytics', 'UA-26264668-5')
         ;
-}, ['layout'], 'console');
-
-App::shutdown(function (Response $response, View $layout) {
+    });
 
+App::shutdown()
+    ->groups(['console'])
+    ->inject('response')
+    ->inject('layout')
+    ->action(function (Response $response, View $layout) {
         $header = new View(__DIR__ . '/../../views/console/comps/header.phtml');
         $footer = new View(__DIR__ . '/../../views/console/comps/footer.phtml');
 
@@ -33,7 +38,7 @@ App::shutdown(function (Response $response, View $layout) {
         ;
 
         $response->html($layout->render());
-}, ['response', 'layout'], 'console');
+    });
 
 App::get('/error/:code')
     ->groups(['web', 'console'])

app/controllers/web/home.php

@@ -7,8 +7,10 @@ use Utopia\Config\Config;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 
-App::init(function (View $layout) {
-
+App::init()
+    ->groups(['home'])
+    ->inject('layout')
+    ->action(function (View $layout) {
         $header = new View(__DIR__ . '/../../views/home/comps/header.phtml');
         $footer = new View(__DIR__ . '/../../views/home/comps/footer.phtml');
 
@@ -24,12 +26,15 @@ App::init(function (View $layout) {
             ->setParam('header', [$header])
             ->setParam('footer', [$footer])
         ;
-}, ['layout'], 'home');
-
-App::shutdown(function (Response $response, View $layout) {
+    });
 
+App::shutdown()
+    ->groups(['home'])
+    ->inject('response')
+    ->inject('layout')
+    ->action(function (Response $response, View $layout) {
         $response->html($layout->render());
-}, ['response', 'layout'], 'home');
+    });
 
 App::get('/')
     ->groups(['web', 'home'])

app/executor.php

@@ -581,7 +581,12 @@ App::setResource('orchestrationPool', fn() => $orchestrationPool);
 App::setResource('activeRuntimes', fn() => $activeRuntimes);
 
 /** Set callbacks */
-App::error(function ($utopia, $error, $request, $response) {
+App::error()
+    ->inject('utopia')
+    ->inject('error')
+    ->inject('request')
+    ->inject('response')
+    ->action(function (App $utopia, throwable $error, Request $request, Response $response) {
         $route = $utopia->match($request);
         logError($error, "httpError", $route);
 
@@ -620,9 +625,11 @@ App::error(function ($utopia, $error, $request, $response) {
             ->setStatusCode($code);
 
         $response->json($output);
-}, ['utopia', 'error', 'request', 'response']);
+    });
 
-App::init(function ($request, $response) {
+App::init()
+    ->inject('request')
+    ->action(function (Request $request) {
         $secretKey = $request->getHeader('x-appwrite-executor-key', '');
         if (empty($secretKey)) {
             throw new Exception('Missing executor key', 401);
@@ -631,7 +638,7 @@ App::init(function ($request, $response) {
         if ($secretKey !== App::getEnv('_APP_EXECUTOR_SECRET', '')) {
             throw new Exception('Missing executor key', 401);
         }
-}, ['request', 'response']);
+    });
 
 
 $http->on('start', function ($http) {