nextcloud / twofactor_gateway

lib/Service/SetupService.php

Spacing +4 added lines, -4 removed lines

@@ -59,13 +59,13 @@
 		$verificationNumber = $this->random->generate(6, ISecureRandom::CHAR_DIGITS);
 		$gateway = $this->gatewayFactory->get($gatewayName);
 		try {
-			$message = $gateway->getSettings()['allow_markdown'] ?? false
-				? $this->l10n->t('`%s` is your verification code.', [$verificationNumber])
-				: $this->l10n->t('%s is your verification code.', [$verificationNumber]);
+			$message = $gateway->getSettings()[ 'allow_markdown' ] ?? false
+				? $this->l10n->t('`%s` is your verification code.', [ $verificationNumber ])
+				: $this->l10n->t('%s is your verification code.', [ $verificationNumber ]);
 			$gateway->send(
 				$identifier,
 				$message,
-				['code' => $verificationNumber],
+				[ 'code' => $verificationNumber ],
 			);
 		} catch (MessageTransmissionException $ex) {
 			throw new VerificationException($ex->getMessage(), $ex->getCode(), $ex);

lib/Provider/Channel/WhatsApp/Gateway.php

Spacing +27 added lines, -27 removed lines

@@ -38,7 +38,7 @@ 
 		'name' => 'WhatsApp',
 		'allow_markdown' => true,
 		'fields' => [
-			['field' => 'base_url', 'prompt' => 'Base URL to your WhatsApp API endpoint:'],
+			[ 'field' => 'base_url', 'prompt' => 'Base URL to your WhatsApp API endpoint:' ],
 		],
 	];
 	private string $instanceId;
@@ -56,24 +56,24 @@ 
 		$this->client = $this->clientService->newClient();
 	}
 
-	#[\Override]
-	public function send(string $identifier, string $message, array $extra = []): void {
+	#[\Override ]
+	public function send(string $identifier, string $message, array $extra = [ ]): void {
 		$this->logger->debug("sending whatsapp message to $identifier, message: $message");
 
 		$response = $this->getSessionStatus();
 		if ($response !== 'CONNECTED') {
-			throw new MessageTransmissionException('WhatsApp session is not connected. Current status: ' . $response);
+			throw new MessageTransmissionException('WhatsApp session is not connected. Current status: '.$response);
 		}
 
 		$chatId = $this->getChatIdFromPhoneNumber($identifier);
 
 		try {
-			$response = $this->client->post($this->getBaseUrl() . '/client/sendMessage/' . $this->instanceId, [
+			$response = $this->client->post($this->getBaseUrl().'/client/sendMessage/'.$this->instanceId, [
 				'json' => [
 					'chatId' => $chatId,
 					'contentType' => 'string',
 					'content' => $message,
-					'options' => [],
+					'options' => [ ],
 				],
 			]);
 		} catch (\Exception $e) {
@@ -87,10 +87,10 @@ 
 		$this->logger->debug("whatsapp message to chat $identifier sent");
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function cliConfigure(InputInterface $input, OutputInterface $output): int {
 		$helper = new QuestionHelper();
-		$baseUrlQuestion = new Question(self::SCHEMA['fields'][0]['prompt'] . ' ');
+		$baseUrlQuestion = new Question(self::SCHEMA[ 'fields' ][ 0 ][ 'prompt' ].' ');
 		$this->lazyBaseUrl = $helper->ask($input, $output, $baseUrlQuestion);
 		$this->lazyBaseUrl = rtrim($this->lazyBaseUrl, '/');
 
@@ -99,7 +99,7 @@ 
 				return 1;
 			}
 		} catch (\Exception $e) {
-			$output->writeln('<error>' . $e->getMessage() . '</error>');
+			$output->writeln('<error>'.$e->getMessage().'</error>');
 		}
 
 		$this->setBaseUrl($this->lazyBaseUrl);
@@ -109,23 +109,23 @@ 
 
 	private function getChatIdFromPhoneNumber(string $phoneNumber): string {
 		try {
-			$response = $this->client->post($this->getBaseUrl() . '/client/getNumberId/' . $this->instanceId, [
+			$response = $this->client->post($this->getBaseUrl().'/client/getNumberId/'.$this->instanceId, [
 				'json' => [
 					'number' => preg_replace('/\D/', '', $phoneNumber),
 				],
 			]);
 			$json = $response->getBody();
 			$data = json_decode($json, true);
-			if (empty($data['result'])) {
+			if (empty($data[ 'result' ])) {
 				throw new MessageTransmissionException('The phone number is not registered on WhatsApp.');
 			}
-			return $data['result']['_serialized'];
+			return $data[ 'result' ][ '_serialized' ];
 		} catch (ServerException $e) {
 			$content = $e->getResponse()?->getBody()?->getContents();
 			if ($content === null) {
 				throw new MessageTransmissionException('Unknown error');
 			}
-			$errorMessage = json_decode($content, true)['error'] ?? 'Unknown error';
+			$errorMessage = json_decode($content, true)[ 'error' ] ?? 'Unknown error';
 			throw new MessageTransmissionException($errorMessage);
 		}
 	}
@@ -139,7 +139,7 @@ 
 		}
 
 		/** @var string */
-		$this->lazyBaseUrl = $this->__call(__FUNCTION__, []);
+		$this->lazyBaseUrl = $this->__call(__FUNCTION__, [ ]);
 		return $this->lazyBaseUrl;
 	}
 
@@ -155,19 +155,19 @@ 
 
 		$last = null;
 		while (true) {
-			$response = $this->client->get($this->getBaseUrl() . '/session/qr/' . $this->instanceId);
+			$response = $this->client->get($this->getBaseUrl().'/session/qr/'.$this->instanceId);
 			$json = $response->getBody();
 			$data = json_decode($json, true);
-			if ($data['success'] === false) {
-				if ($data['message'] === 'qr code not ready or already scanned') {
+			if ($data[ 'success' ] === false) {
+				if ($data[ 'message' ] === 'qr code not ready or already scanned') {
 					$output->writeln('<error>Session not connected yet, waiting...</error>');
 					sleep(2);
 					continue;
 				}
-				$output->writeln('<error>' . $data['message'] . '</error>');
+				$output->writeln('<error>'.$data[ 'message' ].'</error>');
 				return 1;
 			}
-			$qrCodeContent = $data['qr'];
+			$qrCodeContent = $data[ 'qr' ];
 
 			if ($qrCodeContent !== $last) {
 				$last = $qrCodeContent;
@@ -189,7 +189,7 @@ 
 	}
 
 	private function getSessionStatus(): string {
-		$endpoint = $this->getBaseUrl() . '/session/status/' . $this->instanceId;
+		$endpoint = $this->getBaseUrl().'/session/status/'.$this->instanceId;
 
 		try {
 			$response = $this->client->get($endpoint);
@@ -200,18 +200,18 @@ 
 				return 'not_connected';
 			}
 
-			if (($responseData['success'] ?? null) === false) {
-				$msg = $responseData['message'] ?? '';
-				return in_array($msg, ['session_not_found', 'session_not_connected'], true)
+			if (($responseData[ 'success' ] ?? null) === false) {
+				$msg = $responseData[ 'message' ] ?? '';
+				return in_array($msg, [ 'session_not_found', 'session_not_connected' ], true)
 					? $msg
 					: 'not_connected';
 			}
 
-			return (string)($responseData['state'] ?? 'not_connected');
+			return (string)($responseData[ 'state' ] ?? 'not_connected');
 		} catch (ClientException $e) {
 			return 'not_connected';
 		} catch (RequestException $e) {
-			$this->logger->info('Could not connect to ' . $endpoint, ['exception' => $e]);
+			$this->logger->info('Could not connect to '.$endpoint, [ 'exception' => $e ]);
 			throw new \Exception('Could not connect to the WhatsApp API. Please check the URL.', 1);
 		}
 	}
@@ -230,13 +230,13 @@ 
 	}
 
 	private function getSessionStart(): int {
-		$endpoint = $this->getBaseUrl() . '/session/start/' . $this->instanceId;
+		$endpoint = $this->getBaseUrl().'/session/start/'.$this->instanceId;
 		try {
 			$this->client->get($endpoint);
 		} catch (ClientException $e) {
 			return 1;
 		} catch (RequestException $e) {
-			$this->logger->info('Could not connect to ' . $endpoint, [
+			$this->logger->info('Could not connect to '.$endpoint, [
 				'exception' => $e,
 			]);
 			throw new \Exception('Could not connect to the WhatsApp API. Please check the URL.', 1);

lib/Provider/Channel/SMS/Gateway.php

Spacing +19 added lines, -19 removed lines

@@ -32,17 +32,17 @@ 
 		parent::__construct($appConfig);
 	}
 
-	#[\Override]
-	public function send(string $identifier, string $message, array $extra = []): void {
+	#[\Override ]
+	public function send(string $identifier, string $message, array $extra = [ ]): void {
 		$this->getProvider()->send($identifier, $message);
 	}
 
-	#[\Override]
+	#[\Override ]
 	final public function cliConfigure(InputInterface $input, OutputInterface $output): int {
 		$namespaces = $this->providerFactory->getFqcnList();
-		$schemas = [];
+		$schemas = [ ];
 		foreach ($namespaces as $ns) {
-			$schemas[] = $ns::SCHEMA;
+			$schemas[ ] = $ns::SCHEMA;
 		}
 		$names = array_column($schemas, 'name');
 
@@ -50,31 +50,31 @@ 
 		$choiceQuestion = new ChoiceQuestion('Please choose a SMS provider:', $names);
 		$name = $helper->ask($input, $output, $choiceQuestion);
 		$selectedIndex = array_search($name, $names);
-		$schema = $schemas[$selectedIndex];
+		$schema = $schemas[ $selectedIndex ];
 
-		$provider = $this->getProvider($namespaces[$selectedIndex]::getProviderId());
+		$provider = $this->getProvider($namespaces[ $selectedIndex ]::getProviderId());
 
-		foreach ($schema['fields'] as $field) {
-			$id = $field['field'];
-			$prompt = $field['prompt'] . ' ';
-			$defaultVal = $field['default'] ?? null;
-			$optional = (bool)($field['optional'] ?? false);
+		foreach ($schema[ 'fields' ] as $field) {
+			$id = $field[ 'field' ];
+			$prompt = $field[ 'prompt' ].' ';
+			$defaultVal = $field[ 'default' ] ?? null;
+			$optional = (bool)($field[ 'optional' ] ?? false);
 
 			$answer = (string)$helper->ask($input, $output, new Question($prompt, $defaultVal));
 
 			if ($optional && $answer === '') {
-				$method = 'delete' . $this->toCamel($id);
+				$method = 'delete'.$this->toCamel($id);
 				$provider->{$method}();
 				continue;
 			}
 
-			$method = 'set' . $this->toCamel($id);
+			$method = 'set'.$this->toCamel($id);
 			$provider->{$method}($answer);
 		}
 		return 0;
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function getSettings(): array {
 		try {
 			$provider = $this->getProvider();
@@ -84,8 +84,8 @@ 
 		return $provider::SCHEMA;
 	}
 
-	#[\Override]
-	public function isComplete(array $schema = []): bool {
+	#[\Override ]
+	public function isComplete(array $schema = [ ]): bool {
 		if (empty($schema)) {
 			try {
 				$provider = $this->getProvider();
@@ -97,8 +97,8 @@ 
 		return parent::isComplete($schema);
 	}
 
-	#[\Override]
-	public function remove(array $schema = []): void {
+	#[\Override ]
+	public function remove(array $schema = [ ]): void {
 		if (empty($schema)) {
 			$schema = static::SCHEMA;
 		}

lib/Provider/Gateway/AGateway.php

Spacing +20 added lines, -20 removed lines

@@ -17,7 +17,7 @@ 
 
 abstract class AGateway implements IGateway {
 	use TConfigurable;
-	public const SCHEMA = [];
+	public const SCHEMA = [ ];
 
 	public function __construct(
 		public IAppConfig $appConfig,
@@ -27,42 +27,42 @@ 
 	/**
 	 * @throws MessageTransmissionException
 	 */
-	#[\Override]
-	abstract public function send(string $identifier, string $message, array $extra = []): void;
+	#[\Override ]
+	abstract public function send(string $identifier, string $message, array $extra = [ ]): void;
 
-	#[\Override]
-	public function isComplete(array $schema = []): bool {
+	#[\Override ]
+	public function isComplete(array $schema = [ ]): bool {
 		if (empty($schema)) {
 			$schema = static::SCHEMA;
 		}
 		$set = $this->appConfig->getKeys(Application::APP_ID);
-		$fields = array_column($schema['fields'], 'field');
-		$providerId = $schema['id'] ?? $this->getProviderId();
-		$fields = array_map(fn ($f) => $providerId . '_' . $f, $fields);
+		$fields = array_column($schema[ 'fields' ], 'field');
+		$providerId = $schema[ 'id' ] ?? $this->getProviderId();
+		$fields = array_map(fn ($f) => $providerId.'_'.$f, $fields);
 		$intersect = array_intersect($fields, $set);
 		return count($intersect) === count($fields);
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function getSettings(): array {
-		$settings = [];
-		if (isset(static::SCHEMA['instructions'])) {
-			$settings['instructions'] = static::SCHEMA['instructions'];
+		$settings = [ ];
+		if (isset(static::SCHEMA[ 'instructions' ])) {
+			$settings[ 'instructions' ] = static::SCHEMA[ 'instructions' ];
 		}
-		$settings['name'] = static::SCHEMA['name'];
+		$settings[ 'name' ] = static::SCHEMA[ 'name' ];
 		return $settings;
 	}
 
-	#[\Override]
+	#[\Override ]
 	abstract public function cliConfigure(InputInterface $input, OutputInterface $output): int;
 
-	#[\Override]
-	public function remove(array $schema = []): void {
+	#[\Override ]
+	public function remove(array $schema = [ ]): void {
 		if (empty($schema)) {
 			$schema = static::SCHEMA;
 		}
-		foreach ($schema['fields'] as $field) {
-			$method = 'delete' . $this->toCamel($field['field']);
+		foreach ($schema[ 'fields' ] as $field) {
+			$method = 'delete'.$this->toCamel($field[ 'field' ]);
 			$this->{$method}();
 		}
 	}
@@ -71,11 +71,11 @@ 
 		return str_replace(' ', '', ucwords(str_replace('_', ' ', $field)));
 	}
 
-	#[\Override]
+	#[\Override ]
 	public static function getProviderId(): string {
 		$id = self::deriveIdFromFqcn(static::class);
 		if ($id === null) {
-			throw new \LogicException('Cannot derive gateway id from FQCN: ' . static::class);
+			throw new \LogicException('Cannot derive gateway id from FQCN: '.static::class);
 		}
 		return $id;
 	}

lib/Provider/AProvider.php

Spacing +16 added lines, -16 removed lines

@@ -37,7 +37,7 @@ 
 	protected IGateway $gateway;
 
 	private function getSessionKey(): string {
-		return 'twofactor_gateway_' . $this->getGatewayName() . '_secret';
+		return 'twofactor_gateway_'.$this->getGatewayName().'_secret';
 	}
 
 	public function __construct(
@@ -58,14 +58,14 @@ 
 		}
 		$fqcn = static::class;
 		$parts = explode('\\', $fqcn);
-		[$name] = array_slice($parts, -2, 1);
+		[ $name ] = array_slice($parts, -2, 1);
 		$this->gatewayName = strtolower($name);
 		return $this->gatewayName;
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function getId(): string {
-		return 'gateway_' . $this->getGatewayName();
+		return 'gateway_'.$this->getGatewayName();
 	}
 
 	private function getSecret(): string {
@@ -79,21 +79,21 @@ 
 		return $secret;
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function getTemplate(IUser $user): ITemplate {
 		$secret = $this->getSecret();
 
 		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]);
+			$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,
 				$message,
-				['code' => $secret],
+				[ 'code' => $secret ],
 			);
 		} catch (MessageTransmissionException) {
 			return $this->templateManager->getTemplate('twofactor_gateway', 'error');
@@ -104,7 +104,7 @@ 
 		return $tmpl;
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function verifyChallenge(IUser $user, string $challenge): bool {
 		$valid = $this->session->exists($this->getSessionKey())
 			&& $this->session->get($this->getSessionKey()) === $challenge;
@@ -116,31 +116,31 @@ 
 		return $valid;
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function isTwoFactorAuthEnabledForUser(IUser $user): bool {
 		return $this->stateStorage->get($user, $this->getGatewayName())->getState() === StateStorage::STATE_ENABLED;
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function getPersonalSettings(IUser $user): IPersonalProviderSettings {
-		$this->initialState->provideInitialState('settings-' . $this->gateway->getProviderId(), $this->gateway->getSettings());
+		$this->initialState->provideInitialState('settings-'.$this->gateway->getProviderId(), $this->gateway->getSettings());
 		return new PersonalSettings(
 			$this->getGatewayName(),
 			$this->gateway->isComplete(),
 		);
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function getLightIcon(): String {
 		return Server::get(IURLGenerator::class)->imagePath(Application::APP_ID, 'app.svg');
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function getDarkIcon(): String {
 		return Server::get(IURLGenerator::class)->imagePath(Application::APP_ID, 'app-dark.svg');
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function disableFor(IUser $user) {
 		$state = $this->stateStorage->get($user, $this->getGatewayName());
 		if ($state->getState() === StateStorage::STATE_ENABLED) {