Merge branch 'main' of https://github.com/onyx-dot-app/onyx into feat…

…ure/more_lock_validation
onyx-dot-app · Feb 5, 2025 · 0a341e2 · 0a341e2
2 parents 06245fa + 1c12ab3
commit 0a341e2
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/backend/alembic/__init__.py b/backend/alembic/__init__.py
diff --git a/backend/onyx/server/manage/users.py b/backend/onyx/server/manage/users.py
@@ -171,13 +171,14 @@ def list_all_users(
     accepted_page: int | None = None,
     slack_users_page: int | None = None,
     invited_page: int | None = None,
+    include_api_keys: bool = False,
     _: User | None = Depends(current_curator_or_admin_user),
     db_session: Session = Depends(get_session),
 ) -> AllUsersResponse:
     users = [
         user
         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]

diff --git a/web/src/app/admin/assistants/AssistantEditor.tsx b/web/src/app/admin/assistants/AssistantEditor.tsx
@@ -304,7 +304,7 @@ export function AssistantEditor({
   const [isRequestSuccessful, setIsRequestSuccessful] = useState(false);
 
   const { data: userGroups } = useUserGroups();
-  // const { data: allUsers } = useUsers() as {
+  // const { data: allUsers } = useUsers({ includeApiKeys: false }) as {
   //   data: MinimalUserSnapshot[] | undefined;
   // };
 

diff --git a/web/src/app/ee/admin/groups/[groupId]/page.tsx b/web/src/app/ee/admin/groups/[groupId]/page.tsx
@@ -28,7 +28,7 @@ const Page = (props: { params: Promise<{ groupId: string }> }) => {
     data: users,
     isLoading: userIsLoading,
     error: usersError,
-  } = useUsers();
+  } = useUsers({ includeApiKeys: true });
   const {
     data: ccPairs,
     isLoading: isCCPairsLoading,

diff --git a/web/src/app/ee/admin/groups/page.tsx b/web/src/app/ee/admin/groups/page.tsx
@@ -28,7 +28,7 @@ const Main = () => {
     data: users,
     isLoading: userIsLoading,
     error: usersError,
-  } = useUsers();
+  } = useUsers({ includeApiKeys: true });
 
   const { isAdmin } = useUser();
 

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