dinislage/web2py
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed an inconcistency in Auth

Browse Source
This commit is contained in:
mdipierro
2012-08-26 17:53:27 -05:00
parent d47dbc604e
commit 308f790f3c
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.00.0 (2012-08-26 17:48:34) dev Version 2.00.0 (2012-08-26 17:53:23) dev
gluon/tools.py
+12 -7
View File
@@ -31,6 +31,7 @@ from utils import web2py_uuid
from fileutils import read_file, check_credentials from fileutils import read_file, check_credentials
from gluon import * from gluon import *
from gluon.contrib.autolinks import expand_one from gluon.contrib.autolinks import expand_one
from gluon.dal import Row
import serializers import serializers
@@ -1987,7 +1988,7 @@ class Auth(object):
# process authenticated users # process authenticated users
if user: if user:
user = Storage(table_user._filter_fields(user, id=True)) user = Row(table_user._filter_fields(user, id=True))
# process authenticated users # process authenticated users
# user wants to be logged in for longer # user wants to be logged in for longer
self.login_user(user) self.login_user(user)
@@ -2156,7 +2157,9 @@ class Auth(object):
if not self.settings.registration_requires_verification: if not self.settings.registration_requires_verification:
table_user[form.vars.id] = dict(registration_key='') table_user[form.vars.id] = dict(registration_key='')
session.flash = self.messages.registration_successful session.flash = self.messages.registration_successful
user = self.db(table_user[username] == form.vars[username]).select().first() user = self.db(
table_user[username] == form.vars[username]
).select().first()
self.login_user(user) self.login_user(user)
session.flash = self.messages.logged_in session.flash = self.messages.logged_in
self.log_event(log, form.vars) self.log_event(log, form.vars)
@@ -2405,7 +2408,7 @@ class Auth(object):
key = request.vars.key or getarg(-1) key = request.vars.key or getarg(-1)
t0 = int(key.split('-')[0]) t0 = int(key.split('-')[0])
if time.time()-t0 > 60*60*24: raise Exception if time.time()-t0 > 60*60*24: raise Exception
user = self.db(table_user.reset_password_key == key).select().first() user = table_user(reset_password_key=key)
if not user: raise Exception if not user: raise Exception
except Exception: except Exception:
session.flash = self.messages.invalid_reset_password session.flash = self.messages.invalid_reset_password
@@ -2424,10 +2427,12 @@ class Auth(object):
formstyle=self.settings.formstyle, formstyle=self.settings.formstyle,
separator=self.settings.label_separator separator=self.settings.label_separator
) )
if form.accepts(request,session,hideerror=self.settings.hideerror): if form.accepts(request,session,
user.update_record(**{passfield:str(form.vars.new_password), hideerror=self.settings.hideerror):
'registration_key':'', user.update_record(
'reset_password_key':''}) **{passfield:str(form.vars.new_password),
'registration_key':'',
'reset_password_key':''})
session.flash = self.messages.password_changed session.flash = self.messages.password_changed
if self.settings.login_after_password_change: if self.settings.login_after_password_change:
self.login_user(user) self.login_user(user)