github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

accounts-ui: Validate username/email on login

Browse Source 
This resolves a strange error you get if you sign in with all fields empty
This commit is contained in:
Avital Oliver
2012-10-09 22:28:31 -07:00
parent a6e71dcde6
commit 002768d72a
1 changed files with 19 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
packages/accounts-ui-unstyled/login_buttons_dropdown.js
View File

@@ -348,14 +348,26 @@
var password = elementValueById('login-password');
var loginSelector;
if (username !== null)
loginSelector = {username: username};
else if (email !== null)
loginSelector = {email: email};
else if (usernameOrEmail !== null)
loginSelector = usernameOrEmail;
else
if (username !== null) {
if (!Accounts._loginButtons.validateUsername(username))
return;
else
loginSelector = {username: username};
} else if (email !== null) {
if (!Accounts._loginButtons.validateEmail(email))
return;
else
loginSelector = {email: email};
} else if (usernameOrEmail !== null) {
// XXX not sure how we should validate this. but this seems good enough (for now),
// since an email must have at least 3 characters anyways
if (!Accounts._loginButtons.validateUsername(usernameOrEmail))
return;
else
loginSelector = usernameOrEmail;
} else {
throw new Error("Unexpected -- no element to use as a login user selector");
}
Meteor.loginWithPassword(loginSelector, password, function (error, result) {
if (error) {