highperfocused/danswer
1
0
Fork 0
mirror of https://github.com/danswer-ai/danswer.git synced 2025-06-24 15:00:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Small tweaks to get Egynte to work on our cloud

Browse Source
This commit is contained in:
Weves 2024-12-10 17:29:24 -08:00 committed by Chris Weaver
parent 8d83ae2ee8
commit 056b671cd4
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
backend/danswer/server/documents/standard_oauth.py
View File

@ -6,7 +6,6 @@ from fastapi import APIRouter
from fastapi import Depends from fastapi import Depends
from fastapi import HTTPException from fastapi import HTTPException
from fastapi import Query from fastapi import Query
from fastapi import Request
from pydantic import BaseModel from pydantic import BaseModel
from sqlalchemy.orm import Session from sqlalchemy.orm import Session
@ -58,7 +57,6 @@ class AuthorizeResponse(BaseModel):
@router.get("/authorize/{source}") @router.get("/authorize/{source}")
def oauth_authorize( def oauth_authorize(
request: Request,
source: DocumentSource, source: DocumentSource,
desired_return_url: Annotated[str | None, Query()] = None, desired_return_url: Annotated[str | None, Query()] = None,
_: User = Depends(current_user), _: User = Depends(current_user),
@ -71,13 +69,11 @@ def oauth_authorize(
raise HTTPException(status_code=400, detail=f"Unknown OAuth source: {source}") raise HTTPException(status_code=400, detail=f"Unknown OAuth source: {source}")
connector_cls = oauth_connectors[source] connector_cls = oauth_connectors[source]
base_url = str(request.base_url) base_url = WEB_DOMAIN
if "127.0.0.1" in base_url:
base_url = base_url.replace("127.0.0.1", "localhost")
# store state in redis # store state in redis
if not desired_return_url: 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) redis_client = get_redis_client(tenant_id=tenant_id)
state = str(uuid.uuid4()) state = str(uuid.uuid4())
redis_client.set( redis_client.set(

5
deployment/docker_compose/docker-compose.dev.yml
View File

@ -185,6 +185,11 @@ services:
- GITHUB_CONNECTOR_BASE_URL=${GITHUB_CONNECTOR_BASE_URL:-} - GITHUB_CONNECTOR_BASE_URL=${GITHUB_CONNECTOR_BASE_URL:-}
- MAX_DOCUMENT_CHARS=${MAX_DOCUMENT_CHARS:-} - MAX_DOCUMENT_CHARS=${MAX_DOCUMENT_CHARS:-}
- MAX_FILE_SIZE_BYTES=${MAX_FILE_SIZE_BYTES:-} - 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. # Celery Configs (defaults are set in the supervisord.conf file.
# prefer doing that to have one source of defaults) # prefer doing that to have one source of defaults)
- CELERY_WORKER_INDEXING_CONCURRENCY=${CELERY_WORKER_INDEXING_CONCURRENCY:-} - CELERY_WORKER_INDEXING_CONCURRENCY=${CELERY_WORKER_INDEXING_CONCURRENCY:-}