From 8c985b7de1db109f6d15249562f4e7f0334a6e7d Mon Sep 17 00:00:00 2001
From: samanhappy <samanhappy@gmail.com>
Date: Fri, 21 Nov 2025 17:16:48 +0800
Subject: [PATCH] fix: Include mcpServers, oauthClients, and oauthTokens in
 merged settings for non-admin users (#440)

---
 src/services/dataServicex.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/services/dataServicex.ts b/src/services/dataServicex.ts
index db56d28..8cd3ff3 100644
--- a/src/services/dataServicex.ts
+++ b/src/services/dataServicex.ts
@@ -37,9 +37,12 @@ export class DataServicex implements DataService {
     const currentUser = user || UserContextService.getInstance().getCurrentUser();
     if (!currentUser || currentUser.isAdmin) {
       const result = { ...all };
+      result.mcpServers = newSettings.mcpServers;
       result.users = newSettings.users;
       result.systemConfig = newSettings.systemConfig;
       result.groups = newSettings.groups;
+      result.oauthClients = newSettings.oauthClients;
+      result.oauthTokens = newSettings.oauthTokens;
       return result;
     } else {
       const result = JSON.parse(JSON.stringify(all));