Improve wording for TLS-related options (#115) (#119) (#121)

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 2506331) Signed-off-by: Romain Tartière <[email protected]> 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> (cherry picked from commit 61ceae1) Co-authored-by: opensearch-trigger-bot[bot] <98922864+opensearch-trigger-bot[bot]@users.noreply.github.com>
opensearch-project · Sep 28, 2023 · 689ea14 · 689ea14
1 parent 7ccdb06
commit 689ea14
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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',
 });