From cca4bfeb76a6a925a3455881dd86c0b3b3571117 Mon Sep 17 00:00:00 2001 From: kishanhitk Date: Fri, 25 Aug 2023 21:05:12 +0530 Subject: [PATCH 1/3] feat: add await and error handling in delete user api --- studio/components/interfaces/Auth/Users/UserDropdown.tsx | 2 +- studio/pages/api/auth/[ref]/users.ts | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/studio/components/interfaces/Auth/Users/UserDropdown.tsx b/studio/components/interfaces/Auth/Users/UserDropdown.tsx index e9bba005768..626bf9d24a8 100644 --- a/studio/components/interfaces/Auth/Users/UserDropdown.tsx +++ b/studio/components/interfaces/Auth/Users/UserDropdown.tsx @@ -129,7 +129,7 @@ const UserDropdown = ({ user, canRemoveUser, canRemoveMFAFactors }: UserDropdown ) : null} - + } diff --git a/studio/pages/api/auth/[ref]/users.ts b/studio/pages/api/auth/[ref]/users.ts index c68e00cc7f7..cb8f2082165 100644 --- a/studio/pages/api/auth/[ref]/users.ts +++ b/studio/pages/api/auth/[ref]/users.ts @@ -115,6 +115,12 @@ const handleDelete = async (req: NextApiRequest, res: NextApiResponse) => { const payload = req.body const query = { query: `DELETE from auth.users where id='${payload.id}';` } - const response = post(`${PG_META_URL}/query`, query, { headers }) + const response = await post(`${PG_META_URL}/query`, query, { headers }) + + if (response.error) { + console.error('Publication POST:', response.error) + return res.status(400).json({ error: response.error }) + } + return res.status(200).json(response) } From d9e54e88ba12e0efc856b866429515721056b15c Mon Sep 17 00:00:00 2001 From: kishanhitk Date: Fri, 25 Aug 2023 21:30:58 +0530 Subject: [PATCH 2/3] chore: improve error message --- studio/pages/api/auth/[ref]/users.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/studio/pages/api/auth/[ref]/users.ts b/studio/pages/api/auth/[ref]/users.ts index cb8f2082165..536b8591808 100644 --- a/studio/pages/api/auth/[ref]/users.ts +++ b/studio/pages/api/auth/[ref]/users.ts @@ -118,7 +118,7 @@ const handleDelete = async (req: NextApiRequest, res: NextApiResponse) => { const response = await post(`${PG_META_URL}/query`, query, { headers }) if (response.error) { - console.error('Publication POST:', response.error) + console.error('Delete Users POST:', response.error) return res.status(400).json({ error: response.error }) } From bae71621305ec4319f4b1e2ddbbdc9b8359c5628 Mon Sep 17 00:00:00 2001 From: kishanhitk Date: Fri, 25 Aug 2023 22:27:30 +0530 Subject: [PATCH 3/3] fix: `confirmAlert` not dismissing. --- studio/components/interfaces/Auth/Users/UserDropdown.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/studio/components/interfaces/Auth/Users/UserDropdown.tsx b/studio/components/interfaces/Auth/Users/UserDropdown.tsx index 626bf9d24a8..dfbd2d6cb11 100644 --- a/studio/components/interfaces/Auth/Users/UserDropdown.tsx +++ b/studio/components/interfaces/Auth/Users/UserDropdown.tsx @@ -82,8 +82,7 @@ const UserDropdown = ({ user, canRemoveUser, canRemoveMFAFactors }: UserDropdown ui.setNotification({ category: 'success', message: `Successfully deleted ${user.email}` }) PageState.users = PageState.users.filter((x: any) => x.id != user.id) PageState.totalUsers -= 1 - } finally { - } + } catch (error) {} }, }) }