diff options
Diffstat (limited to 'mediagoblin/plugins/basic_auth/views.py')
| -rw-r--r-- | mediagoblin/plugins/basic_auth/views.py | 38 |
1 files changed, 22 insertions, 16 deletions
diff --git a/mediagoblin/plugins/basic_auth/views.py b/mediagoblin/plugins/basic_auth/views.py index 02d370f0..f398f0d2 100644 --- a/mediagoblin/plugins/basic_auth/views.py +++ b/mediagoblin/plugins/basic_auth/views.py @@ -16,7 +16,7 @@ from itsdangerous import BadSignature from mediagoblin import messages -from mediagoblin.db.models import User +from mediagoblin.db.models import LocalUser from mediagoblin.decorators import require_active_login from mediagoblin.plugins.basic_auth import forms, tools from mediagoblin.tools.crypto import get_timed_signer_url @@ -48,7 +48,7 @@ def forgot_password(request): found_by_email = '@' in fp_form.username.data if found_by_email: - user = User.query.filter_by( + user = LocalUser.query.filter_by( email=fp_form.username.data).first() # Don't reveal success in case the lookup happened by email address. success_message = _("If that email address (case sensitive!) is " @@ -56,24 +56,27 @@ def forgot_password(request): "instructions on how to change your password.") else: # found by username - user = User.query.filter_by( + user = LocalUser.query.filter_by( username=fp_form.username.data).first() if user is None: - messages.add_message(request, - messages.WARNING, - _("Couldn't find someone with that username.")) - return redirect(request, 'mediagoblin.auth.forgot_password') + messages.add_message( + request, + messages.WARNING, + _("Couldn't find someone with that username.")) + return redirect(request, + 'mediagoblin.plugins.basic_auth.forgot_password') success_message = _("An email has been sent with instructions " "on how to change your password.") if user and user.has_privilege(u'active') is False: # Don't send reminder because user is inactive or has no verified email - messages.add_message(request, + messages.add_message( + request, messages.WARNING, - _("Could not send password recovery email as your username is in" - "active or your account's email address has not been verified.")) + _("Could not send password recovery email as your username is " + "inactive or your account's email address has not been verified.")) return redirect(request, 'mediagoblin.user_pages.user_home', user=user.username) @@ -114,7 +117,7 @@ def verify_forgot_password(request): 'index') # check if it's a valid user id - user = User.query.filter_by(id=int(token)).first() + user = LocalUser.query.filter_by(id=int(token)).first() # no user in db if not user: @@ -153,15 +156,17 @@ def verify_forgot_password(request): # # if not user.email_verified: # messages.add_message( - # request, messages.ERROR, + # request, + # messages.ERROR, # _('You need to verify your email before you can reset your' # ' password.')) if not user.status == 'active': messages.add_message( - request, messages.ERROR, - _('You are no longer an active user. Please contact the system' - ' admin to reactivate your account.')) + request, + messages.ERROR, + _("You are no longer an active user. Please contact the system " + "admin to reactivate your account.")) return redirect( request, 'index') @@ -211,7 +216,8 @@ def change_pass(request): user.save() messages.add_message( - request, messages.SUCCESS, + request, + messages.SUCCESS, _('Your password was changed successfully')) return redirect(request, 'mediagoblin.edit.account') |