auth

auth.py

@@ -1,12 +1,12 @@
-import os
 import hashlib
-from typing import Any
+import os
+
+from authlib.integrations.base_client import MismatchingStateError
 from authlib.integrations.starlette_client import OAuth
 from fastapi import FastAPI
 from fastapi.requests import Request
-from fastapi.responses import RedirectResponse, HTMLResponse
+from fastapi.responses import HTMLResponse, RedirectResponse
 from starlette.middleware.sessions import SessionMiddleware
-from authlib.integrations.base_client import MismatchingStateError
 
 
 OAUTH_CLIENT_ID = os.environ.get("OAUTH_CLIENT_ID")
@@ -31,10 +31,11 @@ oauth.register(
     server_metadata_url=METADATA_URL,
 )
 
-# Hack to close the login/logout page once the user is logged in/out.
-# TODO: can it be less hacky?
+# Close the login/logout page once the user is logged in/out.
 CLOSE_WINDOW_HTML = HTMLResponse("<script>window.close();</script>")
-OPEN_WINDOW_HTML = HTMLResponse("<script>window.open('{url}', '_blank');</script>")
+
+# If no third-party cookie, open a new tab to login/logout + redirect to the gradio app on this tab.
+OPEN_WINDOW_HTML = HTMLResponse("<script>window.open('{url}', '_blank'); window.location.replace('/');</script>")
 
 
 async def oauth_login(request: Request):
@@ -47,7 +48,6 @@ async def oauth_login(request: Request):
 async def oauth_logout(request: Request) -> RedirectResponse:
     request.session.pop("user", None)
     return CLOSE_WINDOW_HTML
-    return CLOSE_WINDOW_HTML if close_tab else RedirectResponse("/")
 
 
 async def oauth_redirect_callback(request: Request) -> RedirectResponse: