From 589f1193100de0a5d119c67677f3ebb64aed4a9c Mon Sep 17 00:00:00 2001
From: Federico Ruggi <federico.ruggi@shopify.com>
Date: Sat, 18 Oct 2025 11:54:05 +0200
Subject: [PATCH] =?UTF-8?q?=F0=9F=A9=B9=20fix:=20Wrap=20Attempt=20to=20Rec?=
 =?UTF-8?q?onnect=20OAuth=20MCP=20Servers=20(#10172)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/server/controllers/AuthController.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/api/server/controllers/AuthController.js b/api/server/controllers/AuthController.js
index 249817610e..096727e977 100644
--- a/api/server/controllers/AuthController.js
+++ b/api/server/controllers/AuthController.js
@@ -116,11 +116,15 @@ const refreshController = async (req, res) => {
       const token = await setAuthTokens(userId, res, session);
 
       // trigger OAuth MCP server reconnection asynchronously (best effort)
-      void getOAuthReconnectionManager()
-        .reconnectServers(userId)
-        .catch((err) => {
-          logger.error('Error reconnecting OAuth MCP servers:', err);
-        });
+      try {
+        void getOAuthReconnectionManager()
+          .reconnectServers(userId)
+          .catch((err) => {
+            logger.error('[refreshController] Error reconnecting OAuth MCP servers:', err);
+          });
+      } catch (err) {
+        logger.warn(`[refreshController] Cannot attempt OAuth MCP servers reconnection:`, err);
+      }
 
       res.status(200).send({ token, user });
     } else if (req?.query?.retry) {