Merge pull request #675 from nextcloud/fix/check-if-provider-have-markdown-support

fix: check if provider have markdown support

Author: vitormattos

lib/Provider/AProvider.php

@@ -85,11 +85,14 @@ public function getTemplate(IUser $user): ITemplate {
 
 		try {
 			$identifier = $this->stateStorage->get($user, $this->getGatewayName())->getIdentifier() ?? '';
+
+			$message = $this->gateway->getSettings()['allow_markdown'] ?? false
+				? $this->l10n->t('`%s` is your Nextcloud authentication code', [$secret])
+				: $this->l10n->t('%s is your Nextcloud authentication code', [$secret]);
+
 			$this->gateway->send(
 				$identifier,
-				$this->l10n->t('%s is your Nextcloud authentication code', [
-					$secret
-				]),
+				$message,
 				['code' => $secret],
 			);
 		} catch (MessageTransmissionException) {

lib/Provider/Channel/SMS/Gateway.php

@@ -74,6 +74,16 @@ final public function cliConfigure(InputInterface $input, OutputInterface $outpu
 		return 0;
 	}
 
+	#[\Override]
+	public function getSettings(): array {
+		try {
+			$provider = $this->getProvider();
+		} catch (ConfigurationException) {
+			return static::SCHEMA;
+		}
+		return $provider::SCHEMA;
+	}
+
 	#[\Override]
 	public function isComplete(array $schema = []): bool {
 		if (empty($schema)) {

lib/Provider/Channel/WhatsApp/Gateway.php

@@ -36,6 +36,7 @@
 class Gateway extends AGateway {
 	public const SCHEMA = [
 		'name' => 'WhatsApp',
+		'allow_markdown' => true,
 		'fields' => [
 			['field' => 'base_url', 'prompt' => 'Base URL to your WhatsApp API endpoint:'],
 		],
@@ -57,9 +58,6 @@ public function __construct(
 
 	#[\Override]
 	public function send(string $identifier, string $message, array $extra = []): void {
-		if (empty($message)) {
-			$message = $this->l10n->t('`%s` is your Nextcloud verification code.', [$extra['code']]);
-		}
 		$this->logger->debug("sending whatsapp message to $identifier, message: $message");
 
 		$response = $this->getSessionStatus();

lib/Provider/Gateway/AGateway.php

@@ -37,7 +37,8 @@ public function isComplete(array $schema = []): bool {
 		}
 		$set = $this->appConfig->getKeys(Application::APP_ID);
 		$fields = array_column($schema['fields'], 'field');
-		$fields = array_map(fn ($f) => $this->getProviderId() . '_' . $f, $fields);
+		$providerId = $schema['id'] ?? $this->getProviderId();
+		$fields = array_map(fn ($f) => $providerId . '_' . $f, $fields);
 		$intersect = array_intersect($fields, $set);
 		return count($intersect) === count($fields);
 	}

lib/Service/SetupService.php

@@ -59,9 +59,13 @@ public function startSetup(IUser $user, string $gatewayName, string $identifier)
 		$verificationNumber = $this->random->generate(6, ISecureRandom::CHAR_DIGITS);
 		$gateway = $this->gatewayFactory->get($gatewayName);
 		try {
+			$message = match ($gateway->getSettings()['allow_markdown'] ?? false) {
+				true => $this->l10n->t('`%s` is your verification code.', [$verificationNumber]),
+				default => $this->l10n->t('%s is your verification code.', [$verificationNumber]),
+			};
 			$gateway->send(
 				$identifier,
-				$this->l10n->t('%s is your verification code.', [$verificationNumber]),
+				$message,
 				['code' => $verificationNumber],
 			);
 		} catch (MessageTransmissionException $ex) {