fix: Include mcpServers, oauthClients, and oauthTokens in merged settings for non-admin users (#440)

This commit is contained in:
samanhappy
2025-11-21 17:16:48 +08:00
committed by GitHub
parent 01bb011736
commit 8c985b7de1

View File

@@ -37,9 +37,12 @@ export class DataServicex implements DataService {
const currentUser = user || UserContextService.getInstance().getCurrentUser(); const currentUser = user || UserContextService.getInstance().getCurrentUser();
if (!currentUser || currentUser.isAdmin) { if (!currentUser || currentUser.isAdmin) {
const result = { ...all }; const result = { ...all };
result.mcpServers = newSettings.mcpServers;
result.users = newSettings.users; result.users = newSettings.users;
result.systemConfig = newSettings.systemConfig; result.systemConfig = newSettings.systemConfig;
result.groups = newSettings.groups; result.groups = newSettings.groups;
result.oauthClients = newSettings.oauthClients;
result.oauthTokens = newSettings.oauthTokens;
return result; return result;
} else { } else {
const result = JSON.parse(JSON.stringify(all)); const result = JSON.parse(JSON.stringify(all));