Skip to content

[Notifier]  Simplify LightSms implementation #40712

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 7, 2021
Merged

[Notifier]  Simplify LightSms implementation #40712

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 18 additions & 41 deletions src/Symfony/Component/Notifier/Bridge/LightSms/LightSmsTransport.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,15 +100,14 @@ protected function doSend(MessageInterface $message): SentMessage
throw new UnsupportedMessageTypeException(__CLASS__, SmsMessage::class, $message);
}

$timestamp = time();
$data = [
'login' => $this->login,
'phone' => $this->escapePhoneNumber($message->getPhone()),
'text' => $message->getSubject(),
'phone' => $phone = $this->escapePhoneNumber($message->getPhone()),
'sender' => $this->from,
'timestamp' => $timestamp,
'text' => $message->getSubject(),
'timestamp' => time(),
];
$data['signature'] = $this->generateSignature($data, $timestamp);
$data['signature'] = $this->generateSignature($data);

$endpoint = sprintf('https://%s/external/get/send.php', $this->getEndpoint());
$response = $this->client->request(
Expand All @@ -125,55 +124,33 @@ protected function doSend(MessageInterface $message): SentMessage

$content = $response->toArray(false);

// it happens if the host without www
if (isset($content['']['error'])) {
throw new TransportException('Unable to send the SMS: '.$this->getErrorMsg((int) $content['']['error']), $response);
}

if (isset($content['error'])) {
throw new TransportException('Unable to send the SMS: '.$this->getErrorMsg((int) $content['error']), $response);
}
if (0 !== (int) $content[$phone]['error'] ?? -1) {
$errorCode = (int) $content['error'] ?? $content['']['error'] ?? $content[$phone]['error'] ?? -1;
if (-1 === $errorCode) {
throw new TransportException('Unable to send the SMS.', $response);
}

$phone = $this->escapePhoneNumber($message->getPhone());
if (32 === (int) $content[$phone]['error']) {
throw new TransportException('Unable to send the SMS: '.$this->getErrorMsg((int) $content[$phone]['error']), $response);
$error = self::ERROR_CODES[$errorCode] ?? self::ERROR_CODES[999];
throw new TransportException('Unable to send the SMS: '.$error, $response);
}

if (0 === (int) $content[$phone]['error']) {
$sentMessage = new SentMessage($message, (string) $this);
if (isset($content[$phone]['id_sms'])) {
$sentMessage->setMessageId($content[$phone]['id_sms']);
}

return $sentMessage;
$sentMessage = new SentMessage($message, (string) $this);
if (isset($content[$phone]['id_sms'])) {
$sentMessage->setMessageId($content[$phone]['id_sms']);
}

throw new TransportException('Unable to send the SMS.', $response);
return $sentMessage;
}

private function generateSignature(array $data, int $timestamp): string
private function generateSignature(array $data): string
{
$params = [
'timestamp' => $timestamp,
'login' => $this->login,
'phone' => $data['phone'],
'sender' => $this->from,
'text' => $data['text'],
];

ksort($params);
reset($params);
ksort($data);

return md5(implode('', $params).$this->password);
return md5(implode('', array_values($data)).$this->password);
}

private function escapePhoneNumber(string $phoneNumber): string
{
return str_replace('+', '00', $phoneNumber);
}

private function getErrorMsg(int $errorCode): string
{
return self::ERROR_CODES[$errorCode] ?? self::ERROR_CODES[999];
}
}