diff --git a/app/Classes/General/Abstracts/AbstractControllerLogic.php b/app/Classes/General/Abstracts/AbstractControllerLogic.php index 3cde4d22..172c2eb3 100644 --- a/app/Classes/General/Abstracts/AbstractControllerLogic.php +++ b/app/Classes/General/Abstracts/AbstractControllerLogic.php @@ -62,9 +62,14 @@ abstract class AbstractControllerLogic return $response; } catch (ErrorException|GeneralExceptions|TypeError $exception){ - return (new ApiResponseObject($this->getNotificationTitle().' failed', $exception->getMessage(), + if ($request->has('isApiPub')) { + return (new ApiResponseObject($this->getNotificationTitle().' failed', "Server Error", !in_array($exception->getCode(), [0, 42000]) ? $exception->getCode() : HttpStatus::SERVER_ERROR))->handler(); + } else { + return (new ApiResponseObject($this->getNotificationTitle().' failed', $exception->getMessage(), + !in_array($exception->getCode(), [0, 42000]) ? $exception->getCode() : HttpStatus::SERVER_ERROR))->handler(); + } } } diff --git a/app/Classes/Modules/WePost/ControllersLogic/ProcessWePostNotificationLogic.php b/app/Classes/Modules/WePost/ControllersLogic/ProcessWePostNotificationLogic.php index 057b9fc3..3fa2c6a5 100644 --- a/app/Classes/Modules/WePost/ControllersLogic/ProcessWePostNotificationLogic.php +++ b/app/Classes/Modules/WePost/ControllersLogic/ProcessWePostNotificationLogic.php @@ -43,6 +43,10 @@ class ProcessWePostNotificationLogic extends AbstractControllerLogic */ public function logic(Request $request) : JsonResponse { + $request->merge([ + 'isApiPub' => true, + ]); + $result = null; if($this->verifySignature($request)){ $object = new WePostNotificationObject(