Skip to content

Commit 7fddea3

Browse files
committed
Consolidate service providers
1 parent efb684a commit 7fddea3

File tree

9 files changed

+51
-153
lines changed

9 files changed

+51
-153
lines changed

app/Http/Controllers/Auth/LoginController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace App\Http\Controllers\Auth;
44

5+
use App\Providers\AppServiceProvider;
56
use App\Http\Controllers\Controller;
67
use Illuminate\Auth\Middleware\RedirectIfAuthenticated;
78
use App\Providers\RouteServiceProvider;
@@ -28,7 +29,7 @@ class LoginController extends Controller
2829
*
2930
* @var string
3031
*/
31-
protected $redirectTo = RouteServiceProvider::HOME;
32+
protected $redirectTo = AppServiceProvider::HOME;
3233

3334
/**
3435
* Create a new controller instance.

app/Http/Controllers/Auth/RegisterController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace App\Http\Controllers\Auth;
44

5+
use App\Providers\AppServiceProvider;
56
use App\Http\Controllers\Controller;
67
use Illuminate\Auth\Middleware\RedirectIfAuthenticated;
78
use App\Http\Requests\RegisterRequest;
@@ -32,7 +33,7 @@ class RegisterController extends Controller
3233
*
3334
* @var string
3435
*/
35-
protected $redirectTo = RouteServiceProvider::HOME;
36+
protected $redirectTo = AppServiceProvider::HOME;
3637

3738
/**
3839
* Create a new controller instance.

app/Http/Controllers/Auth/ResetPasswordController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace App\Http\Controllers\Auth;
44

5+
use App\Providers\AppServiceProvider;
56
use App\Http\Controllers\Controller;
67
use Illuminate\Auth\Middleware\RedirectIfAuthenticated;
78
use App\Providers\RouteServiceProvider;
@@ -28,7 +29,7 @@ class ResetPasswordController extends Controller
2829
*
2930
* @var string
3031
*/
31-
protected $redirectTo = RouteServiceProvider::HOME;
32+
protected $redirectTo = AppServiceProvider::HOME;
3233

3334
/**
3435
* Create a new controller instance.

app/Http/Controllers/Auth/VerificationController.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
namespace App\Http\Controllers\Auth;
44

5+
use App\Providers\AppServiceProvider;
56
use App\Http\Controllers\Controller;
67
use App\Providers\RouteServiceProvider;
78
use Illuminate\Foundation\Auth\VerifiesEmails;
@@ -30,7 +31,7 @@ class VerificationController extends Controller
3031
*
3132
* @var string
3233
*/
33-
protected $redirectTo = RouteServiceProvider::HOME;
34+
protected $redirectTo = AppServiceProvider::HOME;
3435

3536
/**
3637
* Create a new controller instance.

app/Providers/AppServiceProvider.php

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,41 @@
77
use App\Models\Thread;
88
use App\Models\User;
99
use App\Notifications\SlowQueryLogged;
10+
use App\Observers\UserObserver;
11+
use Illuminate\Cache\RateLimiting\Limit;
1012
use Illuminate\Database\Connection;
1113
use Illuminate\Database\Eloquent\Relations\Relation;
1214
use Illuminate\Database\Events\QueryExecuted;
15+
use Illuminate\Http\Request;
1316
use Illuminate\Notifications\AnonymousNotifiable;
1417
use Illuminate\Support\Facades\DB;
1518
use Illuminate\Support\Facades\Notification;
19+
use Illuminate\Support\Facades\RateLimiter;
1620
use Illuminate\Support\Facades\Request;
21+
use Illuminate\Support\Facades\Route;
1722
use Illuminate\Support\ServiceProvider;
1823
use Laravel\Horizon\Horizon;
1924

2025
class AppServiceProvider extends ServiceProvider
2126
{
27+
/**
28+
* The path to your application's "home" route.
29+
*
30+
* This is used by Laravel authentication to redirect users after login.
31+
*
32+
* @var string
33+
*/
34+
public const HOME = '/user';
35+
2236
public function boot(): void
2337
{
2438
$this->bootEloquentMorphs();
2539
$this->bootMacros();
2640
$this->bootHorizon();
2741
$this->bootSlowQueryLogging();
42+
43+
$this->bootEvent();
44+
$this->bootRoute();
2845
}
2946

3047
private function bootEloquentMorphs()
@@ -65,4 +82,28 @@ private function bootSlowQueryLogging()
6582
);
6683
});
6784
}
85+
86+
/**
87+
* Register any application services.
88+
*/
89+
public function register(): void
90+
{
91+
//
92+
}
93+
94+
public function bootEvent(): void
95+
{
96+
User::observe(UserObserver::class);
97+
}
98+
99+
public function bootRoute(): void
100+
{
101+
RateLimiter::for('api', function (Request $request) {
102+
return Limit::perMinute(6);
103+
});
104+
105+
require base_path('routes/bindings.php');
106+
107+
108+
}
68109
}

app/Providers/AuthServiceProvider.php

Lines changed: 0 additions & 30 deletions
This file was deleted.

app/Providers/EventServiceProvider.php

Lines changed: 0 additions & 76 deletions
This file was deleted.

app/Providers/RouteServiceProvider.php

Lines changed: 0 additions & 42 deletions
This file was deleted.

bootstrap/app.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?php
22

3+
use App\Providers\AppServiceProvider;
34
use Illuminate\Foundation\Application;
45
use Illuminate\Foundation\Configuration\Exceptions;
56
use Illuminate\Foundation\Configuration\Middleware;
@@ -15,7 +16,7 @@
1516
)
1617
->withMiddleware(function (Middleware $middleware) {
1718
$middleware->redirectGuestsTo(fn () => route('login'));
18-
$middleware->redirectUsersTo(RouteServiceProvider::HOME);
19+
$middleware->redirectUsersTo(AppServiceProvider::HOME);
1920

2021
$middleware->web([
2122
\App\Http\Middleware\DisableFloc::class,

0 commit comments

Comments
 (0)