Merge pull request #16 from alphasnow/master

feat(transport): Automatically determine the body content type

Author: overtrue

src/DirectMailTransport.php

@@ -122,7 +122,6 @@ protected function payload(Swift_Mime_SimpleMessage $message, array $region)
             'ToAddress' => $this->getTo($message),
             'FromAlias' => Arr::get($this->options, 'from_alias'),
             'Subject' => $message->getSubject(),
-            'HtmlBody' => $message->getBody(),
             'ClickTrace' => Arr::get($this->options, 'click_trace', 0),
             'Format' => 'json',
             'Action' => 'SingleSendMail',
@@ -135,6 +134,9 @@ protected function payload(Swift_Mime_SimpleMessage $message, array $region)
             'RegionId' => $region['id'],
         ]);
 
+        $bodyName = $this->getBodyName($message);
+        $parameters[$bodyName] = $message->getBody();
+
         $parameters['Signature'] = $this->makeSignature($parameters);
 
         return $parameters;
@@ -155,9 +157,9 @@ protected function makeSignature(array $parameters)
             $encoded[] = \sprintf('%s=%s', rawurlencode($key), rawurlencode($value));
         }
 
-        $signString = 'POST&%2F&'.rawurlencode(\join('&', $encoded));
+        $signString = 'POST&%2F&' . rawurlencode(\join('&', $encoded));
 
-        return base64_encode(hash_hmac('sha1', $signString, $this->getSecret().'&', true));
+        return base64_encode(hash_hmac('sha1', $signString, $this->getSecret() . '&', true));
     }
 
     /**
@@ -236,4 +238,14 @@ public function setSecret(string $secret)
     {
         return $this->secret = $secret;
     }
+
+    /**
+     * @param Swift_Mime_SimpleMessage $message
+     *
+     * @return string
+     */
+    protected function getBodyName(Swift_Mime_SimpleMessage $message)
+    {
+        return $message->getBodyContentType() == 'text/plain' ? 'TextBody' : 'HtmlBody';
+    }
 }