Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Allow spaces and special chars in phone number username #6293

Merged
merged 6 commits into from
Nov 18, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/CONST.js
Original file line number Diff line number Diff line change
Expand Up @@ -431,6 +431,7 @@ const CONST = {
PHONE_MAX_LENGTH: 15,
PHONE_MIN_LENGTH: 5,
REGEX: {
SPECIAL_CHARS_WITHOUT_NEWLINE: /((?!\n)[()-\s\t])/g,
US_PHONE: /^\+1\d{10}$/,
DIGITS_AND_PLUS: /^\+?[0-9]*$/,
PHONE_E164_PLUS: /^\+?[1-9]\d{1,14}$/,
Expand Down
14 changes: 14 additions & 0 deletions src/libs/LoginUtil.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import CONST from '../CONST';

/**
* Remove the special chars from the phone number
* @param {String} phone
* @return {String}
*/
function getPhoneNumberWithoutSpecialChars(phone) {
return phone.replace(CONST.REGEX.SPECIAL_CHARS_WITHOUT_NEWLINE, '');
}

export default {
getPhoneNumberWithoutSpecialChars,
};
3 changes: 2 additions & 1 deletion src/libs/ValidationUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import moment from 'moment';
import _ from 'underscore';
import CONST from '../CONST';
import {getMonthFromExpirationDateString, getYearFromExpirationDateString} from './CardUtils';
import LoginUtil from './LoginUtil';

/**
* Implements the Luhn Algorithm, a checksum formula used to validate credit card
Expand Down Expand Up @@ -253,7 +254,7 @@ function isValidUSPhone(phoneNumber) {
* @returns {Boolean}
*/
function isNumericWithSpecialChars(input) {
return /^\+?\d*$/.test(input.replace(/[()-]/g, ''));
return /^\+?\d*$/.test(LoginUtil.getPhoneNumberWithoutSpecialChars(input));
}

/**
Expand Down
6 changes: 4 additions & 2 deletions src/pages/RequestCallPage.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import Text from '../components/Text';
import KeyboardAvoidingView from '../components/KeyboardAvoidingView';
import RequestCallIcon from '../../assets/images/request-call.svg';
import {getFirstAndLastNameErrors} from '../libs/actions/PersonalDetails';
import LoginUtil from '../libs/LoginUtil';

const propTypes = {
...withLocalizePropTypes,
Expand Down Expand Up @@ -112,7 +113,7 @@ class RequestCallPage extends Component {
policyID: personalPolicy.id,
firstName: this.state.firstName,
lastName: this.state.lastName,
phoneNumber: this.state.phoneNumber,
phoneNumber: LoginUtil.getPhoneNumberWithoutSpecialChars(this.state.phoneNumber),
email: this.props.session.email,
});
}
Expand All @@ -134,7 +135,8 @@ class RequestCallPage extends Component {
* @returns {String}
*/
getPhoneNumberError() {
if (_.isEmpty(this.state.phoneNumber.trim()) || !Str.isValidPhone(this.state.phoneNumber)) {
const phoneNumber = LoginUtil.getPhoneNumberWithoutSpecialChars(this.state.phoneNumber);
if (_.isEmpty(this.state.phoneNumber.trim()) || !Str.isValidPhone(phoneNumber)) {
return this.props.translate('messages.errorMessageInvalidPhone');
}
return '';
Expand Down
8 changes: 6 additions & 2 deletions src/pages/signin/LoginForm.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import withLocalize, {withLocalizePropTypes} from '../../components/withLocalize
import getEmailKeyboardType from '../../libs/getEmailKeyboardType';
import ExpensiTextInput from '../../components/ExpensiTextInput';
import {isNumericWithSpecialChars} from '../../libs/ValidationUtils';
import LoginUtil from '../../libs/LoginUtil';

const propTypes = {
/* Onyx Props */
Expand Down Expand Up @@ -79,7 +80,10 @@ class LoginForm extends React.Component {
return;
}

if (!Str.isValidEmail(this.state.login) && !Str.isValidPhone(this.state.login)) {
const phoneLogin = LoginUtil.getPhoneNumberWithoutSpecialChars(this.state.login);
const isValidPhoneLogin = Str.isValidPhone(phoneLogin);

if (!Str.isValidEmail(this.state.login) && !isValidPhoneLogin) {
if (isNumericWithSpecialChars(this.state.login)) {
this.setState({formError: 'messages.errorMessageInvalidPhone'});
} else {
Expand All @@ -93,7 +97,7 @@ class LoginForm extends React.Component {
});

// Check if this login has an account associated with it or not
fetchAccountDetails(this.state.login);
fetchAccountDetails(isValidPhoneLogin ? phoneLogin : this.state.login);
}

render() {
Expand Down