Skip to content
This repository has been archived by the owner on Dec 6, 2024. It is now read-only.

fix: email TLD can be longer than 3 chars #928

Merged
merged 2 commits into from
Feb 21, 2022
Merged

fix: email TLD can be longer than 3 chars #928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
19f875a
fix: email TLD can be longer than 3 chars
SanketD92 Feb 18, 2022
7702bb6
Merge branch 'develop' into fix-tld-limit
SanketD92 Feb 21, 2022
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
4 changes: 2 additions & 2 deletions addons/addon-base-raas/packages/base-raas-services/lib/schema/create-user.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"minLength": 3,
"maxLength": 300,
"format": "email",
"pattern": "^([^.%+!$&*=^|~#%{}]+)[a-zA-Z0-9\\._%+!$&*=^|~#%{}/\\-]+([^.!]+)@([^-.!](([a-zA-Z0-9\\-]+\\.){1,}([a-zA-Z]{2,3})))"
"pattern": "^([^.%+!$&*=^|~#%{}]+)[a-zA-Z0-9\\._%+!$&*=^|~#%{}/\\-]+([^.!]+)@([^-.!](([a-zA-Z0-9\\-]+\\.){1,}([a-zA-Z]{2,63})))"
},
"usernameInIdp": {
"type": "string",
Expand All @@ -26,7 +26,7 @@
},
"email": {
"type": "string",
"pattern": "^([^.%+!$&*=^|~#%{}]+)[a-zA-Z0-9\\._%+!$&*=^|~#%{}/\\-]+([^.!]+)@([^-.!](([a-zA-Z0-9\\-]+\\.){1,}([a-zA-Z]{2,3})))"
"pattern": "^([^.%+!$&*=^|~#%{}]+)[a-zA-Z0-9\\._%+!$&*=^|~#%{}/\\-]+([^.!]+)@([^-.!](([a-zA-Z0-9\\-]+\\.){1,}([a-zA-Z]{2,63})))"
},
"firstName": {
"type": "string",
Expand Down
2 changes: 1 addition & 1 deletion addons/addon-base-raas/packages/base-raas-services/lib/schema/update-user.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"email": {
"type": "string",
"pattern": "^([^.%+!$&*=^|~#%{}]+)[a-zA-Z0-9\\._%+!$&*=^|~#%{}/\\-]+([^.!]+)@([^-.!](([a-zA-Z0-9\\-]+\\.){1,}([a-zA-Z]{2,3})))"
"pattern": "^([^.%+!$&*=^|~#%{}]+)[a-zA-Z0-9\\._%+!$&*=^|~#%{}/\\-]+([^.!]+)@([^-.!](([a-zA-Z0-9\\-]+\\.){1,}([a-zA-Z]{2,63})))"
},
"usernameInIdp": {
"type": "string",
Expand Down
4 changes: 2 additions & 2 deletions addons/addon-base/packages/services/lib/schema/create-user.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"minLength": 3,
"maxLength": 300,
"format": "email",
"pattern": "^([^.%+!$&*=^|~#%{}]+)[a-zA-Z0-9\\._%+!$&*=^|~#%{}/\\-]+([^.!]+)@([^-.!](([a-zA-Z0-9\\-]+\\.){1,}([a-zA-Z]{2,3})))"
"pattern": "^([^.%+!$&*=^|~#%{}]+)[a-zA-Z0-9\\._%+!$&*=^|~#%{}/\\-]+([^.!]+)@([^-.!](([a-zA-Z0-9\\-]+\\.){1,}([a-zA-Z]{2,63})))"
},
"usernameInIdp": {
"type": "string",
Expand All @@ -26,7 +26,7 @@
},
"email": {
"type": "string",
"pattern": "^([^.%+!$&*=^|~#%{}]+)[a-zA-Z0-9\\._%+!$&*=^|~#%{}/\\-]+([^.!]+)@([^-.!](([a-zA-Z0-9\\-]+\\.){1,}([a-zA-Z]{2,3})))",
"pattern": "^([^.%+!$&*=^|~#%{}]+)[a-zA-Z0-9\\._%+!$&*=^|~#%{}/\\-]+([^.!]+)@([^-.!](([a-zA-Z0-9\\-]+\\.){1,}([a-zA-Z]{2,63})))",
"format": "email",
"minLength": 6,
"maxLength": 512
Expand Down
2 changes: 1 addition & 1 deletion addons/addon-base/packages/services/lib/schema/update-user.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"email": {
"type": "string",
"pattern": "^([^.%+!$&*=^|~#%{}]+)[a-zA-Z0-9\\._%+!$&*=^|~#%{}/\\-]+([^.!]+)@([^-.!](([a-zA-Z0-9\\-]+\\.){1,}([a-zA-Z]{2,3})))"
"pattern": "^([^.%+!$&*=^|~#%{}]+)[a-zA-Z0-9\\._%+!$&*=^|~#%{}/\\-]+([^.!]+)@([^-.!](([a-zA-Z0-9\\-]+\\.){1,}([a-zA-Z]{2,63})))"
},
"firstName": {
"type": "string",
Expand Down
2 changes: 2 additions & 0 deletions addons/addon-base/packages/services/lib/user/__tests__/user-service.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,7 @@ describe('UserService', () => {
'email@domain.name',
'email@domain.co.jp',
'firstname-lastname@domain.com',
'firstname-lastname@domain.aridiculouslylongtldfortesting',
];
it.each(validEmails)('should pass when creating users with valid email: %p', async email => {
// BUILD
Expand Down Expand Up @@ -202,6 +203,7 @@ describe('UserService', () => {
'email@domain', // Missing top level domain (.com/.net/.org/etc)
'email@-domain.com', // Leading dash in front of domain is invalid
'email@domain..com', // Multiple dot in the domain portion is invalid
'firstname-lastname@domain.12345678901234567890123456789012345678901234567890123456789012345678901234567890abittoolongtld',
];
it.each(invalidEmails)('should fail when creating users with invalid email: %p', async email => {
// BUILD
Expand Down
2 changes: 1 addition & 1 deletion main/solution/post-deployment/config/infra/cloudformation.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@ Resources:
exports.handler = (event, context, callback) => {
event.response.autoConfirmUser = true;
// This regex check should be the same as the one in create-user email pattern
const emailRegex = /^\w+([\.+-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,3})+$/
const emailRegex = /^\w+([\.+-]?\w+)*@\w+([\.-]?\w+)*(\.\w{2,63})+$/
const { userPoolId, triggerSource, request, userName } = event
const logInfo = { userPoolId, triggerSource, userName,
requestBody: { name: request.name, given_name: request.given_name, family_name: request.family_name, email: request.email } }
Expand Down