Skip to content

fix: Ticket Order: User able to add invalid email #5690

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.

Sign up for GitHub

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

Merged
merged 10 commits into from
Nov 19, 2020
Merged

fix: Ticket Order: User able to add invalid email #5690

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
9cccc76
Update app.js
Nov 18, 2020
05229c0
Merge branch 'development' into validate-email-5277
Nov 18, 2020
f8dee15
validate email
Nov 18, 2020
3c7d5ee
validate email-1
Nov 18, 2020
0600bd0
Merge branch 'development' into validate-email-5277
Nov 18, 2020
6ce3701
Added simple regExp
Nov 19, 2020
0d225ea
Reverted loginForm Changes
Nov 19, 2020
c9c20ad
Merge branch 'development' into validate-email-5277
Nov 19, 2020
8e20700
disable eslint error
Nov 19, 2020
ade6c83
Merge branch 'validate-email-5277' of https://github.com/daretobediff…
Nov 19, 2020
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
9 changes: 6 additions & 3 deletions app/components/forms/orders/order-form.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@ import moment from 'moment';
import { groupBy, orderBy } from 'lodash-es';
import {
compulsoryProtocolValidUrlPattern, validTwitterProfileUrlPattern, validFacebookProfileUrlPattern,
validGithubProfileUrlPattern
validGithubProfileUrlPattern, validEmail
} from 'open-event-frontend/utils/validators';
import { genders } from 'open-event-frontend/utils/dictionary/genders';
import { ageGroups } from 'open-event-frontend/utils/dictionary/age-groups';
import { countries } from 'open-event-frontend/utils/dictionary/demography';


export default Component.extend(FormMixin, {
router: service(),

Expand Down Expand Up @@ -89,7 +90,8 @@ export default Component.extend(FormMixin, {
prompt : this.l10n.t('Please enter your email')
},
{
type : 'email',
type : 'regExp',
value : validEmail,
prompt : this.l10n.t('Please enter a valid email address')
}
]
Expand Down Expand Up @@ -382,7 +384,8 @@ export default Component.extend(FormMixin, {
identifier : 'email',
rules : [
{
type : 'email',
type : 'regExp',
value : validEmail,
prompt : this.l10n.t('Please enter a valid email address')
}
]
Expand Down
5 changes: 5 additions & 0 deletions app/utils/validators.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,11 @@ export const validPhoneNumber = new RegExp(
'^\\s*(?:\\+?(\\d{1,3}))?([-. (]*(\\d{3})[-. )]*)?((\\d{3})[-. ]*(\\d{2,4})(?:[-.x ]*(\\d+))?)\\s*$'
);

export const validEmail = new RegExp(
/* eslint-disable-next-line no-control-regex*/
'[^@ \t\r\n]+@[^@ \t\r\n]+\.[^@ \t\r\n]+'
);

export const isValidUrl = str => {
return validUrlPattern.test(str);
};