Add link to package in Contact Owners email (#5202)

src/NuGetGallery/Controllers/PackagesController.cs

@@ -956,6 +956,7 @@ public virtual ActionResult ContactOwners(string id, ContactOwnersViewModel cont
             _messageService.SendContactOwnersMessage(
                 fromAddress,
                 package,
+                Url.Package(package, false),
                 contactForm.Message,
                 Url.AccountSettings(relativeUrl: false),
                 contactForm.CopySender);

src/NuGetGallery/Services/IMessageService.cs

@@ -8,7 +8,7 @@ namespace NuGetGallery
 {
     public interface IMessageService
     {
-        void SendContactOwnersMessage(MailAddress fromAddress, PackageRegistration packageRegistration, string message, string emailSettingsUrl, bool copyFromAddress);
+        void SendContactOwnersMessage(MailAddress fromAddress, PackageRegistration packageRegistration, string packageUrl, string message, string emailSettingsUrl, bool copyFromAddress);
         void ReportAbuse(ReportPackageRequest report);
         void ReportMyPackage(ReportPackageRequest report);
         void SendNewAccountEmail(MailAddress toAddress, string confirmationUrl);

src/NuGetGallery/Services/MessageService.cs

@@ -129,17 +129,17 @@ public void ReportMyPackage(ReportPackageRequest request)
             }
         }
 
-        public void SendContactOwnersMessage(MailAddress fromAddress, PackageRegistration packageRegistration, string message, string emailSettingsUrl, bool copySender)
+        public void SendContactOwnersMessage(MailAddress fromAddress, PackageRegistration packageRegistration, string packageUrl, string message, string emailSettingsUrl, bool copySender)
         {
             string subject = "[{0}] Message for owners of the package '{1}'";
-            string body = @"_User {0} <{1}> sends the following message to the owners of Package '{2}'._
+            string body = @"_User {0} <{1}> sends the following message to the owners of Package '[{2}]({3})'._
 
-{3}
+{4}
 
 -----------------------------------------------
 <em style=""font-size: 0.8em;"">
-    To stop receiving contact emails as an owner of this package, sign in to the {4} and
-    [change your email notification settings]({5}).
+    To stop receiving contact emails as an owner of this package, sign in to the {5} and
+    [change your email notification settings]({6}).
 </em>";
 
             body = String.Format(
@@ -148,6 +148,7 @@ [change your email notification settings]({5}).
                 fromAddress.DisplayName,
                 fromAddress.Address,
                 packageRegistration.Id,
+                packageUrl,
                 message,
                 Config.GalleryOwner.DisplayName,
                 emailSettingsUrl);

tests/NuGetGallery.Facts/Controllers/PackagesControllerFacts.cs

@@ -1227,6 +1227,7 @@ public void OnlyShowsOwnersWhoAllowReceivingEmails()
             [Fact]
             public void HtmlEncodesMessageContent()
             {
+                var sentPackageUrl = string.Empty;
                 var messageService = new Mock<IMessageService>();
                 string sentMessage = null;
                 messageService.Setup(
@@ -1235,8 +1236,13 @@ public void HtmlEncodesMessageContent()
                         It.IsAny<PackageRegistration>(),
                         It.IsAny<string>(),
                         It.IsAny<string>(),
+                        It.IsAny<string>(),
                         false))
-                    .Callback<MailAddress, PackageRegistration, string, string, bool>((_, __, msg, ___, ____) => sentMessage = msg);
+                    .Callback<MailAddress, PackageRegistration, string, string, string, bool>((_, __, packageUrl, msg, ____, _____) =>
+                    {
+                        sentPackageUrl = packageUrl;
+                        sentMessage = msg;
+                    });
                 var package = new PackageRegistration { Id = "factory" };
 
                 var packageService = new Mock<IPackageService>();
@@ -1255,6 +1261,7 @@ public void HtmlEncodesMessageContent()
                 var result = controller.ContactOwners("factory", model) as RedirectToRouteResult;
 
                 Assert.Equal("I like the cut of your jib. It&#39;s &lt;b&gt;bold&lt;/b&gt;.", sentMessage);
+                Assert.Equal(controller.Url.Package(package, false), sentPackageUrl);
             }
 
             [Fact]
@@ -1265,6 +1272,7 @@ public void CallsSendContactOwnersMessageWithUserInfo()
                     s => s.SendContactOwnersMessage(
                         It.IsAny<MailAddress>(),
                         It.IsAny<PackageRegistration>(),
+                        It.IsAny<string>(),
                         "I like the cut of your jib",
                         It.IsAny<string>(), false));
                 var package = new PackageRegistration { Id = "factory" };

tests/NuGetGallery.Facts/Services/MessageServiceFacts.cs

@@ -208,7 +208,7 @@ public void WillCopySenderIfAsked()
                     };
                 var messageService = TestableMessageService.Create(GetConfigurationService());
 
-                messageService.SendContactOwnersMessage(from, package, "Test message", "http://someurl/", true);
+                messageService.SendContactOwnersMessage(from, package, "http://someurl/", "Test message", "http://someotherurl/", true);
 
                 var messages = messageService.MockMailSender.Sent;
                 Assert.Equal(2, messages.Count);
@@ -226,30 +226,37 @@ public void WillCopySenderIfAsked()
             [Fact]
             public void WillSendEmailToAllOwners()
             {
-                var from = new MailAddress("[email protected]", "flossy");
+                var id = "smangit";
+                var owner1Email = "[email protected]";
+                var owner2Email = "[email protected]";
+                var userUsername = "flossy";
+                var userEmail = "[email protected]";
+                var from = new MailAddress(userEmail, userUsername);
                 var package = new PackageRegistration
                 {
-                    Id = "smangit",
+                    Id = id,
                     Owners = new[]
                     {
-                        new User { EmailAddress = "[email protected]", EmailAllowed = true },
-                        new User { EmailAddress = "[email protected]", EmailAllowed = true }
+                        new User { EmailAddress = owner1Email, EmailAllowed = true },
+                        new User { EmailAddress = owner2Email, EmailAllowed = true }
                     }
                 };
 
                 var messageService = TestableMessageService.Create(GetConfigurationService());
 
-                messageService.SendContactOwnersMessage(from, package, "Test message", "http://someurl/", false);
+                var packageUrl = "http://packageUrl/";
+                messageService.SendContactOwnersMessage(from, package, packageUrl, "Test message", "http://emailSettingsUrl/", false);
                 var message = messageService.MockMailSender.Sent.Last();
 
-                Assert.Equal("[email protected]", message.To[0].Address);
-                Assert.Equal("[email protected]", message.To[1].Address);
+                Assert.Equal(owner1Email, message.To[0].Address);
+                Assert.Equal(owner2Email, message.To[1].Address);
                 Assert.Equal(TestGalleryOwner, message.From);
-                Assert.Equal("[email protected]", message.ReplyToList.Single().Address);
-                Assert.Contains("[Joe Shmoe] Message for owners of the package 'smangit'", message.Subject);
+                Assert.Equal(userEmail, message.ReplyToList.Single().Address);
+                Assert.Contains($"[Joe Shmoe] Message for owners of the package '{id}'", message.Subject);
                 Assert.Contains("Test message", message.Body);
                 Assert.Contains(
-                    "User flossy <[email protected]> sends the following message to the owners of Package 'smangit'.", message.Body);
+                    $"User {userUsername} <{userEmail}> sends the following message to the owners of Package '[{id}]({packageUrl})'.", 
+                    message.Body);
             }
 
             [Fact]
@@ -268,7 +275,7 @@ public void WillNotSendEmailToOwnerThatOptsOut()
 
                 var messageService = TestableMessageService.Create(GetConfigurationService());
 
-                messageService.SendContactOwnersMessage(from, package, "Test message", "http://someurl/", false);
+                messageService.SendContactOwnersMessage(from, package, "http://someurl/", "Test message", "http://someotherurl/", false);
                 var message = messageService.MockMailSender.Sent.Last();
 
                 Assert.Equal("[email protected]", message.To[0].Address);
@@ -290,7 +297,7 @@ public void WillNotAttemptToSendIfNoOwnersAllow()
                 };
 
                 var messageService = TestableMessageService.Create(GetConfigurationService());
-                messageService.SendContactOwnersMessage(from, package, "Test message", "http://someurl/", false);
+                messageService.SendContactOwnersMessage(from, package, "http://someurl/", "Test message", "http://someotherurl/", false);
 
                 Assert.Empty(messageService.MockMailSender.Sent);
             }
@@ -307,7 +314,7 @@ public void WillNotCopySenderIfNoOwnersAllow()
                     };
 
                 var messageService = TestableMessageService.Create(GetConfigurationService());
-                messageService.SendContactOwnersMessage(from, package, "Test message", "http://someurl/", false);
+                messageService.SendContactOwnersMessage(from, package, "http://someurl/", "Test message", "http://someotherurl/", false);
 
                 Assert.Empty(messageService.MockMailSender.Sent);
             }