Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Added additional allowed headers in CORS

Browse Source
This commit is contained in:
Frank Schubert
2023-03-27 14:03:54 +02:00
parent 2a9cdcf93d
commit 8e72421df6
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
application/Api/v1/AddressdbApicontroller.php
View File

@@ -31,6 +31,13 @@ class AddressdbApicontroller extends mfBaseApicontroller {
protected function authenticated() {
$campaignApiusers = PreordercampaignApiuserModel::search(["worker_id" => $this->me->id]);
if(!$campaignApiusers) {
$cau = new PreordercampaignApiuser();
$cau->preordercampaign_id = 1;
$campaignApiusers = [$cau];
}
foreach($campaignApiusers as $campaignApiuser) {
$campaign = new Preordercampaign($campaignApiuser->preordercampaign_id);
if($campaign) {

6
lib/mvcfronk/mfBase/mfBaseApicontroller.php
View File

@@ -48,7 +48,7 @@ class mfBaseApicontroller {
if($this->http_method == "OPTIONS") {
// dont execute route, OPTIONS only requires CORS headers
header("Access-Control-Allow-Methods: GET,POST,PUT,DELETE,OPTIONS");
header("Access-Control-Allow-Headers: X-Api-Key");
header("Access-Control-Allow-Headers: X-Api-Key, accept, Content-Type");
if(preg_match('#^(https?)://([^/:]+)(:\d+)?/?$#i', $this->headers['origin'], $m)) {
$origin_proto = $m[1];
@@ -129,7 +129,7 @@ class mfBaseApicontroller {
if(!$me->id) {
header("Access-Control-Allow-Methods: GET,POST,PUT,DELETE,OPTIONS");
header("Access-Control-Allow-Headers: X-Api-Key");
header("Access-Control-Allow-Headers: X-Api-Key, accept, Content-Type");
if(preg_match('#^(https?)://([^/:]+)(:\d+)?/?$#i', $this->headers['origin'], $m)) {
$origin_proto = $m[1];
@@ -326,7 +326,7 @@ class mfBaseApicontroller {
private function createCorsHeaders() {
header("Access-Control-Allow-Methods: GET,POST,PUT,DELETE,OPTIONS");
header("Access-Control-Allow-Headers: X-Api-Key");
header("Access-Control-Allow-Headers: X-Api-Key, accept, Content-Type");
if(!is_array($this->allowed_origins) || !count($this->allowed_origins)) {
return true;