aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorElrond <elrond+mediagoblin.org@samba-tng.org>2011-11-14 19:04:13 +0100
committerElrond <elrond+mediagoblin.org@samba-tng.org>2011-12-05 21:08:57 +0100
commit00bb95502e01f8c8fcaa5652889a5ed423051d7c (patch)
treec83c60823d55bb5a2042cfb704b7e4cb9794c110
parent7a3d00ec217cc3fd44788b9d8c63ab9f7b1d05a7 (diff)
downloadmediagoblin-00bb95502e01f8c8fcaa5652889a5ed423051d7c.tar.lz
mediagoblin-00bb95502e01f8c8fcaa5652889a5ed423051d7c.tar.xz
mediagoblin-00bb95502e01f8c8fcaa5652889a5ed423051d7c.zip
Dot-Notation for Users.verification_key
-rw-r--r--mediagoblin/auth/lib.py2
-rw-r--r--mediagoblin/auth/views.py6
-rw-r--r--mediagoblin/tests/test_auth.py2
3 files changed, 5 insertions, 5 deletions
diff --git a/mediagoblin/auth/lib.py b/mediagoblin/auth/lib.py
index 24992094..d03f7af0 100644
--- a/mediagoblin/auth/lib.py
+++ b/mediagoblin/auth/lib.py
@@ -110,7 +110,7 @@ def send_verification_email(user, request):
host=request.host,
uri=request.urlgen('mediagoblin.auth.verify_email'),
userid=unicode(user._id),
- verification_key=user['verification_key'])})
+ verification_key=user.verification_key)})
# TODO: There is no error handling in place
send_email(
diff --git a/mediagoblin/auth/views.py b/mediagoblin/auth/views.py
index caf9835a..d7e8d1bf 100644
--- a/mediagoblin/auth/views.py
+++ b/mediagoblin/auth/views.py
@@ -166,10 +166,10 @@ def verify_email(request):
user = request.db.User.find_one(
{'_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.email_verified = True
- user[u'verification_key'] = None
+ user.verification_key = None
user.save()
@@ -212,7 +212,7 @@ def resend_activation(request):
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()
email_debug_message(request)
diff --git a/mediagoblin/tests/test_auth.py b/mediagoblin/tests/test_auth.py
index bd79a407..7cb867d7 100644
--- a/mediagoblin/tests/test_auth.py
+++ b/mediagoblin/tests/test_auth.py
@@ -187,7 +187,7 @@ def test_register_views(test_app):
assert parsed_get_params['userid'] == [
unicode(new_user._id)]
assert parsed_get_params['token'] == [
- new_user['verification_key']]
+ new_user.verification_key]
## Try verifying with bs verification key, shouldn't work
template.clear_test_template_context()