diff --git a/bootstrap/app.php b/bootstrap/app.php index 037e17d..5035843 100644 --- a/bootstrap/app.php +++ b/bootstrap/app.php @@ -28,17 +28,17 @@ $app = new Illuminate\Foundation\Application( $app->singleton( Illuminate\Contracts\Http\Kernel::class, - App\Http\Kernel::class + \Src\Common\Infrastructure\Laravel\Kernel\Http::class ); $app->singleton( Illuminate\Contracts\Console\Kernel::class, - App\Console\Kernel::class + \Src\Common\Infrastructure\Laravel\Kernel\Console::class ); $app->singleton( Illuminate\Contracts\Debug\ExceptionHandler::class, - App\Exceptions\Handler::class + \Src\Common\Infrastructure\Laravel\Exceptions\Handler::class ); /* diff --git a/composer.json b/composer.json index 299b7e8..f2d9ed6 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ }, "autoload": { "psr-4": { - "App\\": "app/", + "Src\\": "src/", "Database\\Factories\\": "database/factories/", "Database\\Seeders\\": "database/seeders/" } diff --git a/config/app.php b/config/app.php index ef76a7e..5b0e36a 100644 --- a/config/app.php +++ b/config/app.php @@ -189,11 +189,11 @@ return [ /* * Application Service Providers... */ - App\Providers\AppServiceProvider::class, - App\Providers\AuthServiceProvider::class, - // App\Providers\BroadcastServiceProvider::class, - App\Providers\EventServiceProvider::class, - App\Providers\RouteServiceProvider::class, + \Src\Common\Infrastructure\Laravel\Providers\AppServiceProvider::class, +// \Src\Auth\Application\Providers\AuthServiceProvider::class, + // Src\Common\Infrastructure\Laravel\Providers\BroadcastServiceProvider::class, + \Src\Common\Infrastructure\Laravel\Providers\EventServiceProvider::class, + \Src\Common\Infrastructure\Laravel\Providers\RouteServiceProvider::class, ], diff --git a/config/sanctum.php b/config/sanctum.php index 529cfdc..b533647 100644 --- a/config/sanctum.php +++ b/config/sanctum.php @@ -60,8 +60,8 @@ return [ */ 'middleware' => [ - 'verify_csrf_token' => App\Http\Middleware\VerifyCsrfToken::class, - 'encrypt_cookies' => App\Http\Middleware\EncryptCookies::class, + 'verify_csrf_token' => \Src\Common\Infrastructure\Laravel\Middleware\VerifyCsrfToken::class, + 'encrypt_cookies' => \Src\Common\Infrastructure\Laravel\Middleware\EncryptCookies::class, ], ]; diff --git a/src/Auth/Application/Providers/AuthServiceProvider.php b/src/Auth/Application/Providers/AuthServiceProvider.php new file mode 100644 index 0000000..ad0fe0f --- /dev/null +++ b/src/Auth/Application/Providers/AuthServiceProvider.php @@ -0,0 +1,35 @@ + + */ + protected $policies = [ + // 'App\Models\Model' => 'App\Policies\ModelPolicy', + ]; + + /** + * Register any authentication / authorization services. + * + * @return void + */ + public function boot() + { + $this->registerPolicies(); + + // + } + + public function register() + { + // + } + +} diff --git a/app/Http/Controllers/Controller.php b/src/Common/Infrastructure/Laravel/Controller.php similarity index 87% rename from app/Http/Controllers/Controller.php rename to src/Common/Infrastructure/Laravel/Controller.php index a0a2a8a..b1a50fc 100644 --- a/app/Http/Controllers/Controller.php +++ b/src/Common/Infrastructure/Laravel/Controller.php @@ -1,6 +1,6 @@ */ protected $middleware = [ - // \App\Http\Middleware\TrustHosts::class, - \App\Http\Middleware\TrustProxies::class, + // \Src\Common\Infrastructure\Laravel\Middleware\TrustHosts::class, + \Src\Common\Infrastructure\Laravel\Middleware\TrustProxies::class, \Illuminate\Http\Middleware\HandleCors::class, - \App\Http\Middleware\PreventRequestsDuringMaintenance::class, + \Src\Common\Infrastructure\Laravel\Middleware\PreventRequestsDuringMaintenance::class, \Illuminate\Foundation\Http\Middleware\ValidatePostSize::class, - \App\Http\Middleware\TrimStrings::class, + \Src\Common\Infrastructure\Laravel\Middleware\TrimStrings::class, \Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class, ]; @@ -30,19 +34,25 @@ class Kernel extends HttpKernel */ protected $middlewareGroups = [ 'web' => [ - \App\Http\Middleware\EncryptCookies::class, + \Src\Common\Infrastructure\Laravel\Middleware\EncryptCookies::class, \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, \Illuminate\Session\Middleware\StartSession::class, \Illuminate\View\Middleware\ShareErrorsFromSession::class, - \App\Http\Middleware\VerifyCsrfToken::class, - \Illuminate\Routing\Middleware\SubstituteBindings::class, + \Src\Common\Infrastructure\Laravel\Middleware\VerifyCsrfToken::class, + \Illuminate\Routing\Middleware\SubstituteBindings::class ], 'api' => [ - // \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class, + \Laravel\Sanctum\Http\Middleware\EnsureFrontendRequestsAreStateful::class, 'throttle:api', \Illuminate\Routing\Middleware\SubstituteBindings::class, ], + + 'internal_api' => [ + 'jwt.verify:internal_api', + 'throttle:internal_api', + SubstituteBindings::class, + ], ]; /** @@ -53,14 +63,15 @@ class Kernel extends HttpKernel * @var array */ protected $routeMiddleware = [ - 'auth' => \App\Http\Middleware\Authenticate::class, + 'jwt.verify' => JwtMiddleware::class, + 'auth' => \Src\Common\Infrastructure\Laravel\Middleware\Authenticate::class, 'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class, 'auth.session' => \Illuminate\Session\Middleware\AuthenticateSession::class, 'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class, 'can' => \Illuminate\Auth\Middleware\Authorize::class, - 'guest' => \App\Http\Middleware\RedirectIfAuthenticated::class, + 'guest' => \Src\Common\Infrastructure\Laravel\Middleware\RedirectIfAuthenticated::class, 'password.confirm' => \Illuminate\Auth\Middleware\RequirePassword::class, - 'signed' => \App\Http\Middleware\ValidateSignature::class, + 'signed' => \Illuminate\Routing\Middleware\ValidateSignature::class, 'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class, 'verified' => \Illuminate\Auth\Middleware\EnsureEmailIsVerified::class, ]; diff --git a/app/Http/Middleware/Authenticate.php b/src/Common/Infrastructure/Laravel/Middleware/Authenticate.php similarity index 88% rename from app/Http/Middleware/Authenticate.php rename to src/Common/Infrastructure/Laravel/Middleware/Authenticate.php index 704089a..6aba882 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/src/Common/Infrastructure/Laravel/Middleware/Authenticate.php @@ -1,6 +1,6 @@