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

Look in auth_group table for group role name, and use Rows correctly.

Browse Source
This commit is contained in:
ortgit
2014-05-12 16:25:23 -04:00
parent d3bcde04be
commit 9b4f721c71
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gluon/tools.py
+4 -2
View File
@@ -2473,8 +2473,10 @@ class Auth(object):
# Default rule is that the user must be part of a group that is called # Default rule is that the user must be part of a group that is called
# 'web2py Two-Step Authentication' # 'web2py Two-Step Authentication'
if user: if user:
memberships = self.db(self.table_membership().user_id == user.id).select() memberships = self.db((self.table_membership().user_id == user.id)
session.auth_2_factor_enabled = 'web2py Two-Step Authentication' in [i.group_id for i in memberships.values()] &(self.table_group().id == self.table_membership().group_id)).select(
self.table_group().role)
session.auth_2_factor_enabled = 'web2py Two-Step Authentication' in [i.role for i in memberships]
# If user is signed up for two-factor authentication, present the second # If user is signed up for two-factor authentication, present the second
# challenge # challenge
if session.auth_2_factor_enabled: if session.auth_2_factor_enabled: