Using SmtpUri to process SMTP credentials consistent with other jobs (#354)

* url decoding SMTP credentials in the orchestrator.

* Switching to use SmtpUri to process SMTP settings in a consitent way across all jobs.

* Removed the settings that are not used anymore.

Author: agr

src/NuGet.Services.Validation.Orchestrator/Configuration/SmtpConfiguration.cs

@@ -5,10 +5,6 @@ namespace NuGet.Services.Validation.Orchestrator
 {
     public class SmtpConfiguration
     {
-        public string SmtpHost { get; set; }
-        public int SmtpPort { get; set; }
-        public bool EnableSsl { get; set; }
-        public string Username { get; set; }
-        public string Password { get; set; }
+        public string SmtpUri { get; set; }
     }
 }

src/NuGet.Services.Validation.Orchestrator/Job.cs

@@ -190,14 +190,21 @@ private void ConfigureJobServices(IServiceCollection services, IConfigurationRoo
             {
                 var smtpConfigurationAccessor = serviceProvider.GetRequiredService<IOptionsSnapshot<SmtpConfiguration>>();
                 var smtpConfiguration = smtpConfigurationAccessor.Value;
+                if (string.IsNullOrWhiteSpace(smtpConfiguration.SmtpUri))
+                {
+                    return new MailSenderConfiguration();
+                }
+                var smtpUri = new SmtpUri(new Uri(smtpConfiguration.SmtpUri));
                 return new MailSenderConfiguration
                 {
                     DeliveryMethod = System.Net.Mail.SmtpDeliveryMethod.Network,
-                    Host = smtpConfiguration.SmtpHost,
-                    Port = smtpConfiguration.SmtpPort,
-                    EnableSsl = smtpConfiguration.EnableSsl,
+                    Host = smtpUri.Host,
+                    Port = smtpUri.Port,
+                    EnableSsl = smtpUri.Secure,
                     UseDefaultCredentials = false,
-                    Credentials = new NetworkCredential(smtpConfiguration.Username, smtpConfiguration.Password)
+                    Credentials = new NetworkCredential(
+                        smtpUri.UserName,
+                        smtpUri.Password)
                 };
             });
             services.AddTransient<IMailSender>(serviceProvider =>

src/NuGet.Services.Validation.Orchestrator/settings.json

@@ -71,11 +71,7 @@
     "SubscriptionName": ""
   },
   "Smtp": {
-    "SmtpHost": "",
-    "SmtpPort": "587",
-    "EnableSsl": "true",
-    "Username": "",
-    "Password": ""
+    "SmtpUri": ""
   },
   "Email": {
     "GalleryOwner": "NuGet Gallery <[email protected]>",