setup new middleware (#20)

.cubex/paths.json

@@ -8,6 +8,14 @@
             "excludeFromSitemap": false,
             "changeFrequency": "monthly",
             "history": []
+        },
+        "/secure": {
+            "title": null,
+            "lastModified": null,
+            "priority": 1,
+            "excludeFromSitemap": false,
+            "changeFrequency": "monthly",
+            "history": []
         }
     }
 }

public/sitemap.xml

@@ -1 +1 @@
-<?xml version="1.0" encoding="UTF-8"?><urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"><url><loc>http://cubexbase.local-host.xyz:6090/</loc><priority>1</priority><changefreq>monthly</changefreq></url></urlset>
+<?xml version="1.0" encoding="UTF-8"?><urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9"><url><loc>http://cubexbase.local-host.xyz:6090/</loc><priority>1</priority><changefreq>monthly</changefreq></url><url><loc>http://cubexbase.local-host.xyz:6090/secure</loc><priority>1</priority><changefreq>monthly</changefreq></url></urlset>

src/Http/Controllers/SecureController.php

@@ -2,26 +2,30 @@
 
 namespace CubexBase\Application\Http\Controllers;
 
+use Cubex\Middleware\MiddlewareHandler;
 use CubexBase\Application\Context\AppContext;
 use CubexBase\Application\Http\Layout\LayoutController;
 use CubexBase\Application\Http\Middleware\ExampleMiddleware;
+use Packaged\Context\Context;
+use Packaged\Routing\Handler\FuncHandler;
+use Symfony\Component\HttpFoundation\Response;
 
 class SecureController extends LayoutController
 {
-  protected function _middleware(): array
-  {
-    return [
-      ExampleMiddleware::class,
-    ];
-  }
-
   protected function _generateRoutes()
   {
     yield self::_route('$', 'secure');
   }
 
   public function getSecure(AppContext $ctx)
   {
-    return 'This should never be seen';
+    return Response::create('This should never be seen');
+  }
+
+  public function handle(Context $c): Response
+  {
+    $middleware = new MiddlewareHandler(new FuncHandler(fn(Context $c) => parent::handle($c)));
+    $middleware->add(new ExampleMiddleware());
+    return $middleware->handle($c);
   }
 }

src/Http/Layout/WithErrorController.php

@@ -23,7 +23,6 @@ abstract class WithErrorController extends AuthedController implements WithConte
   use GetTranslatorTrait;
   use TranslatableTrait;
   use WithContextTrait;
-  use WithMiddlewareTrait;
 
   protected function _getHandler(Context $context): callable|string|Handler
   {

src/Http/Middleware/ExampleMiddleware.php

@@ -2,13 +2,22 @@
 
 namespace CubexBase\Application\Http\Middleware;
 
+use Cubex\Middleware\Middleware;
+use Packaged\Context\Context;
 use Packaged\Http\Responses\RedirectResponse;
+use Symfony\Component\HttpFoundation\Response;
 
-class ExampleMiddleware extends AbstractMiddleware
+class ExampleMiddleware extends Middleware
 {
-  public function process(&$response): bool
+  public function handle(Context $c): Response
   {
-    $response = RedirectResponse::create('/');
-    return false;
+    //    example middleware
+    echo "<pre>Pre Middleware</pre><br>";
+    $response = $this->next($c);
+    echo $response->getContent();
+    echo "<br><pre>Post Middleware</pre>";
+
+    // redirect to home page
+    return RedirectResponse::create('/');
   }
 }