diff --git a/src/Http/Controllers/IndexController.php b/src/Http/Controllers/IndexController.php index 2408bef6..bce6ad87 100644 --- a/src/Http/Controllers/IndexController.php +++ b/src/Http/Controllers/IndexController.php @@ -9,6 +9,10 @@ class IndexController { public function __invoke() { + if (config('log-viewer.api_only')) { + abort(404); + } + return view(LogViewer::getViewLayout(), [ 'logViewerScriptVariables' => [ 'headers' => (object) [], diff --git a/src/LogViewerServiceProvider.php b/src/LogViewerServiceProvider.php index 1dcfeffb..63c71740 100644 --- a/src/LogViewerServiceProvider.php +++ b/src/LogViewerServiceProvider.php @@ -95,16 +95,14 @@ protected function registerRoutes() $this->loadRoutesFrom(self::basePath('/routes/api.php')); }); - if (! config('log-viewer.api_only', false)) { - Route::group([ - 'domain' => config('log-viewer.route_domain', null), - 'prefix' => config('log-viewer.route_path'), - 'namespace' => 'Opcodes\LogViewer\Http\Controllers', - 'middleware' => config('log-viewer.middleware', null), - ], function () { - $this->loadRoutesFrom(self::basePath('/routes/web.php')); - }); - } + Route::group([ + 'domain' => config('log-viewer.route_domain', null), + 'prefix' => config('log-viewer.route_path'), + 'namespace' => 'Opcodes\LogViewer\Http\Controllers', + 'middleware' => config('log-viewer.middleware', null), + ], function () { + $this->loadRoutesFrom(self::basePath('/routes/web.php')); + }); } protected function registerResources() diff --git a/tests/Feature/RoutesTest.php b/tests/Feature/RoutesTest.php index 0eb03d84..e7519676 100644 --- a/tests/Feature/RoutesTest.php +++ b/tests/Feature/RoutesTest.php @@ -1,6 +1,6 @@ set('log-viewer.route_path', 'new-log-route'); @@ -32,8 +32,8 @@ reloadRoutes(); - route('log-viewer.index'); -})->throws(RouteNotFoundException::class); + get(route('log-viewer.index'))->assertStatus(404); +}); test('only both api and web', function () { config()->set('log-viewer.api_only', false); @@ -41,6 +41,7 @@ reloadRoutes(); expect(route('log-viewer.index'))->toBe('http://localhost/log-viewer'); + get(route('log-viewer.index'))->assertStatus(200); }); /*