Foundry376/Mailspring
1
1
Fork 0
mirror of https://github.com/Foundry376/Mailspring.git synced 2025-03-15 17:53:44 +08:00
Code Issues Projects Releases Packages Wiki Activity

Remove IMAP/SMTP hostname validation #286, #317, #119, #1

Browse source
This commit is contained in:
Ben Gotow 2017-11-07 17:45:48 +01:00
parent b91dd6dbcd
commit fd55eced9f
3 changed files with 0 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/internal_packages/onboarding/lib/onboarding-helpers.es6
View file

@ -150,10 +150,3 @@ export async function finalizeAndValidateAccount(account) {
const response = await proc.test();
return new Account(response.account);
}
export function isValidHost(value) {
if (value === 'localhost') {
return true;
}
return RegExpUtils.domainRegex().test(value) || RegExpUtils.ipAddressRegex().test(value);
}

5
app/internal_packages/onboarding/lib/page-account-settings-exchange.jsx
View file

@ -1,5 +1,4 @@
import { React, PropTypes, RegExpUtils } from 'mailspring-exports';
import { isValidHost } from './onboarding-helpers';
import CreatePageForForm from './decorators/create-page-for-form';
import FormField from './form-field';
@ -48,10 +47,6 @@ class AccountExchangeSettingsForm extends React.Component {
errorFieldNames.push('name');
errorMessage = 'Please provide your name.';
}
if (account.settings.eas_server_host && !isValidHost(account.settings.eas_server_host)) {
errorFieldNames.push('eas_server_host');
errorMessage = 'Please provide a valid host name.';
}
return { errorMessage, errorFieldNames, populated: true };
};

5
app/internal_packages/onboarding/lib/page-account-settings-imap.jsx
View file

@ -1,6 +1,5 @@
import React from 'react';
import PropTypes from 'prop-types';
import { isValidHost } from './onboarding-helpers';
import CreatePageForForm from './decorators/create-page-for-form';
import FormField from './form-field';
@ -46,10 +45,6 @@ class AccountIMAPSettingsForm extends React.Component {
if (!account.settings[`${type}_host`]) {
return { errorMessage, errorFieldNames, populated: false };
}
if (!isValidHost(account.settings[`${type}_host`])) {
errorMessage = 'Please provide a valid hostname or IP adddress.';
errorFieldNames.push(`${type}_host`);
}
if (!Number.isInteger(account.settings[`${type}_port`] / 1)) {
errorMessage = 'Please provide a valid port number.';
errorFieldNames.push(`${type}_port`);