From 6ab57a1ace1f7f98058a78ca4ccf4670fa6f0adc Mon Sep 17 00:00:00 2001
From: Brian Cao <brian@umami.is>
Date: Thu, 1 Feb 2024 12:05:55 -0800
Subject: [PATCH] Auto stash before merge of "dev" and "origin/dev"

---
 src/components/hooks/queries/useFilterQuery.ts |  2 +-
 src/pages/api/teams/[teamId]/users/[userId].ts | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/components/hooks/queries/useFilterQuery.ts b/src/components/hooks/queries/useFilterQuery.ts
index 2f7bac09..7e4c9a86 100644
--- a/src/components/hooks/queries/useFilterQuery.ts
+++ b/src/components/hooks/queries/useFilterQuery.ts
@@ -10,7 +10,7 @@ export interface FilterQueryResult<T> {
   setParams: Dispatch<SetStateAction<T | SearchFilter>>;
 }
 
-export function useFilterQuery<T>({
+export function useFilterQuery<T = any>({
   queryKey,
   queryFn,
   ...options
diff --git a/src/pages/api/teams/[teamId]/users/[userId].ts b/src/pages/api/teams/[teamId]/users/[userId].ts
index da6218b1..02e5eecd 100644
--- a/src/pages/api/teams/[teamId]/users/[userId].ts
+++ b/src/pages/api/teams/[teamId]/users/[userId].ts
@@ -37,6 +37,16 @@ export default async (
 
   const { teamId, userId } = req.query;
 
+  if (req.method === 'GET') {
+    if (!(await canUpdateTeam(req.auth, teamId))) {
+      return unauthorized(res, 'You must be the owner of this team.');
+    }
+
+    const teamUser = await getTeamUser(teamId, userId);
+
+    return ok(res, teamUser);
+  }
+
   if (req.method === 'POST') {
     if (!(await canUpdateTeam(req.auth, teamId))) {
       return unauthorized(res, 'You must be the owner of this team.');