Skip intermediate login page with single provider

[bookstack] / app / Providers / RouteServiceProvider.php

diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
index 2d9cd3b85daaec24a8e18f9e45c64819ed2d9d58..ac3307f2ded53c4799d8e8d1dcef465bd008da37 100644 (file)
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -2,11 +2,23 @@
 
 namespace BookStack\Providers;
 
 
 namespace BookStack\Providers;
 

-use Illuminate\Routing\Router;
+use Illuminate\Cache\RateLimiting\Limit;

 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;
 use Illuminate\Foundation\Support\Providers\RouteServiceProvider as ServiceProvider;

+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\RateLimiter;
+use Illuminate\Support\Facades\Route;

 
 class RouteServiceProvider extends ServiceProvider
 {
 
 class RouteServiceProvider extends ServiceProvider
 {

+    /**
+     * The path to the "home" route for your application.
+     *
+     * This is used by Laravel authentication to redirect users after login.
+     *
+     * @var string
+     */
+    public const HOME = '/';
+

     /**
      * This namespace is applied to the controller routes in your routes file.
      *
     /**
      * This namespace is applied to the controller routes in your routes file.
      *


@@ -14,31 +26,66 @@ class RouteServiceProvider extends ServiceProvider
      *
      * @var string
      */
      *
      * @var string
      */

-    protected $namespace = 'BookStack\Http\Controllers';

 
     /**
      * Define your route model bindings, pattern filters, etc.
      *
 
     /**
      * Define your route model bindings, pattern filters, etc.
      *

-     * @param  \Illuminate\Routing\Router  $router

      * @return void
      */
      * @return void
      */

-    public function boot(Router $router)
+    public function boot()

     {
     {

-        //
+        $this->configureRateLimiting();

 
 

-        parent::boot($router);
+        $this->routes(function () {
+            $this->mapWebRoutes();
+            $this->mapApiRoutes();
+        });
+    }
+
+    /**
+     * Define the "web" routes for the application.
+     *
+     * These routes all receive session state, CSRF protection, etc.
+     *
+     * @return void
+     */
+    protected function mapWebRoutes()
+    {
+        Route::group([
+            'middleware' => 'web',
+            'namespace'  => $this->namespace,
+        ], function ($router) {
+            require base_path('routes/web.php');
+        });
+    }
+
+    /**
+     * Define the "api" routes for the application.
+     *
+     * These routes are typically stateless.
+     *
+     * @return void
+     */
+    protected function mapApiRoutes()
+    {
+        Route::group([
+            'middleware' => 'api',
+            'namespace'  => $this->namespace . '\Api',
+            'prefix'     => 'api',
+        ], function ($router) {
+            require base_path('routes/api.php');
+        });

     }
 
     /**
     }
 
     /**

-     * Define the routes for the application.
+     * Configure the rate limiters for the application.

      *
      *

-     * @param  \Illuminate\Routing\Router  $router

      * @return void
      */
      * @return void
      */

-    public function map(Router $router)
+    protected function configureRateLimiting()

     {
     {

-        $router->group(['namespace' => $this->namespace], function ($router) {
-            require app_path('Http/routes.php');
+        RateLimiter::for('api', function (Request $request) {
+            return Limit::perMinute(60)->by(optional($request->user())->id ?: $request->ip());

         });
     }
 }
         });
     }
 }