scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2024-11-22 23:27:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #3484 from benjiwheeler/join-flow-count-unicode

Browse source 
count unicode characters as single characters
This commit is contained in:
Benjamin Wheeler 2020-01-02 15:15:29 -05:00 committed by GitHub
commit e0c562bfa6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/lib/validate.js
View file

@ -57,7 +57,15 @@ module.exports.validateUsernameRemotely = username => (
module.exports.validatePassword = (password, username) => { module.exports.validatePassword = (password, username) => {
if (!password) { if (!password) {
return {valid: false, errMsgId: 'general.required'}; return {valid: false, errMsgId: 'general.required'};
} else if (password.length < 6) { // Using Array.from(string).length, instead of string.length, improves unicode
// character counting for a subset of unicode characters, so that they are counted
// as single characters by js.
// However, this only helps with a subset of unicode. Characters combinations,
// including diacritical marks or skintone/gender variations, will still appear
// to be multiple characters. See discussions:
// https://blog.jonnew.com/posts/poo-dot-length-equals-two
// https://stackoverflow.com/a/54370584/2308190
} else if (Array.from(password).length < 6) {
return {valid: false, errMsgId: 'registration.validationPasswordLength'}; return {valid: false, errMsgId: 'registration.validationPasswordLength'};
} else if (password === 'password') { } else if (password === 'password') {
return {valid: false, errMsgId: 'registration.validationPasswordNotEquals'}; return {valid: false, errMsgId: 'registration.validationPasswordNotEquals'};

29
test/unit/lib/validate.test.js
View file

@ -52,21 +52,38 @@ describe('unit test lib/validate.js', () => {
expect(response).toEqual({valid: false, errMsgId: 'registration.validationUsernameRegexp'}); expect(response).toEqual({valid: false, errMsgId: 'registration.validationUsernameRegexp'});
}); });
test('validate password', () => { test('validate password existence', () => {
let response; let response;
expect(typeof validate.validatePassword).toBe('function'); expect(typeof validate.validatePassword).toBe('function');
response = validate.validatePassword('abcdef'); response = validate.validatePassword('abcdef');
expect(response).toEqual({valid: true}); expect(response).toEqual({valid: true});
response = validate.validatePassword('abcdefghijklmnopqrst');
expect(response).toEqual({valid: true});
response = validate.validatePassword('passwo');
expect(response).toEqual({valid: true});
response = validate.validatePassword(''); response = validate.validatePassword('');
expect(response).toEqual({valid: false, errMsgId: 'general.required'}); expect(response).toEqual({valid: false, errMsgId: 'general.required'});
});
test('validate password length', () => {
let response;
response = validate.validatePassword('abcdefghijklmnopqrst');
expect(response).toEqual({valid: true});
response = validate.validatePassword('abcde'); response = validate.validatePassword('abcde');
expect(response).toEqual({valid: false, errMsgId: 'registration.validationPasswordLength'}); expect(response).toEqual({valid: false, errMsgId: 'registration.validationPasswordLength'});
response = validate.validatePassword('password'); response = validate.validatePassword('😺');
expect(response).toEqual({valid: false, errMsgId: 'registration.validationPasswordLength'});
response = validate.validatePassword('😺🦆🐝');
expect(response).toEqual({valid: false, errMsgId: 'registration.validationPasswordLength'});
response = validate.validatePassword('😺🦆🐝🐮🐠');
expect(response).toEqual({valid: false, errMsgId: 'registration.validationPasswordLength'});
response = validate.validatePassword('😺🦆🐝🐮🐠🐻');
expect(response).toEqual({valid: true});
});
test('validate password cannot be "password"', () => {
const response = validate.validatePassword('password');
expect(response).toEqual({valid: false, errMsgId: 'registration.validationPasswordNotEquals'}); expect(response).toEqual({valid: false, errMsgId: 'registration.validationPasswordNotEquals'});
});
test('validate password cannot be same as username', () => {
let response;
response = validate.validatePassword('abcdefg', 'abcdefg'); response = validate.validatePassword('abcdefg', 'abcdefg');
expect(response).toEqual({valid: false, errMsgId: 'registration.validationPasswordNotUsername'}); expect(response).toEqual({valid: false, errMsgId: 'registration.validationPasswordNotUsername'});
response = validate.validatePassword('abcdefg', 'abcdefG'); response = validate.validatePassword('abcdefg', 'abcdefG');