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

Fix extra __init__ file + allow adding API keys to user groups

Browse Source
This commit is contained in:
Weves 2025-02-04 16:41:46 -08:00 committed by Chris Weaver
parent 49fd76b336
commit 1c12ab31f9
6 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
backend/alembic/__init__.py
View File

3
backend/onyx/server/manage/users.py
View File

@ -171,13 +171,14 @@ def list_all_users(
accepted_page: int | None = None, accepted_page: int | None = None,
slack_users_page: int | None = None, slack_users_page: int | None = None,
invited_page: int | None = None, invited_page: int | None = None,
include_api_keys: bool = False,
_: User | None = Depends(current_curator_or_admin_user), _: User | None = Depends(current_curator_or_admin_user),
db_session: Session = Depends(get_session), db_session: Session = Depends(get_session),
) -> AllUsersResponse: ) -> AllUsersResponse:
users = [ users = [
user user
for user in get_all_users(db_session, email_filter_string=q) for user in get_all_users(db_session, email_filter_string=q)
if not is_api_key_email_address(user.email) if (include_api_keys or not is_api_key_email_address(user.email))
] ]
slack_users = [user for user in users if user.role == UserRole.SLACK_USER] slack_users = [user for user in users if user.role == UserRole.SLACK_USER]

2
web/src/app/admin/assistants/AssistantEditor.tsx
View File

@ -304,7 +304,7 @@ export function AssistantEditor({
const [isRequestSuccessful, setIsRequestSuccessful] = useState(false); const [isRequestSuccessful, setIsRequestSuccessful] = useState(false);
const { data: userGroups } = useUserGroups(); const { data: userGroups } = useUserGroups();
// const { data: allUsers } = useUsers() as { // const { data: allUsers } = useUsers({ includeApiKeys: false }) as {
// data: MinimalUserSnapshot[] | undefined; // data: MinimalUserSnapshot[] | undefined;
// }; // };

2
web/src/app/ee/admin/groups/[groupId]/page.tsx
View File

@ -28,7 +28,7 @@ const Page = (props: { params: Promise<{ groupId: string }> }) => {
data: users, data: users,
isLoading: userIsLoading, isLoading: userIsLoading,
error: usersError, error: usersError,
} = useUsers(); } = useUsers({ includeApiKeys: true });
const { const {
data: ccPairs, data: ccPairs,
isLoading: isCCPairsLoading, isLoading: isCCPairsLoading,

2
web/src/app/ee/admin/groups/page.tsx
View File

@ -28,7 +28,7 @@ const Main = () => {
data: users, data: users,
isLoading: userIsLoading, isLoading: userIsLoading,
error: usersError, error: usersError,
} = useUsers(); } = useUsers({ includeApiKeys: true });
const { isAdmin } = useUser(); const { isAdmin } = useUser();

8
web/src/lib/hooks.ts
View File

@ -342,8 +342,12 @@ export function useFilters(): FilterManager {
}; };
} }
export const useUsers = () => { interface UseUsersParams {
const url = "/api/manage/users"; includeApiKeys: boolean;
}
export const useUsers = ({ includeApiKeys }: UseUsersParams) => {
const url = `/api/manage/users?include_api_keys=${includeApiKeys}`;
const swrResponse = useSWR<AllUsersResponse>(url, errorHandlingFetcher); const swrResponse = useSWR<AllUsersResponse>(url, errorHandlingFetcher);