Merge branch 'fronkdev' into 'master'

readded network check in Preorder API CIF modules

See merge request fronk/thetool!274
This commit is contained in:
Frank Schubert
2024-02-29 13:27:59 +00:00

View File

@@ -72,15 +72,15 @@ class Cif extends Modules\ApiControllerModule {
return \mfResponse::NotFound(["message" => "Invalid ciftoken"]);
}
/*
$network = \NetworkModel::getFirst(["adb_netzgebiet_id" => $preorder->adb_hausnummer->netzgebiet->id]);
if(!$network) {
return \mfResponse::NotFound(["message" => "Invalid ciftoken"]);
}
if($network->owner_id != $this->me->address_id && $preorder->partner_id != $this->me->address_id) {
if($network->owner_id != $this->me->address_id) {
return \mfResponse::NotFound(["message" => "Invalid ciftoken"]);
}*/
}
$return = $preorder->getCifdataApiArray();
@@ -111,7 +111,7 @@ class Cif extends Modules\ApiControllerModule {
if(!$preorder) {
return \mfResponse::NotFound(["message" => "Invalid ciftoken"]);
}
/*
if(!$preorder->adb_hausnummer->netzgebiet_id) {
return \mfResponse::NotFound(["message" => "Invalid ciftoken"]);
}
@@ -119,9 +119,9 @@ class Cif extends Modules\ApiControllerModule {
if(!$network) {
return \mfResponse::NotFound(["message" => "Invalid ciftoken"]);
}
if($network->owner_id != $this->me->address_id && $preorder->partner_id != $this->me->address_id) {
if($network->owner_id != $this->me->address_id) {
return \mfResponse::NotFound(["message" => "Invalid ciftoken"]);
}*/
}
// set status to 200
if($preorder->status->code < 200) {