refactor: use route service map function (#5365)

monicahq · Jul 14, 2021 · b4b4a13 · b4b4a13
1 parent f0c59be
commit b4b4a13
Showing 1 changed file with 26 additions and 21 deletions.
diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Str;
 use Illuminate\Http\Request;
+use App\Helpers\RequestHelper;
 use App\Models\Contact\Contact;
 use Illuminate\Http\JsonResponse;
 use App\Services\Instance\IdHasher;
@@ -48,25 +49,6 @@ public function boot()
 
         $this->configureRateLimiting();
 
-        $this->routes(function () {
-            Route::prefix('api')
-                ->middleware('api')
-                ->namespace($this->namespace.'\Api')
-                ->group(base_path('routes/api.php'));
-
-            Route::prefix('oauth')
-                ->namespace($this->namespace.'\Api')
-                ->group(base_path('routes/oauth.php'));
-
-            Route::middleware('web')
-                ->namespace($this->namespace)
-                ->group(base_path('routes/web.php'));
-
-            Route::middleware('web')
-                ->namespace($this->namespace)
-                ->group(base_path('routes/special.php'));
-        });
-
         Route::bind('contact', function ($value) {
             // In case the user is logged out
             if (! Auth::check()) {
@@ -90,6 +72,29 @@ public function boot()
         Route::model('otherContact', Contact::class);
     }
 
+    /**
+     * Define the routes for the application.
+     */
+    public function map(): void
+    {
+        Route::prefix('api')
+            ->middleware('api')
+            ->namespace($this->namespace.'\Api')
+            ->group(base_path('routes/api.php'));
+
+        Route::prefix('oauth')
+            ->namespace($this->namespace.'\Api')
+            ->group(base_path('routes/oauth.php'));
+
+        Route::middleware('web')
+            ->namespace($this->namespace)
+            ->group(base_path('routes/web.php'));
+
+        Route::middleware('web')
+            ->namespace($this->namespace)
+            ->group(base_path('routes/special.php'));
+    }
+
     /**
      * Configure the rate limiters for the application.
      *
@@ -99,7 +104,7 @@ protected function configureRateLimiting()
     {
         RateLimiter::for('api', function (Request $request) {
             return Limit::perMinute(60)
-                ->by(optional($request->user())->id ?: $request->ip())
+                ->by(optional($request->user())->id ?: RequestHelper::ip())
                 ->response(function (Request $request, array $headers) {
                     $message = [
                         'error' => [
@@ -112,7 +117,7 @@ protected function configureRateLimiting()
                 });
         });
         RateLimiter::for('oauth', function (Request $request) {
-            return Limit::perMinute(5)->by($request->input('email') ?: $request->ip());
+            return Limit::perMinute(5)->by($request->input('email') ?: RequestHelper::ip());
         });
     }
 }