Merge pull request #101 from bshardi/master

Take Two on Case Sensitive Username and Email - #65
Differential · Mar 8, 2014 · 70a5faa · 70a5faa
2 parents 3071528 + c2736b9
commit 70a5faa
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 1 deletion.
diff --git a/client/entry.coffee b/client/entry.coffee
@@ -4,6 +4,12 @@ AccountsEntry =
     homeRoute: '/home'
     dashboardRoute: '/dashboard'
     passwordSignupFields: 'EMAIL_ONLY'
+    emailToLower: true
+    usernameToLower: false
+
+  isStringEmail: (email) ->
+    emailPattern = /^([\w.-]+)@([\w.-]+)\.([a-zA-Z.]{2,6})$/i 
+    if email.match emailPattern then true else false
 
   config: (appConfig) ->
     @settings = _.extend(@settings, appConfig)

diff --git a/client/i18n/english.coffee b/client/i18n/english.coffee
@@ -36,5 +36,6 @@ en =
     signupCodeRequired: "Signup code is required."
     signupCodeIncorrect: "Signup code is incorrect."
     signInRequired: "You must be signed in to do that."
+    usernameIsEmail: "Username cannot be an email address."
 
 T9n.map "en", en
diff --git a/client/i18n/german.coffee b/client/i18n/german.coffee
@@ -37,5 +37,6 @@ de =
     signupCodeRequired: "Registrierungscode benötigt."
     signupCodeIncorrect: "Registrierungscode ungültig."
     signInRequired: "Sie müssen sich anmelden."
+    usernameIsEmail: "Benutzername kann nicht eine E-Mail."
 
 T9n.map "de", de
diff --git a/client/i18n/polish.coffee b/client/i18n/polish.coffee
@@ -36,5 +36,6 @@ pl =
     signupCodeRequired: "Wymagany jest kod rejestracji."
     signupCodeIncorrect: "Kod rejestracji jest nieprawidłowy."
     signInRequired: "Musisz być zalogowany, aby to zrobić."
+    usernameIsEmail: "Nazwa użytkownika nie może być adres e-mail."
 
 T9n.map "pl", pl
diff --git a/client/i18n/spanish.coffee b/client/i18n/spanish.coffee
@@ -35,5 +35,6 @@ es =
     signupCodeRequired: "Código para suscribir es necesario."
     signupCodeIncorrect: "Código para suscribir no coincide."
     signInRequired: "Debes iniciar sesión para hacer eso."
+    usernameIsEmail: "Usuario no puede ser Email."
 
 T9n.map "es", es
diff --git a/client/views/signIn/signIn.coffee b/client/views/signIn/signIn.coffee
@@ -24,7 +24,13 @@ Template.entrySignIn.helpers
 Template.entrySignIn.events
   'submit #signIn': (event) ->
     event.preventDefault()
-    Session.set('email', $('input[name="email"]').val())
+
+    email = $('input[name="email"]').val()
+    if (AccountsEntry.isStringEmail(email) and AccountsEntry.settings.emailToLower) or
+     (not AccountsEntry.isStringEmail(email) and AccountsEntry.settings.usernameToLower)
+      email = email.toLowerCase()
+
+    Session.set('email', email)
     Session.set('password', $('input[name="password"]').val())
 
     Meteor.loginWithPassword(Session.get('email'), Session.get('password'), (error)->

diff --git a/client/views/signUp/signUp.coffee b/client/views/signUp/signUp.coffee
@@ -49,6 +49,7 @@ Template.entrySignUp.events
         t.find('input[name="username"]').value.toLowerCase()
       else
         undefined
+    if username and AccountsEntry.settings.usernameToLower then username = username.toLowerCase()
 
     signupCode =
       if t.find('input[name="signupCode"]')
@@ -64,6 +65,7 @@ Template.entrySignUp.events
         trimInput t.find('input[type="email"]').value
       else
         undefined
+    if AccountsEntry.settings.emailToLower and email then email = email.toLowerCase()
 
     password = t.find('input[type="password"]').value
 
@@ -104,6 +106,10 @@ Template.entrySignUp.events
       Session.set('entryError', i18n("error.usernameRequired"))
       return
 
+    if username && AccountsEntry.isStringEmail(username)
+      Session.set('entryError', i18n("error.usernameIsEmail"))
+      return
+
     if emailRequired && email.length is 0
       Session.set('entryError', i18n("error.emailRequired"))
       return