From 9f6eb9ba67be2bc8e9f2f688078428d39760f221 Mon Sep 17 00:00:00 2001 From: Christy Jacob Date: Fri, 19 Mar 2021 02:13:49 +0530 Subject: [PATCH] feat: some more refactoring --- app/controllers/general.php | 9 ++------- app/controllers/shared/api.php | 11 +++-------- app/http.php | 1 - app/init.php | 7 ++++--- src/Appwrite/GraphQL/Builder.php | 4 ++-- 5 files changed, 11 insertions(+), 21 deletions(-) diff --git a/app/controllers/general.php b/app/controllers/general.php index ea78a280e4..95560ef0b8 100644 --- a/app/controllers/general.php +++ b/app/controllers/general.php @@ -42,7 +42,7 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo $route = $utopia->match($request); - var_dump("*********** In general.php init with route {$route->getURL()} *************"); + // var_dump("*********** In general.php init with route {$route->getURL()} *************"); if (!empty($route->getLabel('sdk.platform', [])) && empty($project->getId()) && ($route->getLabel('scope', '') !== 'public')) { throw new Exception('Missing or unknown project ID', 400); @@ -213,10 +213,6 @@ App::init(function ($utopia, $request, $response, $console, $project, $user, $lo // TDOO Check if user is god - // var_dump("*********** Allowed Scopes *********"); - // var_dump($scopes); - // var_dump($scope); - if (!\in_array($scope, $scopes)) { if (empty($project->getId()) || Database::SYSTEM_COLLECTION_PROJECTS !== $project->getCollection()) { // Check if permission is denied because project is missing throw new Exception('Project not found', 404); @@ -295,8 +291,7 @@ App::error(function ($error, $utopia, $request, $response, $layout, $project) { //$_SERVER = []; // Reset before reporting to error log to avoid keys being compromised - var_dump("*********** In general.php error->getCode() {$error->getCode()} *************"); - var_dump("*********** In general.php code ${code} *************"); + var_dump("*********** In general.php::error error->getCode() {$error->getCode()} *************"); $output = ((App::isDevelopment())) ? [ 'message' => $error->getMessage(), diff --git a/app/controllers/shared/api.php b/app/controllers/shared/api.php index 051904a5dc..a5a4c2210c 100644 --- a/app/controllers/shared/api.php +++ b/app/controllers/shared/api.php @@ -22,8 +22,6 @@ App::init(function ($utopia, $request, $response, $project, $user, $register, $e /** @var Appwrite\Event\Event $deletes */ /** @var Appwrite\Event\Event $functions */ - var_dump("*********** In api.php init *************"); - Storage::setDevice('files', new Local(APP_STORAGE_UPLOADS.'/app-'.$project->getId())); Storage::setDevice('functions', new Local(APP_STORAGE_FUNCTIONS.'/app-'.$project->getId())); @@ -49,12 +47,9 @@ App::init(function ($utopia, $request, $response, $project, $user, $register, $e //TODO make sure we get array here - - // var_dump($request->getParams()); - - // foreach ($request->getParams() as $key => $value) { // Set request params as potential abuse keys - // $timeLimit->setParam('{param-'.$key.'}', (\is_array($value)) ? \json_encode($value) : $value); - // } + foreach ($request->getParams() as $key => $value) { // Set request params as potential abuse keys + $timeLimit->setParam('{param-'.$key.'}', (\is_array($value)) ? \json_encode($value) : $value); + } $abuse = new Abuse($timeLimit); diff --git a/app/http.php b/app/http.php index 07e12dedaf..003594a235 100644 --- a/app/http.php +++ b/app/http.php @@ -102,7 +102,6 @@ $http->on('request', function (SwooleRequest $swooleRequest, SwooleResponse $swo $app->run($request, $response); } catch (\Throwable $th) { - var_dump("*********** In http.php catching error *************"); Console::error('[Error] Type: '.get_class($th)); Console::error('[Error] Message: '.$th->getMessage()); Console::error('[Error] File: '.$th->getFile()); diff --git a/app/init.php b/app/init.php index 4cd07324b9..b2370b99a8 100644 --- a/app/init.php +++ b/app/init.php @@ -31,6 +31,7 @@ use Utopia\Registry\Registry; use MaxMind\Db\Reader; use PHPMailer\PHPMailer\PHPMailer; use PDO as PDONative; +use Utopia\CLI\Console; const APP_NAME = 'Appwrite'; const APP_DOMAIN = 'appwrite.io'; @@ -511,12 +512,12 @@ App::setResource('schema', function($utopia, $response, $request, $register) { * Try to get the schema from the register. * If there is no schema catch the exception and generate it. */ - var_dump('[INFO] Getting Schema from register..'); + Console::log('Getting Schema from register...'); $schema = $register->get('_schema'); } catch (Exception $e) { - var_dump('[INFO] Exception, Schema not present. Generating Schema'); + Console::error('Schema not present. Generating Schema...'); $schema = Builder::buildSchema($utopia, $response, $register); - $register->set('_schema', function () use ($schema){ // Register cache connection + $register->set('_schema', function () use ($schema){ return $schema; }); } diff --git a/src/Appwrite/GraphQL/Builder.php b/src/Appwrite/GraphQL/Builder.php index cb7cc95b16..1e933bf250 100644 --- a/src/Appwrite/GraphQL/Builder.php +++ b/src/Appwrite/GraphQL/Builder.php @@ -199,7 +199,7 @@ class Builder { * @return Schema */ public static function buildSchema($utopia, $response, $register) { - Console::info("[INFO] Building GraphQL Schema..."); + Console::log("[INFO] Building GraphQL Schema..."); $start = microtime(true); self::init(); @@ -278,7 +278,7 @@ class Builder { ]); $time_elapsed_secs = microtime(true) - $start; - Console::info("[INFO] Time Taken To Build Schema : ${time_elapsed_secs}s"); + Console::log("[INFO] Time Taken To Build Schema : ${time_elapsed_secs}s"); return $schema; }