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

no more self.next in Auth, thanks Niphlod

Browse Source
This commit is contained in:
mdipierro committed 2013-08-07 07:04:05 -05:00
1 parent 90069aacda
commit 438e198e53
2 files changed
+19 -15
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.6.0-development+timestamp.2013.08.07.04.13.27 Version 2.6.0-development+timestamp.2013.08.07.07.03.01
gluon/tools.py
+18 -14
View File
@@ -1154,9 +1154,6 @@ class Auth(object):
del session.auth del session.auth
# ## what happens after login? # ## what happens after login?
self.next = current.request.vars._next
if isinstance(self.next, (list, tuple)):
self.next = self.next[0]
url_index = URL(controller, 'index') url_index = URL(controller, 'index')
url_login = URL(controller, function, args='login') url_login = URL(controller, function, args='login')
# ## what happens after registration? # ## what happens after registration?
@@ -1235,6 +1232,12 @@ class Auth(object):
else: else:
self.signature = None self.signature = None
def get_vars_next(self):
next = current.request.vars._next
if isinstance(next, (list, tuple)):
next = next[0]
return next
def _get_user_id(self): def _get_user_id(self):
"accessor for auth.user_id" "accessor for auth.user_id"
return self.user and self.user.id or None return self.user and self.user.id or None
@@ -2039,16 +2042,17 @@ class Auth(object):
pass pass
### use session for federated login ### use session for federated login
if self.next: snext = self.get_vars_next()
session._auth_next = self.next if snext:
session._auth_next = snext
elif session._auth_next: elif session._auth_next:
self.next = session._auth_next snext = session._auth_next
### pass ### pass
if next is DEFAULT: if next is DEFAULT:
# important for security # important for security
next = self.settings.login_next next = self.settings.login_next
user_next = self.next user_next = snext
if user_next: if user_next:
external = user_next.split('://') external = user_next.split('://')
if external[0].lower() in ['http', 'https', 'ftp']: if external[0].lower() in ['http', 'https', 'ftp']:
@@ -2292,7 +2296,7 @@ class Auth(object):
redirect(self.settings.logged_url, redirect(self.settings.logged_url,
client_side=self.settings.client_side) client_side=self.settings.client_side)
if next is DEFAULT: if next is DEFAULT:
next = self.next or self.settings.register_next next = self.get_vars_next() or self.settings.register_next
if onvalidation is DEFAULT: if onvalidation is DEFAULT:
onvalidation = self.settings.register_onvalidation onvalidation = self.settings.register_onvalidation
if onaccept is DEFAULT: if onaccept is DEFAULT:
@@ -2487,7 +2491,7 @@ class Auth(object):
response.flash = self.messages.function_disabled response.flash = self.messages.function_disabled
return '' return ''
if next is DEFAULT: if next is DEFAULT:
next = self.next or self.settings.retrieve_username_next next = self.get_vars_next() or self.settings.retrieve_username_next
if onvalidation is DEFAULT: if onvalidation is DEFAULT:
onvalidation = self.settings.retrieve_username_onvalidation onvalidation = self.settings.retrieve_username_onvalidation
if onaccept is DEFAULT: if onaccept is DEFAULT:
@@ -2569,7 +2573,7 @@ class Auth(object):
response.flash = self.messages.function_disabled response.flash = self.messages.function_disabled
return '' return ''
if next is DEFAULT: if next is DEFAULT:
next = self.next or self.settings.retrieve_password_next next = self.get_vars_next() or self.settings.retrieve_password_next
if onvalidation is DEFAULT: if onvalidation is DEFAULT:
onvalidation = self.settings.retrieve_password_onvalidation onvalidation = self.settings.retrieve_password_onvalidation
if onaccept is DEFAULT: if onaccept is DEFAULT:
@@ -2645,7 +2649,7 @@ class Auth(object):
session = current.session session = current.session
if next is DEFAULT: if next is DEFAULT:
next = self.next or self.settings.reset_password_next next = self.get_vars_next() or self.settings.reset_password_next
try: try:
key = request.vars.key or getarg(-1) key = request.vars.key or getarg(-1)
t0 = int(key.split('-')[0]) t0 = int(key.split('-')[0])
@@ -2706,7 +2710,7 @@ class Auth(object):
(self.settings.retrieve_password_captcha != False and self.settings.captcha) (self.settings.retrieve_password_captcha != False and self.settings.captcha)
if next is DEFAULT: if next is DEFAULT:
next = self.next or self.settings.request_reset_password_next next = self.get_vars_next() or self.settings.request_reset_password_next
if not self.settings.mailer: if not self.settings.mailer:
response.flash = self.messages.function_disabled response.flash = self.messages.function_disabled
return '' return ''
@@ -2809,7 +2813,7 @@ class Auth(object):
request = current.request request = current.request
session = current.session session = current.session
if next is DEFAULT: if next is DEFAULT:
next = self.next or self.settings.change_password_next next = self.get_vars_next() or self.settings.change_password_next
if onvalidation is DEFAULT: if onvalidation is DEFAULT:
onvalidation = self.settings.change_password_onvalidation onvalidation = self.settings.change_password_onvalidation
if onaccept is DEFAULT: if onaccept is DEFAULT:
@@ -2878,7 +2882,7 @@ class Auth(object):
request = current.request request = current.request
session = current.session session = current.session
if next is DEFAULT: if next is DEFAULT:
next = self.next or self.settings.profile_next next = self.get_vars_next() or self.settings.profile_next
if onvalidation is DEFAULT: if onvalidation is DEFAULT:
onvalidation = self.settings.profile_onvalidation onvalidation = self.settings.profile_onvalidation
if onaccept is DEFAULT: if onaccept is DEFAULT: