From e6364827d33a22e663fa3153ab45bdef92845ae2 Mon Sep 17 00:00:00 2001 From: Noah Date: Tue, 21 Oct 2025 12:11:47 -0400 Subject: [PATCH 1/3] move status for gatekeep response to route --- conditional/__init__.py | 4 +--- conditional/util/member.py | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/conditional/__init__.py b/conditional/__init__.py index 10ee921..d091e4b 100644 --- a/conditional/__init__.py +++ b/conditional/__init__.py @@ -165,9 +165,7 @@ def gatekeep(username): if token != app.config["VOTE_TOKEN"]: return "Users cannot access this page", 403 - return gatekeep_status(username) - - + return gatekeep_status(username), 200 @app.errorhandler(404) diff --git a/conditional/util/member.py b/conditional/util/member.py index 9040c6a..edc3e99 100644 --- a/conditional/util/member.py +++ b/conditional/util/member.py @@ -238,4 +238,4 @@ def gatekeep_status(username): "h_meetings": h_meetings, "c_meetings": d_meetings, "t_seminars": t_seminars, - }, 200 + } From 888b082cdb61a9da0fd44519b34b1caa36117fde Mon Sep 17 00:00:00 2001 From: Noah Date: Tue, 21 Oct 2025 12:18:55 -0400 Subject: [PATCH 2/3] fix me being dumb :) --- conditional/util/member.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conditional/util/member.py b/conditional/util/member.py index edc3e99..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 From b48db4f5eac65253cef7ae7d9193f5ef4268ed51 Mon Sep 17 00:00:00 2001 From: Noah Date: Tue, 21 Oct 2025 13:15:31 -0400 Subject: [PATCH 3/3] fix 500 error when requesting gatekeep for a user that doesn't exist --- conditional/__init__.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/conditional/__init__.py b/conditional/__init__.py index d091e4b..e8f54a8 100644 --- a/conditional/__init__.py +++ b/conditional/__init__.py @@ -164,8 +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), 200 + return gatekeep_data, 200 @app.errorhandler(404)