Merge branch 'master' into remove-invalid-provider

4 files changed, 185 insertions, 1 deletions

diff --git a/lib/Command/Configure.php b/lib/Command/Configure.php
index 095f4cd..0079d90 100644
--- a/lib/Command/Configure.php
+++ b/lib/Command/Configure.php
@@ -102,7 +102,7 @@ class Configure extends Command {
 
 	private function configureSms(InputInterface $input, OutputInterface $output) {
 		$helper = $this->getHelper('question');
-		$providerQuestion = new Question('Please choose a SMS provider (websms, playsms, clockworksms, puzzelsms, ecallsms): ', 'websms');
+		$providerQuestion = new Question('Please choose a SMS provider (websms, playsms, clockworksms, puzzelsms, ecallsms, voipms): ', 'websms');
 		$provider = $helper->ask($input, $output, $providerQuestion);
 
 		/** @var SMSConfig $config */
@@ -190,6 +190,26 @@ class Configure extends Command {
 				$providerConfig->setSenderId($senderId);
 				break;
 
+			case 'voipms':
+				$config->setProvider($provider);
+
+				/** @var VoipMsConfig $providerConfig */
+				$providerConfig = $config->getProvider()->getConfig();
+
+				$usernameQuestion = new Question('Please enter your VoIP.ms API username: ');
+				$username = $helper->ask($input, $output, $usernameQuestion);
+
+				$passwordQuestion = new Question('Please enter your VoIP.ms API password: ');
+				$password = $helper->ask($input, $output, $passwordQuestion);
+
+				$didQuestion = new Question('Please enter your VoIP.ms DID: ');
+				$did = $helper->ask($input, $output, $didQuestion);
+
+				$providerConfig->setUser($username);
+				$providerConfig->setPassword($password);
+				$providerConfig->setDid($did);
+				break;
+
 			default:
 				$output->writeln("Invalid provider $provider");
 				break;
diff --git a/lib/Service/Gateway/SMS/Provider/ProviderFactory.php b/lib/Service/Gateway/SMS/Provider/ProviderFactory.php
index 5bf171e..bcb39d3 100644
--- a/lib/Service/Gateway/SMS/Provider/ProviderFactory.php
+++ b/lib/Service/Gateway/SMS/Provider/ProviderFactory.php
@@ -47,6 +47,8 @@ class ProviderFactory {
 				return $this->container->query(ClockworkSMS::class);
 			case EcallSMS::PROVIDER_ID:
 				return $this->container->query(EcallSMS::class);
+			case VoipMs::PROVIDER_ID:
+				return $this->container->query(VoipMs::class);
 			default:
 				throw new InvalidSmsProviderException("Provider <$id> does not exist");
 		}
diff --git a/lib/Service/Gateway/SMS/Provider/VoipMs.php b/lib/Service/Gateway/SMS/Provider/VoipMs.php
new file mode 100644
index 0000000..f05996d
--- /dev/null
+++ b/lib/Service/Gateway/SMS/Provider/VoipMs.php
@@ -0,0 +1,80 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @author Francois Blackburn <blackburnfrancois@gmail.com>
+ *
+ * Nextcloud - Two-factor Gateway
+ *
+ * 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 <http://www.gnu.org/licenses/>
+ *
+ */
+
+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 VoipMs implements IProvider {
+
+	const PROVIDER_ID = 'voipms';
+
+	/** @var IClient */
+	private $client;
+
+	/** @var VoipMsConfig */
+	private $config;
+
+	public function __construct(IClientService $clientService,
+								VoipMsConfig $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();
+		$user = $config->getUser();
+		$password = $config->getPassword();
+		$did = $config->getDid();
+		try {
+			$this->client->get('https://voip.ms/api/v1/rest.php', [
+				'query' => [
+					'api_username' => $user,
+					'api_password' => $password,
+					'method' => 'sendSMS',
+					'did' => $did,
+					'dst' => $identifier,
+					'message' => $message,
+				],
+			]);
+		} catch (Exception $ex) {
+			throw new SmsTransmissionException();
+		}
+	}
+
+	/**
+	 * @return VoipMsConfig
+	 */
+	public function getConfig(): IProviderConfig {
+		return $this->config;
+	}
+}
diff --git a/lib/Service/Gateway/SMS/Provider/VoipMsConfig.php b/lib/Service/Gateway/SMS/Provider/VoipMsConfig.php
new file mode 100644
index 0000000..f5acfd9
--- /dev/null
+++ b/lib/Service/Gateway/SMS/Provider/VoipMsConfig.php
@@ -0,0 +1,82 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @author Francois Blackburn <blackburnfrancois@gmail.com>
+ *
+ * Nextcloud - Two-factor Gateway for Telegram
+ *
+ * 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 <http://www.gnu.org/licenses/>
+ *
+ */
+
+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 VoipMsConfig implements IProviderConfig {
+
+	/** @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 getUser(): string {
+		return $this->getOrFail('voipms_api_username');
+	}
+
+	public function setUser(string $user) {
+		$this->config->setAppValue(Application::APP_NAME, 'voipms_api_username', $user);
+	}
+
+	public function getPassword(): string {
+		return $this->getOrFail('voipms_api_password');
+	}
+
+	public function setPassword(string $password) {
+		$this->config->setAppValue(Application::APP_NAME, 'voipms_api_password', $password);
+	}
+
+	public function getDid(): string {
+		return $this->getOrFail('voipms_did');
+	}
+
+	public function setDid(string $did) {
+		$this->config->setAppValue(Application::APP_NAME, 'voipms_did', $did);
+	}
+
+	public function isComplete(): bool {
+		$set = $this->config->getAppKeys(Application::APP_NAME);
+		$expected = [
+			'voipms_api_username',
+			'voipms_api_password',
+			'voipms_did',
+		];
+		return count(array_intersect($set, $expected)) === count($expected);
+	}
+
+}