fix: handle @ in display name when using MailHelper.StringToEmailAddr…

…ess (#903) * Update MailHelper.cs fix email regex to allow email addresses in the display name. Input: [email protected] <[email protected]> Expected: -NameGroup: [email protected] -EmailGroup: [email protected] Initial: -NameGroup: {empty string} -EmailGroup: [email protected] <[email protected] Result: A match is found, therefore there is no error caught and email string is bad After: -NameGroup: [email protected] -EmailGroup: [email protected] Result: Success! Other test cases: -<[email protected]> SUCCESS [email protected] SUCCESS -username <[email protected]> SUCCESS -username <usernameexample.com> NO MATCH (SUCCESS)
sendgrid · Apr 9, 2020 · 57ba28b · 57ba28b
1 parent 278735c
commit 57ba28b
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/SendGrid/Helpers/Mail/MailHelper.cs b/src/SendGrid/Helpers/Mail/MailHelper.cs
@@ -17,7 +17,7 @@ public class MailHelper
         private const string NameGroup = "name";
         private const string EmailGroup = "email";
         private static readonly Regex Rfc2822Regex = new Regex(
-            $@"(?:(?<{NameGroup}>)(?<{EmailGroup}>[^\<]*@.*[^\>])|(?<{NameGroup}>[^\<]*)\<(?<{EmailGroup}>.*@.*)\>)",
+            $@"(?:(?<{NameGroup}>[^\<]*)\<(?<{EmailGroup}>.*@.*)\>|(?<{NameGroup}>)(?<{EmailGroup}>[^\<]*@.*[^\>]))",
             RegexOptions.ECMAScript);
 
         /// <summary>

diff --git a/tests/SendGrid.Tests/Integration.cs b/tests/SendGrid.Tests/Integration.cs
@@ -6126,6 +6126,18 @@ public async Task TestRetryBehaviourSucceedsOnSecondAttempt()
             Assert.Equal(HttpStatusCode.OK, result.StatusCode);
         }
 
+        [Theory]
+        [InlineData("first last <[email protected]>", "first last", "[email protected]")]
+        [InlineData("<[email protected]>", "", "[email protected]")]
+        [InlineData("[email protected]", "", "[email protected]")]
+        [InlineData("[email protected] <[email protected]>", "[email protected]", "[email protected]")]
+        public void TestStringToEmailAddress(string input, string expectedName, string expectedEmailAddress)
+        {
+            var actual = MailHelper.StringToEmailAddress(input);
+
+            Assert.True(actual.Name == expectedName && actual.Email == expectedEmailAddress);
+        }
+
         /// <summary>
         /// Tests the conditions in issue #670.
         /// </summary>