Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a7d93c5a authored by Akhil's avatar Akhil 🙂
Browse files

Merge branch 'dev/fix-welcome-email-type' into 'main' 

Dev/fix welcome email type

See merge request !81
parents 8a19fedb 73e7615e

lib/Service/UserService.php

+2 −2
Original line number Original line Diff line number Diff line
@@ -168,7 +168,7 @@ class UserService { 
			$email = $this->createSendGridEmail($fromEmail, $fromName, $toEmail, $toName, $templateID, $uid, $mainDomain);

			$email = $this->createSendGridEmail($fromEmail, $fromName, $toEmail, $toName, $templateID, $uid, $mainDomain);

			$this->sendEmailWithSendGrid($email, $sendgridAPIkey);

			$this->sendEmailWithSendGrid($email, $sendgridAPIkey);

		} catch (Throwable $e) {

		} 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 {

	private function getSendGridAPIKey() : string {
@@ -199,7 +199,7 @@ class UserService { 
		$sendgrid = new \SendGrid($sendgridAPIkey);

		$sendgrid = new \SendGrid($sendgridAPIkey);

		$response = $sendgrid->send($email, [ CURLOPT_TIMEOUT => 15 ]);

		$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());

			throw new \Exception("SendGrid API error - Status Code: " . $response->statusCode());

		}

		}

	}

	}