diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index c8e1d46..2fc5c3d 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -68,6 +68,8 @@ class Kernel extends HttpKernel 'ability' => \Laravel\Sanctum\Http\Middleware\CheckForAnyAbility::class, 'CustomerLoginCheck' => \App\Http\Middleware\CustomerLoginCheck::class, 'IsLoginCheck' => \App\Http\Middleware\IsLoginCheck::class, - 'Staff' => \App\Http\Middleware\StaffCheck::class + 'Staff' => \App\Http\Middleware\StaffCheck::class, + 'json.response' => \App\Http\Middleware\ForceJsonResponse::class, + 'api.auth' => \App\Http\Middleware\ApiAuthCheck::class, ]; } diff --git a/app/Http/Middleware/ApiAuthCheck.php b/app/Http/Middleware/ApiAuthCheck.php new file mode 100644 index 0000000..db2ca19 --- /dev/null +++ b/app/Http/Middleware/ApiAuthCheck.php @@ -0,0 +1,33 @@ +check()) { + return response()->json([ + 'error' => true, + 'message' => 'Unauthorized. Access Denied.', + 'data' => [], + 'code' => 401 + ], 401); + } + + return $next($request); + } +} diff --git a/app/Http/Middleware/ForceJsonResponse.php b/app/Http/Middleware/ForceJsonResponse.php new file mode 100644 index 0000000..c33c139 --- /dev/null +++ b/app/Http/Middleware/ForceJsonResponse.php @@ -0,0 +1,23 @@ +headers->set('Accept', 'application/json'); + + return $next($request); + } +} diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 0010e15..b8fa873 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -38,11 +38,19 @@ class RouteServiceProvider extends ServiceProvider $this->configureRateLimiting(); $this->routes(function () { - Route::domain('api-agency.tgs.com.vn') - ->middleware('api') + // 1. Agency API (Domain riêng, dùng routes/client.php) + Route::domain('api-agency.tgs.com.vn.test') + ->middleware(['api', 'json.response']) + ->namespace($this->namespace) + ->group(base_path('routes/client.php')); + + // 2. System API (Dùng cho portal.test/api/..., dùng routes/api.php) + Route::prefix('api') + ->middleware(['api', 'json.response']) ->namespace($this->namespace) ->group(base_path('routes/api.php')); + // 3. Web & Admin routes Route::middleware('web') ->namespace($this->namespace) ->group(base_path('routes/web.php')); diff --git a/resources/views/components/module/datacenter.blade.php b/resources/views/components/module/datacenter.blade.php index e829762..17360da 100644 --- a/resources/views/components/module/datacenter.blade.php +++ b/resources/views/components/module/datacenter.blade.php @@ -1,130 +1,130 @@ @php - $selectedDatacenterId = old('module_datacenter_id'); +$selectedDatacenterId = old('module_datacenter_id'); - if (!$selectedDatacenterId && $model) { - if ($model instanceof \App\Models\ModuleDatacenter) { - $selectedDatacenterId = $model->id; - } elseif ($model instanceof \App\Models\ModuleHost || $model instanceof \App\Models\ModuleFolder) { - $selectedDatacenterId = $model->module_datacenter_id; - } elseif ($model instanceof \App\Models\ModuleDatastore || $model instanceof \App\Models\ModuleNetwork) { - $selectedDatacenterId = $model->host?->module_datacenter_id; - } elseif ($model instanceof \App\Models\ModuleIpAddress) { - $selectedDatacenterId = $model->host?->module_datacenter_id; - } elseif (isset($model->module_datacenter_id)) { - $selectedDatacenterId = $model->module_datacenter_id; - } elseif (method_exists($model, 'host') && $model->host) { - $selectedDatacenterId = $model->host->module_datacenter_id; - } +if (!$selectedDatacenterId && $model) { + if ($model instanceof \App\Models\ModuleDatacenter) { + $selectedDatacenterId = $model->id; + } elseif ($model instanceof \App\Models\ModuleHost || $model instanceof \App\Models\ModuleFolder) { + $selectedDatacenterId = $model->module_datacenter_id; + } elseif ($model instanceof \App\Models\ModuleDatastore || $model instanceof \App\Models\ModuleNetwork) { + $selectedDatacenterId = $model->host?->module_datacenter_id; + } elseif ($model instanceof \App\Models\ModuleIpAddress) { + $selectedDatacenterId = $model->host?->module_datacenter_id; + } elseif (isset($model->module_datacenter_id)) { + $selectedDatacenterId = $model->module_datacenter_id; + } elseif (method_exists($model, 'host') && $model->host) { + $selectedDatacenterId = $model->host->module_datacenter_id; } +} @endphp -