aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/auth/tools.py
diff options
context:
space:
mode:
authorRodney Ewing <ewing.rj@gmail.com>2013-05-27 09:04:53 -0700
committerRodney Ewing <ewing.rj@gmail.com>2013-05-27 09:04:53 -0700
commit0ccc722ddc2fabcd57b0a9b72d474feb5b312052 (patch)
treee8abe3c17147d72e003eddcc7fb8847a25dbbddf /mediagoblin/auth/tools.py
parent3b8c733b98533e6dd7612f071b672b19a97ecf1e (diff)
parentf855efff87c22ddb6b2a7ad690933de02ddfbc62 (diff)
downloadmediagoblin-0ccc722ddc2fabcd57b0a9b72d474feb5b312052.tar.lz
mediagoblin-0ccc722ddc2fabcd57b0a9b72d474feb5b312052.tar.xz
mediagoblin-0ccc722ddc2fabcd57b0a9b72d474feb5b312052.zip
Merge branch 'pre-auth' into basic_auth
Conflicts: mediagoblin/auth/tools.py mediagoblin/auth/views.py mediagoblin/plugins/basic_auth/tools.py
Diffstat (limited to 'mediagoblin/auth/tools.py')
-rw-r--r--mediagoblin/auth/tools.py62
1 files changed, 32 insertions, 30 deletions
diff --git a/mediagoblin/auth/tools.py b/mediagoblin/auth/tools.py
index 484c3030..94f23993 100644
--- a/mediagoblin/auth/tools.py
+++ b/mediagoblin/auth/tools.py
@@ -31,6 +31,8 @@ _log = logging.getLogger(__name__)
_log = logging.getLogger(__name__)
+_log = logging.getLogger(__name__)
+
def normalize_user_or_email_field(allow_email=True, allow_user=True):
"""
@@ -126,6 +128,36 @@ def send_verification_email(user, request):
rendered_email)
+EMAIL_FP_VERIFICATION_TEMPLATE = (
+ u"http://{host}{uri}?"
+ u"userid={userid}&token={fp_verification_key}")
+
+
+def send_fp_verification_email(user, request):
+ """
+ Send the verification email to users to change their password.
+
+ Args:
+ - user: a user object
+ - request: the request
+ """
+ rendered_email = render_template(
+ request, 'mediagoblin/auth/fp_verification_email.txt',
+ {'username': user.username,
+ 'verification_url': EMAIL_FP_VERIFICATION_TEMPLATE.format(
+ host=request.host,
+ uri=request.urlgen('mediagoblin.auth.verify_forgot_password'),
+ userid=unicode(user.id),
+ fp_verification_key=user.fp_verification_key)})
+
+ # TODO: There is no error handling in place
+ send_email(
+ mg_globals.app_config['email_sender_address'],
+ [user.email],
+ 'GNU MediaGoblin - Change forgotten password!',
+ rendered_email)
+
+
def basic_extra_validation(register_form, *args):
users_with_username = User.query.filter_by(
username=register_form.username.data).count()
@@ -166,36 +198,6 @@ def register_user(request, register_form):
return None
-EMAIL_FP_VERIFICATION_TEMPLATE = (
- u"http://{host}{uri}?"
- u"userid={userid}&token={fp_verification_key}")
-
-
-def send_fp_verification_email(user, request):
- """
- Send the verification email to users to change their password.
-
- Args:
- - user: a user object
- - request: the request
- """
- rendered_email = render_template(
- request, 'mediagoblin/auth/fp_verification_email.txt',
- {'username': user.username,
- 'verification_url': EMAIL_FP_VERIFICATION_TEMPLATE.format(
- host=request.host,
- uri=request.urlgen('mediagoblin.auth.verify_forgot_password'),
- userid=unicode(user.id),
- fp_verification_key=user.fp_verification_key)})
-
- # TODO: There is no error handling in place
- send_email(
- mg_globals.app_config['email_sender_address'],
- [user.email],
- 'GNU MediaGoblin - Change forgotten password!',
- rendered_email)
-
-
def check_login_simple(username, password, username_might_be_email=False):
user = auth.get_user(username)
if not user: