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

Allow admins to connect public credentials to connectors

Browse Source
This commit is contained in:
Weves
2023-09-01 09:50:21 -07:00
committed by Chris Weaver
parent 0d4244f990
commit b89a06f03b
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
backend/danswer/db/credentials.py
View File

@@ -4,6 +4,7 @@ from sqlalchemy import select
from sqlalchemy.orm import Session from sqlalchemy.orm import Session
from sqlalchemy.sql.expression import or_ from sqlalchemy.sql.expression import or_
from danswer.auth.schemas import UserRole
from danswer.connectors.google_drive.constants import ( from danswer.connectors.google_drive.constants import (
DB_CREDENTIALS_DICT_SERVICE_ACCOUNT_KEY, DB_CREDENTIALS_DICT_SERVICE_ACCOUNT_KEY,
) )
@@ -39,6 +40,16 @@ def fetch_credential_by_id(
) -> Credential | None: ) -> Credential | None:
stmt = select(Credential).where(Credential.id == credential_id) stmt = select(Credential).where(Credential.id == credential_id)
if user: if user:
# admins have access to all public credentials + credentials they own
if user.role == UserRole.ADMIN:
stmt = stmt.where(
or_(
Credential.user_id == user.id,
Credential.user_id.is_(None),
Credential.public_doc == True, # noqa: E712
)
)
else:
stmt = stmt.where( stmt = stmt.where(
or_(Credential.user_id == user.id, Credential.user_id.is_(None)) or_(Credential.user_id == user.id, Credential.user_id.is_(None))
) )