malhuda/jikan-rest
1
0
Fork 0
mirror of https://github.com/jikan-me/jikan-rest.git synced 2025-02-20 11:23:35 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

improved CORS support once again

Browse Source
This commit is contained in:
pushrbx 2023-05-23 20:30:30 +01:00
parent 9262d0b32a
commit 6c82c3e953
3 changed files with 42 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
app/Http/Middleware/CorsMiddleware.php
View File

@ -2,36 +2,49 @@
namespace App\Http\Middleware; namespace App\Http\Middleware;
use Illuminate\Http\Request; use Fruitcake\Cors\CorsService;
use Illuminate\Contracts\Container\Container;
use Illuminate\Http\Response; use Illuminate\Http\Response;
use Illuminate\Http\JsonResponse; use Illuminate\Http\JsonResponse;
use Illuminate\Http\RedirectResponse; use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Middleware\HandleCors;
use Laravel\Lumen\Http\ResponseFactory; use Laravel\Lumen\Http\ResponseFactory;
class CorsMiddleware class CorsMiddleware extends HandleCors
{ {
public function __construct(private readonly ResponseFactory $responseFactory) public function __construct(Container $container, CorsService $cors, private readonly ResponseFactory $responseFactory)
{ {
parent::__construct($container, $cors);
} }
public function handle(Request $request, \Closure $next): Response | JsonResponse | RedirectResponse public function handle($request, \Closure $next): Response | JsonResponse | RedirectResponse
{ {
if ($request->isMethod('OPTIONS')) { if (! $this->hasMatchingPath($request)) {
$headers = [ return $next($request);
'Access-Control-Allow-Origin' => '*',
'Access-Control-Allow-Methods' => 'GET, OPTIONS',
'Access-Control-Max-Age' => '86400',
'Accept-Control-Allow-Headers' => 'Accept,Accept-Encoding,DNT,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range',
'Content-Type' => 'text/plain',
'Content-Length' => '0'
];
$response = $this->responseFactory->make("", 204, $headers);
$response->setProtocolVersion("1.1");
} }
else {
$this->cors->setOptions($this->container['config']->get('cors', []));
if ($this->cors->isPreflightRequest($request)) {
$symfonyResponse = $this->cors->handlePreflightRequest($request);
$this->cors->varyHeader($symfonyResponse, 'Access-Control-Request-Method');
$lumenResponse = $this->responseFactory->make($symfonyResponse->getContent(), $symfonyResponse->getStatusCode(), $symfonyResponse->headers->all());
$lumenResponse->setProtocolVersion("1.1");
return $lumenResponse;
}
$response = $next($request); $response = $next($request);
if ($request->getMethod() === 'OPTIONS') {
$this->cors->varyHeader($response, 'Access-Control-Request-Method');
} }
return $response; $symfonyResponse = $this->cors->addActualRequestHeaders($response, $request);
$lumenResponse = $this->responseFactory->make($symfonyResponse->getContent(), $symfonyResponse->getStatusCode(), $symfonyResponse->headers->all());
$lumenResponse->setProtocolVersion("1.1");
return $lumenResponse;
} }
} }

1
bootstrap/app.php
View File

@ -83,6 +83,7 @@ if (env('INSIGHTS', false)) {
} }
if (env('CORS_MIDDLEWARE', false)) { if (env('CORS_MIDDLEWARE', false)) {
$app->configure('cors');
$globalMiddleware[] = \App\Http\Middleware\CorsMiddleware::class; $globalMiddleware[] = \App\Http\Middleware\CorsMiddleware::class;
} }

9
config/cors.php Normal file
View File

@ -0,0 +1,9 @@
<?php
return [
'paths' => ['*'],
'allowed_methods' => ['GET', 'OPTIONS'],
'allowed_origins' => ['*'],
'allowed_headers' => ['Accept,Accept-Encoding,DNT,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Content-Range,Range'],
'max_age' => 86400,
'supports_credentials' => false,
];