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

auth.settings.enable_tokens and header web2py_user_token

Browse Source
This commit is contained in:
mdipierro
2015-06-29 13:38:54 -05:00
parent cdbf48f09b
commit 00608e4f04
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/packages/dal
+1 -1
Submodule gluon/packages/dal updated: b60f9032cc...419ab9fe3c
gluon/tools.py
+6 -6
View File
@@ -1464,7 +1464,7 @@ class Auth(object):
settings.update(Auth.default_settings) settings.update(Auth.default_settings)
settings.update( settings.update(
cas_domains=[request.env.http_host], cas_domains=[request.env.http_host],
api_tokens=False, enable_tokens=False,
cas_provider=cas_provider, cas_provider=cas_provider,
cas_actions=dict(login='login', cas_actions=dict(login='login',
validate='validate', validate='validate',
@@ -1925,7 +1925,7 @@ class Auth(object):
writable=False, readable=False, writable=False, readable=False,
label=T('Modified By'), ondelete=ondelete)) label=T('Modified By'), ondelete=ondelete))
def define_tables(self, username=None, signature=None, api_tokens=False, def define_tables(self, username=None, signature=None, enable_tokens=False,
migrate=None, fake_migrate=None): migrate=None, fake_migrate=None):
""" """
To be called unless tables are defined manually To be called unless tables are defined manually
@@ -1952,7 +1952,7 @@ class Auth(object):
username = settings.use_username username = settings.use_username
else: else:
settings.use_username = username settings.use_username = username
settings.api_tokens = api_tokens settings.enable_tokens = enable_tokens
if not self.signature: if not self.signature:
self.define_signature() self.define_signature()
if signature == True: if signature == True:
@@ -2136,7 +2136,7 @@ class Auth(object):
migrate=self.__get_migrate( migrate=self.__get_migrate(
settings.table_cas_name, migrate), settings.table_cas_name, migrate),
fake_migrate=fake_migrate)) fake_migrate=fake_migrate))
if settings.api_tokens: if settings.enable_tokens:
extra_fields = settings.extra_fields.get( extra_fields = settings.extra_fields.get(
settings.table_token_name, []) + signature_list settings.table_token_name, []) + signature_list
if not settings.table_token_name in db.tables: if not settings.table_token_name in db.tables:
@@ -3772,10 +3772,10 @@ class Auth(object):
return self.requires(True, otherwise=otherwise) return self.requires(True, otherwise=otherwise)
def requires_login_or_token(self, otherwise=None): def requires_login_or_token(self, otherwise=None):
if self.settings.api_tokens == True: if self.settings.enable_tokens == True:
user = None user = None
request = current.request request = current.request
token = request.env.http_web2py_api_token or request.vars._token token = request.env.http_web2py_user_token or request.vars._token
table_token = self.table_token() table_token = self.table_token()
table_user = self.table_user() table_user = self.table_user()
from gluon.settings import global_settings from gluon.settings import global_settings