From c125c389a9af06defc6a6d70b607fe701a8e4c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Kuffel?= Date: Sat, 18 Sep 2021 21:17:07 +0200 Subject: add SerwerSMS.pl provider MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Kuffel --- .../Gateway/SMS/Provider/ProviderFactory.php | 2 + lib/Service/Gateway/SMS/Provider/SerwerSMS.php | 82 ++++++++++++++++++++ .../Gateway/SMS/Provider/SerwerSMSConfig.php | 87 ++++++++++++++++++++++ 3 files changed, 171 insertions(+) create mode 100644 lib/Service/Gateway/SMS/Provider/SerwerSMS.php create mode 100644 lib/Service/Gateway/SMS/Provider/SerwerSMSConfig.php (limited to 'lib/Service/Gateway') diff --git a/lib/Service/Gateway/SMS/Provider/ProviderFactory.php b/lib/Service/Gateway/SMS/Provider/ProviderFactory.php index 7977bde..e399d29 100644 --- a/lib/Service/Gateway/SMS/Provider/ProviderFactory.php +++ b/lib/Service/Gateway/SMS/Provider/ProviderFactory.php @@ -63,6 +63,8 @@ class ProviderFactory { return $this->container->query(ClickatellCentral::class); case ClickSend::PROVIDER_ID: return $this->container->query(ClickSend::class); + case SerwerSMS::PROVIDER_ID: + return $this->container->query(SerwerSMS::class); default: throw new InvalidSmsProviderException("Provider <$id> does not exist"); } diff --git a/lib/Service/Gateway/SMS/Provider/SerwerSMS.php b/lib/Service/Gateway/SMS/Provider/SerwerSMS.php new file mode 100644 index 0000000..97cdff0 --- /dev/null +++ b/lib/Service/Gateway/SMS/Provider/SerwerSMS.php @@ -0,0 +1,82 @@ + + * + * Nextcloud - Two-factor Gateway for SerwerSMS.pl + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see + * + */ + +namespace OCA\TwoFactorGateway\Service\Gateway\SMS\Provider; + +use Exception; +use OCA\TwoFactorGateway\Exception\SmsTransmissionException; +use OCP\Http\Client\IClient; +use OCP\Http\Client\IClientService; + +class SerwerSMS implements IProvider { + public const PROVIDER_ID = 'serwersms'; + + /** @var IClient */ + private $client; + + /** @var SerwerSMSConfig */ + private $config; + + public function __construct(IClientService $clientService, + SerwerSMSConfig $config) { + $this->client = $clientService->newClient(); + $this->config = $config; + } + + /** + * @param string $identifier + * @param string $message + * + * @throws SmsTransmissionException + */ + public function send(string $identifier, string $message) { + $config = $this->getConfig(); + $login = $config->getLogin(); + $password = $config->getPassword(); + $sender = $config->getSender(); + try { + $this->client->post('https://api2.serwersms.pl/messages/send_sms', [ + 'headers' => [ + 'Content-Type' => 'application/json', + ], + 'json' => [ + 'username' => $login, + 'password' => $password, + 'phone' => $identifier, + 'text' => $message, + 'sender' => $sender, + ], + ]); + } catch (Exception $ex) { + throw new SmsTransmissionException(); + } + } + + /** + * @return SerwerSMSConfig + */ + public function getConfig(): IProviderConfig { + return $this->config; + } +} + diff --git a/lib/Service/Gateway/SMS/Provider/SerwerSMSConfig.php b/lib/Service/Gateway/SMS/Provider/SerwerSMSConfig.php new file mode 100644 index 0000000..7db562f --- /dev/null +++ b/lib/Service/Gateway/SMS/Provider/SerwerSMSConfig.php @@ -0,0 +1,87 @@ + + * + * Nextcloud - Two-factor Gateway for SerwerSMS.pl + * + * This code is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License, version 3, + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License, version 3, + * along with this program. If not, see + * + */ + +namespace OCA\TwoFactorGateway\Service\Gateway\SMS\Provider; + +use function array_intersect; +use OCA\TwoFactorGateway\AppInfo\Application; +use OCA\TwoFactorGateway\Exception\ConfigurationException; +use OCP\IConfig; + +class SerwerSMSConfig implements IProviderConfig { + private const expected = [ + 'serwersms_login', + 'serwersms_password', + 'serwersms_sender', + ]; + + /** @var IConfig */ + private $config; + + public function __construct(IConfig $config) { + $this->config = $config; + } + + private function getOrFail(string $key): string { + $val = $this->config->getAppValue(Application::APP_NAME, $key, null); + if (is_null($val)) { + throw new ConfigurationException(); + } + return $val; + } + + public function getLogin(): string { + return $this->getOrFail('serwersms_login'); + } + + public function getPassword(): string { + return $this->getOrFail('serwersms_password'); + } + + public function getSender(): string { + return $this->getOrFail('serwersms_sender'); + } + + public function setLogin(string $login) { + $this->config->setAppValue(Application::APP_NAME, 'serwersms_login', $login); + } + + public function setPassword(string $password) { + $this->config->setAppValue(Application::APP_NAME, 'serwersms_password', $password); + } + + public function setSender(string $sender) { + $this->config->setAppValue(Application::APP_NAME, 'serwersms_sender', $sender); + } + + public function isComplete(): bool { + $set = $this->config->getAppKeys(Application::APP_NAME); + return count(array_intersect($set, self::expected)) === count(self::expected); + } + + public function remove() { + foreach (self::expected as $key) { + $this->config->deleteAppValue(Application::APP_NAME, $key); + } + } +} -- cgit v1.2.3 From f465ef41b2f738d0c357349685bfeec59c370020 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Kuffel?= Date: Mon, 4 Oct 2021 09:06:20 +0200 Subject: add SerwerSMS.pl API response error handling MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Paweł Kuffel --- lib/Service/Gateway/SMS/Provider/SerwerSMS.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'lib/Service/Gateway') diff --git a/lib/Service/Gateway/SMS/Provider/SerwerSMS.php b/lib/Service/Gateway/SMS/Provider/SerwerSMS.php index 97cdff0..1ed445f 100644 --- a/lib/Service/Gateway/SMS/Provider/SerwerSMS.php +++ b/lib/Service/Gateway/SMS/Provider/SerwerSMS.php @@ -55,7 +55,7 @@ class SerwerSMS implements IProvider { $password = $config->getPassword(); $sender = $config->getSender(); try { - $this->client->post('https://api2.serwersms.pl/messages/send_sms', [ + $response = $this->client->post('https://api2.serwersms.pl/messages/send_sms', [ 'headers' => [ 'Content-Type' => 'application/json', ], @@ -67,6 +67,12 @@ class SerwerSMS implements IProvider { 'sender' => $sender, ], ]); + + $responseData = json_decode($response->getBody(), true); + + if ($responseData['success'] !== true) { + throw new SmsTransmissionException(); + } } catch (Exception $ex) { throw new SmsTransmissionException(); } -- cgit v1.2.3 From 449885a9276c1f6d5076f95b3ce897bb01bde006 Mon Sep 17 00:00:00 2001 From: Vitor Mattos Date: Fri, 6 May 2022 11:44:23 -0300 Subject: Update SerwerSMS.php --- lib/Service/Gateway/SMS/Provider/SerwerSMS.php | 1 - 1 file changed, 1 deletion(-) (limited to 'lib/Service/Gateway') diff --git a/lib/Service/Gateway/SMS/Provider/SerwerSMS.php b/lib/Service/Gateway/SMS/Provider/SerwerSMS.php index 1ed445f..27c4569 100644 --- a/lib/Service/Gateway/SMS/Provider/SerwerSMS.php +++ b/lib/Service/Gateway/SMS/Provider/SerwerSMS.php @@ -85,4 +85,3 @@ class SerwerSMS implements IProvider { return $this->config; } } - -- cgit v1.2.3