From eb464157113021f6771b171c23bb638d9efced25 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 12 Aug 2021 13:40:35 -0400
Subject: [PATCH] fix(mail(js)): hide sign and encrypt options if not usable

When composing a message, don't offer to sign nor encrypt the message
if user has not uploaded a certificate or if S/MIME is disabled.
---
 SoObjects/SOGo/SOGoUser.m                          |  2 +-
 UI/PreferencesUI/UIxJSONPreferences.m              |  2 +-
 UI/Templates/MailerUI/UIxMailEditor.wox            | 12 ++++++------
 UI/WebServerResources/js/Mailer/Account.service.js | 12 +++++++++++-
 4 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index 90d1c3ddf..dc9b7773a 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -945,7 +945,7 @@
   [mailAccount setObject: delegates  forKey: @"delegates"];
 
   // 9. Security
-  if ([[_defaults mailCertificate] length])
+  if ([[self domainDefaults] mailCertificateEnabled] && [[_defaults mailCertificate] length])
     {
       security = [NSMutableDictionary new];
 
diff --git a/UI/PreferencesUI/UIxJSONPreferences.m b/UI/PreferencesUI/UIxJSONPreferences.m
index 6905b46bc..602c5a6bd 100644
--- a/UI/PreferencesUI/UIxJSONPreferences.m
+++ b/UI/PreferencesUI/UIxJSONPreferences.m
@@ -410,7 +410,7 @@ static SoProduct *preferencesProduct = nil;
         {
           auxAccount = [accounts objectAtIndex: i];
           security = [auxAccount objectForKey: @"security"];
-          if (security)
+          if (security && [domainDefaults mailCertificateEnabled])
             {
               limitedSecurity = [NSMutableDictionary dictionaryWithDictionary: security];
               if ([limitedSecurity objectForKey: @"certificate"])
diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index 85e34c3f1..7c36b1546 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -231,15 +231,15 @@
                     <var:string label:value="Return Receipt"/>
                   </sg-checkmark>
                 </md-menu-item>
-                <md-menu-item>
+                <md-menu-item ng-show="editor.account.$hasCertificate()">
                   <md-button class="md-primary" ng-disabled="true" ng-bind="::'Security' | loc"><!-- Security --></md-button>
                 </md-menu-item>
-                <md-menu-item>
+                <md-menu-item ng-show="::editor.account.$hasCertificate()">
                   <sg-checkmark ng-model="editor.message.editable.sign">
                     <var:string label:value="Sign"/>
                   </sg-checkmark>
                 </md-menu-item>
-                <md-menu-item>
+                <md-menu-item ng-show="::editor.account.$hasCertificate()">
                   <sg-checkmark ng-model="editor.message.editable.encrypt">
                     <var:string label:value="Encrypt"/>
                   </sg-checkmark>
@@ -248,7 +248,7 @@
                   <md-button class="md-primary" ng-disabled="true"><var:string label:value="Priority"/></md-button>
                 </md-menu-item>
                 <md-menu-item>
-                  <md-button ng-click="editor.message.editable.priority = 1">
+                  <md-button ng-click="::editor.message.editable.priority = 1">
                     <md-icon>{{ editor.message.editable.priority == 1 ? 'check' : null }}</md-icon>
                     <var:string label:value="highest"/>
                   </md-button>
@@ -286,7 +286,7 @@
         <!-- MESSAGE CONTENT -->
         <md-input-container class="md-block sg-mail-editor-content">
           <textarea name="content" class="plain-text"
-                    ng-if="editor.composeType == 'text'"
+                    ng-if="::(editor.composeType == 'text')"
                     rows="9"
                     ng-model="editor.message.editable.text"
                     ng-focus="editor.onTextFocus($event)"
@@ -296,7 +296,7 @@
                     sg-autogrow="true"
                     md-detect-hidden="md-detect-hidden"><!-- plain text editor --></textarea>
           <sg-ckeditor id="message-content"
-                       ng-if="editor.composeType == 'html'"
+                       ng-if="::(editor.composeType == 'html')"
                        config="editor.ckConfig"
                        on-instance-ready="editor.onHTMLReady($editor)"
                        on-focus="editor.onHTMLFocus($editor)"
diff --git a/UI/WebServerResources/js/Mailer/Account.service.js b/UI/WebServerResources/js/Mailer/Account.service.js
index 5195272f6..a8ae70914 100644
--- a/UI/WebServerResources/js/Mailer/Account.service.js
+++ b/UI/WebServerResources/js/Mailer/Account.service.js
@@ -392,6 +392,16 @@
     return identity.textSignature;
   };
 
+  /**
+   * @function $hasCertificate
+   * @memberof Account.prototype
+   * @desc Return true if the user has a S/MIME certificate for this account
+   * @returns a boolean value
+   */
+  Account.prototype.$hasCertificate = function() {
+    return this.security && this.security.hasCertificate;
+  };
+
   /**
    * @function $certificate
    * @memberof Account.prototype
@@ -401,7 +411,7 @@
   Account.prototype.$certificate = function() {
     var _this = this;
 
-    if (this.security && this.security.hasCertificate) {
+    if (this.$hasCertificate()) {
       if (this.$$certificate)
         return Account.$q.when(this.$$certificate);
       else {