From 9b4f721c71726fea2a2300b33fcd8620ced993e8 Mon Sep 17 00:00:00 2001 From: ortgit Date: Mon, 12 May 2014 16:25:23 -0400 Subject: [PATCH] Look in auth_group table for group role name, and use Rows correctly. --- gluon/tools.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gluon/tools.py b/gluon/tools.py index d9ca7f2c..38667f16 100644 --- a/gluon/tools.py +++ b/gluon/tools.py @@ -2473,8 +2473,10 @@ class Auth(object): # Default rule is that the user must be part of a group that is called # 'web2py Two-Step Authentication' if user: - memberships = self.db(self.table_membership().user_id == user.id).select() - session.auth_2_factor_enabled = 'web2py Two-Step Authentication' in [i.group_id for i in memberships.values()] + memberships = self.db((self.table_membership().user_id == user.id) + &(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 # challenge if session.auth_2_factor_enabled: