Cleanup API

api/backlog/index.php

@@ -7,13 +7,27 @@ 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);
 
-try {
-    $backend->authenticateFromHeader($_SERVER['HTTP_AUTHORIZATION'] ?: "");
-    $renderer->renderJson($backend->context($_REQUEST['anchor'] ?: 0, $_REQUEST['buffer'] ?: 0, $_REQUEST['before'], $_REQUEST['after']));
-} catch (\Exception $e) {
-    $renderer->renderJson(["error" => $e->getMessage()]);
+function param(string $key, $default = null)
+{
+    return array_key_exists($key, $_REQUEST) ? ($_REQUEST[$key] !== "" ? $_REQUEST[$key] : $default) : $default;
+}
+
+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)
+    ));
 }

api/search/index.php

@@ -7,13 +7,30 @@ 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);
 
-try {
-    $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));
-} catch (\Exception $e) {
-    $renderer->renderJson(["error" => $e->getMessage()]);
+function param(string $key, $default = null)
+{
+    return array_key_exists($key, $_REQUEST) ? ($_REQUEST[$key] !== "" ? $_REQUEST[$key] : $default) : $default;
+}
+
+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)
+    ));
 }

api/searchbuffer/index.php

@@ -7,13 +7,30 @@ 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);
 
-try {
-    $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));
-} catch (\Exception $e) {
-    $renderer->renderJson(["error" => $e->getMessage()]);
+function param(string $key, $default = null)
+{
+    return array_key_exists($key, $_REQUEST) ? ($_REQUEST[$key] !== "" ? $_REQUEST[$key] : $default) : $default;
+}
+
+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)
+    ));
 }

res/js/component/app.js

@@ -42,7 +42,7 @@ class App {
             return;
         this.loadingQuery++;
         const queryId = this.loadingQuery;
-        load('web/search/', statehandler.parse()).then(result => {
+        load('api/search/', statehandler.parse()).then(result => {
             if (this.loadingQuery !== queryId)
                 return;
             this.navigation.loading.hide();
@@ -95,7 +95,7 @@ class App {
         buffer.setLoading(true);
         const offset = buffer.count();
         console.log(offset);
-        load('web/searchbuffer/', statehandler.parse({
+        load('api/searchbuffer/', statehandler.parse({
             buffer: buffer.id,
             offset: offset
         })).then(result => {
@@ -121,7 +121,7 @@ class App {
         if (context.loading)
             return;
         context.setLoading(true);
-        load('web/backlog/', statehandler.parse({
+        load('api/backlog/', statehandler.parse({
             buffer: buffer.id,
             anchor: context.anchorAfter,
             after: 10,

res/js/component/app.jsx

@@ -46,7 +46,7 @@ class App {
 
         this.loadingQuery++;
         const queryId = this.loadingQuery;
-        load("web/search/", statehandler.parse()).then((result) => {
+        load("api/search/", statehandler.parse()).then((result) => {
             if (this.loadingQuery !== queryId)
                 return;
 
@@ -107,7 +107,7 @@ class App {
         buffer.setLoading(true);
         const offset = buffer.count();
         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.setLoading(false);
         });
@@ -134,7 +134,7 @@ class App {
             return;
 
         context.setLoading(true);
-        load("web/backlog/", statehandler.parse({
+        load("api/backlog/", statehandler.parse({
             buffer: buffer.id,
             anchor: context.anchorAfter,
             after: 10,

web/backlog/index.php

-<?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

web/search/index.php

-<?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

web/searchbuffer/index.php

-<?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