-
Notifications
You must be signed in to change notification settings - Fork 9.4k
GraphQL CORS Headers #28713
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
magento-engcom-team
merged 8 commits into
magento:2.4-develop
from
michalderlatka:28561_graphql_cors_requests
Jun 27, 2020
Merged
GraphQL CORS Headers #28713
Changes from all commits
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
50635d9
magento/magento2#28561: GraphQL added CORS headers
michalderlatka b79c484
magento/magento2#28561: GraphQL added CORS headers
michalderlatka 69cb58c
Merge branch '2.4-develop' into 28561_graphql_cors_requests
cpartica 5ba8fd7
magento/magento2#28561: GraphQL added CORS headers (static test fix)
michalderlatka c3def13
Merge branch '28561_graphql_cors_requests' of github.com:michalderlat…
michalderlatka e82cca4
magento/magento2#28561: GraphQL added CORS headers (static test fix)
michalderlatka 64b4228
Merge branch '2.4-develop' of https://github.com/magento/magento2 int…
michalderlatka 88840a7
magento/magento2#28561: GraphQL added CORS headers (fixing issues)
michalderlatka File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
71 changes: 71 additions & 0 deletions
71
app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowCredentialsHeaderProvider.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
<?php | ||
/** | ||
* Copyright © Magento, Inc. All rights reserved. | ||
* See COPYING.txt for license details. | ||
*/ | ||
declare(strict_types=1); | ||
|
||
namespace Magento\GraphQl\Controller\HttpResponse\Cors; | ||
|
||
use Magento\Framework\App\Response\HeaderProvider\HeaderProviderInterface; | ||
use Magento\GraphQl\Model\Cors\ConfigurationInterface; | ||
|
||
/** | ||
* Provides value for Access-Control-Allow-Credentials header if CORS is enabled | ||
*/ | ||
class CorsAllowCredentialsHeaderProvider implements HeaderProviderInterface | ||
{ | ||
/** | ||
* @var string | ||
*/ | ||
private $headerName; | ||
|
||
/** | ||
* CORS configuration provider | ||
* | ||
* @var \Magento\GraphQl\Model\Cors\ConfigurationInterface | ||
*/ | ||
private $corsConfiguration; | ||
|
||
/** | ||
* @param ConfigurationInterface $corsConfiguration | ||
* @param string $headerName | ||
*/ | ||
public function __construct( | ||
ConfigurationInterface $corsConfiguration, | ||
string $headerName | ||
) { | ||
$this->corsConfiguration = $corsConfiguration; | ||
$this->headerName = $headerName; | ||
} | ||
|
||
/** | ||
* Get name of header | ||
* | ||
* @return string | ||
*/ | ||
public function getName(): string | ||
{ | ||
return $this->headerName; | ||
} | ||
|
||
/** | ||
* Get value for header | ||
* | ||
* @return string | ||
*/ | ||
public function getValue(): string | ||
{ | ||
return "1"; | ||
} | ||
|
||
/** | ||
* Check if header can be applied | ||
* | ||
* @return bool | ||
*/ | ||
public function canApply(): bool | ||
{ | ||
return $this->corsConfiguration->isEnabled() && $this->corsConfiguration->isCredentialsAllowed(); | ||
} | ||
} |
71 changes: 71 additions & 0 deletions
71
app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowHeadersHeaderProvider.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
<?php | ||
/** | ||
* Copyright © Magento, Inc. All rights reserved. | ||
* See COPYING.txt for license details. | ||
*/ | ||
declare(strict_types=1); | ||
|
||
namespace Magento\GraphQl\Controller\HttpResponse\Cors; | ||
|
||
use Magento\Framework\App\Response\HeaderProvider\HeaderProviderInterface; | ||
use Magento\GraphQl\Model\Cors\ConfigurationInterface; | ||
|
||
cpartica marked this conversation as resolved.
Show resolved
Hide resolved
|
||
/** | ||
* Provides value for Access-Control-Allow-Headers header if CORS is enabled | ||
*/ | ||
class CorsAllowHeadersHeaderProvider implements HeaderProviderInterface | ||
{ | ||
/** | ||
* @var string | ||
*/ | ||
private $headerName; | ||
|
||
/** | ||
* CORS configuration provider | ||
* | ||
* @var \Magento\GraphQl\Model\Cors\ConfigurationInterface | ||
*/ | ||
private $corsConfiguration; | ||
|
||
/** | ||
* @param ConfigurationInterface $corsConfiguration | ||
* @param string $headerName | ||
*/ | ||
public function __construct( | ||
ConfigurationInterface $corsConfiguration, | ||
string $headerName | ||
) { | ||
$this->corsConfiguration = $corsConfiguration; | ||
$this->headerName = $headerName; | ||
} | ||
|
||
michalderlatka marked this conversation as resolved.
Show resolved
Hide resolved
|
||
/** | ||
* Get name of header | ||
* | ||
* @return string | ||
*/ | ||
public function getName(): string | ||
{ | ||
return $this->headerName; | ||
} | ||
|
||
/** | ||
* Check if header can be applied | ||
* | ||
* @return bool | ||
*/ | ||
public function canApply(): bool | ||
{ | ||
return $this->corsConfiguration->isEnabled() && $this->getValue(); | ||
} | ||
|
||
/** | ||
* Get value for header | ||
* | ||
* @return string|null | ||
*/ | ||
public function getValue(): ?string | ||
{ | ||
return $this->corsConfiguration->getAllowedHeaders(); | ||
} | ||
} |
71 changes: 71 additions & 0 deletions
71
app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowMethodsHeaderProvider.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
<?php | ||
/** | ||
* Copyright © Magento, Inc. All rights reserved. | ||
* See COPYING.txt for license details. | ||
*/ | ||
declare(strict_types=1); | ||
|
||
namespace Magento\GraphQl\Controller\HttpResponse\Cors; | ||
|
||
use Magento\Framework\App\Response\HeaderProvider\HeaderProviderInterface; | ||
use Magento\GraphQl\Model\Cors\ConfigurationInterface; | ||
|
||
/** | ||
* Provides value for Access-Control-Allow-Methods header if CORS is enabled | ||
*/ | ||
class CorsAllowMethodsHeaderProvider implements HeaderProviderInterface | ||
{ | ||
/** | ||
* @var string | ||
*/ | ||
private $headerName; | ||
|
||
cpartica marked this conversation as resolved.
Show resolved
Hide resolved
|
||
/** | ||
* CORS configuration provider | ||
* | ||
* @var \Magento\GraphQl\Model\Cors\ConfigurationInterface | ||
*/ | ||
private $corsConfiguration; | ||
|
||
/** | ||
* @param ConfigurationInterface $corsConfiguration | ||
* @param string $headerName | ||
*/ | ||
public function __construct( | ||
ConfigurationInterface $corsConfiguration, | ||
string $headerName | ||
) { | ||
$this->corsConfiguration = $corsConfiguration; | ||
$this->headerName = $headerName; | ||
} | ||
|
||
/** | ||
* Get name of header | ||
* | ||
* @return string | ||
*/ | ||
public function getName(): string | ||
{ | ||
return $this->headerName; | ||
} | ||
|
||
/** | ||
* Check if header can be applied | ||
* | ||
* @return bool | ||
*/ | ||
public function canApply(): bool | ||
{ | ||
return $this->corsConfiguration->isEnabled() && $this->getValue(); | ||
} | ||
|
||
/** | ||
* Get value for header | ||
* | ||
* @return string|null | ||
*/ | ||
public function getValue(): ?string | ||
{ | ||
return $this->corsConfiguration->getAllowedMethods(); | ||
} | ||
} |
71 changes: 71 additions & 0 deletions
71
app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsAllowOriginHeaderProvider.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
<?php | ||
/** | ||
* Copyright © Magento, Inc. All rights reserved. | ||
* See COPYING.txt for license details. | ||
*/ | ||
declare(strict_types=1); | ||
|
||
namespace Magento\GraphQl\Controller\HttpResponse\Cors; | ||
|
||
use Magento\Framework\App\Response\HeaderProvider\HeaderProviderInterface; | ||
use Magento\GraphQl\Model\Cors\ConfigurationInterface; | ||
|
||
/** | ||
* Provides value for Access-Control-Allow-Origin header if CORS is enabled | ||
*/ | ||
class CorsAllowOriginHeaderProvider implements HeaderProviderInterface | ||
{ | ||
/** | ||
* @var string | ||
*/ | ||
private $headerName; | ||
|
||
/** | ||
* CORS configuration provider | ||
* | ||
* @var \Magento\GraphQl\Model\Cors\ConfigurationInterface | ||
*/ | ||
private $corsConfiguration; | ||
|
||
/** | ||
* @param ConfigurationInterface $corsConfiguration | ||
* @param string $headerName | ||
*/ | ||
public function __construct( | ||
ConfigurationInterface $corsConfiguration, | ||
string $headerName | ||
) { | ||
$this->corsConfiguration = $corsConfiguration; | ||
$this->headerName = $headerName; | ||
} | ||
|
||
/** | ||
* Get name of header | ||
* | ||
* @return string | ||
*/ | ||
public function getName(): string | ||
{ | ||
return $this->headerName; | ||
} | ||
|
||
/** | ||
* Check if header can be applied | ||
* | ||
* @return bool | ||
*/ | ||
public function canApply(): bool | ||
{ | ||
return $this->corsConfiguration->isEnabled() && $this->getValue(); | ||
} | ||
|
||
/** | ||
* Get value for header | ||
* | ||
* @return string|null | ||
*/ | ||
public function getValue(): ?string | ||
{ | ||
return $this->corsConfiguration->getAllowedOrigins(); | ||
} | ||
} |
71 changes: 71 additions & 0 deletions
71
app/code/Magento/GraphQl/Controller/HttpResponse/Cors/CorsMaxAgeHeaderProvider.php
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,71 @@ | ||
<?php | ||
/** | ||
* Copyright © Magento, Inc. All rights reserved. | ||
* See COPYING.txt for license details. | ||
*/ | ||
declare(strict_types=1); | ||
|
||
namespace Magento\GraphQl\Controller\HttpResponse\Cors; | ||
|
||
use Magento\Framework\App\Response\HeaderProvider\HeaderProviderInterface; | ||
use Magento\GraphQl\Model\Cors\ConfigurationInterface; | ||
|
||
/** | ||
* Provides value for Access-Control-Max-Age header if CORS is enabled | ||
*/ | ||
class CorsMaxAgeHeaderProvider implements HeaderProviderInterface | ||
{ | ||
/** | ||
* @var string | ||
*/ | ||
private $headerName; | ||
|
||
/** | ||
* CORS configuration provider | ||
* | ||
* @var \Magento\GraphQl\Model\Cors\ConfigurationInterface | ||
*/ | ||
private $corsConfiguration; | ||
|
||
/** | ||
* @param ConfigurationInterface $corsConfiguration | ||
* @param string $headerName | ||
*/ | ||
public function __construct( | ||
ConfigurationInterface $corsConfiguration, | ||
string $headerName | ||
) { | ||
$this->corsConfiguration = $corsConfiguration; | ||
$this->headerName = $headerName; | ||
} | ||
|
||
/** | ||
* Get name of header | ||
* | ||
* @return string | ||
*/ | ||
public function getName(): string | ||
{ | ||
return $this->headerName; | ||
} | ||
|
||
/** | ||
* Check if header can be applied | ||
* | ||
* @return bool | ||
*/ | ||
public function canApply(): bool | ||
{ | ||
return $this->corsConfiguration->isEnabled() && $this->getValue(); | ||
} | ||
|
||
/** | ||
* Get value for header | ||
* | ||
* @return string|null | ||
*/ | ||
public function getValue(): ?string | ||
{ | ||
return (string) $this->corsConfiguration->getMaxAge(); | ||
} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.