From 633b3bcb15bba2bcca6898303e71f0a88cf3d020 Mon Sep 17 00:00:00 2001
From: Eldad Fux <eldad.fux@gmail.com>
Date: Tue, 7 Jul 2020 23:40:08 +0300
Subject: [PATCH] Fixed preloading

---
 app/app.php                     | 9 +++++----
 app/controllers/api/account.php | 2 +-
 app/init.php                    | 2 +-
 app/preload.php                 | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/app/app.php b/app/app.php
index 5344fd47b..cb90b25d3 100644
--- a/app/app.php
+++ b/app/app.php
@@ -3,7 +3,7 @@
 require_once __DIR__.'/init.php';
 
 use Utopia\App;
-use Appwrite\Utopia\Request;
+use Appwrite\Swoole\Request;
 use Appwrite\Utopia\Response;
 use Utopia\View;
 use Utopia\Exception;
@@ -20,7 +20,7 @@ Config::setParam('cookieDomain', 'localhost');
 Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);
 
 App::init(function ($utopia, $request, $response, $console, $project, $user, $locale, $webhooks, $audits, $usage, $clients) {
-    /** @var Appwrite\Utopia\Request $request */
+    /** @var Appwrite\Swoole\Request $request */
     /** @var Appwrite\Utopia\Response $response */
     /** @var Appwrite\Database\Document $console */
     /** @var Appwrite\Database\Document $project */
@@ -275,12 +275,13 @@ App::shutdown(function ($utopia, $request, $response, $project, $webhooks, $audi
 }, ['utopia', 'request', 'response', 'project', 'webhooks', 'audits', 'usage', 'deletes', 'mode']);
 
 App::options(function ($request, $response) {
-    /** @var Appwrite\Utopia\Request $request */
+    /** @var Appwrite\Swoole\Request $request */
     /** @var Appwrite\Utopia\Response $response */
 
-    $origin = $request->getOrigin('');
+    $origin = $request->getOrigin();
 
     $response
+        ->addHeader('Server', 'Appwrite')
         ->addHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE')
         ->addHeader('Access-Control-Allow-Headers', 'Origin, Cookie, Set-Cookie, X-Requested-With, Content-Type, Access-Control-Allow-Origin, Access-Control-Request-Headers, Accept, X-Appwrite-Project, X-Appwrite-Key, X-Appwrite-Locale, X-Appwrite-Mode, X-SDK-Version, Cache-Control, Expires, Pragma, X-Fallback-Cookies')
         ->addHeader('Access-Control-Expose-Headers', 'X-Fallback-Cookies')
diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index 960560290..c1168c47c 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -160,7 +160,7 @@ App::post('/v1/account/sessions')
     ->param('email', '', function () { return new Email(); }, 'User email.')
     ->param('password', '', function () { return new Password(); }, 'User password. Must be between 6 to 32 chars.')
     ->action(function ($email, $password, $request, $response, $projectDB, $webhooks, $audits) {
-        /** @var Appwrite\Utopia\Request $request */
+        /** @var Appwrite\Swoole\Request $request */
         /** @var Appwrite\Utopia\Response $response */
         /** @var Appwrite\Database\Database $projectDB */
         /** @var Appwrite\Event\Event $webhooks */
diff --git a/app/init.php b/app/init.php
index d37a7b9ec..bb5995032 100644
--- a/app/init.php
+++ b/app/init.php
@@ -363,7 +363,7 @@ App::setResource('user', function($mode, $project, $console, $request, $response
 }, ['mode', 'project', 'console', 'request', 'response', 'projectDB', 'consoleDB']);
 
 App::setResource('project', function($consoleDB, $request) {
-    /** @var Appwrite\Utopia\Request $request */
+    /** @var Appwrite\Swoole\Request $request */
     /** @var Appwrite\Database\Database $consoleDB */
 
     Authorization::disable();
diff --git a/app/preload.php b/app/preload.php
index 3e961f48b..d65fd09f0 100644
--- a/app/preload.php
+++ b/app/preload.php
@@ -31,5 +31,5 @@ include 'app.php';
     ->ignore(realpath(__DIR__ . '/../vendor/maxmind'))
     ->ignore(realpath(__DIR__ . '/../vendor/maxmind-db'))
     ->ignore(realpath(__DIR__ . '/../vendor/psr/log'))
-    // ->ignore(realpath(__DIR__ . '/../vendor/piwik'))
+    ->ignore(realpath(__DIR__ . '/../vendor/piwik'))
     ->load();
\ No newline at end of file