From 4e1ef9adb8879ef11ac3db9a7a64a8ec1288d718 Mon Sep 17 00:00:00 2001
From: Kang Ming <kang.ming1996@gmail.com>
Date: Tue, 8 Aug 2023 12:32:37 +0800
Subject: [PATCH 1/2] hotfix: use correct endpoint to revoke authorized oauth
 app

---
 studio/data/oauth/authorized-app-revoke-mutation.ts | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/studio/data/oauth/authorized-app-revoke-mutation.ts b/studio/data/oauth/authorized-app-revoke-mutation.ts
index b44fc2d2f79..4bce4d807a1 100644
--- a/studio/data/oauth/authorized-app-revoke-mutation.ts
+++ b/studio/data/oauth/authorized-app-revoke-mutation.ts
@@ -1,7 +1,7 @@
 import { useMutation, UseMutationOptions, useQueryClient } from '@tanstack/react-query'
 import { toast } from 'react-hot-toast'
 
-import { delete_ } from 'lib/common/fetch'
+import { post } from 'lib/common/fetch'
 import { API_ADMIN_URL } from 'lib/constants'
 import { ResponseError } from 'types'
 import { oauthAppKeys } from './keys'
@@ -15,9 +15,7 @@ export async function revokeAuthorizedApp({ id, slug }: AuthorizedAppRevokeVaria
   if (!id) throw new Error('App ID is required')
   if (!slug) throw new Error('Organization slug is required')
 
-  const response = await delete_(
-    `${API_ADMIN_URL}/organizations/${slug}/oauth/apps/${id}?type=authorized`
-  )
+  const response = await post(`${API_ADMIN_URL}/organizations/${slug}/oauth/apps/${id}/revoke`, {})
   if (response.error) throw response.error
   return response
 }

From fb9eda73e25619628704320b857f8e697ceb49c1 Mon Sep 17 00:00:00 2001
From: Joshen Lim <joshenlimek@gmail.com>
Date: Tue, 8 Aug 2023 16:30:49 +0800
Subject: [PATCH 2/2] Fix exit surveys all getting classified as downgrades

---
 .../interfaces/BillingV2/Subscription/Tier/ExitSurveyModal.tsx   | 1 +
 .../BillingSettingsV2/Subscription/ExitSurveyModal.tsx           | 1 +
 .../Settings/General/DeleteProjectPanel/DeleteProjectButton.tsx  | 1 +
 studio/data/feedback/exit-survey-send.ts                         | 1 +
 4 files changed, 4 insertions(+)

diff --git a/studio/components/interfaces/BillingV2/Subscription/Tier/ExitSurveyModal.tsx b/studio/components/interfaces/BillingV2/Subscription/Tier/ExitSurveyModal.tsx
index b9b5b5d7f46..533fb0bd8ac 100644
--- a/studio/components/interfaces/BillingV2/Subscription/Tier/ExitSurveyModal.tsx
+++ b/studio/components/interfaces/BillingV2/Subscription/Tier/ExitSurveyModal.tsx
@@ -98,6 +98,7 @@ const ExitSurveyModal = ({ visible, onClose }: ExitSurveyModalProps) => {
         projectRef,
         reasons: selectedReasons.reduce((a, b) => `${a}- ${b}\n`, ''),
         message,
+        exitAction: 'downgrade',
       })
     } finally {
     }
diff --git a/studio/components/interfaces/Organization/BillingSettingsV2/Subscription/ExitSurveyModal.tsx b/studio/components/interfaces/Organization/BillingSettingsV2/Subscription/ExitSurveyModal.tsx
index c6f0eed6aa0..4e57308e7f2 100644
--- a/studio/components/interfaces/Organization/BillingSettingsV2/Subscription/ExitSurveyModal.tsx
+++ b/studio/components/interfaces/Organization/BillingSettingsV2/Subscription/ExitSurveyModal.tsx
@@ -93,6 +93,7 @@ const ExitSurveyModal = ({ visible, subscription, onClose }: ExitSurveyModalProp
         orgSlug: slug,
         reasons: selectedReasons.reduce((a, b) => `${a}- ${b}\n`, ''),
         message,
+        exitAction: 'downgrade',
       })
     } finally {
     }
diff --git a/studio/components/interfaces/Settings/General/DeleteProjectPanel/DeleteProjectButton.tsx b/studio/components/interfaces/Settings/General/DeleteProjectPanel/DeleteProjectButton.tsx
index b1f7f739336..bcdd82cdf49 100644
--- a/studio/components/interfaces/Settings/General/DeleteProjectPanel/DeleteProjectButton.tsx
+++ b/studio/components/interfaces/Settings/General/DeleteProjectPanel/DeleteProjectButton.tsx
@@ -77,6 +77,7 @@ const DeleteProjectButton = ({ type = 'danger' }: DeleteProjectButtonProps) => {
           projectRef,
           message,
           reasons: selectedReasons.reduce((a, b) => `${a}- ${b}\n`, ''),
+          exitAction: 'delete',
         })
       }
 
diff --git a/studio/data/feedback/exit-survey-send.ts b/studio/data/feedback/exit-survey-send.ts
index 1faecb67fc0..f145695e406 100644
--- a/studio/data/feedback/exit-survey-send.ts
+++ b/studio/data/feedback/exit-survey-send.ts
@@ -10,6 +10,7 @@ export type SendDowngradeFeedbackVariables = {
   orgSlug?: string
   reasons: string
   message: string
+  exitAction: 'downgrade' | 'delete'
 }
 
 export async function sendDowngradeFeedback({