revert to user name over stable id

app.py

@@ -102,8 +102,15 @@ def add_solution_cbk(
     stable_id = claims.get("sub")
     logger.info(f"User stable ID: {stable_id}")
 
-    if not stable_id:
-        return styled_error("Could not retrieve your stable user ID. Please try signing in again.")
+    # if not stable_id:
+    #     return styled_error("Could not retrieve your stable user ID. Please try signing in again.")
+    # user_id = stable_id
+
+    # NOTE: stable_id is sometimes None (expired Token?) so we opt to use username.
+    # TODO: extract stable_id robustly, if possible.
+    if not profile.username:
+        return styled_error("Could not retrieve username. Please try signing in again.")
+    user_id = profile.username
 
     try:
         # Validating the submission file.
@@ -138,7 +145,7 @@ def add_solution_cbk(
     return add_new_solutions(
         lbdb,
         profile.username,
-        stable_id,
+        user_id,
         system_name,
         org,
         sys_type,

src/submission/submit.py

@@ -25,7 +25,7 @@ MIN_WAIT_TIME_PER_USER_HRS = 24
 def add_new_solutions(
     lbdb: F1Data,
     username: str,
-    stable_id: str,
+    user_id: str,
     system_name: str,
     org: str,
     sys_type: str,
@@ -41,13 +41,13 @@ def add_new_solutions(
 
     user_last_submission_date = None
     for sid in submitted_ids:
-        # Extract stable ID (last part)
-        past_stable_id = sid.rsplit("_", 1)[-1]
+        # Extract user ID (last part)
+        past_user_id = sid.rsplit("_", 1)[-1]
         # Extract timestamp string (first two parts)
         ts_str = "_".join(sid.split("_", 2)[:2])
 
         ts = datetime.strptime(ts_str, "%Y%m%d_%H%M%S").replace(tzinfo=timezone.utc)
-        if past_stable_id == stable_id:
+        if past_user_id == user_id:
             if user_last_submission_date is None:
                 user_last_submission_date = ts
             else:
@@ -85,7 +85,7 @@ def add_new_solutions(
             "An error occurred. Please try again later."
         )  # Use same message as external error. Avoid infoleak.
 
-    submission_id = f"{datetime.now(timezone.utc).strftime('%Y%m%d_%H%M%S')}_{username}_{stable_id}"
+    submission_id = f"{datetime.now(timezone.utc).strftime('%Y%m%d_%H%M%S')}_{username}_{user_id}"
 
     # Seems good, creating the eval.
     logger.info(f"Adding new submission: {submission_id}")