Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-11-14 15:13:29 +01:00
Code Issues Releases Activity

Split parameters

Browse Source
This commit is contained in:
David Bomba 2024-08-29 17:12:12 +10:00
parent 918258948b
commit 4ea7c7ef63
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Http/Controllers/MailgunController.php
View File

@ -128,7 +128,7 @@ class MailgunController extends BaseController
if (!$authorizedByHash && !$authorizedByToken)
return response()->json(['message' => 'Unauthorized'], 403);
ProcessMailgunInboundWebhook::dispatch($input["sender"] . "|" . $input["recipient"] . "|" . $input["message-url"])->delay(rand(2, 10));
ProcessMailgunInboundWebhook::dispatch($input["sender"], $input["recipient"], $input["message-url"])->delay(rand(2, 10));
return response()->json(['message' => 'Success.'], 200);
}

12
app/Jobs/Mailgun/ProcessMailgunInboundWebhook.php
View File

@ -34,7 +34,7 @@ class ProcessMailgunInboundWebhook implements ShouldQueue
* Create a new job instance.
* $input consists of 3 informations: sender/from|recipient/to|messageUrl
*/
public function __construct(private string $input)
public function __construct(private string $sender, private string $recipient, private string $message_url)
{
$this->engine = new InboundMailEngine();
}
@ -167,8 +167,8 @@ class ProcessMailgunInboundWebhook implements ShouldQueue
*/
public function handle()
{
$from = explode("|", $this->input)[0];
$to = explode("|", $this->input)[1];
$from = $this->sender;//explode("|", $this->input)[0];
$to = $this->recipient; //explode("|", $this->input)[1];
// $messageId = explode("|", $this->input)[2]; // used as base in download function
// Spam protection
@ -196,7 +196,7 @@ class ProcessMailgunInboundWebhook implements ShouldQueue
if ($company_mailgun_domain && $company_mailgun_secret) {
$credentials = $company_mailgun_domain . ":" . $company_mailgun_secret . "@";
$messageUrl = explode("|", $this->input)[2];
$messageUrl = $this->message_url;//explode("|", $this->input)[2];
$messageUrl = str_replace("http://", "http://" . $credentials, $messageUrl);
$messageUrl = str_replace("https://", "https://" . $credentials, $messageUrl);
@ -207,7 +207,7 @@ class ProcessMailgunInboundWebhook implements ShouldQueue
nlog("[ProcessMailgunInboundWebhook] Error while downloading with company credentials, we try to use default credentials now...");
$credentials = config('services.mailgun.domain') . ":" . config('services.mailgun.secret') . "@";
$messageUrl = explode("|", $this->input)[2];
$messageUrl = $this->message_url;//explode("|", $this->input)[2];
$messageUrl = str_replace("http://", "http://" . $credentials, $messageUrl);
$messageUrl = str_replace("https://", "https://" . $credentials, $messageUrl);
$mail = json_decode(file_get_contents($messageUrl));
@ -219,7 +219,7 @@ class ProcessMailgunInboundWebhook implements ShouldQueue
} else {
$credentials = config('services.mailgun.domain') . ":" . config('services.mailgun.secret') . "@";
$messageUrl = explode("|", $this->input)[2];
$messageUrl = $this->message_url; //explode("|", $this->input)[2];
$messageUrl = str_replace("http://", "http://" . $credentials, $messageUrl);
$messageUrl = str_replace("https://", "https://" . $credentials, $messageUrl);
$mail = json_decode(file_get_contents($messageUrl));

2
app/Services/InboundMail/InboundMailEngine.php
View File

@ -310,7 +310,7 @@ class InboundMailEngine
}
private function logBlocked(Company $company, string $data)
{
nlog("[InboundMailEngine][company:" . $company->id . "] " . $data);
nlog("[InboundMailEngine][company:" . $company->company_key . "] " . $data);
(
new SystemLogger(