wassname/flask-security
1
0
Fork 0
mirror of https://github.com/wassname/flask-security.git synced 2026-09-09 11:22:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Polish

Browse Source
This commit is contained in:
Matt Wright
2012-03-08 17:36:08 -05:00
parent 7ea3929718
commit 9c8b8b8e39
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flask_security/__init__.py
+12 -14
View File
@@ -118,19 +118,18 @@ def roles_required(*args):
def wrapper(fn):
@wraps(fn)
def decorated_view(*args, **kwargs):
if current_user.is_authenticated() and perm.can():
if not current_user.is_authenticated():
c = current_app.config[AUTH_CONFIG_KEY]
return redirect(c[LOGIN_VIEW_KEY])
if perm.can():
return fn(*args, **kwargs)
logger.debug('Identity does not provide all of the '
'following roles: %s' % [r for r in roles])
flash(FLASH_PERMISSIONS, 'error')
if current_user.is_authenticated():
return redirect(request.referrer)
c = current_app.config[AUTH_CONFIG_KEY]
return redirect(c[LOGIN_VIEW_KEY])
return redirect(request.referrer or '/')
return decorated_view
return wrapper
@@ -140,20 +139,19 @@ def roles_accepted(*args):
def wrapper(fn):
@wraps(fn)
def decorated_view(*args, **kwargs):
if not current_user.is_authenticated():
c = current_app.config[AUTH_CONFIG_KEY]
return redirect(c[LOGIN_VIEW_KEY])
for perm in perms:
if current_user.is_authenticated() and perm.can():
if perm.can():
return fn(*args, **kwargs)
logger.debug('Identity does not provide at least one of '
'the following roles: %s' % [r for r in roles])
flash(FLASH_PERMISSIONS, 'error')
if current_user.is_authenticated():
return redirect(request.referrer)
c = current_app.config[AUTH_CONFIG_KEY]
return redirect(c[LOGIN_VIEW_KEY])
return redirect(request.referrer or '/')
return decorated_view
return wrapper