From dd005fc041fbb850a6ed3dcf6d15dc28bfef8aa8 Mon Sep 17 00:00:00 2001
From: Maxim Smakouz <m.smakouz@gmail.com>
Date: Tue, 21 Jun 2022 21:20:18 +0300
Subject: [PATCH 1/3] Add RoutesBootloader

---
 app/routes/api.php                            | 19 ++++
 app/routes/web.php                            | 20 +++++
 app/src/App.php                               |  1 -
 .../Bootloader/LocaleSelectorBootloader.php   | 24 -----
 app/src/Bootloader/RoutesBootloader.php       | 90 +++++++++++--------
 5 files changed, 91 insertions(+), 63 deletions(-)
 create mode 100644 app/routes/api.php
 create mode 100644 app/routes/web.php
 delete mode 100644 app/src/Bootloader/LocaleSelectorBootloader.php

diff --git a/app/routes/api.php b/app/routes/api.php
new file mode 100644
index 0000000..02af95f
--- /dev/null
+++ b/app/routes/api.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+use Spiral\Router\Loader\Configurator\RoutingConfigurator;
+
+/*
+|--------------------------------------------------------------------------
+| API Routes
+|--------------------------------------------------------------------------
+|
+| Here is where you can register web routes for your application. These
+| routes are loaded by the Router within a group which
+| contains the "api" middleware group.
+|
+*/
+return function (RoutingConfigurator $routes) {
+
+};
diff --git a/app/routes/web.php b/app/routes/web.php
new file mode 100644
index 0000000..4fafa17
--- /dev/null
+++ b/app/routes/web.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Controller\HomeController;
+use Spiral\Router\Loader\Configurator\RoutingConfigurator;
+
+/*
+|--------------------------------------------------------------------------
+| Web Routes
+|--------------------------------------------------------------------------
+|
+| Here is where you can register web routes for your application. These
+| routes are loaded by the Router within a group which
+| contains the "web" middleware group.
+|
+*/
+return function (RoutingConfigurator $routes) {
+    $routes->add('html', '/<action>.html')->controller(HomeController::class);
+};
diff --git a/app/src/App.php b/app/src/App.php
index 55c1cec..e4b5db9 100644
--- a/app/src/App.php
+++ b/app/src/App.php
@@ -106,7 +106,6 @@ class App extends Kernel
      * Application specific services and extensions.
      */
     protected const APP = [
-        Bootloader\LocaleSelectorBootloader::class,
         Bootloader\RoutesBootloader::class,
 
         // fast code prototyping
diff --git a/app/src/Bootloader/LocaleSelectorBootloader.php b/app/src/Bootloader/LocaleSelectorBootloader.php
deleted file mode 100644
index fd3530d..0000000
--- a/app/src/Bootloader/LocaleSelectorBootloader.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-/**
- * This file is part of Spiral package.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-declare(strict_types=1);
-
-namespace App\Bootloader;
-
-use App\Middleware\LocaleSelector;
-use Spiral\Boot\Bootloader\Bootloader;
-use Spiral\Bootloader\Http\HttpBootloader;
-
-class LocaleSelectorBootloader extends Bootloader
-{
-    public function boot(HttpBootloader $http): void
-    {
-        $http->addMiddleware(LocaleSelector::class);
-    }
-}
diff --git a/app/src/Bootloader/RoutesBootloader.php b/app/src/Bootloader/RoutesBootloader.php
index 11c7cc5..c3f5297 100644
--- a/app/src/Bootloader/RoutesBootloader.php
+++ b/app/src/Bootloader/RoutesBootloader.php
@@ -1,52 +1,66 @@
 <?php
 
-/**
- * This file is part of Spiral package.
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
 declare(strict_types=1);
 
 namespace App\Bootloader;
 
-use App\Controller\HomeController;
-use Spiral\Boot\Bootloader\Bootloader;
-use Spiral\Router\Route;
-use Spiral\Router\RouteInterface;
-use Spiral\Router\RouterInterface;
-use Spiral\Router\Target\Controller;
-use Spiral\Router\Target\Namespaced;
+use App\Middleware\LocaleSelector;
+use Spiral\Boot\DirectoriesInterface;
+use Spiral\Bootloader\Http\RoutesBootloader as BaseRoutesBootloader;
+use Spiral\Cookies\Middleware\CookiesMiddleware;
+use Spiral\Csrf\Middleware\CsrfMiddleware;
+use Spiral\Debug\StateCollector\HttpCollector;
+use Spiral\Http\Middleware\ErrorHandlerMiddleware;
+use Spiral\Http\Middleware\JsonPayloadMiddleware;
+use Spiral\Router\Loader\Configurator\RoutingConfigurator;
+use Spiral\Session\Middleware\SessionMiddleware;
 
-class RoutesBootloader extends Bootloader
+final class RoutesBootloader extends BaseRoutesBootloader
 {
-    public function boot(RouterInterface $router): void
+    public function __construct(
+        private readonly DirectoriesInterface $dirs
+    ) {
+    }
+
+    protected function globalMiddleware(): array
     {
-        // named route
-        $router->setRoute(
-            name: 'html',
-            route: new Route('/<action>.html', new Controller(HomeController::class))
-        );
-
-        // fallback (default) route
-        $router->setDefault($this->defaultRoute());
+        return [
+            ErrorHandlerMiddleware::class,
+            JsonPayloadMiddleware::class,
+            HttpCollector::class,
+            LocaleSelector::class,
+        ];
     }
 
-    /**
-     * Default route points to namespace of controllers.
-     */
-    protected function defaultRoute(): RouteInterface
+    protected function middlewareGroups(): array
     {
-        // handle all /controller/action like urls
-        $route = new Route(
-            pattern: '/[<controller>[/<action>]]',
-            target: new Namespaced('App\\Controller')
-        );
-
-        return $route->withDefaults([
-            'controller' => 'home',
-            'action' => 'index',
-        ]);
+        return [
+            'web' => [
+                CookiesMiddleware::class,
+                SessionMiddleware::class,
+                CsrfMiddleware::class,
+            ],
+            'api' => [
+                //
+            ]
+        ];
+    }
+
+    protected function defineRoutes(RoutingConfigurator $routes): void
+    {
+        $routes->import($this->dirs->get('app') . '/routes/web.php')->group('web');
+        $routes->import($this->dirs->get('app') . '/routes/api.php')->group('api');
+
+        $routes->default('/[<controller>[/<action>]]')
+            ->namespaced('App\\Controller')
+            ->defaults([
+                'controller' => 'home',
+                'action' => 'index',
+            ])
+            ->middleware([
+                CookiesMiddleware::class,
+                SessionMiddleware::class,
+                CsrfMiddleware::class,
+            ]);
     }
 }

From 51617b93a01b3a5dba09752134684be2d7db04ec Mon Sep 17 00:00:00 2001
From: Maxim Smakouz <m.smakouz@gmail.com>
Date: Tue, 21 Jun 2022 21:22:59 +0300
Subject: [PATCH 2/3] Fix CS

---
 app/routes/api.php                      | 1 -
 app/src/Bootloader/RoutesBootloader.php | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/routes/api.php b/app/routes/api.php
index 02af95f..951f566 100644
--- a/app/routes/api.php
+++ b/app/routes/api.php
@@ -15,5 +15,4 @@
 |
 */
 return function (RoutingConfigurator $routes) {
-
 };
diff --git a/app/src/Bootloader/RoutesBootloader.php b/app/src/Bootloader/RoutesBootloader.php
index c3f5297..289ba41 100644
--- a/app/src/Bootloader/RoutesBootloader.php
+++ b/app/src/Bootloader/RoutesBootloader.php
@@ -42,7 +42,7 @@ protected function middlewareGroups(): array
             ],
             'api' => [
                 //
-            ]
+            ],
         ];
     }
 

From c3ad37ac396e3ce8caa544bdb4be34a1f43c704a Mon Sep 17 00:00:00 2001
From: Maxim Smakouz <m.smakouz@gmail.com>
Date: Wed, 22 Jun 2022 10:41:31 +0300
Subject: [PATCH 3/3] Remove api routes, add examples with
 AuthTransportMiddleware

---
 app/routes/api.php                      | 18 ------------------
 app/src/Bootloader/RoutesBootloader.php | 10 +++++-----
 2 files changed, 5 insertions(+), 23 deletions(-)
 delete mode 100644 app/routes/api.php

diff --git a/app/routes/api.php b/app/routes/api.php
deleted file mode 100644
index 951f566..0000000
--- a/app/routes/api.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Spiral\Router\Loader\Configurator\RoutingConfigurator;
-
-/*
-|--------------------------------------------------------------------------
-| API Routes
-|--------------------------------------------------------------------------
-|
-| Here is where you can register web routes for your application. These
-| routes are loaded by the Router within a group which
-| contains the "api" middleware group.
-|
-*/
-return function (RoutingConfigurator $routes) {
-};
diff --git a/app/src/Bootloader/RoutesBootloader.php b/app/src/Bootloader/RoutesBootloader.php
index 289ba41..72fb6bf 100644
--- a/app/src/Bootloader/RoutesBootloader.php
+++ b/app/src/Bootloader/RoutesBootloader.php
@@ -5,9 +5,11 @@
 namespace App\Bootloader;
 
 use App\Middleware\LocaleSelector;
+use Spiral\Auth\Middleware\AuthTransportMiddleware;
 use Spiral\Boot\DirectoriesInterface;
 use Spiral\Bootloader\Http\RoutesBootloader as BaseRoutesBootloader;
 use Spiral\Cookies\Middleware\CookiesMiddleware;
+use Spiral\Core\Container\Autowire;
 use Spiral\Csrf\Middleware\CsrfMiddleware;
 use Spiral\Debug\StateCollector\HttpCollector;
 use Spiral\Http\Middleware\ErrorHandlerMiddleware;
@@ -39,9 +41,10 @@ protected function middlewareGroups(): array
                 CookiesMiddleware::class,
                 SessionMiddleware::class,
                 CsrfMiddleware::class,
+                // new Autowire(AuthTransportMiddleware::class, ['transportName' => 'cookie'])
             ],
             'api' => [
-                //
+                // new Autowire(AuthTransportMiddleware::class, ['transportName' => 'header'])
             ],
         ];
     }
@@ -49,7 +52,6 @@ protected function middlewareGroups(): array
     protected function defineRoutes(RoutingConfigurator $routes): void
     {
         $routes->import($this->dirs->get('app') . '/routes/web.php')->group('web');
-        $routes->import($this->dirs->get('app') . '/routes/api.php')->group('api');
 
         $routes->default('/[<controller>[/<action>]]')
             ->namespaced('App\\Controller')
@@ -58,9 +60,7 @@ protected function defineRoutes(RoutingConfigurator $routes): void
                 'action' => 'index',
             ])
             ->middleware([
-                CookiesMiddleware::class,
-                SessionMiddleware::class,
-                CsrfMiddleware::class,
+                // SomeMiddleware::class,
             ]);
     }
 }