nextcloud / twofactor_gateway

lib/Service/Gateway/Signal/Gateway.php

Spacing +12 added lines, -12 removed lines

@@ -72,24 +72,24 @@ 
 		$client = $this->clientService->newClient();
 		// determine type of gateway
 		$response = $client->post(
-			$this->config->getUrl() . '/api/v1/rpc',
+			$this->config->getUrl().'/api/v1/rpc',
 			[
 				'http_errors' => false,
 				'json' => [
 					'jsonrpc' => '2.0',
 					'method' => 'version',
-					'id' => 'version_' . $this->timeFactory->getTime(),
+					'id' => 'version_'.$this->timeFactory->getTime(),
 				],
 			]);
 		if ($response->getStatusCode() === 200 || $response->getStatusCode() === 201) {
 			// native signal-cli JSON RPC. The 201 "created" is probably a bug.
 			$response = $response = $client->post(
-				$this->config->getUrl() . '/api/v1/rpc',
+				$this->config->getUrl().'/api/v1/rpc',
 				[
 					'json' => [
 						'jsonrpc' => '2.0',
 						'method' => 'send',
-						'id' => 'code_' . $this->timeFactory->getTime(),
+						'id' => 'code_'.$this->timeFactory->getTime(),
 						'params' => [
 							'recipient' => $identifier,
 							'message' => $message,
@@ -100,12 +100,12 @@ 
 			$body = $response->getBody();
 			$json = json_decode($body, true);
 			$statusCode = $response->getStatusCode();
-			if ($statusCode < 200 || $statusCode >= 300 || is_null($json) || !is_array($json) || ($json['jsonrpc'] ?? null) != '2.0' || !isset($json['result']['timestamp'])) {
+			if ($statusCode < 200 || $statusCode >= 300 || is_null($json) || !is_array($json) || ($json[ 'jsonrpc' ] ?? null) != '2.0' || !isset($json[ 'result' ][ 'timestamp' ])) {
 				throw new SmsTransmissionException("error reported by Signal gateway, status=$statusCode, body=$body}");
 			}
 		} else {
 			$response = $client->get(
-				$this->config->getUrl() . '/v1/about',
+				$this->config->getUrl().'/v1/about',
 				[
 					'http_errors' => false,
 				],
@@ -117,10 +117,10 @@ 
 				// https://bbernhard.github.io/signal-cli-rest-api/
 				$body = $response->getBody();
 				$json = json_decode($body, true);
-				$versions = $json['versions'] || [];
+				$versions = $json[ 'versions' ] || [ ];
 				if (is_array($versions) && in_array('v2', $versions)) {
 					$response = $client->post(
-						$this->config->getUrl() . '/v2/send',
+						$this->config->getUrl().'/v2/send',
 						[
 							'json' => [
 								'recipients' => $identifier,
@@ -131,7 +131,7 @@ 
 					);
 				} else {
 					$response = $client->post(
-						$this->config->getUrl() . '/v1/send/' . $identifier,
+						$this->config->getUrl().'/v1/send/'.$identifier,
 						[
 							'json' => [ 'message' => $message ],
 						]
@@ -140,13 +140,13 @@ 
 				$body = $response->getBody();
 				$json = json_decode($body, true);
 				$statusCode = $response->getStatusCode();
-				if ($statusCode !== 201 || is_null($json) || !is_array($json) ||  (!isset($json['timestamps']) && !isset($json['timestamp']))) {
+				if ($statusCode !== 201 || is_null($json) || !is_array($json) || (!isset($json[ 'timestamps' ]) && !isset($json[ 'timestamp' ]))) {
 					throw new SmsTransmissionException("error reported by Signal gateway, status=$statusCode, body=$body}");
 				}
 			} else {
 				// Try old deprecated gateway https://gitlab.com/morph027/signal-web-gateway
 				$response = $client->post(
-					$this->config->getUrl() . '/v1/send/' . $identifier,
+					$this->config->getUrl().'/v1/send/'.$identifier,
 					[
 						'body' => [
 							'to' => $identifier,
@@ -159,7 +159,7 @@ 
 				$json = json_decode($body, true);
 				$statusCode = $response->getStatusCode();
 
-				if ($statusCode !== 200 || is_null($json) || !is_array($json) || !isset($json['success']) || $json['success'] !== true) {
+				if ($statusCode !== 200 || is_null($json) || !is_array($json) || !isset($json[ 'success' ]) || $json[ 'success' ] !== true) {
 					throw new SmsTransmissionException("error reported by Signal gateway, status=$statusCode, body=$body}");
 				}
 			}