From 09e9483d94ac8361f47e6ff9af16ac519ed039bb Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Mon, 22 Apr 2024 21:38:48 +0200
Subject: [PATCH] Changed autoloading order

---
 app/cli.php    | 2 +-
 app/http.php   | 7 ++-----
 app/init2.php  | 2 ++
 app/worker.php | 1 -
 4 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/cli.php b/app/cli.php
index 9194edd5e1..423dff72b5 100644
--- a/app/cli.php
+++ b/app/cli.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once __DIR__ . '/init.php';
+require_once __DIR__ . '/init2.php';
 require_once __DIR__ . '/controllers/general.php';
 
 use Appwrite\Event\Certificate;
diff --git a/app/http.php b/app/http.php
index ec65d7275f..0ba12219ee 100644
--- a/app/http.php
+++ b/app/http.php
@@ -1,6 +1,6 @@
 <?php
-
-require_once __DIR__ . '/../vendor/autoload.php';
+require_once __DIR__ . '/init2.php';
+require_once __DIR__ . '/controllers/general.php';
 
 use Appwrite\Utopia\Queue\Connections;
 use Appwrite\Utopia\Request;
@@ -22,9 +22,6 @@ use Utopia\Http\Adapter\Swoole\Server;
 use Utopia\Http\Http;
 use Utopia\System\System;
 
-require_once __DIR__ . '/init2.php';
-require_once __DIR__ . '/controllers/general.php';
-
 $workerNumber = swoole_cpu_num() * intval(System::getEnv('_APP_WORKER_PER_CORE', 6));
 $payloadSize = 6 * (1024 * 1024); // 6MB
 
diff --git a/app/init2.php b/app/init2.php
index 70ab15b397..7561fa7cd3 100644
--- a/app/init2.php
+++ b/app/init2.php
@@ -1,4 +1,5 @@
 <?php
+require_once __DIR__ . '/../vendor/autoload.php';
 
 use PHPMailer\PHPMailer\PHPMailer;
 use Utopia\VCS\Adapter\Git\GitHub;
@@ -470,6 +471,7 @@ $user
             try {
                 $payload = $jwt->decode($authJWT);
             } catch (JWTException $error) {
+                $request->removeHeader('x-appwrite-jwt');
                 throw new Exception(Exception::USER_JWT_INVALID, 'Failed to verify JWT. ' . $error->getMessage());
             }
 
diff --git a/app/worker.php b/app/worker.php
index 7763843955..33db5fa6a8 100644
--- a/app/worker.php
+++ b/app/worker.php
@@ -1,6 +1,5 @@
 <?php
 
-require_once __DIR__ . '/../vendor/autoload.php';
 require_once __DIR__ . '/init2.php';
 
 use Appwrite\Event\Audit;