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

added request_reset_password_on...

Browse Source
This commit is contained in:
mdipierro
2015-06-07 21:28:18 -05:00
parent 236fdcfafc
commit 0e9c5caf4d
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/packages/dal
+1 -1
Submodule gluon/packages/dal updated: 06654a1676...62eb7767db
gluon/tools.py
+12 -3
View File
@@ -1499,6 +1499,8 @@ class Auth(object):
change_password_onvalidation = [], change_password_onvalidation = [],
change_password_onaccept = [], change_password_onaccept = [],
retrieve_password_onvalidation = [], retrieve_password_onvalidation = [],
request_reset_password_onvalidation = [],
request_reset_password_onaccept = [],
reset_password_onvalidation = [], reset_password_onvalidation = [],
reset_password_onaccept = [], reset_password_onaccept = [],
hmac_key = hmac_key, hmac_key = hmac_key,
@@ -3173,6 +3175,12 @@ class Auth(object):
except Exception: except Exception:
session.flash = self.messages.invalid_reset_password session.flash = self.messages.invalid_reset_password
redirect(next, client_side=self.settings.client_side) redirect(next, client_side=self.settings.client_side)
if onvalidation is DEFAULT:
onvalidation = self.settings.reset_password_onvalidation
if onaccept is DEFAULT:
onaccept = self.settings.reset_password_onaccept
passfield = self.settings.password_field passfield = self.settings.password_field
form = SQLFORM.factory( form = SQLFORM.factory(
Field('new_password', 'password', Field('new_password', 'password',
@@ -3188,7 +3196,7 @@ 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, if form.accepts(request, session, onvalidation=onvalidation,
hideerror=self.settings.hideerror): hideerror=self.settings.hideerror):
user.update_record( user.update_record(
**{passfield: str(form.vars.new_password), **{passfield: str(form.vars.new_password),
@@ -3197,6 +3205,7 @@ class Auth(object):
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)
callback(onaccept, form)
redirect(next, client_side=self.settings.client_side) redirect(next, client_side=self.settings.client_side)
return form return form
@@ -3222,9 +3231,9 @@ class Auth(object):
response.flash = self.messages.function_disabled response.flash = self.messages.function_disabled
return '' return ''
if onvalidation is DEFAULT: if onvalidation is DEFAULT:
onvalidation = self.settings.reset_password_onvalidation onvalidation = self.settings.request_reset_password_onvalidation
if onaccept is DEFAULT: if onaccept is DEFAULT:
onaccept = self.settings.reset_password_onaccept onaccept = self.settings.request_reset_password_onaccept
if log is DEFAULT: if log is DEFAULT:
log = self.messages['reset_password_log'] log = self.messages['reset_password_log']
userfield = self.settings.login_userfield or 'username' \ userfield = self.settings.login_userfield or 'username' \