CodeMirror/appwrite
1
0
Fork 0
mirror of synced 2024-06-02 10:54:44 +12:00
Code Issues Projects Releases Wiki Activity

format newly added changes

Browse source
This commit is contained in:
Everly Precia Suresh 2022-05-31 11:35:59 +00:00
parent 746dc72439
commit f039fb36fc
4 changed files with 22 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
app/controllers/general.php
View file

@ -193,7 +193,7 @@ App::init(function (App $utopia, Request $request, Response $response, Document
*/
if (App::getEnv('_APP_OPTIONS_FORCE_HTTPS', 'disabled') === 'enabled') { // Force HTTPS
if ($request->getProtocol() !== 'https') {
if($request->getMethod() !== Request::METHOD_GET) {
if ($request->getMethod() !== Request::METHOD_GET) {
throw new AppwriteException('Method unsupported over HTTP.', 500, AppwriteException::GENERAL_PROTOCOL_UNSUPPORTED);
}
@ -225,7 +225,8 @@ App::init(function (App $utopia, Request $request, Response $response, Document
!$originValidator->isValid($origin)
&& \in_array($request->getMethod(), [Request::METHOD_POST, Request::METHOD_PUT, Request::METHOD_PATCH, Request::METHOD_DELETE])
&& $route->getLabel('origin', false) !== '*'
&& empty($request->getHeader('x-appwrite-key', ''))) {
&& empty($request->getHeader('x-appwrite-key', ''))
) {
throw new AppwriteException($originValidator->getDescription(), 403, AppwriteException::GENERAL_UNKNOWN_ORIGIN);
}
@ -290,11 +291,13 @@ App::init(function (App $utopia, Request $request, Response $response, Document
Authorization::setRole($authRole);
}
$service = $route->getLabel('sdk.namespace','');
if(!empty($service)) {
if(array_key_exists($service, $project->getAttribute('services',[]))
&& !$project->getAttribute('services',[])[$service]
&& !Auth::isPrivilegedUser(Authorization::getRoles())) {
$service = $route->getLabel('sdk.namespace', '');
if (!empty($service)) {
if (
array_key_exists($service, $project->getAttribute('services', []))
&& !$project->getAttribute('services', [])[$service]
&& !Auth::isPrivilegedUser(Authorization::getRoles())
) {
throw new AppwriteException('Service is disabled', 503, AppwriteException::GENERAL_SERVICE_DISABLED);
}
}
@ -304,7 +307,7 @@ App::init(function (App $utopia, Request $request, Response $response, Document
throw new AppwriteException('Project not found', 404, AppwriteException::PROJECT_NOT_FOUND);
}
throw new AppwriteException($user->getAttribute('email', 'User').' (role: '.\strtolower($roles[$role]['label']).') missing scope ('.$scope.')', 401, AppwriteException::GENERAL_UNAUTHORIZED_SCOPE);
throw new AppwriteException($user->getAttribute('email', 'User') . ' (role: ' . \strtolower($roles[$role]['label']) . ') missing scope (' . $scope . ')', 401, AppwriteException::GENERAL_UNAUTHORIZED_SCOPE);
}
if (false === $user->getAttribute('status')) { // Account is blocked
@ -413,7 +416,7 @@ App::error(function (AppwriteException|UtopiaException $error, App $utopia, Requ
/** Handle Utopia Errors */
if ($error instanceof Utopia\Exception) {
$error = new AppwriteException($message, $code, AppwriteException::GENERAL_UNKNOWN, $error);
switch($code) {
switch ($code) {
case 400:
$error->setType(AppwriteException::GENERAL_ARGUMENT_INVALID);
break;
@ -535,7 +538,7 @@ App::get('/robots.txt')
->label('docs', false)
->inject('response')
->action(function (Response $response) {
$template = new View(__DIR__.'/../views/general/robots.phtml');
$template = new View(__DIR__ . '/../views/general/robots.phtml');
$response->text($template->render(false));
});
@ -545,7 +548,7 @@ App::get('/humans.txt')
->label('docs', false)
->inject('response')
->action(function (Response $response) {
$template = new View(__DIR__.'/../views/general/humans.phtml');
$template = new View(__DIR__ . '/../views/general/humans.phtml');
$response->text($template->render(false));
});

6
app/controllers/mock.php
View file

@ -208,7 +208,7 @@ App::get('/v1/mock/tests/general/download')
->label('sdk.mock', true)
->inject('response')
->action(function (Response $response) {
$response
->setContentType('text/plain')
->addHeader('Content-Disposition', 'attachment; filename="test.txt"')
@ -238,7 +238,7 @@ App::post('/v1/mock/tests/general/upload')
->inject('request')
->inject('response')
->action(function (string $x, int $y, array $z, array $file, Request $request, Response $response) {
$file = $request->getFiles('file');
$contentRange = $request->getHeader('content-range');
@ -558,7 +558,7 @@ App::get('/v1/mock/tests/general/oauth2/failure')
]);
});
App::shutdown(function(App $utopia, Response $response, Request $request) {
App::shutdown(function (App $utopia, Response $response, Request $request) {
$result = [];
$route = $utopia->match($request);

8
app/controllers/web/console.php
View file

@ -324,8 +324,8 @@ App::get('/console/storage')
->inject('layout')
->action(function (View $layout) {
$page = new View(__DIR__.'/../../views/console/storage/index.phtml');
$page = new View(__DIR__ . '/../../views/console/storage/index.phtml');
$page
->setParam('home', App::getEnv('_APP_HOME', 0))
->setParam('fileLimit', App::getEnv('_APP_STORAGE_LIMIT', 0))
@ -420,7 +420,7 @@ App::get('/console/functions')
->label('scope', 'console')
->inject('layout')
->action(function (View $layout) {
$page = new View(__DIR__.'/../../views/console/functions/index.phtml');
$page = new View(__DIR__ . '/../../views/console/functions/index.phtml');
$page
->setParam('runtimes', Config::getParam('runtimes'))
@ -438,7 +438,7 @@ App::get('/console/functions/function')
->label('scope', 'console')
->inject('layout')
->action(function (View $layout) {
$page = new View(__DIR__.'/../../views/console/functions/function.phtml');
$page = new View(__DIR__ . '/../../views/console/functions/function.phtml');
$page
->setParam('events', Config::getParam('events', []))

2
app/controllers/web/home.php
View file

@ -86,7 +86,7 @@ App::get('/auth/signup')
->inject('layout')
->action(function (View $layout) {
$page = new View(__DIR__.'/../../views/home/auth/signup.phtml');
$page = new View(__DIR__ . '/../../views/home/auth/signup.phtml');
$page
->setParam('root', App::getEnv('_APP_CONSOLE_WHITELIST_ROOT', 'enabled'))