diff --git a/conditional/__init__.py b/conditional/__init__.py index 10ee921..e8f54a8 100644 --- a/conditional/__init__.py +++ b/conditional/__init__.py @@ -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) diff --git a/conditional/util/member.py b/conditional/util/member.py index 9040c6a..15bd1f6 100644 --- a/conditional/util/member.py +++ b/conditional/util/member.py @@ -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 @@ -238,4 +238,4 @@ def gatekeep_status(username): "h_meetings": h_meetings, "c_meetings": d_meetings, "t_seminars": t_seminars, - }, 200 + }