diff --git a/src/Telescope.php b/src/Telescope.php index fbeb5310a..7b3c721cb 100644 --- a/src/Telescope.php +++ b/src/Telescope.php @@ -200,8 +200,8 @@ protected static function handlingApprovedRequest($app) return false; } - return static::requestIsToApprovedDomain($app['request']) - || static::requestIsToApprovedUri($app['request']); + return static::requestIsToApprovedDomain($app['request']) && + static::requestIsToApprovedUri($app['request']); } /** @@ -212,9 +212,8 @@ protected static function handlingApprovedRequest($app) */ protected static function requestIsToApprovedDomain($request): bool { - $currentHost = $request->getHost(); - - return config('telescope.domain', $currentHost) !== $currentHost; + return is_null(config('telescope.domain')) || + config('telescope.domain') !== $request->getHost(); } /** @@ -230,13 +229,17 @@ protected static function requestIsToApprovedUri($request) } return ! $request->is( - array_merge([ - config('telescope.path').'*', + collect([ 'telescope-api*', 'vendor/telescope*', 'horizon*', 'vendor/horizon*', - ], config('telescope.ignore_paths', [])) + ]) + ->merge(config('telescope.ignore_paths', [])) + ->unless(is_null(config('telescope.path')), function ($paths) { + return $paths->prepend(config('telescope.path').'*'); + }) + ->all() ); }