heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dot-Notation for Users.fp_token_expire

Browse Source
This commit is contained in:
Elrond 2011-11-14 19:24:15 +01:00
parent dc39e4555c
commit 2d540fed8b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mediagoblin/auth/views.py
View File

@ -251,7 +251,7 @@ def forgot_password(request):
if user: if user:
if user.email_verified and user.status == 'active': if user.email_verified and user.status == 'active':
user.fp_verification_key = unicode(uuid.uuid4()) user.fp_verification_key = unicode(uuid.uuid4())
user[u'fp_token_expire'] = datetime.datetime.now() + \ user.fp_token_expire = datetime.datetime.now() + \
datetime.timedelta(days=10) datetime.timedelta(days=10)
user.save() user.save()
@ -303,7 +303,7 @@ def verify_forgot_password(request):
# check if we have a real user and correct token # check if we have a real user and correct token
if ((user and user.fp_verification_key and if ((user and user.fp_verification_key and
user.fp_verification_key == unicode(formdata_token) and user.fp_verification_key == unicode(formdata_token) and
datetime.datetime.now() < user['fp_token_expire'] datetime.datetime.now() < user.fp_token_expire
and user.email_verified and user.status == 'active')): and user.email_verified and user.status == 'active')):
cp_form = auth_forms.ChangePassForm(formdata_vars) cp_form = auth_forms.ChangePassForm(formdata_vars)
@ -312,7 +312,7 @@ def verify_forgot_password(request):
user.pw_hash = auth_lib.bcrypt_gen_password_hash( user.pw_hash = auth_lib.bcrypt_gen_password_hash(
request.POST['password']) request.POST['password'])
user.fp_verification_key = None user.fp_verification_key = None
user[u'fp_token_expire'] = None user.fp_token_expire = None
user.save() user.save()
return redirect(request, 'mediagoblin.auth.fp_changed_success') return redirect(request, 'mediagoblin.auth.fp_changed_success')

8
mediagoblin/tests/test_auth.py
View File

@ -274,7 +274,7 @@ def test_register_views(test_app):
### The forgotten password token should be set to expire in ~ 10 days ### The forgotten password token should be set to expire in ~ 10 days
# A few ticks have expired so there are only 9 full days left... # A few ticks have expired so there are only 9 full days left...
assert (new_user['fp_token_expire'] - datetime.datetime.now()).days == 9 assert (new_user.fp_token_expire - datetime.datetime.now()).days == 9
## Try using a bs password-changing verification key, shouldn't work ## Try using a bs password-changing verification key, shouldn't work
template.clear_test_template_context() template.clear_test_template_context()
@ -285,12 +285,12 @@ def test_register_views(test_app):
## Try using an expired token to change password, shouldn't work ## Try using an expired token to change password, shouldn't work
template.clear_test_template_context() template.clear_test_template_context()
real_token_expiration = new_user['fp_token_expire'] real_token_expiration = new_user.fp_token_expire
new_user['fp_token_expire'] = datetime.datetime.now() new_user.fp_token_expire = datetime.datetime.now()
new_user.save() new_user.save()
response = test_app.get("%s?%s" % (path, get_params), status=404) response = test_app.get("%s?%s" % (path, get_params), status=404)
assert_equal(response.status, '404 Not Found') assert_equal(response.status, '404 Not Found')
new_user['fp_token_expire'] = real_token_expiration new_user.fp_token_expire = real_token_expiration
new_user.save() new_user.save()
## Verify step 1 of password-change works -- can see form to change password ## Verify step 1 of password-change works -- can see form to change password