Issue 4258 - ContactOwners e-mails contain the package version numer …

…next to package id (#5116)
NuGet · Jan 19, 2018 · 0a897f7 · 0a897f7
1 parent fb75a6e
commit 0a897f7
Show file tree

Hide file tree

Showing 11 changed files with 340 additions and 86 deletions.
diff --git a/src/NuGetGallery/App_Start/Routes.cs b/src/NuGetGallery/App_Start/Routes.cs
@@ -405,7 +405,7 @@ public static void RegisterUIRoutes(RouteCollection routes)
             routes.Redirect(
                 r => r.MapRoute(
                     "PackageActions",
-                    "Package/{action}/{id}",
+                    "Package/{action}/{id}/{version}",
                     new { controller = "Packages", action = "ContactOwners" },
                     // This next bit looks bad, but it's not. It will never change because
                     // it's mapping the legacy routes to the new better routes.

diff --git a/src/NuGetGallery/Controllers/PackagesController.cs b/src/NuGetGallery/Controllers/PackagesController.cs
@@ -911,10 +911,9 @@ await _supportRequestService.UpdateIssueAsync(
         [HttpGet]
         [Authorize]
         [RequiresAccountConfirmation("contact package owners")]
-        public virtual ActionResult ContactOwners(string id)
+        public virtual ActionResult ContactOwners(string id, string version)
         {
-            var package = _packageService.FindPackageByIdAndVersion(id, version: null);
-
+            var package = _packageService.FindPackageByIdAndVersionStrict(id, version);
             if (package == null || package.PackageRegistration == null)
             {
                 return HttpNotFound();
@@ -923,7 +922,8 @@ public virtual ActionResult ContactOwners(string id)
             bool hasOwners = package.PackageRegistration.Owners.Any();
             var model = new ContactOwnersViewModel
             {
-                PackageId = package.PackageRegistration.Id,
+                PackageId = id,
+                PackageVersion = package.Version,
                 ProjectUrl = package.ProjectUrl,
                 Owners = package.PackageRegistration.Owners.Where(u => u.EmailAllowed),
                 CopySender = true,
@@ -937,17 +937,17 @@ public virtual ActionResult ContactOwners(string id)
         [Authorize]
         [ValidateAntiForgeryToken]
         [RequiresAccountConfirmation("contact package owners")]
-        public virtual ActionResult ContactOwners(string id, ContactOwnersViewModel contactForm)
+        public virtual ActionResult ContactOwners(string id, string version, ContactOwnersViewModel contactForm)
         {
             // Html Encode the message
             contactForm.Message = System.Web.HttpUtility.HtmlEncode(contactForm.Message);
 
             if (!ModelState.IsValid)
             {
-                return ContactOwners(id);
+                return ContactOwners(id, version);
             }
 
-            var package = _packageService.FindPackageRegistrationById(id);
+            var package = _packageService.FindPackageByIdAndVersionStrict(id, version);
             if (package == null)
             {
                 return HttpNotFound();
@@ -971,7 +971,7 @@ public virtual ActionResult ContactOwners(string id, ContactOwnersViewModel cont
                 routeValues: new
                 {
                     id,
-                    version = (string)null
+                    version
                 });
         }
 

diff --git a/src/NuGetGallery/Services/IMessageService.cs b/src/NuGetGallery/Services/IMessageService.cs
@@ -8,7 +8,7 @@ namespace NuGetGallery
 {
     public interface IMessageService
     {
-        void SendContactOwnersMessage(MailAddress fromAddress, PackageRegistration packageRegistration, string packageUrl, string message, string emailSettingsUrl, bool copyFromAddress);
+        void SendContactOwnersMessage(MailAddress fromAddress, Package package, string packageUrl, string message, string emailSettingsUrl, bool copyFromAddress);
         void ReportAbuse(ReportPackageRequest report);
         void ReportMyPackage(ReportPackageRequest report);
         void SendNewAccountEmail(MailAddress toAddress, string confirmationUrl);

diff --git a/src/NuGetGallery/Services/MessageService.cs b/src/NuGetGallery/Services/MessageService.cs
@@ -129,31 +129,32 @@ public void ReportMyPackage(ReportPackageRequest request)
             }
         }
 
-        public void SendContactOwnersMessage(MailAddress fromAddress, PackageRegistration packageRegistration, string packageUrl, string message, string emailSettingsUrl, bool copySender)
+        public void SendContactOwnersMessage(MailAddress fromAddress, Package package, string packageUrl, string message, string emailSettingsUrl, bool copySender)
         {
             string subject = "[{0}] Message for owners of the package '{1}'";
-            string body = @"_User {0} &lt;{1}&gt; sends the following message to the owners of Package '[{2}]({3})'._
+            string body = @"_User {0} &lt;{1}&gt; sends the following message to the owners of Package '[{2} {3}]({4})'._
 
-{4}
+{5}
 
 -----------------------------------------------
 <em style=""font-size: 0.8em;"">
-    To stop receiving contact emails as an owner of this package, sign in to the {5} and
-    [change your email notification settings]({6}).
+    To stop receiving contact emails as an owner of this package, sign in to the {6} and
+    [change your email notification settings]({7}).
 </em>";
 
             body = String.Format(
                 CultureInfo.CurrentCulture,
                 body,
                 fromAddress.DisplayName,
                 fromAddress.Address,
-                packageRegistration.Id,
+                package.PackageRegistration.Id,
+                package.Version,
                 packageUrl,
                 message,
                 Config.GalleryOwner.DisplayName,
                 emailSettingsUrl);
 
-            subject = String.Format(CultureInfo.CurrentCulture, subject, Config.GalleryOwner.DisplayName, packageRegistration.Id);
+            subject = String.Format(CultureInfo.CurrentCulture, subject, Config.GalleryOwner.DisplayName, package.PackageRegistration.Id);
 
             using (var mailMessage = new MailMessage())
             {
@@ -162,7 +163,7 @@ [change your email notification settings]({6}).
                 mailMessage.From = Config.GalleryOwner;
                 mailMessage.ReplyToList.Add(fromAddress);
 
-                AddOwnersToMailMessage(packageRegistration, mailMessage);
+                AddOwnersToMailMessage(package.PackageRegistration, mailMessage);
 
                 if (mailMessage.To.Any())
                 {

diff --git a/src/NuGetGallery/UrlExtensions.cs b/src/NuGetGallery/UrlExtensions.cs
@@ -893,7 +893,7 @@ public static string Contact(this UrlHelper url, bool relativeUrl = true)
             return GetActionLink(url, "Contact", "Pages", relativeUrl);
         }
 
-        public static string ContactOwners(this UrlHelper url, string id, bool relativeUrl = true)
+        public static string ContactOwners(this UrlHelper url, string id, string version, bool relativeUrl = true)
         {
             return GetActionLink(
                 url,
@@ -902,7 +902,8 @@ public static string ContactOwners(this UrlHelper url, string id, bool relativeU
                 relativeUrl,
                 routeValues: new RouteValueDictionary
                 {
-                    { "id", id }
+                    { "id", id },
+                    { "version", version }
                 });
         }
 

diff --git a/src/NuGetGallery/ViewModels/ContactOwnersViewModel.cs b/src/NuGetGallery/ViewModels/ContactOwnersViewModel.cs
@@ -11,6 +11,8 @@ public class ContactOwnersViewModel
     {
         public string PackageId { get; set; }
 
+        public string PackageVersion { get; set; }
+
         public string ProjectUrl { get; set; }
 
         public IEnumerable<User> Owners { get; set; }

diff --git a/src/NuGetGallery/Views/Packages/ContactOwners.cshtml b/src/NuGetGallery/Views/Packages/ContactOwners.cshtml
@@ -1,6 +1,6 @@
 @model ContactOwnersViewModel
 @{
-    ViewBag.Title = "Contact Owners";
+    ViewBag.Title = "Contact the Owners of " + Model.PackageId + " " + Model.PackageVersion;
     ViewBag.Tab = "Packages";
     ViewBag.MdPageColumns = Constants.ColumnsFormMd;
     Layout = "~/Views/Shared/Gallery/Layout.cshtml";
@@ -12,9 +12,10 @@
             @Html.Partial("_PackageHeading", new PackageHeadingModel
                    {
                        PageHeading = "Contact the Owners of",
-                       PackageDisplay = Model.PackageId.Abbreviate(50),
+                       PackageDisplay = Model.PackageId + " " + Model.PackageVersion,
                        Id = Model.PackageId,
-                       LinkIdOnly = true
+                       Version = Model.PackageVersion,
+                       LinkIdOnly = false
                    })
             @if (Model.Owners.Any())
             {

diff --git a/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml b/src/NuGetGallery/Views/Packages/DisplayPackage.cshtml
@@ -517,7 +517,7 @@
                 }
                 <li>
                     <i class="ms-Icon ms-Icon--Mail" aria-hidden="true"></i>
-                    <a href="@Url.ContactOwners(Model.Id)" title="Ask the package owners a question">Contact owners</a>
+                    <a href="@Url.ContactOwners(Model.Id, Model.Version)" title="Ask the package owners a question">Contact owners</a>
                 </li>
                 @if (Model.CanReportAsOwner)
                 {

diff --git a/src/NuGetGallery/Views/Packages/ReportAbuse.cshtml b/src/NuGetGallery/Views/Packages/ReportAbuse.cshtml
@@ -25,7 +25,7 @@
                     This form is for reporting abusive packages such as
                     packages containing malicious code or spam. If "@Model.PackageId" simply doesn't
                     work, or if you need help getting the package installed, please
-                    <a href="@Url.ContactOwners(Model.PackageId)" title="contact the owners">contact the owners instead.</a>
+                    <a href="@Url.ContactOwners(Model.PackageId, Model.PackageVersion)" title="contact the owners">contact the owners instead.</a>
                 </text>
             )