Merge pull request pmengal#22 from reinaldocoelho/master

reinaldocoelho · web-flow · commit 556ab293623a · 2017-04-03T10:43:24.000-03:00
Adding fix to email with broke quotes.
diff --git a/Class Library/ActiveUp.Net.Common/Parser.cs b/Class Library/ActiveUp.Net.Common/Parser.cs
@@ -1037,15 +1037,15 @@ public static AddressCollection ParseAddresses(string input)
         /// <returns></returns>
         public static Address ParseAddress(string input)
         {
-            input = input.TrimEnd(';');
+            input = (input ?? "").Replace("\"", "").TrimEnd(';');
             try
             {
                 if (!input.Contains("<"))
                     return new Address { Email = RemoveWhiteSpaces(input) };
 
                 Address address = null;
 
-                Match displayNameMatch = Regex.Match(input, "(\"?(.+)(\"?(?=\\s?<)|(?=<)))");
+                var displayNameMatch = Regex.Match(input, "(\"?(.+)(\"?(?=\\s?<)|(?=<)))");
                 if (displayNameMatch.Success)
                     address = new Address(input.Replace(displayNameMatch.Value, string.Empty).Trim().Trim(new[] { '<', '>' }), displayNameMatch.Groups[1].Value);
                 else
@@ -1054,7 +1054,7 @@ public static Address ParseAddress(string input)
                 CleanupAddress(address);
                 return address;
             }
-            catch
+            catch (Exception)
             {
                 return new Address { Email = input };
             }
diff --git a/Class Library/ActiveUp.Net.Tests/Common/ParserTests.cs b/Class Library/ActiveUp.Net.Tests/Common/ParserTests.cs
@@ -107,6 +107,14 @@ public void should_parse_address_with_no_closing_quote_after_display_name()
             address.Name.ShouldEqual("Display Name only one quote");
         }
 
+        [Test]
+        public void should_parse_address_with_invalid_empty_quote()
+        {
+            var address = Parser.ParseAddress("\"\" Invoice@dymak.nl\"");
+            address.Email.ShouldEqual("Invoice@dymak.nl");
+            address.Name.ShouldEqual("");
+        }
+
         /// <summary>
         /// [discussion:641270] - Created discussion to validate if this test is rigth.
         /// </summary>

Original file line number	Diff line number	Diff line change
`@@ -1037,15 +1037,15 @@ public static AddressCollection ParseAddresses(string input)`
`1037`	`1037`	`/// <returns></returns>`
`1038`	`1038`	`public static Address ParseAddress(string input)`
`1039`	`1039`	`{`
`1040`		`- input = input.TrimEnd(';');`
	`1040`	`+ input = (input ?? "").Replace("\"", "").TrimEnd(';');`
`1041`	`1041`	`try`
`1042`	`1042`	`{`
`1043`	`1043`	`if (!input.Contains("<"))`
`1044`	`1044`	`return new Address { Email = RemoveWhiteSpaces(input) };`
`1045`	`1045`
`1046`	`1046`	`Address address = null;`
`1047`	`1047`
`1048`		`- Match displayNameMatch = Regex.Match(input, "(\"?(.+)(\"?(?=\\s?<)\|(?=<)))");`
	`1048`	`+ var displayNameMatch = Regex.Match(input, "(\"?(.+)(\"?(?=\\s?<)\|(?=<)))");`
`1049`	`1049`	`if (displayNameMatch.Success)`
`1050`	`1050`	`address = new Address(input.Replace(displayNameMatch.Value, string.Empty).Trim().Trim(new[] { '<', '>' }), displayNameMatch.Groups[1].Value);`
`1051`	`1051`	`else`
`@@ -1054,7 +1054,7 @@ public static Address ParseAddress(string input)`
`1054`	`1054`	`CleanupAddress(address);`
`1055`	`1055`	`return address;`
`1056`	`1056`	`}`
`1057`		`- catch`
	`1057`	`+ catch (Exception)`
`1058`	`1058`	`{`
`1059`	`1059`	`return new Address { Email = input };`
`1060`	`1060`	`}`