wip

app.py

@@ -171,27 +171,27 @@ def add_solution_cbk(
 #         return gr.update(value='<script>window.location.href = "/logout";</script>')
 
 
-def gate_submission_by_prof(profile: gr.OAuthProfile | None):
-    if not profile:
-        return gr.update(visible=True), gr.update(visible=False)
-    return gr.update(visible=False), gr.update(visible=True)
+# def gate_submission_by_prof(profile: gr.OAuthProfile | None):
+#     if not profile:
+#         return gr.update(visible=True), gr.update(visible=False)
+#     return gr.update(visible=False), gr.update(visible=True)
 
 
-# def gate_submission(oauth_token: gr.OAuthToken | None):
-#     """
-#     @brief Toggles the visibility of the login box and submission panel based on the user's login status.
-#     """
-#     logger.info("GATE TOKEN %s", oauth_token)
-#     if oauth_token is None:
-#         logger.info("GATE: NO TOKEN")
-#         return gr.update(visible=True), gr.update(visible=False)
-#     try:
-#         whoami(oauth_token.token)
-#         logger.info("GATE: TOKEN IS VALID")
-#         return gr.update(visible=False), gr.update(visible=True)
-#     except Exception:
-#         logger.info("GATE: TOKEN HAS EXPIRED")
-#         return gr.update(visible=True), gr.update(visible=False)
+def gate_submission(oauth_token: gr.OAuthToken | None):
+    """
+    @brief Toggles the visibility of the login box and submission panel based on the user's login status.
+    """
+    logger.info("GATE TOKEN %s", oauth_token)
+    if oauth_token is None:
+        logger.info("GATE: NO TOKEN")
+        return gr.update(visible=True), gr.update(visible=False), gr.update(visible=False)
+    try:
+        whoami(oauth_token.token)
+        logger.info("GATE: TOKEN IS VALID")
+        return gr.update(visible=False), gr.update(visible=False), gr.update(visible=True)
+    except Exception:
+        logger.info("GATE: TOKEN HAS EXPIRED")
+        return gr.update(visible=False), gr.update(visible=True), gr.update(visible=False)
 
 
 def get_theme():
@@ -218,8 +218,6 @@ def get_theme():
 blocks = gr.Blocks(css=custom_css, theme=get_theme())
 with blocks:
 
-    # reload_html = gr.HTML(visible=False)
-
     gr.Image(
         "assets/banner.png",
         interactive=False,
@@ -274,6 +272,12 @@ with blocks:
                 gr.Markdown("Please sign in to continue:")
                 gr.LoginButton()
 
+            # Shown when login token is EXPIRED
+            logout_box = gr.Group(visible=False)
+            with logout_box:
+                gr.Markdown("Your login has EXPIRED. Please log out and log in again")
+                gr.Button("Manual Logout", link="/logout")
+
             # Shown when logged IN
             submit_panel = gr.Group(visible=False)
             with submit_panel:
@@ -324,7 +328,7 @@ with blocks:
 
     # On initial load (and after OAuth redirect), toggle the UI based on login status.
     # blocks.load(gate_submission, inputs=None, outputs=[login_box, submit_panel])
-    blocks.load(gate_submission_by_prof, inputs=None, outputs=[login_box, submit_panel])
+    blocks.load(gate_submission, inputs=None, outputs=[login_box, logout_box, submit_panel])
 
 
 logger.info("Scheduler")