Bug fixes

Fixes an issue in the accounts template expecting homepage_account and fixes an issue where prereg attendees were added to the session for validating and then not removed, causing a 500 error if you clicked the Stripe payment button more than once. Also removes a stray debugging log statement.

Author: kitsuta

uber/auth.py

@@ -64,7 +64,6 @@ def _fetch_key(self, kid):
                     return None
                 self.key_fetch_time = time.time()
                 oidc_config = requests.get(c.OIDC_METADATA_URL).json()
-                log.error(oidc_config)
                 jwks_uri = oidc_config['jwks_uri']
 
                 keys = requests.get(jwks_uri).json()['keys']

uber/site_sections/preregistration.py

@@ -11,7 +11,7 @@
 import secrets
 from collections import defaultdict
 from sqlalchemy import func, or_
-from sqlalchemy.orm import selectinload, joinedload
+from sqlalchemy.orm import selectinload, joinedload, make_transient
 from sqlalchemy.orm.exc import NoResultFound
 
 from uber.config import c
@@ -891,12 +891,15 @@ def prereg_payment(self, session, message='', **params):
 
             used_codes = defaultdict(int)
             for attendee in cart.attendees:
+                session.add(attendee)
                 used_codes[attendee.promo_code_code] += 1
                 form_list = ['BadgeExtras'] # Re-check purchase limits
 
                 forms = load_forms(params, attendee, form_list, checkboxes_present=False)
 
                 all_errors = validate_model(session, forms, attendee, create_preview_model=False)
+                session.expunge(attendee)
+                make_transient(attendee)
                 if all_errors:
                     message = ' '.join([item for sublist in all_errors.values() for item in sublist])
 

uber/templates/preregistration/preregbase.html

@@ -2,10 +2,11 @@
 {% import "forms/account.html" as account_fields with context %}
 
 {% block backlink %}
+{% set account = account or logged_in_account or session.current_attendee_account() %}
 {% if c.ATTENDEE_ACCOUNTS_ENABLED or c.HAS_REGISTRATION_ACCESS or c.HAS_GROUP_ADMIN_ACCESS %}
 <nav class="navbar navbar-expand-lg">
     <div class="container-fluid">
-        <div class="badge bg-dark">Logged in as: {{ homepage_account.email }}</div>
+        <div class="badge bg-dark">Logged in as: {{ account.email }}</div>
         <div class="d-flex justify-content-end gap-2">
             {% if c.HAS_REGISTRATION_ACCESS and attendee and not attendee.is_new %}
             <a class="btn btn-secondary btn-sm" href="../registration/form?id={{ attendee.id }}">Admin Form</a>
@@ -20,9 +21,9 @@
             {% elif c.CURRENT_ADMIN %}
             <a href="../accounts/homepage" class="btn btn-secondary btn-sm">Admin Area</a>
             {% endif %}
-            {% if c.ATTENDEE_ACCOUNTS_ENABLED and (logged_in_account or homepage_account) %}
+            {% if c.ATTENDEE_ACCOUNTS_ENABLED and account %}
             {% if c.PAGE_PATH != '/preregistration/homepage' %}<a class="btn btn-info btn-sm" href="../preregistration/homepage">Homepage</a>{% endif %}
-            {% if homepage_account and (not homepage_account.is_sso_account or c.LOCAL_ACCOUNTS_DISABLED) %}
+            {% if account and (not account.is_sso_account or c.LOCAL_ACCOUNTS_DISABLED) %}
             <button class="btn btn-warning btn-sm" type="button" data-bs-toggle="modal" data-bs-target="#account_settings">
                 <i class="fa fa-cog"></i> Account Settings
             </button>
@@ -50,13 +51,13 @@ <h4 class="modal-title" id="account_settings_title">
         <div class="modal-body">
             <form method="post" action="update_account">
             {{ csrf_token() }}
-            <input type="hidden" name="id" value="{{ homepage_account.id }}" />
+            <input type="hidden" name="id" value="{{ account.id }}" />
             <input type="hidden" name="return_to" value="..{{ c.PAGE_PATH }}?{{ c.QUERY_STRING_NO_MSG }}" />
-            {% if homepage_account.is_sso_account and c.OIDC_ENABLED %}
+            {% if account.is_sso_account and c.OIDC_ENABLED %}
             <div class="row g-3">
                 <div class="col-sm">
                     <label for="email" class="form-text">Account Notifications Email</label>
-                    <input type="email" name="account_email" id="account_email" value="{{ homepage_account.email }}" class="form-control" placeholder="Account email address" required>
+                    <input type="email" name="account_email" id="account_email" value="{{ account.email }}" class="form-control" placeholder="Account email address" required>
                     <p class="form-text">This is the email we'll use to send notifications about your {{ c.EVENT_NAME_AND_YEAR }} account. Changing this does not affect your {{ c.OIDC_ACCOUNT_NAME }} account email or login.</p>
                 </div>
             </div>
@@ -71,7 +72,7 @@ <h4 class="modal-title" id="account_settings_title">
             <div class="row g-3 mb-3">
                 <div class="col-sm">
                     <label for="email" class="form-text">Account Email</label>
-                    <input type="email" name="account_email" id="account_email" value="{{ homepage_account.email }}" class="form-control" placeholder="Account email address" required>
+                    <input type="email" name="account_email" id="account_email" value="{{ account.email }}" class="form-control" placeholder="Account email address" required>
                 </div>
             </div>
             <div class="row g-3 mb-3">