- Added an HttpFactory and beginning the removal of old annotations from Notes

meta/definitions/authorize.php

@@ -0,0 +1,17 @@
+<?php
+
+use Lean\Factory\HttpFactory;
+use \Ulmus\User\Middleware\AuthorizeMiddleware;
+
+use function DI\{get, autowire, create};
+
+return [
+    AuthorizeMiddleware::class => create(AuthorizeMiddleware::class)->constructor(get('authorize.error')),
+
+    'authorize.error' => function($c) {
+        return HttpFactory::createJsonResponse([
+            'api.error' => "Authorization failed",
+            'api.datetime' => ( new \DateTime )->format(\DateTime::ATOM),
+        ]);
+    },
+];

meta/definitions/cronard.php

@@ -15,7 +15,7 @@ return [
     CronardMiddleware::class => function($c) {
         $cronardMiddleware = new CronardMiddleware($c, getenv('CRON_KEY'), function() : ResponseInterface {
             return new HtmlResponse(sprintf("%s - cron task begin...", date('Y-m-d H:i:s')));
-        }, [], $c->get(TaskFetcher::class));
+        }, []);
 
         return $cronardMiddleware->fromFile(getenv("META_PATH")."/crontab.php")->fromAnnotations($c->get(TaskFetcher::class));
     },

meta/definitions/negundo.php

@@ -6,7 +6,7 @@ use Negundo\Client\{ SoftwareConfig, Dump, Task, NegundoMiddleware };
 
 return [
     SoftwareConfig::class => create(SoftwareConfig::class)->constructor(getenv('NEGUNDO_HASH'), getenv('NEGUNDO_SERVER')),
-    # NegundoMiddleware::class => create(NegundoMiddleware::class)->constructor(get(SoftwareConfig::class)),
-    Dump::class => create(Dump::class)->constructor(get(SoftwareConfig::class)),
-    Task::class => create(Task::class)->constructor(get(SoftwareConfig::class)),
+    NegundoMiddleware::class => autowire(NegundoMiddleware::class),
+    Dump::class => autowire(Dump::class),
+    Task::class => autowire(Task::class),
 ];

meta/definitions/routes.php

@@ -53,15 +53,23 @@ return [
 
     ApplicationStrategy::class => autowire(\Lean\ApplicationStrategy::class),
 
-    'routes.middlewares'  => [ "dump", "errorHandler", SessionMiddleware::class, CronardMiddleware::class, Mcnd\Event\EventMiddleware::class, Mcnd\CLI\CliMiddleware::class,  ],
+    'routes.middlewares'  => [
+        "dump", "errorHandler", SessionMiddleware::class, CronardMiddleware::class, Mcnd\Event\EventMiddleware::class, Mcnd\CLI\CliMiddleware::class,
+    ],
+
+    'app.middlewares' => [],
 
     'routes.list' => function($c) {
         return function (ContainerInterface $container) {
             $router = $container->get(Router::class);
-            
-            foreach($container->get('routes.middlewares') as $i => $middleware) {
-                if ( $container->has($middleware) ) {
-                    $router->middleware($container->get($middleware));
+
+            foreach([ 'routes.middlewares', 'app.middlewares' ] as $key) {
+                if ($container->has('app.middlewares')) {
+                    foreach ($container->get($key) as $i => $middleware) {
+                        if ($container->has($middleware)) {
+                            $router->middleware($container->get($middleware));
+                        }
+                    }
                 }
             }