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

solved problems with auth and cookie expire

Browse Source
This commit is contained in:
mdipierro
2013-08-22 02:38:49 -05:00
parent 9d9190584e
commit 18601c4f72
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
VERSION
+1 -1
View File
@@ -1 +1 @@
Version 2.6.0-development+timestamp.2013.08.22.02.31.01 Version 2.6.0-development+timestamp.2013.08.22.02.36.56
gluon/globals.py
+4 -1
View File
@@ -917,9 +917,12 @@ class Session(Storage):
if response.session_id: if response.session_id:
rcookies[response.session_id_name] = response.session_id rcookies[response.session_id_name] = response.session_id
rcookies[response.session_id_name]['path'] = '/' rcookies[response.session_id_name]['path'] = '/'
if response.session_cookie_expires: if isinstance(response.session_cookie_expires,datetime.datetime):
rcookies[response.session_id_name]['expires'] = \ rcookies[response.session_id_name]['expires'] = \
response.session_cookie_expires.strftime(FMT) response.session_cookie_expires.strftime(FMT)
elif isinstance(response.session_cookie_expires,str):
rcookies[response.session_id_name]['expires'] = \
response.session_cookie_expires
def clear(self): def clear(self):
previous_session_hash = self.pop('_session_hash', None) previous_session_hash = self.pop('_session_hash', None)
gluon/tools.py
+1 -2
View File
@@ -1225,8 +1225,7 @@ class Auth(object):
response = current.response response = current.response
if auth and auth.remember: if auth and auth.remember:
# when user wants to be logged in for longer # when user wants to be logged in for longer
response.cookies[response.session_id_name]["expires"] = \ response.session_cookie_expires = auth.expiration
auth.expiration
if signature: if signature:
self.define_signature() self.define_signature()
else: else: