From c81968043a924fadd9683e78b382c342f2e77990 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 3 Oct 2016 23:20:25 -0400 Subject: [PATCH] Password rules for registration. --- src/popup/app/accounts/accountsRegisterController.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/popup/app/accounts/accountsRegisterController.js b/src/popup/app/accounts/accountsRegisterController.js index 4bdcd09e8c7..3370bfdf245 100644 --- a/src/popup/app/accounts/accountsRegisterController.js +++ b/src/popup/app/accounts/accountsRegisterController.js @@ -21,12 +21,10 @@ toastr.error('Master password is required.', 'Errors have occurred'); return; } - if (model.masterPassword.length < 8) { - toastr.error('Master password must be at least 8 characters long.', 'Errors have occurred'); - return; - } - if (!/[a-z]/i.test(model.masterPassword) || !/\d/.test(model.masterPassword)) { - toastr.error('Master password requires at least 1 letter and 1 number.', 'Errors have occurred'); + if (model.masterPassword.length < 8 || !/[a-z]/i.test(model.masterPassword) || + /^[a-zA-Z]*$/.test(model.masterPassword)) { + toastr.error('Master password must be at least 8 characters long and contain at least 1 letter and 1 number ' + + 'or special character.', 'Errors have occurred'); return; } if (model.masterPassword !== model.masterPasswordRetype) {