adam/meal-order-manager
1
0
Fork 0
mirror of https://github.com/Sea-Haven-Industries/meal-order-manager.git synced 2026-10-07 16:18:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: resolve remaining merge conflicts

Browse source
This commit is contained in:
Adam Moussa 2026-08-03 14:12:09 -04:00
parent c1f339c99b
commit 43a75d540a
No known key found for this signature in database
4 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
functions/submit_order/handler.py
View file

@ -65,6 +65,10 @@ def _get_discount_settings() -> tuple[Decimal, Decimal]:
return _settings return _settings
def _get_admin_emails() -> set[str]:
return {email.lower() for email in get_settings().get("admin_emails", [])}
def _google_auth_configured() -> bool: def _google_auth_configured() -> bool:
return bool(os.environ.get("GOOGLE_CLIENT_ID_PARAM", "")) return bool(os.environ.get("GOOGLE_CLIENT_ID_PARAM", ""))
@ -147,6 +151,10 @@ def _verify_google_token(token: str) -> tuple[dict | None, str]:
return None, "invalid" return None, "invalid"
def _authentication_service_unavailable() -> dict:
return response(503, {"error": "Authentication service temporarily unavailable"})
def _verify_admin(event) -> tuple[dict | None, dict | None]: def _verify_admin(event) -> tuple[dict | None, dict | None]:
"""Verify Google auth and admin access. Returns (user_info, error_response).""" """Verify Google auth and admin access. Returns (user_info, error_response)."""
if not _google_auth_configured(): if not _google_auth_configured():
@ -163,14 +171,11 @@ def _verify_admin(event) -> tuple[dict | None, dict | None]:
user_info, status = _verify_google_token(token) user_info, status = _verify_google_token(token)
if status == "unavailable": if status == "unavailable":
return None, response( return None, _authentication_service_unavailable()
503, {"error": "Authentication service temporarily unavailable"}
)
if user_info is None: if user_info is None:
return None, response(403, {"error": "Invalid or unauthorized Google account"}) return None, response(403, {"error": "Invalid or unauthorized Google account"})
admin_emails = {e.lower() for e in get_settings().get("admin_emails", [])} if user_info["email"].lower() not in _get_admin_emails():
if user_info["email"].lower() not in admin_emails:
return None, response(403, {"error": "Admin access required"}) return None, response(403, {"error": "Admin access required"})
return user_info, None return user_info, None
@ -422,21 +427,15 @@ def handle_submit(event):
client_id = _get_google_client_id() client_id = _get_google_client_id()
except Exception as exc: except Exception as exc:
logger.error("SSM fetch failed for Google client ID: %s", exc) logger.error("SSM fetch failed for Google client ID: %s", exc)
return response( return _authentication_service_unavailable()
503, {"error": "Authentication service temporarily unavailable"}
)
if not client_id: if not client_id:
logger.error("Google client ID is unavailable") logger.error("Google client ID is unavailable")
return response( return _authentication_service_unavailable()
503, {"error": "Authentication service temporarily unavailable"}
)
if not google_token: if not google_token:
return response(403, {"error": "Google authentication is required"}) return response(403, {"error": "Google authentication is required"})
user_info, verify_status = _verify_google_token(google_token) user_info, verify_status = _verify_google_token(google_token)
if verify_status == "unavailable": if verify_status == "unavailable":
return response( return _authentication_service_unavailable()
503, {"error": "Authentication service temporarily unavailable"}
)
if user_info is None: if user_info is None:
return response(403, {"error": "Invalid or unauthorized Google account"}) return response(403, {"error": "Invalid or unauthorized Google account"})
name = user_info["name"] name = user_info["name"]
@ -453,8 +452,7 @@ def handle_submit(event):
week = current_week() week = current_week()
status = get_form_status(week) status = get_form_status(week)
admin_emails = {e.lower() for e in get_settings().get("admin_emails", [])} is_admin_user = email.lower() in _get_admin_emails()
is_admin_user = email.lower() in admin_emails
if status == "closed" and not is_admin_user: if status == "closed" and not is_admin_user:
return response(410, {"error": "Orders are closed for this week"}) return response(410, {"error": "Orders are closed for this week"})
if status == "not_found": if status == "not_found":

8
package-lock.json generated
View file

@ -8,10 +8,10 @@
"name": "meal-order-manager", "name": "meal-order-manager",
"version": "1.0.0", "version": "1.0.0",
"devDependencies": { "devDependencies": {
"@eslint/js": "^10.0.1", "@eslint/js": "10.0.1",
"eslint": "^10.8.0", "eslint": "10.8.0",
"globals": "^17.8.0", "globals": "17.8.0",
"prettier": "^3.9.6" "prettier": "3.9.6"
} }
}, },
"node_modules/@eslint-community/eslint-utils": { "node_modules/@eslint-community/eslint-utils": {

8
package.json
View file

@ -9,9 +9,9 @@
"lint:templates": "eslint \"src/server/templates/*.js\"" "lint:templates": "eslint \"src/server/templates/*.js\""
}, },
"devDependencies": { "devDependencies": {
"@eslint/js": "^10.0.1", "@eslint/js": "10.0.1",
"eslint": "^10.8.0", "eslint": "10.8.0",
"globals": "^17.8.0", "globals": "17.8.0",
"prettier": "^3.9.6" "prettier": "3.9.6"
} }
} }

2
src/server/generate_form.py
View file

@ -159,7 +159,7 @@ def main():
ssm = boto3.client("ssm") ssm = boto3.client("ssm")
resp = ssm.get_parameter(Name="/meal-order-manager/google-client-id") resp = ssm.get_parameter(Name="/meal-order-manager/google-client-id")
google_client_id = resp["Parameter"]["Value"] google_client_id = resp["Parameter"]["Value"].strip()
except Exception as exc: except Exception as exc:
parser.error( parser.error(
"Google auth is required in cloud mode, but the Google client ID " "Google auth is required in cloud mode, but the Google client ID "