Skip to content
Snippets Groups Projects
Verified Commit a3d23934 authored by Janne Mareike Koschinski's avatar Janne Mareike Koschinski
Browse files

Cleanup API

parent 2a8cc6b6
Branches
No related tags found
No related merge requests found
...@@ -7,13 +7,27 @@ require_once '../../database/Database.php'; ...@@ -7,13 +7,27 @@ require_once '../../database/Database.php';
require_once '../../database/helper/RendererHelper.php'; require_once '../../database/helper/RendererHelper.php';
require_once '../../database/helper/SessionHelper.php'; require_once '../../database/helper/SessionHelper.php';
$session = SessionHelper::getInstance();
$config = Config::createFromGlobals(); $config = Config::createFromGlobals();
$renderer = new RendererHelper($config); $renderer = new RendererHelper($config);
$backend = Database::createFromConfig($config); $backend = Database::createFromConfig($config);
try { function param(string $key, $default = null)
$backend->authenticateFromHeader($_SERVER['HTTP_AUTHORIZATION'] ?: ""); {
$renderer->renderJson($backend->context($_REQUEST['anchor'] ?: 0, $_REQUEST['buffer'] ?: 0, $_REQUEST['before'], $_REQUEST['after'])); return array_key_exists($key, $_REQUEST) ? ($_REQUEST[$key] !== "" ? $_REQUEST[$key] : $default) : $default;
} catch (\Exception $e) { }
$renderer->renderJson(["error" => $e->getMessage()]);
if (!$backend->authenticate(
$session->username ?: $_SERVER['PHP_AUTH_USER'] ?: '',
$session->password ?: $_SERVER['PHP_AUTH_PW'] ?: ''
)) {
$session->destroy();
$renderer->renderJsonError(false);
} else {
$renderer->renderJson($backend->context(
param('anchor', 0),
param('buffer', 0),
param('before', 4),
param('after', 4)
));
} }
...@@ -7,13 +7,30 @@ require_once '../../database/Database.php'; ...@@ -7,13 +7,30 @@ require_once '../../database/Database.php';
require_once '../../database/helper/RendererHelper.php'; require_once '../../database/helper/RendererHelper.php';
require_once '../../database/helper/SessionHelper.php'; require_once '../../database/helper/SessionHelper.php';
$session = SessionHelper::getInstance();
$config = Config::createFromGlobals(); $config = Config::createFromGlobals();
$renderer = new RendererHelper($config); $renderer = new RendererHelper($config);
$backend = Database::createFromConfig($config); $backend = Database::createFromConfig($config);
try { function param(string $key, $default = null)
$backend->authenticateFromHeader($_SERVER['HTTP_AUTHORIZATION'] ?: ""); {
$renderer->renderJson($backend->find($_REQUEST['query'] ?: "", $_REQUEST['since'] ?: null, $_REQUEST['before'] ?: null, $_REQUEST['buffer'] ?: null, $_REQUEST['network'] ?: null, $_REQUEST['sender'] ?: null, $_REQUEST['limit'] ?: null)); return array_key_exists($key, $_REQUEST) ? ($_REQUEST[$key] !== "" ? $_REQUEST[$key] : $default) : $default;
} catch (\Exception $e) { }
$renderer->renderJson(["error" => $e->getMessage()]);
if (!$backend->authenticate(
$session->username ?: $_SERVER['PHP_AUTH_USER'] ?: '',
$session->password ?: $_SERVER['PHP_AUTH_PW'] ?: ''
)) {
$session->destroy();
$renderer->renderJsonError(false);
} else {
$renderer->renderJson($backend->find(
param('query', ""),
param('since'),
param('before'),
param('buffer'),
param('network'),
param('sender'),
param('limit', 4)
));
} }
...@@ -7,13 +7,30 @@ require_once '../../database/Database.php'; ...@@ -7,13 +7,30 @@ require_once '../../database/Database.php';
require_once '../../database/helper/RendererHelper.php'; require_once '../../database/helper/RendererHelper.php';
require_once '../../database/helper/SessionHelper.php'; require_once '../../database/helper/SessionHelper.php';
$session = SessionHelper::getInstance();
$config = Config::createFromGlobals(); $config = Config::createFromGlobals();
$renderer = new RendererHelper($config); $renderer = new RendererHelper($config);
$backend = Database::createFromConfig($config); $backend = Database::createFromConfig($config);
try { function param(string $key, $default = null)
$backend->authenticateFromHeader($_SERVER['HTTP_AUTHORIZATION'] ?: ""); {
$renderer->renderJson($backend->findInBuffer($_REQUEST['query'] ?: "", $_REQUEST['since'] ?: null, $_REQUEST['before'] ?: null, $_REQUEST['buffer'] ?: 0, $_REQUEST['offset'] ?: 0, $_REQUEST['limit'] ?: 20)); return array_key_exists($key, $_REQUEST) ? ($_REQUEST[$key] !== "" ? $_REQUEST[$key] : $default) : $default;
} catch (\Exception $e) { }
$renderer->renderJson(["error" => $e->getMessage()]);
if (!$backend->authenticate(
$session->username ?: $_SERVER['PHP_AUTH_USER'] ?: '',
$session->password ?: $_SERVER['PHP_AUTH_PW'] ?: ''
)) {
$session->destroy();
$renderer->renderJsonError(false);
} else {
$renderer->renderJson($backend->findInBuffer(
param('query', ""),
param('since'),
param('before'),
param('sender'),
param('buffer', 0),
param('offset', 0),
param('limit', 20)
));
} }
...@@ -42,7 +42,7 @@ class App { ...@@ -42,7 +42,7 @@ class App {
return; return;
this.loadingQuery++; this.loadingQuery++;
const queryId = this.loadingQuery; const queryId = this.loadingQuery;
load('web/search/', statehandler.parse()).then(result => { load('api/search/', statehandler.parse()).then(result => {
if (this.loadingQuery !== queryId) if (this.loadingQuery !== queryId)
return; return;
this.navigation.loading.hide(); this.navigation.loading.hide();
...@@ -95,7 +95,7 @@ class App { ...@@ -95,7 +95,7 @@ class App {
buffer.setLoading(true); buffer.setLoading(true);
const offset = buffer.count(); const offset = buffer.count();
console.log(offset); console.log(offset);
load('web/searchbuffer/', statehandler.parse({ load('api/searchbuffer/', statehandler.parse({
buffer: buffer.id, buffer: buffer.id,
offset: offset offset: offset
})).then(result => { })).then(result => {
...@@ -121,7 +121,7 @@ class App { ...@@ -121,7 +121,7 @@ class App {
if (context.loading) if (context.loading)
return; return;
context.setLoading(true); context.setLoading(true);
load('web/backlog/', statehandler.parse({ load('api/backlog/', statehandler.parse({
buffer: buffer.id, buffer: buffer.id,
anchor: context.anchorAfter, anchor: context.anchorAfter,
after: 10, after: 10,
......
...@@ -46,7 +46,7 @@ class App { ...@@ -46,7 +46,7 @@ class App {
this.loadingQuery++; this.loadingQuery++;
const queryId = this.loadingQuery; const queryId = this.loadingQuery;
load("web/search/", statehandler.parse()).then((result) => { load("api/search/", statehandler.parse()).then((result) => {
if (this.loadingQuery !== queryId) if (this.loadingQuery !== queryId)
return; return;
...@@ -107,7 +107,7 @@ class App { ...@@ -107,7 +107,7 @@ class App {
buffer.setLoading(true); buffer.setLoading(true);
const offset = buffer.count(); const offset = buffer.count();
console.log(offset); console.log(offset);
load("web/searchbuffer/", statehandler.parse({buffer: buffer.id, offset: offset})).then((result) => { load("api/searchbuffer/", statehandler.parse({buffer: buffer.id, offset: offset})).then((result) => {
buffer.load(result); buffer.load(result);
buffer.setLoading(false); buffer.setLoading(false);
}); });
...@@ -134,7 +134,7 @@ class App { ...@@ -134,7 +134,7 @@ class App {
return; return;
context.setLoading(true); context.setLoading(true);
load("web/backlog/", statehandler.parse({ load("api/backlog/", statehandler.parse({
buffer: buffer.id, buffer: buffer.id,
anchor: context.anchorAfter, anchor: context.anchorAfter,
after: 10, after: 10,
......
<?php
namespace QuasselRestSearch;
require_once '../../qrs_config.php';
require_once '../../database/Database.php';
require_once '../../database/helper/RendererHelper.php';
require_once '../../database/helper/SessionHelper.php';
$session = SessionHelper::getInstance();
$config = Config::createFromGlobals();
$renderer = new RendererHelper($config);
$backend = Database::createFromConfig($config);
if (!$backend->authenticate($session->username ?: '', $session->password ?: '')) {
$session->destroy();
$renderer->renderJsonError(false);
} else {
syslog(LOG_INFO, json_encode($_GET));
$renderer->renderJson($backend->context($_REQUEST['anchor'] ?: 0, $_REQUEST['buffer'] ?: 0, $_REQUEST['before'], $_REQUEST['after']));
}
\ No newline at end of file
<?php
namespace QuasselRestSearch;
require_once '../../qrs_config.php';
require_once '../../database/Database.php';
require_once '../../database/helper/RendererHelper.php';
require_once '../../database/helper/SessionHelper.php';
$session = SessionHelper::getInstance();
$config = Config::createFromGlobals();
$renderer = new RendererHelper($config);
$backend = Database::createFromConfig($config);
function param(string $key, $default = null)
{
return array_key_exists($key, $_REQUEST) ? ($_REQUEST[$key] !== "" ? $_REQUEST[$key] : $default) : $default;
}
if (!$backend->authenticate($session->username ?: '', $session->password ?: '')) {
$session->destroy();
$renderer->renderJsonError(false);
} else {
$renderer->renderJson($backend->find(
param('query', ""),
param('since'),
param('before'),
param('buffer'),
param('network'),
param('sender'),
param('limit', 4)
));
}
\ No newline at end of file
<?php
namespace QuasselRestSearch;
require_once '../../qrs_config.php';
require_once '../../database/Database.php';
require_once '../../database/helper/RendererHelper.php';
require_once '../../database/helper/SessionHelper.php';
$session = SessionHelper::getInstance();
$config = Config::createFromGlobals();
$renderer = new RendererHelper($config);
$backend = Database::createFromConfig($config);
function param(string $key, $default = null)
{
return array_key_exists($key, $_REQUEST) ? ($_REQUEST[$key] !== "" ? $_REQUEST[$key] : $default) : $default;
}
if (!$backend->authenticate($session->username ?: '', $session->password ?: '')) {
$session->destroy();
$renderer->renderJsonError(false);
} else {
$renderer->renderJson($backend->findInBuffer(
param('query', ""),
param('since'),
param('before'),
param('sender'),
param('buffer', 0),
param('offset', 0),
param('limit', 20)
));
}
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment