Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-01 07:14:38 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixes for CORS

Browse Source
This commit is contained in:
David Bomba 2021-06-02 13:14:40 +10:00
parent 06dfbd914d
commit 4c0c770c56
4 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/Http/Kernel.php
View File

@ -65,12 +65,12 @@ class Kernel extends HttpKernel
* @var array * @var array
*/ */
protected $middleware = [ protected $middleware = [
\Fruitcake\Cors\HandleCors::class,
CheckForMaintenanceMode::class, CheckForMaintenanceMode::class,
ValidatePostSize::class, ValidatePostSize::class,
TrimStrings::class, TrimStrings::class,
ConvertEmptyStringsToNull::class, ConvertEmptyStringsToNull::class,
TrustProxies::class, TrustProxies::class,
// \Fruitcake\Cors\HandleCors::class,
Cors::class, Cors::class,
]; ];
@ -105,6 +105,7 @@ class Kernel extends HttpKernel
EncryptCookies::class, EncryptCookies::class,
AddQueuedCookiesToResponse::class, AddQueuedCookiesToResponse::class,
StartSession::class, StartSession::class,
// \Illuminate\Session\Middleware\AuthenticateSession::class,
ShareErrorsFromSession::class, ShareErrorsFromSession::class,
VerifyCsrfToken::class, VerifyCsrfToken::class,
SubstituteBindings::class, SubstituteBindings::class,
@ -162,9 +163,6 @@ class Kernel extends HttpKernel
protected $middlewarePriority = [ protected $middlewarePriority = [
Cors::class, Cors::class,
AddQueuedCookiesToResponse::class,
VerifyCsrfToken::class,
StartSession::class,
SetDomainNameDb::class, SetDomainNameDb::class,
SetDb::class, SetDb::class,
SetWebDb::class, SetWebDb::class,

26
app/Http/Middleware/Cors.php
View File

@ -10,24 +10,24 @@ class Cors
{ {
public function handle($request, Closure $next) public function handle($request, Closure $next)
{ {
// if ($request->getMethod() == 'OPTIONS') { if ($request->getMethod() == 'OPTIONS') {
// header('Access-Control-Allow-Origin: *'); header('Access-Control-Allow-Origin: *');
// // ALLOW OPTIONS METHOD // ALLOW OPTIONS METHOD
// $headers = [ $headers = [
// 'Access-Control-Allow-Methods'=> 'POST, GET, OPTIONS, PUT, DELETE', 'Access-Control-Allow-Methods'=> 'POST, GET, OPTIONS, PUT, DELETE',
// 'Access-Control-Allow-Headers'=> 'X-API-COMPANY-KEY,X-CLIENT-VERSION,X-API-SECRET,X-API-TOKEN,X-API-PASSWORD,DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,X-CSRF-TOKEN,X-XSRF-TOKEN,X-LIVEWIRE', 'Access-Control-Allow-Headers'=> 'X-API-COMPANY-KEY,X-CLIENT-VERSION,X-API-SECRET,X-API-TOKEN,X-API-PASSWORD,DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,X-CSRF-TOKEN,X-XSRF-TOKEN,X-LIVEWIRE',
// ]; ];
// return Response::make('OK', 200, $headers); return Response::make('OK', 200, $headers);
// } }
$response = $next($request); $response = $next($request);
// $response->headers->set('Access-Control-Allow-Origin', '*'); $response->headers->set('Access-Control-Allow-Origin', '*');
// $response->headers->set('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS'); $response->headers->set('Access-Control-Allow-Methods', 'GET, POST, PUT, DELETE, OPTIONS');
// $response->headers->set('Access-Control-Allow-Headers', 'X-API-COMPANY-KEY,X-API-SECRET,X-API-TOKEN,X-API-PASSWORD,DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,X-CSRF-TOKEN,X-XSRF-TOKEN,X-LIVEWIRE'); $response->headers->set('Access-Control-Allow-Headers', 'X-API-COMPANY-KEY,X-API-SECRET,X-API-TOKEN,X-API-PASSWORD,DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range,X-CSRF-TOKEN,X-XSRF-TOKEN,X-LIVEWIRE');
// $response->headers->set('Access-Control-Expose-Headers', 'X-APP-VERSION,X-MINIMUM-CLIENT-VERSION'); $response->headers->set('Access-Control-Expose-Headers', 'X-APP-VERSION,X-MINIMUM-CLIENT-VERSION');
$response->headers->set('X-APP-VERSION', config('ninja.app_version')); $response->headers->set('X-APP-VERSION', config('ninja.app_version'));
$response->headers->set('X-MINIMUM-CLIENT-VERSION', config('ninja.minimum_client_version')); $response->headers->set('X-MINIMUM-CLIENT-VERSION', config('ninja.minimum_client_version'));

1
app/Http/Middleware/SetDomainNameDb.php
View File

@ -86,6 +86,7 @@ class SetDomainNameDb
} }
config(['app.url' => $request->getSchemeAndHttpHost()]);
return $next($request); return $next($request);
} }

2
config/session.php
View File

@ -196,6 +196,6 @@ return [
| |
*/ */
'same_site' => 'none', 'same_site' => 'lax',
]; ];