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 88ab23526e6c54aae08b992909859109e3e31e5b..ac3307f2ded53c4799d8e8d1dcef465bd008da37 100644 (file)
--- a/app/Providers/RouteServiceProvider.php
+++ b/app/Providers/RouteServiceProvider.php
@@ -2,12 +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 Route;
+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.
      *


@@ -15,7 +26,6 @@ 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.


@@ -24,19 +34,14 @@ class RouteServiceProvider extends ServiceProvider
      */
     public function boot()
     {
      */
     public function boot()
     {

-        parent::boot();
-    }
+        $this->configureRateLimiting();

 
 

-    /**
-     * Define the routes for the application.
-     *
-     * @return void
-     */
-    public function map()
-    {
-        $this->mapWebRoutes();
-//        $this->mapApiRoutes();
+        $this->routes(function () {
+            $this->mapWebRoutes();
+            $this->mapApiRoutes();
+        });

     }
     }

+

     /**
      * Define the "web" routes for the application.
      *
     /**
      * Define the "web" routes for the application.
      *


@@ -48,11 +53,12 @@ class RouteServiceProvider extends ServiceProvider
     {
         Route::group([
             'middleware' => 'web',
     {
         Route::group([
             'middleware' => 'web',

-            'namespace' => $this->namespace,
+            'namespace'  => $this->namespace,

         ], function ($router) {
             require base_path('routes/web.php');
         });
     }
         ], function ($router) {
             require base_path('routes/web.php');
         });
     }

+

     /**
      * Define the "api" routes for the application.
      *
     /**
      * Define the "api" routes for the application.
      *


@@ -64,10 +70,22 @@ class RouteServiceProvider extends ServiceProvider
     {
         Route::group([
             'middleware' => 'api',
     {
         Route::group([
             'middleware' => 'api',

-            'namespace' => $this->namespace,
-            'prefix' => 'api',
+            'namespace'  => $this->namespace . '\Api',
+            'prefix'     => 'api',

         ], function ($router) {
             require base_path('routes/api.php');
         });
     }
         ], function ($router) {
             require base_path('routes/api.php');
         });
     }

+
+    /**
+     * Configure the rate limiters for the application.
+     *
+     * @return void
+     */
+    protected function configureRateLimiting()
+    {
+        RateLimiter::for('api', function (Request $request) {
+            return Limit::perMinute(60)->by(optional($request->user())->id ?: $request->ip());
+        });
+    }

 }
 }