From 61ceae1d54162e4576b9a645fc162c4795c4d5e0 Mon Sep 17 00:00:00 2001
From: "opensearch-trigger-bot[bot]"
 <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
Date: Wed, 27 Sep 2023 10:04:43 +0800
Subject: [PATCH] Improve wording for TLS-related options (#115) (#119)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

When configuring a SMTP sender, the user is prompted for an "Encryption
method" and given a drop-down list to choose from.  The list currently
contain "SSL", "TLS" and "None" which is a bit confusing given that TLS
is built on deprecated SSL and both refer to the same thing.

In this list, "SSL" actually mean TLS, and "TLS" actually mean StartTLS
(aka Opportunistic TLS).

Adjust wording to wake this more obvious.  The new wording match the one
used in Thunderbird when configuring connection security.


(cherry picked from commit 2506331e250488d813b1561c320dab70ba318712)

Signed-off-by: Romain Tartière <romain@blogreen.org>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
---
 .cypress/integration/email_senders_and_groups.spec.js       | 2 +-
 public/pages/Emails/__tests__/SendersTableControls.test.tsx | 2 +-
 public/pages/Emails/components/forms/CreateSenderForm.tsx   | 2 +-
 public/utils/constants.ts                                   | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.cypress/integration/email_senders_and_groups.spec.js b/.cypress/integration/email_senders_and_groups.spec.js
index 76155d93..2aef7889 100644
--- a/.cypress/integration/email_senders_and_groups.spec.js
+++ b/.cypress/integration/email_senders_and_groups.spec.js
@@ -67,7 +67,7 @@ describe('Test create email senders', () => {
       force: true,
     });
     cy.wait(delay);
-    cy.get('.euiContextMenuItem__text').contains('TLS').click({ force: true });
+    cy.get('.euiContextMenuItem__text').contains('STARTTLS').click({ force: true });
     cy.wait(delay);
 
     cy.get('.euiButton__text').contains('Create').click({ force: true });
diff --git a/public/pages/Emails/__tests__/SendersTableControls.test.tsx b/public/pages/Emails/__tests__/SendersTableControls.test.tsx
index b4f5a3e9..732af29e 100644
--- a/public/pages/Emails/__tests__/SendersTableControls.test.tsx
+++ b/public/pages/Emails/__tests__/SendersTableControls.test.tsx
@@ -56,7 +56,7 @@ describe('<SendersTableControls /> spec', () => {
       </MainContext.Provider>
     );
     fireEvent.click(utils.getByText('Encryption method'));
-    fireEvent.click(utils.getByText('TLS'));
+    fireEvent.click(utils.getByText('STARTTLS'));
     fireEvent.click(utils.getByText('None'));
     expect(onFiltersChange).toBeCalledWith({ encryptionMethod: ["start_tls", "none"] });
   });
diff --git a/public/pages/Emails/components/forms/CreateSenderForm.tsx b/public/pages/Emails/components/forms/CreateSenderForm.tsx
index 18274c15..df373d4f 100644
--- a/public/pages/Emails/components/forms/CreateSenderForm.tsx
+++ b/public/pages/Emails/components/forms/CreateSenderForm.tsx
@@ -147,7 +147,7 @@ export function CreateSenderForm(props: CreateSenderFormProps) {
         style={{ maxWidth: '650px' }}
         helpText={
           <div>
-            SSL or TLS is recommended for security. To use either one, you must
+            SSL/TLS or STARTTLS is recommended for security. To use either one, you must
             enter each sender account's credentials to the OpenSearch
             keystore using the CLI.{' '}
             <EuiLink
diff --git a/public/utils/constants.ts b/public/utils/constants.ts
index a1032b9d..81691978 100644
--- a/public/utils/constants.ts
+++ b/public/utils/constants.ts
@@ -74,8 +74,8 @@ export const CHANNEL_TYPE = Object.freeze({
 };
 
 export const ENCRYPTION_TYPE = Object.freeze({
-  ssl: 'SSL',
-  start_tls: 'TLS',
+  ssl: 'SSL/TLS',
+  start_tls: 'STARTTLS',
   none: 'None',
 });