moved normalize_user_or_email_field to auth/tools.py from auth/forms.py

[mediagoblin.git] / mediagoblin / auth / forms.py

diff --git a/mediagoblin/auth/forms.py b/mediagoblin/auth/forms.py
index 917909c5995266eab555102e271856b9cd4588bf..599b2576d562156dfafc94c54754c488f16152b9 100644 (file)
--- a/mediagoblin/auth/forms.py
+++ b/mediagoblin/auth/forms.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -16,36 +16,52 @@
 
 import wtforms
 
-from mediagoblin.util import fake_ugettext_passthrough as _
+from mediagoblin.tools.mail import normalize_email
+from mediagoblin.tools.translate import lazy_pass_to_ugettext as _
+from mediagoblin.auth.tools import normalize_user_or_email_field
 
 
 class RegistrationForm(wtforms.Form):
     username = wtforms.TextField(
         _('Username'),
         [wtforms.validators.Required(),
-         wtforms.validators.Length(min=3, max=30),
-         wtforms.validators.Regexp(r'^\w+$')])
+         normalize_user_or_email_field(allow_email=False)])
     password = wtforms.PasswordField(
         _('Password'),
         [wtforms.validators.Required(),
-         wtforms.validators.Length(min=6, max=30),
-         wtforms.validators.EqualTo(
-                'confirm_password',
-                _('Passwords must match.'))])
-    confirm_password = wtforms.PasswordField(
-        _('Confirm password'),
-        [wtforms.validators.Required()])
+         wtforms.validators.Length(min=5, max=1024)])
     email = wtforms.TextField(
         _('Email address'),
         [wtforms.validators.Required(),
-         wtforms.validators.Email()])
+         normalize_user_or_email_field(allow_user=False)])
 
 
 class LoginForm(wtforms.Form):
     username = wtforms.TextField(
-        _('Username'),
+        _('Username or Email'),
         [wtforms.validators.Required(),
-         wtforms.validators.Regexp(r'^\w+$')])
+         normalize_user_or_email_field()])
     password = wtforms.PasswordField(
         _('Password'),
+        [wtforms.validators.Required(),
+         wtforms.validators.Length(min=5, max=1024)])
+
+
+class ForgotPassForm(wtforms.Form):
+    username = wtforms.TextField(
+        _('Username or email'),
+        [wtforms.validators.Required(),
+         normalize_user_or_email_field()])
+
+
+class ChangePassForm(wtforms.Form):
+    password = wtforms.PasswordField(
+        'Password',
+        [wtforms.validators.Required(),
+         wtforms.validators.Length(min=5, max=1024)])
+    userid = wtforms.HiddenField(
+        '',
+        [wtforms.validators.Required()])
+    token = wtforms.HiddenField(
+        '',
         [wtforms.validators.Required()])