From 9d5bfa45c13dbcfdcf6b1b043165ffc85f4c8b12 Mon Sep 17 00:00:00 2001 From: ishaan-jaff Date: Sat, 27 Jan 2024 16:50:53 -0800 Subject: [PATCH] (fix) use GOOGLE_REDIRECT_URI. --- litellm/proxy/proxy_server.py | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/litellm/proxy/proxy_server.py b/litellm/proxy/proxy_server.py index 1154cf816..72029b4fb 100644 --- a/litellm/proxy/proxy_server.py +++ b/litellm/proxy/proxy_server.py @@ -2860,6 +2860,17 @@ async def user_auth(request: Request): @app.get("/google-login/key/generate", tags=["experimental"]) async def google_login(request: Request): GOOGLE_REDIRECT_URI = os.getenv("GOOGLE_REDIRECT_URI") + if GOOGLE_REDIRECT_URI is None: + raise ProxyException( + message="GOOGLE_REDIRECT_URI not set. Set it in .env file", + type="auth_error", + param="GOOGLE_REDIRECT_URI", + code=status.HTTP_500_INTERNAL_SERVER_ERROR, + ) + if GOOGLE_REDIRECT_URI.endswith("/"): + GOOGLE_REDIRECT_URI += "google-callback" + else: + GOOGLE_REDIRECT_URI += "/google-callback" GOOGLE_CLIENT_ID = ( "246483686424-clje5sggkjma26ilktj6qssakqhoon0m.apps.googleusercontent.com" ) @@ -2872,6 +2883,18 @@ async def google_callback(code: str, request: Request): import httpx GOOGLE_REDIRECT_URI = os.getenv("GOOGLE_REDIRECT_URI") + if GOOGLE_REDIRECT_URI is None: + raise ProxyException( + message="GOOGLE_REDIRECT_URI not set. Set it in .env file", + type="auth_error", + param="GOOGLE_REDIRECT_URI", + code=status.HTTP_500_INTERNAL_SERVER_ERROR, + ) + # Add "/google-callback"" to your callback URL + if GOOGLE_REDIRECT_URI.endswith("/"): + GOOGLE_REDIRECT_URI += "google-callback" + else: + GOOGLE_REDIRECT_URI += "/google-callback" GOOGLE_CLIENT_ID = ( "246483686424-clje5sggkjma26ilktj6qssakqhoon0m.apps.googleusercontent.com" )