Skip to content
Merged
Show file tree
Hide file tree
Changes from 11 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -218,7 +218,7 @@ def connector_permission_sync_generator_task(

r = get_redis_client(tenant_id=tenant_id)

lock = r.lock(
lock: RedisLock = r.lock(
DanswerRedisLocks.CONNECTOR_DOC_PERMISSIONS_SYNC_LOCK_PREFIX
+ f"_{redis_connector.id}",
timeout=CELERY_PERMISSIONS_SYNC_LOCK_TIMEOUT,
Expand Down
9 changes: 9 additions & 0 deletions backend/danswer/configs/app_configs.py
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,15 @@
or ""
)

OAUTH_SLACK_CLIENT_ID = os.environ.get("OAUTH_SLACK_CLIENT_ID", "")
OAUTH_SLACK_CLIENT_SECRET = os.environ.get("OAUTH_SLACK_CLIENT_SECRET", "")

# for future OAuth connector support
# OAUTH_CONFLUENCE_CLIENT_ID = os.environ.get("OAUTH_CONFLUENCE_CLIENT_ID", "")
# OAUTH_CONFLUENCE_CLIENT_SECRET = os.environ.get("OAUTH_CONFLUENCE_CLIENT_SECRET", "")
# OAUTH_JIRA_CLIENT_ID = os.environ.get("OAUTH_JIRA_CLIENT_ID", "")
# OAUTH_JIRA_CLIENT_SECRET = os.environ.get("OAUTH_JIRA_CLIENT_SECRET", "")

USER_AUTH_SECRET = os.environ.get("USER_AUTH_SECRET", "")
# for basic auth
REQUIRE_EMAIL_VERIFICATION = (
Expand Down
1 change: 0 additions & 1 deletion backend/danswer/db/credentials.py
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,6 @@ def create_credential(
)

db_session.commit()

return credential


Expand Down
1 change: 0 additions & 1 deletion backend/danswer/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@
from shared_configs.configs import MULTI_TENANT
from shared_configs.configs import SENTRY_DSN


logger = setup_logger()


Expand Down
3 changes: 3 additions & 0 deletions backend/ee/danswer/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
)
from ee.danswer.server.manage.standard_answer import router as standard_answer_router
from ee.danswer.server.middleware.tenant_tracking import add_tenant_id_middleware
from ee.danswer.server.oauth import router as oauth_router
from ee.danswer.server.query_and_chat.chat_backend import (
router as chat_router,
)
Expand Down Expand Up @@ -119,6 +120,8 @@ def get_application() -> FastAPI:
include_router_with_global_prefix_prepended(application, query_router)
include_router_with_global_prefix_prepended(application, chat_router)
include_router_with_global_prefix_prepended(application, standard_answer_router)
include_router_with_global_prefix_prepended(application, oauth_router)

# Enterprise-only global settings
include_router_with_global_prefix_prepended(
application, enterprise_settings_admin_router
Expand Down
Loading
Loading