Supported showing headers in mail message detail view

Author: Jijie Chen

src/Papercut.Module.WebUI/Controllers/MessageController.cs

@@ -67,6 +67,7 @@ public HttpResponseMessage Get(string id)
             {
                 return Request.CreateResponse(HttpStatusCode.NotFound);
             }
+
             var dto = MimeMessageEntry.Dto.CreateFrom(new MimeMessageEntry(messageEntry, messageLoader.LoadMailMessage(messageEntry)));
             return Request.CreateResponse(HttpStatusCode.OK, dto);
         }

src/Papercut.Module.WebUI/Models/MimeMessageEntry.cs

@@ -80,6 +80,7 @@ public static Dto CreateFrom(MimeMessageEntry messageEntry)
                     BCc = ToAddressList(mail?.Bcc),
                     HtmlBody = mail?.HtmlBody,
                     TextBody = mail?.TextBody,
+                    Headers = (mail?.Headers ?? new HeaderList()).Select(h => new HeaderDto { Name = h.Field, Value = h.Value}).ToList()
                 };
             }
 
@@ -115,16 +116,22 @@ static List<EmailAddressDto> ToAddressList(IList<InternetAddress> mailAddresses)
 
 
             public string HtmlBody { get; set; }
-            
-            public string TextBody { get; set; }
 
-           
+            public string TextBody { get; set; }
+            public List<HeaderDto> Headers { get; set; }
         }
 
         public class EmailAddressDto
         {
             public string Name { get; set; }
             public string Address { get; set; }
         }
+
+        public class HeaderDto
+        {
+            public string Name { get; set; }
+            public string Value { get; set; }
+        }
     }
+
 }

src/Papercut.Module.WebUI/assets/css/style.css

@@ -134,6 +134,21 @@
   padding: 10px;
 }
 
+#preview-headers ul{
+    margin: 0;
+    padding: 0;
+    margin-top: 15px;
+}
+
+#preview-headers ul li{
+    list-style: none;
+    margin: 5px 0;
+}
+
+#preview-headers ul li .header-name{
+    font-weight:bold;
+}
+
 .preview .tab-content {
   overflow-y: visible;
 }

src/Papercut.Module.WebUI/assets/index.html

@@ -145,14 +145,22 @@
   </div>
 
   <div class="mail-content">
-    <ul class="nav nav-tabs">
-      <li ng-if="hasHTML(preview)" ng-class="{ active: hasHTML(preview) }"><a href="#preview-html" data-toggle="tab">HTML</a></li>
-      <li ng-class="{ active: !hasHTML(preview) }"><a href="#preview-plain" data-toggle="tab">Plain text</a></li>
+      <ul class="nav nav-tabs">
+        <li ng-if="hasHTML(preview)" ng-class="{ active: hasHTML(preview) }"><a href="#preview-html" data-toggle="tab">HTML</a></li>
+          <li ng-class="{ active: !hasHTML(preview) }"><a href="#preview-plain" data-toggle="tab">Plain text</a></li>
+          <li><a href="#preview-headers" data-toggle="tab">Headers</a></li>
     </ul>
 
     <div class="tab-content">
       <iframe target-blank="" ng-if="hasHTML(preview)" ng-class="{ active: hasHTML(preview) }" class="tab-pane" id="preview-html" body-html="preview.previewHTML" seamless frameborder="0" style="width: 100%"></iframe>
       <div class="tab-pane" ng-class="{ active: !hasHTML(preview) }" id="preview-plain" ng-bind-html="formatMessagePlain(preview)"></div>
+        <div class="tab-pane" id="preview-headers">
+            <ul>
+                <li ng-repeat="header in preview.Headers">
+                    <span class="header-name">{{header.Name}}</span>: {{header.Value}}
+                </li>
+            </ul>
+        </div>
     </div>
   </div>
 </div>

test/Papercut.Module.WebUI.Tests/MessageFacts/LoadMessageFacts.cs

@@ -149,6 +149,31 @@ public void ShouldLoadMessageDetailByID()
         }
 
         [Test, Order(4)]
+        public void ShouldContainHeadersInMessageDetail()
+        {
+            var existedMail = new MimeMessage
+            {
+                Subject = "Test",
+                From = {new MailboxAddress("mffeng@gmail.com")},
+                To = {new MailboxAddress("xwliu@gmail.com")},
+                Body = new TextPart("plain") {Text = "Hello Buddy"}
+            };
+            existedMail.Headers.Add(HeaderId.ReplyTo, "one@replyto.com");
+            existedMail.Headers.Add("X-Extended", "extended value");
+            this._messageRepository.SaveMessage(fs => existedMail.WriteTo(fs));
+            var messages = Get<MessageListResponse>("/api/messages").Messages;
+            var id = messages.First().Id;
+
+
+            var detail = Get<MimeMessageEntry.Dto>($"/api/messages/{id}");
+            Assert.AreEqual(id, detail.Id);
+
+            var headers = detail.Headers;
+            Assert.AreEqual("one@replyto.com",  headers.First(h => h.Name == "Reply-To").Value);
+            Assert.AreEqual("extended value", headers.First(h => h.Name == "X-Extended").Value);
+        }
+
+        [Test, Order(0)]
         public void ShouldReturn404IfNotFoundByID()
         {
             var response = Client.GetAsync("/api/messages/some-strange-id").Result;

test/Papercut.Module.WebUI.Tests/Papercut.Module.WebUI.Tests.csproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\..\packages\NUnit3TestAdapter.3.8.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\..\packages\NUnit3TestAdapter.3.8.0\build\net35\NUnit3TestAdapter.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -99,6 +100,12 @@
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\NUnit3TestAdapter.3.8.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\NUnit3TestAdapter.3.8.0\build\net35\NUnit3TestAdapter.props'))" />
+  </Target>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

test/Papercut.Module.WebUI.Tests/packages.config

@@ -7,5 +7,6 @@
   <package id="MimeKit" version="1.16.2" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
   <package id="NUnit" version="3.5.0" targetFramework="net45" />
+  <package id="NUnit3TestAdapter" version="3.8.0" targetFramework="net45" />
   <package id="Serilog" version="2.5.0" targetFramework="net45" />
 </packages>