nextcloud / twofactor_gateway

lib/Provider/Channel/SMS/Provider/IProvider.php

Spacing +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 use OCP\IAppConfig;
 
 interface IProvider {
-	public const SCHEMA = [];
+	public const SCHEMA = [ ];
 
 	/**
 	 * @param string $identifier

lib/Provider/Channel/SMS/Provider/AProvider.php

Spacing +7 added lines, -7 removed lines

@@ -20,27 +20,27 @@
 	/**
 	 * @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 static function idOverride(): ?string {
 		return null;
 	}
 
-	#[\Override]
+	#[\Override ]
 	public static function getProviderId(): string {
-		if (static::SCHEMA['id'] ?? null) {
-			return static::SCHEMA['id'];
+		if (static::SCHEMA[ 'id' ] ?? null) {
+			return static::SCHEMA[ 'id' ];
 		}
 		$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;
 	}

lib/Provider/Channel/SMS/Provider.php

Spacing +2 added lines, -2 removed lines

@@ -13,12 +13,12 @@
 
 class Provider extends AProvider {
 
-	#[\Override]
+	#[\Override ]
 	public function getDisplayName(): string {
 		return $this->l10n->t('Message gateway verification');
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function getDescription(): string {
 		return $this->l10n->t('Authenticate via SMS');
 	}

lib/Provider/Channel/SMS/Gateway.php

Spacing +17 added lines, -17 removed lines

@@ -33,16 +33,16 @@ 
 		parent::__construct($appConfig);
 	}
 
-	#[\Override]
-	public function send(IUser $user, string $identifier, string $message, array $extra = []): void {
+	#[\Override ]
+	public function send(IUser $user, 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();
 		foreach ($namespaces as $ns) {
-			$schemas[] = $ns::SCHEMA;
+			$schemas[ ] = $ns::SCHEMA;
 		}
 		$names = array_column($schemas, 'name');
 
@@ -50,32 +50,32 @@ 
 		$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]
-	public function isComplete(array $schema = []): bool {
+	#[\Override ]
+	public function isComplete(array $schema = [ ]): bool {
 		if (empty($schema)) {
 			try {
 				$provider = $this->getProvider();
@@ -87,8 +87,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/Channel/XMPP/Provider.php

Spacing +2 added lines, -2 removed lines

@@ -13,12 +13,12 @@
 
 class Provider extends AProvider {
 
-	#[\Override]
+	#[\Override ]
 	public function getDisplayName(): string {
 		return $this->l10n->t('XMPP verification');
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function getDescription(): string {
 		return $this->l10n->t('Authenticate via XMPP');
 	}

lib/Provider/Channel/XMPP/Gateway.php

Spacing +17 added lines, -17 removed lines

@@ -39,11 +39,11 @@ 
 			<p>Enter your JID (XMPP address) to receive your verification code below.</p>
 			HTML,
 		'fields' => [
-			['field' => 'sender',   'prompt' => 'Please enter your sender XMPP-JID:'],
-			['field' => 'password', 'prompt' => 'Please enter your sender XMPP password:'],
-			['field' => 'server',   'prompt' => 'Please enter full path to access REST/HTTP API:'],
-			['field' => 'username'],
-			['field' => 'method',   'prompt' => 'Please enter 1 or 2 for XMPP sending option:'],
+			[ 'field' => 'sender', 'prompt' => 'Please enter your sender XMPP-JID:' ],
+			[ 'field' => 'password', 'prompt' => 'Please enter your sender XMPP password:' ],
+			[ 'field' => 'server', 'prompt' => 'Please enter full path to access REST/HTTP API:' ],
+			[ 'field' => 'username' ],
+			[ 'field' => 'method', 'prompt' => 'Please enter 1 or 2 for XMPP sending option:' ],
 		],
 	];
 
@@ -54,8 +54,8 @@ 
 		parent::__construct($appConfig);
 	}
 
-	#[\Override]
-	public function send(IUser $user, string $identifier, string $message, array $extra = []): void {
+	#[\Override ]
+	public function send(IUser $user, string $identifier, string $message, array $extra = [ ]): void {
 		$this->logger->debug("sending xmpp message to $identifier, message: $message");
 
 		$sender = $this->getSender();
@@ -63,7 +63,7 @@ 
 		$server = $this->getServer();
 		$method = $this->getMethod();
 		$user = $this->getUsername();
-		$url = $server . $identifier;
+		$url = $server.$identifier;
 
 		if ($method === '1') {
 			$from = $user;
@@ -79,8 +79,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");
@@ -89,27 +89,27 @@ 
 		}
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function cliConfigure(InputInterface $input, OutputInterface $output): int {
 		$helper = new QuestionHelper();
-		$fields = self::SCHEMA['fields'];
+		$fields = self::SCHEMA[ 'fields' ];
 		$fields = array_combine(array_column($fields, 'field'), $fields);
 		$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!');
@@ -118,7 +118,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!');
@@ -127,7 +127,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/Channel/WhatsApp/Provider.php

Spacing +2 added lines, -2 removed lines

@@ -13,12 +13,12 @@
 
 class Provider extends AProvider {
 
-	#[\Override]
+	#[\Override ]
 	public function getDisplayName(): string {
 		return $this->l10n->t('WhatsApp verification');
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function getDescription(): string {
 		return $this->l10n->t('Authenticate via WhatsApp');
 	}

lib/Provider/Channel/WhatsApp/Gateway.php

Spacing +28 added lines, -28 removed lines

@@ -38,7 +38,7 @@ 
 	public const SCHEMA = [
 		'name' => 'WhatsApp',
 		'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,25 +56,25 @@ 
 		$this->client = $this->clientService->newClient();
 	}
 
-	#[\Override]
-	public function send(IUser $user, string $identifier, string $message, array $extra = []): void {
-		$message = $this->l10n->t('`%s` is your Nextcloud verification code.', [$extra['code']]);
+	#[\Override ]
+	public function send(IUser $user, string $identifier, string $message, array $extra = [ ]): void {
+		$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();
 		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) {
@@ -88,10 +88,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, '/');
 
@@ -100,7 +100,7 @@ 
 				return 1;
 			}
 		} catch (\Exception $e) {
-			$output->writeln('<error>' . $e->getMessage() . '</error>');
+			$output->writeln('<error>'.$e->getMessage().'</error>');
 		}
 
 		$this->setBaseUrl($this->lazyBaseUrl);
@@ -110,23 +110,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);
 		}
 	}
@@ -140,7 +140,7 @@ 
 		}
 
 		/** @var string */
-		$this->lazyBaseUrl = $this->__call(__FUNCTION__, []);
+		$this->lazyBaseUrl = $this->__call(__FUNCTION__, [ ]);
 		return $this->lazyBaseUrl;
 	}
 
@@ -156,19 +156,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;
@@ -190,7 +190,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);
@@ -201,18 +201,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);
 		}
 	}
@@ -231,13 +231,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/Telegram/Provider.php

Spacing +2 added lines, -2 removed lines

@@ -13,12 +13,12 @@
 
 class Provider extends AProvider {
 
-	#[\Override]
+	#[\Override ]
 	public function getDisplayName(): string {
 		return $this->l10n->t('Telegram verification');
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function getDescription(): string {
 		return $this->l10n->t('Authenticate via Telegram');
 	}