merge cleanups

This commit is contained in:
paulwer 2024-01-20 08:53:47 +01:00
parent 678da384a9
commit 1d92b91fc6

View File

@ -62,13 +62,16 @@ class MailgunController extends BaseController
*/
public function webhook(Request $request)
{
if ($request->header('X-API-SECURITY') && $request->header('X-API-SECURITY') == config('services.mailgun.token')) {
$input = $request->all();
if (\abs(\time() - $request['signature']['timestamp']) > 15)
return response()->json(['message' => 'Success'], 200);
if(\hash_equals(\hash_hmac('sha256', $input['signature']['timestamp'] . $input['signature']['token'], config('services.mailgun.webhook_signing_key')), $input['signature']['signature']))
ProcessMailgunWebhook::dispatch($request->all())->delay(10);
return response()->json(['message' => 'Success'], 200);
}
return response()->json(['message' => 'Unauthorized'], 403);
return response()->json(['message' => 'Success.'], 200);
}
/**
@ -105,17 +108,14 @@ class MailgunController extends BaseController
* ),
* )
*/
public function webhook(Request $request)
public function inboundWebhook(Request $request)
{
if ($request->header('X-API-SECURITY') && $request->header('X-API-SECURITY') == config('services.mailgun.token')) {
ProcessMailgunInboundWebhook::dispatch($request->all())->delay(10);
$input = $request->all();
if (\abs(\time() - $request['signature']['timestamp']) > 15)
return response()->json(['message' => 'Success'], 200);
}
if(\hash_equals(\hash_hmac('sha256', $input['signature']['timestamp'] . $input['signature']['token'], config('services.mailgun.webhook_signing_key')), $input['signature']['signature']))
ProcessMailgunWebhook::dispatch($request->all())->delay(10);
return response()->json(['message' => 'Success.'], 200);
return response()->json(['message' => 'Unauthorized'], 403);
}
}