diff --git a/endpoints/oauthlogin.py b/endpoints/oauthlogin.py index 865991d8c..a33ea5ddf 100644 --- a/endpoints/oauthlogin.py +++ b/endpoints/oauthlogin.py @@ -148,7 +148,7 @@ def github_oauth_callback(): # Retrieve the user's information. user_data = get_user(github_login, token) - if not user_data or not 'login' in user_data: + if not user_data or 'login' not in user_data: return render_ologin_error('GitHub') username = user_data['login'] @@ -168,7 +168,8 @@ def github_oauth_callback(): headers={'Accept': 'application/vnd.github.moondragon+json'}) organizations = set([org.get('login').lower() for org in get_orgs.json()]) - if not (organizations & set(github_login.allowed_organizations())): + matching_organizations = organizations & set(github_login.allowed_organizations()) + if not matching_organizations: err = """You are not a member of an allowed GitHub organization. Please contact your system administrator if you believe this is in error.""" return render_ologin_error('GitHub', err) @@ -351,4 +352,3 @@ def dex_oauth_attach(): return render_ologin_error(dex_login.public_title, err) return redirect(url_for('web.user_view', path=user_obj.username, tab='external')) -