From b28d96b5cc96a00610a19b68de300c3723e29298 Mon Sep 17 00:00:00 2001 From: Mike Stone Date: Wed, 18 Jan 2017 11:07:24 -0500 Subject: [PATCH] Allow PATCHing the app config domain (#1006) --- frontend/kolide/helpers.js | 2 +- frontend/kolide/helpers.tests.js | 6 ++++++ frontend/test/stubs.js | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/frontend/kolide/helpers.js b/frontend/kolide/helpers.js index 0b23814ba8..185baa2d73 100644 --- a/frontend/kolide/helpers.js +++ b/frontend/kolide/helpers.js @@ -36,7 +36,7 @@ export const formatConfigDataForServer = (config) => { const orgInfoAttrs = pick(config, ['org_logo_url', 'org_name']); const serverSettingsAttrs = pick(config, ['kolide_server_url']); const smtpSettingsAttrs = pick(config, [ - 'authentication_method', 'authentication_type', 'email_enabled', 'enable_ssl_tls', + 'authentication_method', 'authentication_type', 'domain', 'email_enabled', 'enable_ssl_tls', 'enable_start_tls', 'password', 'port', 'sender_address', 'server', 'user_name', 'verify_ssl_certs', ]); diff --git a/frontend/kolide/helpers.tests.js b/frontend/kolide/helpers.tests.js index eca1179489..bb466d80c8 100644 --- a/frontend/kolide/helpers.tests.js +++ b/frontend/kolide/helpers.tests.js @@ -24,6 +24,7 @@ describe('Kolide API - helpers', () => { org_logo_url: '0.0.0.0:8080/logo.png', kolide_server_url: '', configured: false, + domain: '', sender_address: '', server: '', port: 587, @@ -48,6 +49,11 @@ describe('Kolide API - helpers', () => { org_info: { org_name: 'The Gnar Co' }, server_settings: { kolide_server_url: 'https://example.com' }, }); + expect( + formatConfigDataForServer({ domain: 'https://kolide.co' }) + ).toEqual({ + smtp_settings: { domain: 'https://kolide.co' }, + }); }); }); diff --git a/frontend/test/stubs.js b/frontend/test/stubs.js index ccb1f68010..aaa954e2ad 100644 --- a/frontend/test/stubs.js +++ b/frontend/test/stubs.js @@ -23,6 +23,7 @@ export const configStub = { }, smtp_settings: { configured: false, + domain: '', sender_address: '', server: '', port: 587,