From 5d5999b80a6f59817d679ab2e6dfaa32b509eb2e Mon Sep 17 00:00:00 2001
From: neo773 <62795688+neo773@users.noreply.github.com>
Date: Wed, 5 Nov 2025 05:21:25 +0530
Subject: [PATCH] fix `useTriggerProviderReconnect` (#15620)

---
 .../useTriggerProviderReconnect.test.tsx      | 26 ++++++++++++++-----
 .../hooks/useTriggerProviderReconnect.ts      |  6 ++++-
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/packages/twenty-front/src/modules/settings/accounts/hooks/__tests__/useTriggerProviderReconnect.test.tsx b/packages/twenty-front/src/modules/settings/accounts/hooks/__tests__/useTriggerProviderReconnect.test.tsx
index a900e091c6..f331b82235 100644
--- a/packages/twenty-front/src/modules/settings/accounts/hooks/__tests__/useTriggerProviderReconnect.test.tsx
+++ b/packages/twenty-front/src/modules/settings/accounts/hooks/__tests__/useTriggerProviderReconnect.test.tsx
@@ -115,7 +115,9 @@ describe('useTriggerProviderReconnect', () => {
 
       expect(mockTriggerApisOAuth).toHaveBeenCalledWith(
         ConnectedAccountProvider.GOOGLE,
-        undefined,
+        {
+          redirectLocation: '/settings/accounts',
+        },
       );
       expect(mockNavigate).not.toHaveBeenCalled();
     });
@@ -133,7 +135,9 @@ describe('useTriggerProviderReconnect', () => {
 
       expect(mockTriggerApisOAuth).toHaveBeenCalledWith(
         ConnectedAccountProvider.MICROSOFT,
-        undefined,
+        {
+          redirectLocation: '/settings/accounts',
+        },
       );
       expect(mockNavigate).not.toHaveBeenCalled();
     });
@@ -160,7 +164,10 @@ describe('useTriggerProviderReconnect', () => {
 
       expect(mockTriggerApisOAuth).toHaveBeenCalledWith(
         ConnectedAccountProvider.GOOGLE,
-        options,
+        {
+          ...options,
+          redirectLocation: '/settings/accounts',
+        },
       );
       expect(mockNavigate).not.toHaveBeenCalled();
     });
@@ -186,7 +193,10 @@ describe('useTriggerProviderReconnect', () => {
 
       expect(mockTriggerApisOAuth).toHaveBeenCalledWith(
         ConnectedAccountProvider.MICROSOFT,
-        options,
+        {
+          ...options,
+          redirectLocation: '/settings/accounts',
+        },
       );
       expect(mockNavigate).not.toHaveBeenCalled();
     });
@@ -205,7 +215,9 @@ describe('useTriggerProviderReconnect', () => {
 
       expect(mockTriggerApisOAuth).toHaveBeenCalledWith(
         ConnectedAccountProvider.GOOGLE,
-        undefined,
+        {
+          redirectLocation: '/settings/accounts',
+        },
       );
       expect(mockNavigate).not.toHaveBeenCalled();
     });
@@ -230,7 +242,9 @@ describe('useTriggerProviderReconnect', () => {
 
       expect(mockTriggerApisOAuth).toHaveBeenCalledWith(
         ConnectedAccountProvider.GOOGLE,
-        undefined,
+        {
+          redirectLocation: '/settings/accounts',
+        },
       );
     });
   });
diff --git a/packages/twenty-front/src/modules/settings/accounts/hooks/useTriggerProviderReconnect.ts b/packages/twenty-front/src/modules/settings/accounts/hooks/useTriggerProviderReconnect.ts
index 7d87fdde17..d7f43b7440 100644
--- a/packages/twenty-front/src/modules/settings/accounts/hooks/useTriggerProviderReconnect.ts
+++ b/packages/twenty-front/src/modules/settings/accounts/hooks/useTriggerProviderReconnect.ts
@@ -1,5 +1,6 @@
 import { useCallback } from 'react';
 import { ConnectedAccountProvider, SettingsPath } from 'twenty-shared/types';
+import { getSettingsPath } from 'twenty-shared/utils';
 
 import { useTriggerApisOAuth } from '@/settings/accounts/hooks/useTriggerApiOAuth';
 import { useNavigateSettings } from '~/hooks/useNavigateSettings';
@@ -26,7 +27,10 @@ export const useTriggerProviderReconnect = () => {
         return;
       }
 
-      await triggerApisOAuth(provider, options);
+      await triggerApisOAuth(provider, {
+        ...options,
+        redirectLocation: getSettingsPath(SettingsPath.Accounts),
+      });
     },
     [triggerApisOAuth, navigate],
   );