Skip to content
This repository was archived by the owner on Nov 8, 2018. It is now read-only.

Tidy up code for remembering the IDP #45

Open
kentsanggds wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Tidy up code for remembering the IDP #45

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc84387
Refactored in line with comments
kentsanggds Feb 13, 2017
ee2644b
Fixed bug in fn dept from idp name
kentsanggds Feb 13, 2017
2308257
Refactored dept from idp name in line with Review
kentsanggds Mar 3, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions app/main/views/auth.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,10 @@ def match_idp_email(idp, email_address):


def dept_from_idp_name(idp_name):
idp = [idp['name'] for idp in idp_profiles if idp_name == idp['idp_name']]
if idp:
return ' or '.join(idp)
return None
dept = [profile['name']
for profile in idp_profiles if idp_name == profile['idp_name']]
if dept:
return ' or '.join(dept)
Copy link
Copy Markdown
Contributor

@andyhd andyhd Mar 3, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Arbitrary indentation level on line 101. But rather than using a list comprehension, consider using a for loop instead - list comprehensions are less readable. Also, since the callers of this function do not handle a None return value, the check on line 102 is redundant. Eg:

dept_names = []

for profile in idp_profiles:

    if idp_name == profile['idp_name']:
        dept_names.append(profile['name'])

return ' or '.join(dept_names)



def idp_for_dept(dept):
Expand Down Expand Up @@ -149,8 +149,8 @@ def authentication_request():

elif request.cookies.get('gateway_idp'):
session['suggested_idp'] = request.cookies.get('gateway_idp')
department = dept_from_idp_name(session['suggested_idp'])
session['department_name'] = department
session['department_name'] = dept_from_idp_name(
session['suggested_idp'])
return redirect(url_for('.confirm_dept'))

return redirect(url_for('.request_email_address'))
Expand Down