nextcloud / twofactor_gateway

lib/Provider/Channel/Signal/Gateway.php

Spacing +10 added lines, -10 removed lines

@@ -30,7 +30,7 @@ 
 		'name' => 'Signal',
 		'instructions' => 'The gateway can send authentication to your Signal mobile and deskop app.',
 		'fields' => [
-			['field' => 'url', 'prompt' => 'Please enter the URL of the Signal gateway (leave blank to use default):', 'default' => 'http://localhost:5000'],
+			[ 'field' => 'url', 'prompt' => 'Please enter the URL of the Signal gateway (leave blank to use default):', 'default' => 'http://localhost:5000' ],
 		],
 	];
 
@@ -42,29 +42,29 @@ 
 		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 {
 		$client = $this->clientService->newClient();
 		// determine type of gateway
-		$response = $client->get($this->getUrl() . '/v1/about');
+		$response = $client->get($this->getUrl().'/v1/about');
 		if ($response->getStatusCode() === 200) {
 			// New style gateway https://gitlab.com/morph027/signal-cli-dbus-rest-api
 			$response = $client->post(
-				$this->getUrl() . '/v1/send/' . $identifier,
+				$this->getUrl().'/v1/send/'.$identifier,
 				[
 					'json' => [ 'message' => $message ],
 				]
 			);
 			$body = (string)$response->getBody();
 			$json = json_decode($body, true);
-			if ($response->getStatusCode() !== 201 || is_null($json) || !is_array($json) || !isset($json['timestamp'])) {
+			if ($response->getStatusCode() !== 201 || is_null($json) || !is_array($json) || !isset($json[ 'timestamp' ])) {
 				$status = $response->getStatusCode();
 				throw new MessageTransmissionException("error reported by Signal gateway, status=$status, body=$body}");
 			}
 		} else {
 			// Try old deprecated gateway https://gitlab.com/morph027/signal-web-gateway
 			$response = $client->post(
-				$this->getUrl() . '/v1/send/' . $identifier,
+				$this->getUrl().'/v1/send/'.$identifier,
 				[
 					'body' => [
 						'to' => $identifier,
@@ -76,17 +76,17 @@ 
 			$body = (string)$response->getBody();
 			$json = json_decode($body, true);
 
-			if ($response->getStatusCode() !== 200 || is_null($json) || !is_array($json) || !isset($json['success']) || $json['success'] !== true) {
+			if ($response->getStatusCode() !== 200 || is_null($json) || !is_array($json) || !isset($json[ 'success' ]) || $json[ 'success' ] !== true) {
 				$status = $response->getStatusCode();
 				throw new MessageTransmissionException("error reported by Signal gateway, status=$status, body=$body}");
 			}
 		}
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function cliConfigure(InputInterface $input, OutputInterface $output): int {
 		$helper = new QuestionHelper();
-		$urlQuestion = new Question(self::SCHEMA['fields'][0]['prompt'], self::SCHEMA['fields'][0]['default']);
+		$urlQuestion = new Question(self::SCHEMA[ 'fields' ][ 0 ][ 'prompt' ], self::SCHEMA[ 'fields' ][ 0 ][ 'default' ]);
 		$url = $helper->ask($input, $output, $urlQuestion);
 		$output->writeln("Using $url.");
 

lib/Provider/Channel/SMS/Gateway.php

Spacing +18 added lines, -18 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,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/Gateway.php

Spacing +17 added lines, -17 removed lines

@@ -38,11 +38,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:' ],
 		],
 	];
 
@@ -53,8 +53,8 @@ 
 		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->logger->debug("sending xmpp message to $identifier, message: $message");
 
 		$sender = $this->getSender();
@@ -62,7 +62,7 @@ 
 		$server = $this->getServer();
 		$method = $this->getMethod();
 		$user = $this->getUsername();
-		$url = $server . $identifier;
+		$url = $server.$identifier;
 
 		if ($method === '1') {
 			$from = $user;
@@ -78,8 +78,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");
@@ -88,27 +88,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!');
@@ -117,7 +117,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!');
@@ -126,7 +126,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/IGateway.php

Spacing +3 added lines, -3 removed lines

@@ -23,15 +23,15 @@
 	 *
 	 * @throws MessageTransmissionException
 	 */
-	public function send(string $identifier, string $message, array $extra = []): void;
+	public function send(string $identifier, string $message, array $extra = [ ]): void;
 
-	public function isComplete(array $schema = []): bool;
+	public function isComplete(array $schema = [ ]): bool;
 
 	public function getSettings(): array;
 
 	public function cliConfigure(InputInterface $input, OutputInterface $output): int;
 
-	public function remove(array $schema = []): void;
+	public function remove(array $schema = [ ]): void;
 
 	public static function getProviderId(): string;
 }

lib/Provider/Gateway/AGateway.php

Spacing +19 added lines, -19 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,41 +27,41 @@ 
 	/**
 	 * @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');
-		$fields = array_map(fn ($f) => $this->getProviderId() . '_' . $f, $fields);
+		$fields = array_column($schema[ 'fields' ], 'field');
+		$fields = array_map(fn ($f) => $this->getProviderId().'_'.$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}();
 		}
 	}
@@ -70,11 +70,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/AFactory.php

Spacing +8 added lines, -8 removed lines

@@ -13,9 +13,9 @@ 
 
 abstract class AFactory {
 	/** @var array<string,AGateway|AProvider|ISMSProvider> */
-	protected array $instances = [];
+	protected array $instances = [ ];
 	/** @var array<string> */
-	protected array $fqcn = [];
+	protected array $fqcn = [ ];
 
 	abstract protected function getPrefix(): string;
 	abstract protected function getSuffix(): string;
@@ -28,8 +28,8 @@ 
 	/** @return AGateway|AProvider|ISMSProvider */
 	public function get(string $name): object {
 		$needle = 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) {
@@ -38,7 +38,7 @@ 
 				continue;
 			}
 			$instance = \OCP\Server::get($fqcn);
-			$this->instances[$needle] = $instance;
+			$this->instances[ $needle ] = $instance;
 			return $instance;
 		}
 
@@ -51,7 +51,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) {
@@ -63,7 +63,7 @@ 
 			if (!$this->isValid($fqcn)) {
 				continue;
 			}
-			$this->fqcn[] = $fqcn;
+			$this->fqcn[ ] = $fqcn;
 		}
 		return $this->fqcn;
 	}
@@ -78,7 +78,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/Gateway/Factory.php

Spacing +3 added lines, -3 removed lines

@@ -12,17 +12,17 @@
 use OCA\TwoFactorGateway\Provider\AFactory;
 
 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 IGateway::class;
 	}

lib/Provider/Channel/SMS/Factory.php

Spacing +9 added lines, -9 removed lines

@@ -15,38 +15,38 @@
 
 class Factory extends AFactory {
 	/** @var array<string,IProvider> */
-	protected array $instances = [];
-	#[\Override]
+	protected array $instances = [ ];
+	#[\Override ]
 	protected function getPrefix(): string {
 		return 'OCA\\TwoFactorGateway\\Provider\\Channel\\SMS\\Provider\\Drivers\\';
 	}
 
-	#[\Override]
+	#[\Override ]
 	protected function getSuffix(): string {
 		return '';
 	}
 
-	#[\Override]
+	#[\Override ]
 	protected function getBaseClass(): string {
 		return IProvider::class;
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function isValid(string $fqcn): bool {
 		return defined("$fqcn::SCHEMA")
 			&& is_array($fqcn::SCHEMA);
 	}
 
-	#[\Override]
+	#[\Override ]
 	public function get(string $name): IProvider {
-		if (isset($this->instances[$name])) {
-			return $this->instances[$name];
+		if (isset($this->instances[ $name ])) {
+			return $this->instances[ $name ];
 		}
 		foreach ($this->getFqcnList() as $fqcn) {
 			if ($fqcn::getProviderId() === $name) {
 				$instance = \OCP\Server::get($fqcn);
 				$instance->setAppConfig(\OCP\Server::get(\OCP\IAppConfig::class));
-				$this->instances[$name] = $instance;
+				$this->instances[ $name ] = $instance;
 				return $instance;
 			}
 		}

lib/Command/Test.php

Spacing +5 added lines, -5 removed lines

@@ -25,16 +25,16 @@ 
 	) {
 		parent::__construct('twofactorauth:gateway:test');
 
-		$ids = [];
+		$ids = [ ];
 		$fqcn = $this->gatewayFactory->getFqcnList();
 		foreach ($fqcn as $fqcn) {
-			$ids[] = $fqcn::getProviderId();
+			$ids[ ] = $fqcn::getProviderId();
 		}
 
 		$this->addArgument(
 			'gateway',
 			InputArgument::REQUIRED,
-			'The name of the gateway: ' . implode(', ', $ids)
+			'The name of the gateway: '.implode(', ', $ids)
 		);
 		$this->addArgument(
 			'identifier',
@@ -43,7 +43,7 @@ 
 		);
 	}
 
-	#[\Override]
+	#[\Override ]
 	protected function execute(InputInterface $input, OutputInterface $output) {
 		$gatewayName = $input->getArgument('gateway');
 		$identifier = $input->getArgument('identifier');
@@ -55,7 +55,7 @@ 
 			return 1;
 		}
 
-		$gateway->send($identifier, 'Test', ['code' => '123456']);
+		$gateway->send($identifier, 'Test', [ 'code' => '123456' ]);
 		return 0;
 	}
 }