This commit is contained in:
Matt Wright
2012-05-24 21:07:29 -04:00
parent 08582b7f82
commit a47c6b9d55
3 changed files with 9 additions and 14 deletions
+2 -1
View File
@@ -293,7 +293,8 @@ class Security(object):
endpoint='reset')(views.reset)
def setup_confirmable(self, bp):
bp.route(self.confirm_url, endpoint='confirm')(views.confirm)
bp.route(self.confirm_url,
endpoint='confirm')(views.confirm)
class ForgotPasswordForm(Form):
+2
View File
@@ -73,6 +73,8 @@ def reset_by_token(token, email, password):
security.datastore._save_model(user)
send_mail('Your password has been reset', user.email, 'reset_notice')
return user
+5 -13
View File
@@ -17,7 +17,6 @@ from importlib import import_module
from flask import url_for, flash, current_app, request, session, render_template
from flask.ext.security.signals import user_registered, password_reset_requested
from werkzeug.exceptions import BadRequest
def generate_token():
@@ -57,10 +56,8 @@ def find_redirect(key):
result = (get_url(session.pop(key.lower(), None)) or
get_url(current_app.config[key.upper()] or None) or '/')
try:
del session[key.lower()]
except:
pass
session.pop(key.lower(), None)
return result
@@ -68,9 +65,11 @@ def config_value(app, key, default=None):
return app.config.get('SECURITY_' + key.upper(), default)
def send_mail(subject, recipient, template, context):
def send_mail(subject, recipient, template, context=None):
from flask.ext.mail import Message
context = context or {}
msg = Message(subject,
sender=current_app.security.email_sender,
recipients=[recipient])
@@ -118,10 +117,3 @@ def capture_reset_password_requests(reset_password_sent_at=None):
yield users
finally:
password_reset_requested.disconnect(_on)
def get_arg_or_bad_request(context, name):
rv = context.get(name, None)
if not rv:
raise BadRequest()
return rv