nextcloud / twofactor_gateway

lib/Provider/Channel/WhatsApp/Gateway.php

Spacing +27 added lines, -27 removed lines

@@ -51,7 +51,7 @@ 
 		$this->client = $this->clientService->newClient();
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function createSettings(): Settings {
 		return new Settings(
 			name: 'WhatsApp',
@@ -65,24 +65,24 @@ 
 		);
 	}
 
-	#[\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) {
@@ -96,10 +96,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($this->getSettings()->fields[0]->prompt . ' ');
+		$baseUrlQuestion = new Question($this->getSettings()->fields[ 0 ]->prompt.' ');
 		$this->lazyBaseUrl = $helper->ask($input, $output, $baseUrlQuestion);
 		$this->lazyBaseUrl = rtrim($this->lazyBaseUrl, '/');
 
@@ -108,7 +108,7 @@ 
 				return 1;
 			}
 		} catch (\Exception $e) {
-			$output->writeln('<error>' . $e->getMessage() . '</error>');
+			$output->writeln('<error>'.$e->getMessage().'</error>');
 		}
 
 		$this->setBaseUrl($this->lazyBaseUrl);
@@ -118,23 +118,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);
 		}
 	}
@@ -148,7 +148,7 @@ 
 		}
 
 		/** @var string */
-		$this->lazyBaseUrl = $this->__call(__FUNCTION__, []);
+		$this->lazyBaseUrl = $this->__call(__FUNCTION__, [ ]);
 		return $this->lazyBaseUrl;
 	}
 
@@ -164,19 +164,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;
@@ -198,7 +198,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);
@@ -209,18 +209,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);
 		}
 	}
@@ -239,13 +239,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/Provider/Drivers/Voipbuster.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 		);
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function send(string $identifier, string $message) {
 		$user = $this->getApiUser();
 		$password = $this->getApiPassword();

lib/Provider/Channel/XMPP/Gateway.php

Spacing +14 added lines, -14 removed lines

@@ -40,7 +40,7 @@ 
 		parent::__construct($appConfig);
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function createSettings(): Settings {
 		return new Settings(
 			name: 'XMPP',
@@ -73,8 +73,8 @@ 
 		);
 	}
 
-	#[\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 xmpp message to $identifier, message: $message");
 
 		$sender = $this->getSender();
@@ -82,7 +82,7 @@ 
 		$server = $this->getServer();
 		$method = $this->getMethod();
 		$user = $this->getUsername();
-		$url = $server . $identifier;
+		$url = $server.$identifier;
 
 		if ($method === '1') {
 			$from = $user;
@@ -98,8 +98,8 @@ 
 			curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
 			curl_setopt($ch, CURLOPT_POST, 1);
 			curl_setopt($ch, CURLOPT_POSTFIELDS, $message);
-			curl_setopt($ch, CURLOPT_USERPWD, $from . ':' . $password);
-			curl_setopt($ch, CURLOPT_HTTPHEADER, ['Content-Type: text/plain']);
+			curl_setopt($ch, CURLOPT_USERPWD, $from.':'.$password);
+			curl_setopt($ch, CURLOPT_HTTPHEADER, [ 'Content-Type: text/plain' ]);
 			$result = curl_exec($ch);
 			curl_close($ch);
 			$this->logger->debug("XMPP message to $identifier sent");
@@ -108,30 +108,30 @@ 
 		}
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function cliConfigure(InputInterface $input, OutputInterface $output): int {
 		$helper = new QuestionHelper();
 		$settings = $this->getSettings();
-		$fields = [];
+		$fields = [ ];
 		foreach ($settings->fields as $field) {
-			$fields[$field->field] = $field;
+			$fields[ $field->field ] = $field;
 		}
 		$sender = '';
 		while (empty($sender) or substr_count($sender, '@') !== 1) {
-			$senderQuestion = new Question($fields['sender']->prompt . ' ');
+			$senderQuestion = new Question($fields[ 'sender' ]->prompt.' ');
 			$sender = $helper->ask($input, $output, $senderQuestion);
 			if (empty($sender)) {
 				$output->writeln('XMPP-JID must not be empty!');
 			} elseif (substr_count($sender, '@') !== 1) {
 				$output->writeln('XMPP-JID not valid!');
 			} else {
-				$username = explode('@', $sender)[0];
+				$username = explode('@', $sender)[ 0 ];
 			}
 		}
 		$output->writeln("Using $sender as XMPP-JID.\nUsing $username as username.");
 		$password = '';
 		while (empty($password)) {
-			$passwordQuestion = new Question($fields['password']->prompt . ' ');
+			$passwordQuestion = new Question($fields[ 'password' ]->prompt.' ');
 			$password = $helper->ask($input, $output, $passwordQuestion);
 			if (empty($password)) {
 				$output->writeln('Password must not be empty!');
@@ -140,7 +140,7 @@ 
 		$output->writeln('Password accepted.');
 		$server = '';
 		while (empty($server)) {
-			$serverQuestion = new Question($fields['server']->prompt . ' ');
+			$serverQuestion = new Question($fields[ 'server' ]->prompt.' ');
 			$server = $helper->ask($input, $output, $serverQuestion);
 			if (empty($server)) {
 				$output->writeln('API path must not be empty!');
@@ -149,7 +149,7 @@ 
 		$output->writeln("Using $server as full URL to access REST/HTTP API.");
 		$method = 0;
 		while (intval($method) < 1 or intval($method) > 2) {
-			echo $fields['method']->prompt . PHP_EOL;
+			echo $fields[ 'method' ]->prompt.PHP_EOL;
 			echo "(1) prosody with mod_rest\n";
 			echo "(2) prosody with mod_post_msg\n";
 			$methodQuestion = new Question('Your choice: ');

lib/Provider/Gateway/Factory.php

Spacing +3 added lines, -3 removed lines

@@ -13,17 +13,17 @@
 
 /** @extends AFactory<AGateway> */
 class Factory extends AFactory {
-	#[\Override]
+	#[\Override ]
 	protected function getPrefix(): string {
 		return 'OCA\\TwoFactorGateway\\Provider\\Channel\\';
 	}
 
-	#[\Override]
+	#[\Override ]
 	protected function getSuffix(): string {
 		return 'Gateway';
 	}
 
-	#[\Override]
+	#[\Override ]
 	protected function getBaseClass(): string {
 		return AGateway::class;
 	}

lib/Provider/FieldDefinition.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	) {
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function jsonSerialize(): mixed {
 		return [
 			'field' => $this->field,

lib/Provider/AProvider.php

Spacing +15 added lines, -15 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,7 +79,7 @@ 
 		return $secret;
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function getTemplate(IUser $user): ITemplate {
 		$secret = $this->getSecret();
 
@@ -87,13 +87,13 @@ 
 			$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->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) {

lib/Provider/Channel/Telegram/Provider/Drivers/ClientCli/Cli.php

Spacing +3 added lines, -3 removed lines

@@ -9,9 +9,9 @@
  */
 
 /** @todo see the README.md in this directory */
-require __DIR__ . '/../../../../../../../vendor-bin/telegram-client/vendor/autoload.php';
-require __DIR__ . '/Login.php';
-require __DIR__ . '/SendMessage.php';
+require __DIR__.'/../../../../../../../vendor-bin/telegram-client/vendor/autoload.php';
+require __DIR__.'/Login.php';
+require __DIR__.'/SendMessage.php';
 
 use OCA\TwoFactorGateway\Provider\Channel\Telegram\Provider\Drivers\ClientCli\Login;
 use OCA\TwoFactorGateway\Provider\Channel\Telegram\Provider\Drivers\ClientCli\SendMessage;

lib/Provider/AFactory.php

Spacing +8 added lines, -8 removed lines

@@ -13,9 +13,9 @@ 
  */
 abstract class AFactory {
 	/** @var array<string, T> */
-	protected array $instances = [];
+	protected array $instances = [ ];
 	/** @var array<string> */
-	protected array $fqcn = [];
+	protected array $fqcn = [ ];
 
 	abstract protected function getPrefix(): string;
 
@@ -33,8 +33,8 @@ 
 			true => $this->typeFrom($name),
 			false => strtolower($name),
 		};
-		if (isset($this->instances[$needle])) {
-			return $this->instances[$needle];
+		if (isset($this->instances[ $needle ])) {
+			return $this->instances[ $needle ];
 		}
 
 		foreach ($this->getFqcnList() as $fqcn) {
@@ -43,7 +43,7 @@ 
 				continue;
 			}
 			$instance = \OCP\Server::get($fqcn);
-			$this->instances[$type] = $instance;
+			$this->instances[ $type ] = $instance;
 			return $instance;
 		}
 
@@ -56,7 +56,7 @@ 
 			return $this->fqcn;
 		}
 
-		$loader = require __DIR__ . '/../../vendor/autoload.php';
+		$loader = require __DIR__.'/../../vendor/autoload.php';
 		foreach ($loader->getClassMap() as $fqcn => $_) {
 			$type = $this->typeFrom($fqcn);
 			if ($type === null) {
@@ -65,7 +65,7 @@ 
 			if (!is_subclass_of($fqcn, $this->getBaseClass(), true)) {
 				continue;
 			}
-			$this->fqcn[] = $fqcn;
+			$this->fqcn[ ] = $fqcn;
 		}
 		return $this->fqcn;
 	}
@@ -80,7 +80,7 @@ 
 			return null;
 		}
 		$type = substr($fqcn, strlen($prefix));
-		$type = substr($type, 0, -strlen('\\' . $suffix));
+		$type = substr($type, 0, -strlen('\\'.$suffix));
 		if (strpos($type, '\\') !== false || $type === '') {
 			return null;
 		}

lib/Provider/Channel/Telegram/Provider/AProvider.php

Spacing +7 added lines, -7 removed lines

@@ -24,15 +24,15 @@ 
 	/**
 	 * @throws MessageTransmissionException
 	 */
-	#[\Override]
+	#[\Override ]
 	abstract public function send(string $identifier, string $message);
 
-	#[\Override]
+	#[\Override ]
 	public function setAppConfig(IAppConfig $appConfig): void {
 		$this->appConfig = $appConfig;
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function getSettings(): Settings {
 		if ($this->settings !== null) {
 			return $this->settings;
@@ -40,12 +40,12 @@ 
 		return $this->settings = $this->createSettings();
 	}
 
-	#[\Override]
+	#[\Override ]
 	public static function idOverride(): ?string {
 		return null;
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function getProviderId(): string {
 		$settings = $this->getSettings();
 		if (!empty($settings->id)) {
@@ -53,12 +53,12 @@ 
 		}
 		$id = self::getIdFromProviderFqcn(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;
 	}
 
-	#[\Override]
+	#[\Override ]
 	abstract public function cliConfigure(InputInterface $input, OutputInterface $output): int;
 
 	private static function getIdFromProviderFqcn(string $fqcn): ?string {