Dot-Notation for Users.verification_key
This commit is contained in:
parent
7a3d00ec21
commit
00bb95502e
@ -110,7 +110,7 @@ def send_verification_email(user, request):
|
|||||||
host=request.host,
|
host=request.host,
|
||||||
uri=request.urlgen('mediagoblin.auth.verify_email'),
|
uri=request.urlgen('mediagoblin.auth.verify_email'),
|
||||||
userid=unicode(user._id),
|
userid=unicode(user._id),
|
||||||
verification_key=user['verification_key'])})
|
verification_key=user.verification_key)})
|
||||||
|
|
||||||
# TODO: There is no error handling in place
|
# TODO: There is no error handling in place
|
||||||
send_email(
|
send_email(
|
||||||
|
@ -166,10 +166,10 @@ def verify_email(request):
|
|||||||
user = request.db.User.find_one(
|
user = request.db.User.find_one(
|
||||||
{'_id': ObjectId(unicode(request.GET['userid']))})
|
{'_id': ObjectId(unicode(request.GET['userid']))})
|
||||||
|
|
||||||
if user and user['verification_key'] == unicode(request.GET['token']):
|
if user and user.verification_key == unicode(request.GET['token']):
|
||||||
user.status = u'active'
|
user.status = u'active'
|
||||||
user.email_verified = True
|
user.email_verified = True
|
||||||
user[u'verification_key'] = None
|
user.verification_key = None
|
||||||
|
|
||||||
user.save()
|
user.save()
|
||||||
|
|
||||||
@ -212,7 +212,7 @@ def resend_activation(request):
|
|||||||
|
|
||||||
return redirect(request, "mediagoblin.user_pages.user_home", user=request.user['username'])
|
return redirect(request, "mediagoblin.user_pages.user_home", user=request.user['username'])
|
||||||
|
|
||||||
request.user[u'verification_key'] = unicode(uuid.uuid4())
|
request.user.verification_key = unicode(uuid.uuid4())
|
||||||
request.user.save()
|
request.user.save()
|
||||||
|
|
||||||
email_debug_message(request)
|
email_debug_message(request)
|
||||||
|
@ -187,7 +187,7 @@ def test_register_views(test_app):
|
|||||||
assert parsed_get_params['userid'] == [
|
assert parsed_get_params['userid'] == [
|
||||||
unicode(new_user._id)]
|
unicode(new_user._id)]
|
||||||
assert parsed_get_params['token'] == [
|
assert parsed_get_params['token'] == [
|
||||||
new_user['verification_key']]
|
new_user.verification_key]
|
||||||
|
|
||||||
## Try verifying with bs verification key, shouldn't work
|
## Try verifying with bs verification key, shouldn't work
|
||||||
template.clear_test_template_context()
|
template.clear_test_template_context()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user