- (Bug Fix) Fixed an issue with the HttpRequestService not sending a DELETE request, was sending a GET instead

- (Feature) Added ability to send file uploads with POST requests

Author: objectivehtml

core/services/HttpRequestService.php

@@ -5,6 +5,7 @@
 use Craft\Postmaster_TransportModel;
 use Craft\Plugins\Postmaster\Components\BaseService;
 use Guzzle\Http\Client;
+use Guzzle\Http\Exception\ClientErrorResponseException;
 
 class HttpRequestService extends BaseService {
 
@@ -42,25 +43,50 @@ public function send(Postmaster_TransportModel $model)
 						break;
 
 					case 'post':
-						$request = $client->post($this->settings->url, $headers, $this->settings->postVars);
+						$request = $client->post($this->settings->url, $this->settings->getHeaders(), $this->settings->getRequestVars());
 						break;
 
 					case 'put':
-						$request = $client->put($this->settings->url, $headers, $this->settings->postVars);
+						$request = $client->put($this->settings->url, $this->settings->getHeaders(), $this->settings->getRequestVars());
 						break;
 
 					case 'delete':
-						$request = $client->get($this->settings->url, $headers, $this->settings->postVars);
+						$request = $client->delete($this->settings->url, $this->settings->getHeaders());
 						break;
 				}
 
-				$request->send();
+				$response = $request->send();
+
+				$model->addData('responseString', (string) $response->getBody());
+				$model->addData('responseJson', json_decode($model->getData('responseString')));
 
 				return $this->success($model);
 			}
+			catch(ClientErrorResponseException $e)
+			{
+				$response = (string) $e->getResponse()->getBody();
+				$json = json_decode($response);
+
+				if(is_object($json) && isset($json->errors))
+				{
+					if(!is_array($json->errors))
+					{
+						$json->errors = (array) $json->errors;
+					}
+
+					return $this->failed($model, 400, $json->errors);
+				}
+				else
+				{
+					return $this->failed($model, 400, array($response));
+				}
+
+			}
 			catch(\Exception $e)
 			{
-				return $this->failed($model, 400, $e->getMessage());
+				$error = $e->getMessage();
+
+				return $this->failed($model, 400, !is_array($error) ? array($error) : $error);
 			}
 		}
 

models/Postmaster_HttpRequestServiceSettingsModel.php

@@ -9,23 +9,72 @@ public function parse(Array $data = array())
 
 		foreach($this->postVars as $row => $vars)
 		{
-			$vars['value'] = craft()->templates->renderString($vars['value'], $data);
+			$vars['value'] = trim(craft()->templates->renderString($vars['value'], $data));
 
 			$parsedVars[] = $vars;
 		}
 
 		$this->postVars = $parsedVars;
+
+		$parsedFiles = array();
+
+		foreach($this->files as $row => $vars)
+		{
+			$vars['value'] = trim(craft()->templates->renderString($vars['value'], $data));
+
+			$parsedFiles[] = $vars;
+		}
+
+		$this->files = $parsedFiles;
+		
+		parent::parse($data);
 
         return $this;
 	}
 
+	public function getHeaders()
+	{
+		$headers = array();
+
+		foreach($this->headers as $header)
+		{
+			$headers[$header['name']] = $header['value'];
+		}
+
+		return $headers;
+	}
+
+	public function getRequestVars()
+	{
+		$vars = array();
+
+		foreach($this->postVars as $var)
+		{
+			$vars[$var['name']] = trim($var['value']);
+		}
+
+		foreach($this->files as $var)
+		{
+			$value = trim($var['value']);
+
+			if(!empty($value))
+			{
+				// $vars[$var['name']] = fopen($value, 'r');
+				$vars[$var['name']] = '@' . $value;
+			}
+		}
+
+		return $vars;
+	}
+
 	protected function defineAttributes()
     {
         return array(
             'url' => array(AttributeType::String),
             'action' => array(AttributeType::String, 'default' => 'post'),
             'postVars' => array(AttributeType::Mixed, 'default' => array()),
-            'headers' => array(AttributeType::Mixed, 'default' => array())
+            'headers' => array(AttributeType::Mixed, 'default' => array()),
+            'files' => array(AttributeType::Mixed, 'default' => array())
         );
     }
 }

templates/services/http/settings.html

@@ -64,4 +64,22 @@
 		}
 	},
 	rows: settings.postVars
+}) }}
+
+{{ forms.editableTableField({
+	label: "File Uploads",
+	instructions: "Enter the names and file paths to include in the request payload. POST is required for file uploads."|t,
+	name: 'settings[serviceSettings][http][files]',
+	id: 'http_files',
+	cols: {
+		name: {
+			heading: 'Name'|t,
+			type: 'singleline'
+		}, 
+		value: {
+			heading: 'Path'|t,
+			type: 'singleline'
+		}
+	},
+	rows: settings.files
 }) }}