highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-03-30 04:31:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add OAuth configurability (#499)

Browse Source
This commit is contained in:
Yuhong Sun 2023-10-02 11:05:08 -07:00 committed by GitHub
parent c666f35cd0
commit ab65b19c4c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
backend/danswer/configs/app_configs.py
View File

@ -58,8 +58,14 @@ VALID_EMAIL_DOMAINS = (
) )
# OAuth Login Flow # OAuth Login Flow
GOOGLE_OAUTH_CLIENT_ID = os.environ.get("GOOGLE_OAUTH_CLIENT_ID") or "" # Used for both Google OAuth2 and OIDC flows
GOOGLE_OAUTH_CLIENT_SECRET = os.environ.get("GOOGLE_OAUTH_CLIENT_SECRET") or "" OAUTH_CLIENT_ID = (
os.environ.get("OAUTH_CLIENT_ID", os.environ.get("GOOGLE_OAUTH_CLIENT_ID")) or ""
)
OAUTH_CLIENT_SECRET = (
os.environ.get("OAUTH_CLIENT_SECRET", os.environ.get("GOOGLE_OAUTH_CLIENT_SECRET"))
or ""
)
# The following Basic Auth configs are not supported by the frontend UI # The following Basic Auth configs are not supported by the frontend UI
REQUIRE_EMAIL_VERIFICATION = ( REQUIRE_EMAIL_VERIFICATION = (

14
backend/danswer/main.py
View File

@ -16,10 +16,9 @@ from danswer.chat.personas import load_personas_from_yaml
from danswer.configs.app_configs import APP_HOST from danswer.configs.app_configs import APP_HOST
from danswer.configs.app_configs import APP_PORT from danswer.configs.app_configs import APP_PORT
from danswer.configs.app_configs import AUTH_TYPE from danswer.configs.app_configs import AUTH_TYPE
from danswer.configs.app_configs import DISABLE_AUTH
from danswer.configs.app_configs import DISABLE_GENERATIVE_AI from danswer.configs.app_configs import DISABLE_GENERATIVE_AI
from danswer.configs.app_configs import GOOGLE_OAUTH_CLIENT_ID from danswer.configs.app_configs import OAUTH_CLIENT_ID
from danswer.configs.app_configs import GOOGLE_OAUTH_CLIENT_SECRET from danswer.configs.app_configs import OAUTH_CLIENT_SECRET
from danswer.configs.app_configs import SECRET from danswer.configs.app_configs import SECRET
from danswer.configs.app_configs import WEB_DOMAIN from danswer.configs.app_configs import WEB_DOMAIN
from danswer.configs.constants import AuthType from danswer.configs.constants import AuthType
@ -115,7 +114,7 @@ def get_application() -> FastAPI:
) )
elif AUTH_TYPE == AuthType.GOOGLE_OAUTH: elif AUTH_TYPE == AuthType.GOOGLE_OAUTH:
oauth_client = GoogleOAuth2(GOOGLE_OAUTH_CLIENT_ID, GOOGLE_OAUTH_CLIENT_SECRET) oauth_client = GoogleOAuth2(OAUTH_CLIENT_ID, OAUTH_CLIENT_SECRET)
application.include_router( application.include_router(
fastapi_users.get_oauth_router( fastapi_users.get_oauth_router(
oauth_client, oauth_client,
@ -163,11 +162,8 @@ def get_application() -> FastAPI:
# Will throw exception if an issue is found # Will throw exception if an issue is found
verify_auth() verify_auth()
if DISABLE_AUTH: if OAUTH_CLIENT_ID and OAUTH_CLIENT_SECRET:
logger.info("User Authentication is turned off.") logger.info("Both OAuth Client ID and Secret are configured.")
if GOOGLE_OAUTH_CLIENT_ID and GOOGLE_OAUTH_CLIENT_SECRET:
logger.info("Found both OAuth Client ID and secret configured.")
if SKIP_RERANKING: if SKIP_RERANKING:
logger.info("Reranking step of search flow is disabled") logger.info("Reranking step of search flow is disabled")