Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 01:18:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 84

Allow PATCHing the app config domain (#1006)

Browse source
This commit is contained in:
Mike Stone 2017-01-18 11:07:24 -05:00 committed by GitHub
parent 42ed377312
commit b28d96b5cc
3 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/kolide/helpers.js
View file

@ -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',
]);

6
frontend/kolide/helpers.tests.js
View file

@ -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' },
});
});
});

1
frontend/test/stubs.js
View file

@ -23,6 +23,7 @@ export const configStub = {
},
smtp_settings: {
configured: false,
domain: '',
sender_address: '',
server: '',
port: 587,