Skip to content

Commit

Permalink
Improve wording for TLS-related options (#115) (#119)
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
1 parent 7ccdb06 commit 61ceae1
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .cypress/integration/email_senders_and_groups.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 });
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"] });
});
Expand Down
2 changes: 1 addition & 1 deletion public/pages/Emails/components/forms/CreateSenderForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions public/utils/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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',
});

Expand Down

0 comments on commit 61ceae1

Please sign in to comment.