diff --git a/backend/danswer/server/documents/standard_oauth.py b/backend/danswer/server/documents/standard_oauth.py index 4c4b0c497..ddc857619 100644 --- a/backend/danswer/server/documents/standard_oauth.py +++ b/backend/danswer/server/documents/standard_oauth.py @@ -6,7 +6,6 @@ from fastapi import APIRouter from fastapi import Depends from fastapi import HTTPException from fastapi import Query -from fastapi import Request from pydantic import BaseModel from sqlalchemy.orm import Session @@ -58,7 +57,6 @@ class AuthorizeResponse(BaseModel): @router.get("/authorize/{source}") def oauth_authorize( - request: Request, source: DocumentSource, desired_return_url: Annotated[str | None, Query()] = None, _: User = Depends(current_user), @@ -71,13 +69,11 @@ def oauth_authorize( raise HTTPException(status_code=400, detail=f"Unknown OAuth source: {source}") connector_cls = oauth_connectors[source] - base_url = str(request.base_url) - if "127.0.0.1" in base_url: - base_url = base_url.replace("127.0.0.1", "localhost") + base_url = WEB_DOMAIN # store state in redis if not desired_return_url: - desired_return_url = f"{WEB_DOMAIN}/admin/connectors/{source}?step=0" + desired_return_url = f"{base_url}/admin/connectors/{source}?step=0" redis_client = get_redis_client(tenant_id=tenant_id) state = str(uuid.uuid4()) redis_client.set( diff --git a/deployment/docker_compose/docker-compose.dev.yml b/deployment/docker_compose/docker-compose.dev.yml index 55466f086..19991de2d 100644 --- a/deployment/docker_compose/docker-compose.dev.yml +++ b/deployment/docker_compose/docker-compose.dev.yml @@ -185,6 +185,11 @@ services: - GITHUB_CONNECTOR_BASE_URL=${GITHUB_CONNECTOR_BASE_URL:-} - MAX_DOCUMENT_CHARS=${MAX_DOCUMENT_CHARS:-} - MAX_FILE_SIZE_BYTES=${MAX_FILE_SIZE_BYTES:-} + # Egnyte OAuth Configs + - EGNYTE_CLIENT_ID=${EGNYTE_CLIENT_ID:-} + - EGNYTE_CLIENT_SECRET=${EGNYTE_CLIENT_SECRET:-} + - EGNYTE_BASE_DOMAIN=${EGNYTE_BASE_DOMAIN:-} + - EGNYTE_LOCALHOST_OVERRIDE=${EGNYTE_LOCALHOST_OVERRIDE:-} # Celery Configs (defaults are set in the supervisord.conf file. # prefer doing that to have one source of defaults) - CELERY_WORKER_INDEXING_CONCURRENCY=${CELERY_WORKER_INDEXING_CONCURRENCY:-}