Modernize.

Author: killua-eu

README.md

@@ -62,6 +62,7 @@ systemctl enable php8.3-fpm
 systemctl enable nginx
 systemctl start postgresql
 systemctl enable postgresql
+systemctl restart postgresql
 systemctl start mysql
 systemctl enable mysql
 ```

glued/Config/routes.yaml

@@ -3,11 +3,11 @@
 namespace Glued\Controllers;
 
 use Glued\Lib\QuerySelect;
-use mysql_xdevapi\Exception;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Glued\Lib\Controllers\AbstractBlank;
 
-class AuthController extends AbstractController
+class AuthController extends AbstractBlank
 {
 
     /**

glued/Controllers/AbstractController.php

@@ -6,9 +6,9 @@
 
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Glued\Lib\Controllers\AbstractBlank;
 
-
-class ConfigController extends AbstractController
+class ConfigController extends AbstractBlank
 {
 
     /**

glued/Controllers/AuthController.php

@@ -6,8 +6,9 @@
 
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
+use Glued\Lib\Controllers\AbstractBlank;
 
-class FeController extends AbstractController
+class FeController extends AbstractBlank
 {
 
     //

glued/Controllers/ConfigController.php

@@ -4,47 +4,14 @@
 
 namespace Glued\Controllers;
 
-use mysql_xdevapi\Exception;
+use Glued\Lib\Controllers\AbstractService;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Glued\Lib\Exceptions\TransformException;
 
-class ServiceController extends AbstractController
+class ServiceController extends AbstractService
 {
 
-    public function getOpenapi(Request $request, Response $response, array $args = []): Response
-    {
-        // Directory to look for paths
-        $path = "{$this->settings['glued']['datapath']}/{$this->settings['glued']['uservice']}/cache" ;
-        $filesWhitelist = ["openapi.json", "openapi.yaml", "openapi.yml"]; // Potential file names
-
-        foreach ($filesWhitelist as $file) {
-            $fullPath = rtrim($path, '/') . '/' . $file;
-            if (file_exists($fullPath)) {
-                $content = file_get_contents($fullPath);
-                $response->getBody()->write($content);
-                $contentType = 'application/json';
-                if (pathinfo($fullPath, PATHINFO_EXTENSION) === 'yaml' || pathinfo($fullPath, PATHINFO_EXTENSION) === 'yml') { $contentType = 'application/x-yaml'; }
-                return $response->withHeader('Content-Type', $contentType);
-            }
-        }
-        throw new \Exception("OpenAPI specification not found", 404);
-    }
-
-    public function getHealth(Request $request, Response $response, array $args = []): Response {
-        try {
-            $check['service'] = basename(__ROOT__);
-            $check['timestamp'] = microtime();
-            $check['healthy'] = true;
-            $check['status']['postgres'] = $this->pg->query("select true as test")->fetch()['test'] ?? false;
-            $check['status']['auth'] = $_SERVER['X-GLUED-AUTH-UUID'] ?? 'anonymous';
-        } catch (Exception $e) {
-            $check['healthy'] = false;
-            return $response->withJson($check);
-        }
-        return $response->withJson($check);
-    }
-
     /**
      * Returns list of routes.
      * @param  Request  $request  

glued/Controllers/FeController.php

@@ -4,19 +4,15 @@
 
 namespace Glued\Controllers;
 
+use Glued\Lib\Controllers\AbstractBlank;
 use Psr\Http\Message\ResponseInterface as Response;
 use Psr\Http\Message\ServerRequestInterface as Request;
 use Glued\Classes\Auth;
-use Glued\Lib\Exceptions\DefaultException;
-use Glued\Lib\Exceptions\AuthTokenException;
-use Glued\Lib\Exceptions\AuthJwtException;
-use Glued\Lib\Exceptions\AuthOidcException;
-use Glued\Lib\Exceptions\DbException;
 use Glued\Lib\Exceptions\TransformException;
 use Linfo\Linfo;
 
 
-class StatusController extends AbstractController
+class StatusController extends AbstractBlank
 {
 
     /**