Dot-Notation for Users.pw_hash

This commit is contained in:
Elrond 2011-11-14 18:49:21 +01:00
parent 809cbfc5ab
commit 9047b254f3
4 changed files with 6 additions and 6 deletions

View File

@ -82,7 +82,7 @@ def register(request):
user = request.db.User()
user.username = username
user.email = email
user['pw_hash'] = auth_lib.bcrypt_gen_password_hash(
user.pw_hash = auth_lib.bcrypt_gen_password_hash(
request.POST['password'])
user.save(validate=True)
@ -309,7 +309,7 @@ def verify_forgot_password(request):
cp_form = auth_forms.ChangePassForm(formdata_vars)
if request.method == 'POST' and cp_form.validate():
user[u'pw_hash'] = auth_lib.bcrypt_gen_password_hash(
user.pw_hash = auth_lib.bcrypt_gen_password_hash(
request.POST['password'])
user[u'fp_verification_key'] = None
user[u'fp_token_expire'] = None

View File

@ -96,7 +96,7 @@ class User(Document):
See if a user can login with this password
"""
return auth_lib.bcrypt_check_password(
password, self['pw_hash'])
password, self.pw_hash)
class MediaEntry(Document):

View File

@ -52,7 +52,7 @@ def adduser(args):
entry = db.User()
entry.username = unicode(args.username.lower())
entry.email = unicode(args.email)
entry['pw_hash'] = auth_lib.bcrypt_gen_password_hash(args.password)
entry.pw_hash = auth_lib.bcrypt_gen_password_hash(args.password)
entry['status'] = u'active'
entry['email_verified'] = True
entry.save(validate=True)
@ -96,7 +96,7 @@ def changepw(args):
user = db.User.one({'username': unicode(args.username.lower())})
if user:
user['pw_hash'] = auth_lib.bcrypt_gen_password_hash(args.password)
user.pw_hash = auth_lib.bcrypt_gen_password_hash(args.password)
user.save()
print 'Password successfully changed'
else:

View File

@ -29,7 +29,7 @@ def test_get_test_app_wipes_db():
new_user = mg_globals.database.User()
new_user.username = u'lolcat'
new_user.email = u'lol@cats.example.org'
new_user['pw_hash'] = u'pretend_this_is_a_hash'
new_user.pw_hash = u'pretend_this_is_a_hash'
new_user.save()
assert mg_globals.database.User.find().count() == 1