From 51a6db995aae58e128817bd7550685fd47d71871 Mon Sep 17 00:00:00 2001
From: Damodar Lohani <dlohani48@gmail.com>
Date: Tue, 2 Aug 2022 01:10:48 +0000
Subject: [PATCH] groups at the top in hooks

---
 app/controllers/api/projects.php | 2 +-
 app/controllers/mock.php         | 2 +-
 app/controllers/shared/api.php   | 6 +++---
 app/controllers/shared/web.php   | 2 +-
 app/controllers/web/console.php  | 4 ++--
 app/controllers/web/home.php     | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php
index 0714499c0..214af8e44 100644
--- a/app/controllers/api/projects.php
+++ b/app/controllers/api/projects.php
@@ -32,8 +32,8 @@ use Utopia\Validator\Text;
 use Utopia\Validator\WhiteList;
 
 App::init()
-    ->inject('project')
     ->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);
diff --git a/app/controllers/mock.php b/app/controllers/mock.php
index 1e09de8e4..6dd29d448 100644
--- a/app/controllers/mock.php
+++ b/app/controllers/mock.php
@@ -559,10 +559,10 @@ App::get('/v1/mock/tests/general/oauth2/failure')
     });
 
 App::shutdown()
+    ->groups(['mock'])
     ->inject('utopia')
     ->inject('response')
     ->inject('request')
-    ->groups(['mock'])
     ->action(function (App $utopia, Response $response, Request $request) {
 
         $result = [];
diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php
index 5c377e1db..2d2720956 100644
--- a/app/controllers/shared/api.php
+++ b/app/controllers/shared/api.php
@@ -20,6 +20,7 @@ use Utopia\Database\Validator\Authorization;
 use Utopia\Registry\Registry;
 
 App::init()
+    ->groups(['api'])
     ->inject('utopia')
     ->inject('request')
     ->inject('response')
@@ -33,7 +34,6 @@ App::init()
     ->inject('database')
     ->inject('dbForProject')
     ->inject('mode')
-    ->groups(['api'])
     ->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);
@@ -132,10 +132,10 @@ App::init()
     });
 
 App::init()
+    ->groups(['auth'])
     ->inject('utopia')
     ->inject('request')
     ->inject('project')
-    ->groups(['auth'])
     ->action(function (App $utopia, Request $request, Document $project) {
 
         $route = $utopia->match($request);
@@ -186,6 +186,7 @@ App::init()
     });
 
 App::shutdown()
+    ->groups(['api'])
     ->inject('utopia')
     ->inject('request')
     ->inject('response')
@@ -197,7 +198,6 @@ App::shutdown()
     ->inject('database')
     ->inject('mode')
     ->inject('dbForProject')
-    ->groups(['api'])
     ->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())) {
diff --git a/app/controllers/shared/web.php b/app/controllers/shared/web.php
index cfffd951f..5e1e0bd37 100644
--- a/app/controllers/shared/web.php
+++ b/app/controllers/shared/web.php
@@ -7,11 +7,11 @@ use Appwrite\Utopia\Request;
 use Appwrite\Utopia\View;
 
 App::init()
+    ->groups(['web'])
     ->inject('utopia')
     ->inject('request')
     ->inject('response')
     ->inject('layout')
-    ->groups(['web'])
     ->action(function (App $utopia, Request $request, Response $response, View $layout) {
         /* AJAX check  */
         if (!empty($request->getQuery('version', ''))) {
diff --git a/app/controllers/web/console.php b/app/controllers/web/console.php
index 08b247ac7..e627ff986 100644
--- a/app/controllers/web/console.php
+++ b/app/controllers/web/console.php
@@ -10,8 +10,8 @@ use Utopia\Database\Validator\UID;
 use Utopia\Storage\Storage;
 
 App::init()
-    ->inject('layout')
     ->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.')
@@ -20,9 +20,9 @@ App::init()
     });
 
 App::shutdown()
+    ->groups(['console'])
     ->inject('response')
     ->inject('layout')
-    ->groups(['console'])
     ->action(function (Response $response, View $layout) {
         $header = new View(__DIR__ . '/../../views/console/comps/header.phtml');
         $footer = new View(__DIR__ . '/../../views/console/comps/footer.phtml');
diff --git a/app/controllers/web/home.php b/app/controllers/web/home.php
index faee76a5c..90828a1d5 100644
--- a/app/controllers/web/home.php
+++ b/app/controllers/web/home.php
@@ -8,8 +8,8 @@ use Utopia\Database\Database;
 use Utopia\Database\Document;
 
 App::init()
-    ->inject('layout')
     ->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');
@@ -29,9 +29,9 @@ App::init()
     });
 
 App::shutdown()
+    ->groups(['home'])
     ->inject('response')
     ->inject('layout')
-    ->groups(['home'])
     ->action(function (Response $response, View $layout) {
         $response->html($layout->render());
     });