use config values and setup $endpointPath

Author: Developerayo

composer.json

@@ -1,6 +1,6 @@
 {
   "name": "developerayo/fireblocks-laravel-sdk",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "description": "A Laravel Package for Fireblocks",
   "keywords": [
     "developerayo",

config/fireblocks.php

@@ -10,5 +10,7 @@
     'default_headers' => [],
     'temp_folder_path' => env('FIREBLOCKS_TEMP_FOLDER', null),
     'timeout' => env('FIREBLOCKS_TIMEOUT', 30),
+    'connect_timeout' => env('FIREBLOCKS_CONNECT_TIMEOUT', 10),
+    'verify_ssl' => env('FIREBLOCKS_VERIFY_SSL', true),
     'debug' => env('FIREBLOCKS_DEBUG', false),
 ];

src/Client.php

@@ -30,9 +30,10 @@ public function __construct(Config $config, ?ClientInterface $httpClient = null)
 
 		$this->httpClient = $httpClient ?? new GuzzleClient([
 			'base_uri' => $config->getBasePath(),
-			'timeout' => 30,
-			'connect_timeout' => 10,
+			'timeout' => $config->getTimeout(),
+			'connect_timeout' => $config->getConnectTimeout(),
 			'http_errors' => false,
+			'verify' => $config->getVerifySSL(),
 		]);
 
 		$this->defaultHeaders = [
@@ -79,11 +80,22 @@ public function makeRequest(
 			$pathWithQuery .= '?' . http_build_query($queryParams);
 		}
 
-		$token = $this->generateToken($method, $pathWithQuery, $requestBody);
+		if ($endpointPath !== null) {
+			$url = $endpointPath;
+			if (!empty($queryParams)) {
+				$url .= '?' . http_build_query($queryParams);
+			}
+		} else {
+			$url = $this->config->getBasePath() . $pathWithQuery;
+		}
+		
+		$tokenPath = $endpointPath !== null 
+			? parse_url($endpointPath, PHP_URL_PATH) . (parse_url($endpointPath, PHP_URL_QUERY) ? '?' . parse_url($endpointPath, PHP_URL_QUERY) : '')
+			: $pathWithQuery;
+		
+		$token = $this->generateToken($method, $tokenPath, $requestBody);
 		$headers['Authorization'] = 'Bearer ' . $token;
 
-		$url = $this->config->getBasePath() . $pathWithQuery;
-
 		$requestPayload = null;
 		if ($requestBody !== null) {
 			$requestPayload = is_string($requestBody) ? $requestBody : json_encode($requestBody);
@@ -118,31 +130,6 @@ public function getConfig(): Config
 		return $this->config;
 	}
 
-	public function buildAcceptHeader(array $accept): ?string
-	{
-		if (empty($accept)) {
-			return null;
-		}
-		
-		if (in_array('application/json', $accept, true)) {
-			return 'application/json';
-		}
-		
-		return implode(',', $accept);
-	}
-
-	public function buildContentTypeHeader(array $contentTypes): string
-	{
-		if (empty($contentTypes)) {
-			return 'application/json';
-		}
-		
-		if (in_array('application/json', $contentTypes, true)) {
-			return 'application/json';
-		}
-		
-		return $contentTypes[0];
-	}
 
 	/**
 	 * Generate JWT for api auth
@@ -236,74 +223,4 @@ private function handleApiError(int $statusCode, string $body, array $headers):
 		}
 	}
 
-	public static function sanitizeForSerialization($data)
-	{
-		if (is_scalar($data) || null === $data) {
-			return $data;
-		}
-
-		if ($data instanceof \DateTime) {
-			return $data->format(\DateTime::ATOM);
-		}
-
-		if (is_array($data)) {
-			foreach ($data as $property => $value) {
-				$data[$property] = self::sanitizeForSerialization($value);
-			}
-			return $data;
-		}
-
-		if (is_object($data)) {
-			$values = [];
-			if ($data instanceof \JsonSerializable) {
-				$values = $data->jsonSerialize();
-			} else {
-				$values = (array) $data;
-			}
-			foreach ($values as $property => $value) {
-				$values[$property] = self::sanitizeForSerialization($value);
-			}
-			return $values;
-		}
-
-		return (string) $data;
-	}
-
-	public static function processFormData(array $formData, array $files = []): array
-	{
-		$processedData = [];
-		
-		foreach ($formData as $name => $value) {
-			if (is_array($value)) {
-				foreach ($value as $item) {
-					$processedData[] = [
-						'name' => $name . '[]',
-						'contents' => $item
-					];
-				}
-			} else {
-				$processedData[] = [
-					'name' => $name,
-					'contents' => $value
-				];
-			}
-		}
-		
-		foreach ($files as $name => $file) {
-			if (is_array($file)) {
-				$processedData[] = [
-					'name' => $name,
-					'contents' => $file['contents'] ?? '',
-					'filename' => $file['filename'] ?? $name
-				];
-			} else {
-				$processedData[] = [
-					'name' => $name,
-					'contents' => $file
-				];
-			}
-		}
-		
-		return $processedData;
-	}
 }

src/Config.php

@@ -13,6 +13,9 @@ class Config
 	public bool $debug;
 	public array $defaultHeaders;
 	public ?string $tempFolderPath;
+	public int $timeout;
+	public int $connectTimeout;
+	public bool $verifySSL;
 
 	// constants for base path 
 	public const SANDBOX = 'https://sandbox-api.fireblocks.io/v1';
@@ -31,6 +34,9 @@ public function __construct(array $config = [])
 		$this->debug = $config['debug'] ?? config('app.debug', false);
 		$this->defaultHeaders = $config['default_headers'] ?? [];
 		$this->tempFolderPath = $config['temp_folder_path'] ?? null;
+		$this->timeout = $config['timeout'] ?? config('fireblocks.timeout') ?? 30;
+		$this->connectTimeout = $config['connect_timeout'] ?? config('fireblocks.connect_timeout') ?? 10;
+		$this->verifySSL = $config['verify_ssl'] ?? config('fireblocks.verify_ssl') ?? true;
 
 		$this->validate();
 	}
@@ -80,6 +86,21 @@ public function getTempFolderPath(): ?string
 		return $this->tempFolderPath;
 	}
 
+	public function getTimeout(): int
+	{
+		return $this->timeout;
+	}
+
+	public function getConnectTimeout(): int
+	{
+		return $this->connectTimeout;
+	}
+
+	public function getVerifySSL(): bool
+	{
+		return $this->verifySSL;
+	}
+
 	public function setApiKey(string $apiKey): self
 	{
 		$this->apiKey = $apiKey;