Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 5 additions & 3 deletions conditional/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,12 @@ def gatekeep(username):
token = request.headers.get("X-VOTE-TOKEN", "")
if token != app.config["VOTE_TOKEN"]:
return "Users cannot access this page", 403
try:
gatekeep_data = gatekeep_status(username)
except KeyError:
return "", 404

return gatekeep_status(username)


return gatekeep_data, 200


@app.errorhandler(404)
Expand Down
4 changes: 2 additions & 2 deletions conditional/util/member.py
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def get_voting_members():
for intro_member in passed_fall:
voting_set.add(intro_member.uid)

voting_list = list(username for username in voting_set if gatekeep_status(username)[0]["result"])
voting_list = list(username for username in voting_set if gatekeep_status(username)["result"])
return voting_list


Expand Down Expand Up @@ -238,4 +238,4 @@ def gatekeep_status(username):
"h_meetings": h_meetings,
"c_meetings": d_meetings,
"t_seminars": t_seminars,
}, 200
}