From 7b1febe8413b6a661c95e96913b980f2e215b093 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Tue, 8 Dec 2015 11:56:01 -0500
Subject: [PATCH] Fix display of S/MIME signature validation

---
 UI/MailPartViewers/UIxMailPartSignedViewer.m     |  6 +++---
 UI/Templates/MailerUI/UIxMailViewTemplate.wox    | 16 ++++++++++++++--
 .../js/Mailer/Message.service.js                 | 11 ++++++++++-
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/UI/MailPartViewers/UIxMailPartSignedViewer.m b/UI/MailPartViewers/UIxMailPartSignedViewer.m
index d78fd059d..a07c64145 100644
--- a/UI/MailPartViewers/UIxMailPartSignedViewer.m
+++ b/UI/MailPartViewers/UIxMailPartSignedViewer.m
@@ -233,9 +233,9 @@
 
   return [NSDictionary dictionaryWithObjectsAndKeys:
                          [self className], @"type",
-                       @"supports-smime", [NSNumber numberWithBool: [self supportsSMIME]],
-                       @"valid", [NSNumber numberWithBool: [self validSignature]],
-                       @"error", [self validationMessage],
+                       [NSNumber numberWithBool: [self supportsSMIME]], @"supports-smime",
+                       [NSNumber numberWithBool: [self validSignature]], @"valid",
+                       [self validationMessage], @"error",
                        renderedParts, @"content",
                        nil];
 }
diff --git a/UI/Templates/MailerUI/UIxMailViewTemplate.wox b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
index 319c73884..7ee2e431b 100644
--- a/UI/Templates/MailerUI/UIxMailViewTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailViewTemplate.wox
@@ -162,8 +162,18 @@
               </md-autocomplete>
             </md-chips>
           </div>
-          <md-divider><!-- end of headers --></md-divider>
-          <div>
+
+            <!-- S/MIME Signature -->
+            <md-whiteframe class="md-whiteframe-z2" layout="row" layout-align="space-between center"
+                           ng-show="::viewer.message.$smime.message">
+              <div layout="row" layout-align="start center">
+                <div class="md-tile-left">
+                  <md-icon ng-hide="::viewer.message.$smime.validSignature" class="md-warn">error</md-icon>
+                  <md-icon ng-show="::viewer.message.$smime.validSignature" class="md-accent">check</md-icon>
+                </div>
+                <p ng-bind-html="::viewer.message.$smime.message"><!-- message --></p>
+              </div>
+            </md-whiteframe>
 
             <!-- Load external images -->
             <md-whiteframe class="md-whiteframe-z2" layout="row" layout-align="space-between center"
@@ -200,6 +210,8 @@
               </div>
             </md-whiteframe>
 
+          <md-divider><!-- end of headers --></md-divider>
+          <div>
             <div class="msg-body">
               <div layout="row" layout-wrap="layout-wrap">
                 <div class="mailer_mailcontent" layout="row" layout-wrap="layout-wrap"
diff --git a/UI/WebServerResources/js/Mailer/Message.service.js b/UI/WebServerResources/js/Mailer/Message.service.js
index f8423ef93..ba340f7fd 100644
--- a/UI/WebServerResources/js/Mailer/Message.service.js
+++ b/UI/WebServerResources/js/Mailer/Message.service.js
@@ -263,8 +263,17 @@
               return part.preferredPart == alternatePart.contentType;
             }));
           }
-          // Can be used for UIxMailPartMixedViewer and UIxMailPartMessageViewer
+          // Can be used for UIxMailPartMixedViewer, UIxMailPartMessageViewer, and UIxMailPartSignedViewer
           else if (angular.isArray(part.content)) {
+            if (part.type == 'UIxMailPartSignedViewer' && part['supports-smime'] === 1) {
+              // First line in a h1, others each in a p
+              var formattedMessage = "<p>" + part.error.replace(/\n/, "</p><p class=\"md-caption\">");
+              formattedMessage = formattedMessage.replace(/\n/g, "</p><p class=\"md-caption\">") + "</p>";
+              _this.$smime = {
+                validSignature: part.valid,
+                message: formattedMessage
+              };
+            }
             _.each(part.content, function(mixedPart) {
               _visit(mixedPart);
             });