diff options
| -rw-r--r-- | SendGrid/SendGridMail/ISendGrid.cs | 2 | ||||
| -rw-r--r-- | SendGrid/SendGridMail/SendGrid.cs | 50 | ||||
| -rw-r--r-- | SendGrid/SendGridMail/Transport/Web.cs | 19 | ||||
| -rw-r--r-- | SendGrid/Tests/Transport/TestWebApi.cs | 153 |
4 files changed, 147 insertions, 77 deletions
diff --git a/SendGrid/SendGridMail/ISendGrid.cs b/SendGrid/SendGridMail/ISendGrid.cs index 6c9d3fa..1d5ea8f 100644 --- a/SendGrid/SendGridMail/ISendGrid.cs +++ b/SendGrid/SendGridMail/ISendGrid.cs @@ -16,6 +16,8 @@ namespace SendGrid MailAddress From { get; set; }
MailAddress[] To { get; set; }
+ MailAddress[] Cc { get; set; }
+ MailAddress[] Bcc { get; set; }
MailAddress[] ReplyTo { get; set; }
Dictionary<String, MemoryStream> StreamedAttachments { get; set; }
String[] Attachments { get; set; }
diff --git a/SendGrid/SendGridMail/SendGrid.cs b/SendGrid/SendGridMail/SendGrid.cs index 667f94d..1533a46 100644 --- a/SendGrid/SendGridMail/SendGrid.cs +++ b/SendGrid/SendGridMail/SendGrid.cs @@ -107,6 +107,32 @@ namespace SendGrid }
}
+ public MailAddress[] Cc
+ {
+ get { return _message.CC.ToArray(); }
+ set
+ {
+ _message.CC.Clear();
+ foreach (var mailAddress in value)
+ {
+ _message.CC.Add(mailAddress);
+ }
+ }
+ }
+
+ public MailAddress[] Bcc
+ {
+ get { return _message.Bcc.ToArray(); }
+ set
+ {
+ _message.Bcc.Clear();
+ foreach (var mailAddress in value)
+ {
+ _message.Bcc.Add(mailAddress);
+ }
+ }
+ }
+
public String Subject
{
get { return _message.Subject; }
@@ -148,7 +174,29 @@ namespace SendGrid }
}
- public Dictionary<String, MemoryStream> StreamedAttachments
+ public void AddCc(string address)
+ {
+ var mailAddress = new MailAddress(address);
+ _message.CC.Add(mailAddress);
+ }
+
+ public void AddCc(MailAddress address)
+ {
+ _message.CC.Add(address);
+ }
+
+ public void AddBcc(string address)
+ {
+ var mailAddress = new MailAddress(address);
+ _message.Bcc.Add(mailAddress);
+ }
+
+ public void AddBcc(MailAddress address)
+ {
+ _message.Bcc.Add(address);
+ }
+
+ public Dictionary<String, MemoryStream> StreamedAttachments
{
get { return _streamedAttachments; }
set { _streamedAttachments = value; }
diff --git a/SendGrid/SendGridMail/Transport/Web.cs b/SendGrid/SendGridMail/Transport/Web.cs index 750cb48..9784097 100644 --- a/SendGrid/SendGridMail/Transport/Web.cs +++ b/SendGrid/SendGridMail/Transport/Web.cs @@ -7,7 +7,6 @@ using System.Net.Http; using System.Net.Http.Headers;
using System.Threading.Tasks;
using System.Xml;
-using Exceptions;
using SendGrid.SmtpApi;
// ReSharper disable MemberCanBePrivate.Global
@@ -46,6 +45,8 @@ namespace SendGrid BaseAddress = new Uri("https://" + BaseUrl)
};
+ client.DefaultRequestHeaders.TryAddWithoutValidation("User-Agent", "sendgrid/4.0.1;csharp");
+
var content = new MultipartFormDataContent();
AttachFormParams(message, content);
AttachFiles(message, content);
@@ -198,8 +199,18 @@ namespace SendGrid .Concat(message.To.ToList().Select(a => new KeyValuePair<String, String>("toname[]", a.DisplayName)))
.ToList();
}
- if (message.GetEmbeddedImages().Count > 0)
- {
+
+ if (message.Cc != null)
+ {
+ result.AddRange(message.Cc.Select(c => new KeyValuePair<string, string>("cc[]", c.Address)));
+ }
+
+ if (message.Bcc != null)
+ {
+ result.AddRange(message.Bcc.Select(c => new KeyValuePair<string, string>("bcc[]", c.Address)));
+ }
+
+ if (message.GetEmbeddedImages().Count > 0) {
result = result.Concat(message.GetEmbeddedImages().ToList().Select(x => new KeyValuePair<String, String>(string.Format("content[{0}]", x.Key), x.Value)))
.ToList();
}
@@ -220,4 +231,4 @@ namespace SendGrid #endregion
}
-}
\ No newline at end of file +}
diff --git a/SendGrid/Tests/Transport/TestWebApi.cs b/SendGrid/Tests/Transport/TestWebApi.cs index 39aa992..0c847a9 100644 --- a/SendGrid/Tests/Transport/TestWebApi.cs +++ b/SendGrid/Tests/Transport/TestWebApi.cs @@ -1,73 +1,82 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Net; -using System.Net.Mail; -using Moq; -using NUnit.Framework; -using SendGrid; - -namespace Tests.Transport -{ - [TestFixture] - internal class TestWebApi - { - private const string TestUsername = "username"; - private const string TestPassword = "password"; - - [Test] - public void TestFetchFileBodies() - { - var webApi = new Web(new NetworkCredential(TestUsername, TestPassword)); - var message = new Mock<ISendGrid>(); - var attachments = new[] {"foo", "bar", "foobar"}; - message.SetupProperty(foo => foo.Attachments, null); - var result = webApi.FetchFileBodies(message.Object); - Assert.AreEqual(0, result.Count); - - message.SetupProperty(foo => foo.Attachments, attachments); - result = webApi.FetchFileBodies(message.Object); - Assert.AreEqual(attachments.Count(), result.Count); - for (var index = 0; index < attachments.Length; index++) - Assert.AreEqual(result[index].Value.Name, attachments[index]); - } - - [Test] - public void TestFetchFormParams() - { - // Test Variables - const string toAddress = "foobar@outlook.com"; - const string fromAddress = "test@outlook.com"; - const string subject = "Test Subject"; - const string textBody = "Test Text Body"; - const string htmlBody = "<p>Test HTML Body</p>"; - const string headerKey = "headerkey"; - var testHeader = new Dictionary<string, string> { { headerKey, "headervalue" } }; - const string categoryName = "Example Category"; - - var message = new SendGridMessage(); - message.AddTo(toAddress); - message.From = new MailAddress(fromAddress); - message.Subject = subject; - message.Text = textBody; - message.Html = htmlBody; - message.AddHeaders(testHeader); - message.Header.SetCategory(categoryName); - - var webApi = new Web(new NetworkCredential(TestUsername, TestPassword)); - var result = webApi.FetchFormParams(message); - Assert.True(result.Any(r => r.Key == "api_user" && r.Value == TestUsername)); - Assert.True(result.Any(r => r.Key == "api_key" && r.Value == TestPassword)); - Assert.True(result.Any(r => r.Key == "to[]" && r.Value == toAddress)); - Assert.True(result.Any(r => r.Key == "from" && r.Value == fromAddress)); - Assert.True(result.Any(r => r.Key == "subject" && r.Value == subject)); - Assert.True(result.Any(r => r.Key == "text" && r.Value == textBody)); - Assert.True(result.Any(r => r.Key == "html" && r.Value == htmlBody)); - Assert.True( - result.Any( - r => r.Key == "headers" && r.Value == String.Format("{{\"{0}\":\"{1}\"}}", headerKey, testHeader[headerKey]))); - Assert.True( - result.Any(r => r.Key == "x-smtpapi" && r.Value == String.Format("{{\"category\" : \"{0}\"}}", categoryName))); - } - } +using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+using System.Net.Mail;
+using Moq;
+using NUnit.Framework;
+using SendGrid;
+
+namespace Tests.Transport
+{
+ [TestFixture]
+ internal class TestWebApi
+ {
+ private const string TestUsername = "username";
+ private const string TestPassword = "password";
+
+ [Test]
+ public void TestFetchFileBodies()
+ {
+ var webApi = new Web(new NetworkCredential(TestUsername, TestPassword));
+ var message = new Mock<ISendGrid>();
+ var attachments = new[] {"foo", "bar", "foobar"};
+ message.SetupProperty(foo => foo.Attachments, null);
+ var result = webApi.FetchFileBodies(message.Object);
+ Assert.AreEqual(0, result.Count);
+
+ message.SetupProperty(foo => foo.Attachments, attachments);
+ result = webApi.FetchFileBodies(message.Object);
+ Assert.AreEqual(attachments.Count(), result.Count);
+ for (var index = 0; index < attachments.Length; index++)
+ Assert.AreEqual(result[index].Value.Name, attachments[index]);
+ }
+
+ [Test]
+ public void TestFetchFormParams()
+ {
+ // Test Variables
+ const string toAddress = "foobar@outlook.com";
+ const string ccAddress = "cc@outlook.com";
+ const string bcc1Address = "bcc1@outlook.com";
+ const string bcc2Address = "bcc2@outlook.com";
+ MailAddress[] bccAddresses = {new MailAddress(bcc1Address), new MailAddress(bcc2Address)};
+ const string fromAddress = "test@outlook.com";
+ const string subject = "Test Subject";
+ const string textBody = "Test Text Body";
+ const string htmlBody = "<p>Test HTML Body</p>";
+ const string headerKey = "headerkey";
+ var testHeader = new Dictionary<string, string> { { headerKey, "headervalue" } };
+ const string categoryName = "Example Category";
+
+ var message = new SendGridMessage();
+ message.AddTo(toAddress);
+ message.AddCc(ccAddress);
+ message.Bcc = bccAddresses;
+ message.From = new MailAddress(fromAddress);
+ message.Subject = subject;
+ message.Text = textBody;
+ message.Html = htmlBody;
+ message.AddHeaders(testHeader);
+ message.Header.SetCategory(categoryName);
+
+ var webApi = new Web(new NetworkCredential(TestUsername, TestPassword));
+ var result = webApi.FetchFormParams(message);
+ Assert.True(result.Any(r => r.Key == "api_user" && r.Value == TestUsername));
+ Assert.True(result.Any(r => r.Key == "api_key" && r.Value == TestPassword));
+ Assert.True(result.Any(r => r.Key == "to[]" && r.Value == toAddress));
+ Assert.True(result.Any(r => r.Key == "cc[]" && r.Value == ccAddress));
+ Assert.True(result.Any(r => r.Key == "bcc[]" && r.Value == bcc1Address));
+ Assert.True(result.Any(r => r.Key == "bcc[]" && r.Value == bcc2Address));
+ Assert.True(result.Any(r => r.Key == "from" && r.Value == fromAddress));
+ Assert.True(result.Any(r => r.Key == "subject" && r.Value == subject));
+ Assert.True(result.Any(r => r.Key == "text" && r.Value == textBody));
+ Assert.True(result.Any(r => r.Key == "html" && r.Value == htmlBody));
+ Assert.True(
+ result.Any(
+ r => r.Key == "headers" && r.Value == String.Format("{{\"{0}\":\"{1}\"}}", headerKey, testHeader[headerKey])));
+ Assert.True(
+ result.Any(r => r.Key == "x-smtpapi" && r.Value == String.Format("{{\"category\" : \"{0}\"}}", categoryName)));
+ }
+ }
}
\ No newline at end of file |