CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-28 03:01:15 +12:00
Code Issues Projects Releases Wiki Activity

Fixed preloading

Browse source
This commit is contained in:
Eldad Fux 2020-07-07 23:40:08 +03:00
parent e113f89b5b
commit 633b3bcb15
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/app.php
View file

@ -3,7 +3,7 @@
require_once __DIR__.'/init.php'; require_once __DIR__.'/init.php';
use Utopia\App; use Utopia\App;
use Appwrite\Utopia\Request; use Appwrite\Swoole\Request;
use Appwrite\Utopia\Response; use Appwrite\Utopia\Response;
use Utopia\View; use Utopia\View;
use Utopia\Exception; use Utopia\Exception;
@ -20,7 +20,7 @@ Config::setParam('cookieDomain', 'localhost');
Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE); Config::setParam('cookieSamesite', Response::COOKIE_SAMESITE_NONE);
App::init(function ($utopia, $request, $response, $console, $project, $user, $locale, $webhooks, $audits, $usage, $clients) { 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\Utopia\Response $response */
/** @var Appwrite\Database\Document $console */ /** @var Appwrite\Database\Document $console */
/** @var Appwrite\Database\Document $project */ /** @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']); }, ['utopia', 'request', 'response', 'project', 'webhooks', 'audits', 'usage', 'deletes', 'mode']);
App::options(function ($request, $response) { App::options(function ($request, $response) {
/** @var Appwrite\Utopia\Request $request */ /** @var Appwrite\Swoole\Request $request */
/** @var Appwrite\Utopia\Response $response */ /** @var Appwrite\Utopia\Response $response */
$origin = $request->getOrigin(''); $origin = $request->getOrigin();
$response $response
->addHeader('Server', 'Appwrite')
->addHeader('Access-Control-Allow-Methods', 'GET, POST, PUT, PATCH, DELETE') ->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-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') ->addHeader('Access-Control-Expose-Headers', 'X-Fallback-Cookies')

2
app/controllers/api/account.php
View file

@ -160,7 +160,7 @@ App::post('/v1/account/sessions')
->param('email', '', function () { return new Email(); }, 'User email.') ->param('email', '', function () { return new Email(); }, 'User email.')
->param('password', '', function () { return new Password(); }, 'User password. Must be between 6 to 32 chars.') ->param('password', '', function () { return new Password(); }, 'User password. Must be between 6 to 32 chars.')
->action(function ($email, $password, $request, $response, $projectDB, $webhooks, $audits) { ->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\Utopia\Response $response */
/** @var Appwrite\Database\Database $projectDB */ /** @var Appwrite\Database\Database $projectDB */
/** @var Appwrite\Event\Event $webhooks */ /** @var Appwrite\Event\Event $webhooks */

2
app/init.php
View file

@ -363,7 +363,7 @@ App::setResource('user', function($mode, $project, $console, $request, $response
}, ['mode', 'project', 'console', 'request', 'response', 'projectDB', 'consoleDB']); }, ['mode', 'project', 'console', 'request', 'response', 'projectDB', 'consoleDB']);
App::setResource('project', function($consoleDB, $request) { App::setResource('project', function($consoleDB, $request) {
/** @var Appwrite\Utopia\Request $request */ /** @var Appwrite\Swoole\Request $request */
/** @var Appwrite\Database\Database $consoleDB */ /** @var Appwrite\Database\Database $consoleDB */
Authorization::disable(); Authorization::disable();

2
app/preload.php
View file

@ -31,5 +31,5 @@ include 'app.php';
->ignore(realpath(__DIR__ . '/../vendor/maxmind')) ->ignore(realpath(__DIR__ . '/../vendor/maxmind'))
->ignore(realpath(__DIR__ . '/../vendor/maxmind-db')) ->ignore(realpath(__DIR__ . '/../vendor/maxmind-db'))
->ignore(realpath(__DIR__ . '/../vendor/psr/log')) ->ignore(realpath(__DIR__ . '/../vendor/psr/log'))
// ->ignore(realpath(__DIR__ . '/../vendor/piwik')) ->ignore(realpath(__DIR__ . '/../vendor/piwik'))
->load(); ->load();