From 6ef7609db6b393429e5bfea2292ac38d32a221f7 Mon Sep 17 00:00:00 2001 From: Akhil Date: Tue, 19 Sep 2023 15:21:42 +0530 Subject: [PATCH 1/2] Fix type in log statement --- lib/Service/UserService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php index 8803fcd9..07d980d4 100644 --- a/lib/Service/UserService.php +++ b/lib/Service/UserService.php @@ -168,7 +168,7 @@ class UserService { $email = $this->createSendGridEmail($fromEmail, $fromName, $toEmail, $toName, $templateID, $uid, $mainDomain); $this->sendEmailWithSendGrid($email, $sendgridAPIkey); } catch (Throwable $e) { - $this->logger->error('Error sending email to: ' . $email . ': ' . $e->getMessage()); + $this->logger->error('Error sending email to: ' . $toEmail . ': ' . $e->getMessage()); } } private function getSendGridAPIKey() : string { -- GitLab From 6f1bbb1ae48ef5609d1199e85b857c11573dd713 Mon Sep 17 00:00:00 2001 From: Akhil Date: Tue, 19 Sep 2023 15:34:20 +0530 Subject: [PATCH 2/2] handle success codes correctly --- lib/Service/UserService.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Service/UserService.php b/lib/Service/UserService.php index 07d980d4..e74854d0 100644 --- a/lib/Service/UserService.php +++ b/lib/Service/UserService.php @@ -199,7 +199,7 @@ class UserService { $sendgrid = new \SendGrid($sendgridAPIkey); $response = $sendgrid->send($email, [ CURLOPT_TIMEOUT => 15 ]); - if ($response->statusCode() !== 200) { + if ($response->statusCode() < 200 || $response->statusCode() > 299) { throw new \Exception("SendGrid API error - Status Code: " . $response->statusCode()); } } -- GitLab