From 5abe2a9ad7c95410cd18d819558acc74ea82ebc6 Mon Sep 17 00:00:00 2001 From: Jellyfrog Date: Tue, 25 Oct 2022 18:02:09 +0200 Subject: [PATCH] fix cors --- app/Http/Middleware/HandleCors.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/app/Http/Middleware/HandleCors.php b/app/Http/Middleware/HandleCors.php index dba9ce4f74..c84742c111 100644 --- a/app/Http/Middleware/HandleCors.php +++ b/app/Http/Middleware/HandleCors.php @@ -25,11 +25,11 @@ namespace App\Http\Middleware; -use Asm89\Stack\CorsService; +use Fruitcake\Cors\CorsService; use Illuminate\Contracts\Container\Container; use Illuminate\Support\Arr; -class HandleCors extends \Fruitcake\Cors\HandleCors +class HandleCors extends \Illuminate\Http\Middleware\HandleCors { private $map = [ 'allowmethods' => 'allowed_methods', @@ -38,7 +38,7 @@ class HandleCors extends \Fruitcake\Cors\HandleCors 'exposeheaders' => 'exposed_headers', ]; - public function __construct(Container $container) + public function __construct(Container $container, CorsService $cors) { // load legacy config settings before booting the CorsService if (\LibreNMS\Config::get('api.cors.enabled')) { @@ -58,7 +58,6 @@ class HandleCors extends \Fruitcake\Cors\HandleCors $container['config']->set('cors', $laravel_config); } - $cors = $container->make(CorsService::class); - parent::__construct($cors, $container); + parent::__construct($container, $cors); } }