Skip to content

fix: return full self user list shape #1213

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Clouder0 wants to merge 4 commits into
base: dev
Choose a base branch
from
Open

fix: return full self user list shape #1213

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
196e658
fix: return full self user list shape
Clouder0 May 21, 2026
8b42136
fix: target self user display loading
Clouder0 May 21, 2026
d8d0f56
chore: remove unreachable self user guard
Clouder0 May 21, 2026
df3c7bd
Merge branch 'dev' into codex/fix-user-management-self-page
Clouder0 May 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
294 changes: 166 additions & 128 deletions src/actions/users.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,135 @@ function canExposeFullKey(
return session.key.canLoginWebUi && (isAdmin || session.user.id === targetUser.id);
}

async function buildUserDisplays(
users: User[],
session: UserActionSession,
isAdmin: boolean
): Promise<UserDisplay[]> {
if (users.length === 0) {
return [];
}

const locale = await getLocale();
const t = await getTranslations("users");
const userIds = users.map((u) => u.id);
const [keysMap, usageMap] = await Promise.all([
findKeyListBatch(userIds),
findKeyUsageTodayBatch(userIds),
]);
const statisticsMap = await findKeysStatisticsBatchFromKeys(keysMap);

return users.map((user) => {
try {
const keys = keysMap.get(user.id) || [];
const usageRecords = usageMap.get(user.id) || [];
const keyStatistics = statisticsMap.get(user.id) || [];
const canUserManageKey = canExposeFullKey(session, user, isAdmin);

const usageLookup = new Map(
usageRecords.map((item) => [
item.keyId,
{ totalCost: item.totalCost ?? 0, totalTokens: item.totalTokens ?? 0 },
])
);
const statisticsLookup = new Map(keyStatistics.map((stat) => [stat.keyId, stat]));

return {
id: user.id,
name: user.name,
note: user.description || undefined,
role: user.role,
rpm: user.rpm,
dailyQuota: user.dailyQuota,
providerGroup: user.providerGroup || undefined,
tags: user.tags || [],
limit5hUsd: user.limit5hUsd ?? null,
limit5hResetMode: user.limit5hResetMode,
limitWeeklyUsd: user.limitWeeklyUsd ?? null,
limitMonthlyUsd: user.limitMonthlyUsd ?? null,
limitTotalUsd: user.limitTotalUsd ?? null,
costResetAt: user.costResetAt ?? null,
limitConcurrentSessions: user.limitConcurrentSessions ?? null,
dailyResetMode: user.dailyResetMode,
dailyResetTime: user.dailyResetTime,
isEnabled: user.isEnabled,
expiresAt: user.expiresAt ?? null,
allowedClients: user.allowedClients || [],
blockedClients: user.blockedClients || [],
allowedModels: user.allowedModels ?? [],
keys: keys.map((key) => {
const stats = statisticsLookup.get(key.id);
return {
id: key.id,
name: key.name,
maskedKey: maskKey(key.key),
canReveal: canUserManageKey,
canCopy: canUserManageKey,
expiresAt: key.expiresAt
? key.expiresAt.toISOString().split("T")[0]
: t("neverExpires"),
status: key.isEnabled ? "enabled" : ("disabled" as const),
createdAt: key.createdAt,
createdAtFormatted: key.createdAt.toLocaleString(locale, {
year: "numeric",
month: "2-digit",
day: "2-digit",
hour: "2-digit",
minute: "2-digit",
second: "2-digit",
}),
todayUsage: usageLookup.get(key.id)?.totalCost ?? 0,
todayTokens: usageLookup.get(key.id)?.totalTokens ?? 0,
todayCallCount: stats?.todayCallCount ?? 0,
lastUsedAt: stats?.lastUsedAt ?? null,
lastProviderName: stats?.lastProviderName ?? null,
modelStats: stats?.modelStats ?? [],
canLoginWebUi: key.canLoginWebUi,
limit5hUsd: key.limit5hUsd,
limit5hResetMode: key.limit5hResetMode,
limitDailyUsd: key.limitDailyUsd,
dailyResetMode: key.dailyResetMode,
dailyResetTime: key.dailyResetTime,
limitWeeklyUsd: key.limitWeeklyUsd,
limitMonthlyUsd: key.limitMonthlyUsd,
limitTotalUsd: key.limitTotalUsd,
limitConcurrentSessions: key.limitConcurrentSessions || 0,
costResetAt: key.costResetAt?.toISOString() ?? null,
providerGroup: key.providerGroup,
};
}),
};
} catch (error) {
logger.error(`Failed to process keys for user ${user.id}:`, error);
return {
id: user.id,
name: user.name,
note: user.description || undefined,
role: user.role,
rpm: user.rpm,
dailyQuota: user.dailyQuota,
providerGroup: user.providerGroup || undefined,
tags: user.tags || [],
limit5hUsd: user.limit5hUsd ?? null,
limit5hResetMode: user.limit5hResetMode,
limitWeeklyUsd: user.limitWeeklyUsd ?? null,
limitMonthlyUsd: user.limitMonthlyUsd ?? null,
limitTotalUsd: user.limitTotalUsd ?? null,
costResetAt: user.costResetAt ?? null,
limitConcurrentSessions: user.limitConcurrentSessions ?? null,
dailyResetMode: user.dailyResetMode,
dailyResetTime: user.dailyResetTime,
isEnabled: user.isEnabled,
expiresAt: user.expiresAt ?? null,
allowedClients: user.allowedClients || [],
blockedClients: user.blockedClients || [],
allowedModels: user.allowedModels ?? [],
keys: [],
};
}
});
}

/**
* 批量获取用户列表的返回结果。
*/
Expand Down Expand Up @@ -334,10 +463,6 @@ export async function getUsers(params?: GetUsersBatchParams): Promise<UserDispla
return [];
}

// Get current locale and translations
const locale = await getLocale();
const t = await getTranslations("users");

// Treat any non-admin role as non-admin for safety.
const isAdmin = session.user.role === "admin";
const normalizedParams = normalizeUserListParams(params);
Expand All @@ -361,134 +486,47 @@ export async function getUsers(params?: GetUsersBatchParams): Promise<UserDispla
return [];
}

// 管理员可以看到完整Key，普通用户只能看到自己的 Key

// === Batch queries optimization ===
// Instead of N*3 queries (one per user for keys, usage, statistics),
// we now do 3 batch queries total
const userIds = users.map((u) => u.id);
const [keysMap, usageMap] = await Promise.all([
findKeyListBatch(userIds),
findKeyUsageTodayBatch(userIds),
]);
const statisticsMap = await findKeysStatisticsBatchFromKeys(keysMap);

const userDisplays: UserDisplay[] = users.map((user) => {
try {
const keys = keysMap.get(user.id) || [];
const usageRecords = usageMap.get(user.id) || [];
const keyStatistics = statisticsMap.get(user.id) || [];
return await buildUserDisplays(users, session, isAdmin);
} catch (error) {
logger.error("Failed to fetch user data:", error);
return [];
}
}

const usageLookup = new Map(
usageRecords.map((item) => [
item.keyId,
{ totalCost: item.totalCost ?? 0, totalTokens: item.totalTokens ?? 0 },
])
);
const statisticsLookup = new Map(keyStatistics.map((stat) => [stat.keyId, stat]));
/**
* 获取当前登录用户的用户管理页显示数据。
*
* 与 getUsers() 的非管理员路径保持同一返回形状，但不让管理员 self endpoint
* 退化为全量用户列表扫描。
*/
export async function getCurrentUserDisplay(): Promise<ActionResult<UserDisplay>> {
try {
const tError = await getTranslations("errors");
const session = await getSession();
if (!session) {
return {
ok: false,
error: tError("UNAUTHORIZED"),
errorCode: ERROR_CODES.UNAUTHORIZED,
};
}

return {
id: user.id,
name: user.name,
note: user.description || undefined,
role: user.role,
rpm: user.rpm,
dailyQuota: user.dailyQuota,
providerGroup: user.providerGroup || undefined,
tags: user.tags || [],
limit5hUsd: user.limit5hUsd ?? null,
limit5hResetMode: user.limit5hResetMode,
limitWeeklyUsd: user.limitWeeklyUsd ?? null,
limitMonthlyUsd: user.limitMonthlyUsd ?? null,
limitTotalUsd: user.limitTotalUsd ?? null,
costResetAt: user.costResetAt ?? null,
limitConcurrentSessions: user.limitConcurrentSessions ?? null,
dailyResetMode: user.dailyResetMode,
dailyResetTime: user.dailyResetTime,
isEnabled: user.isEnabled,
expiresAt: user.expiresAt ?? null,
allowedClients: user.allowedClients || [],
blockedClients: user.blockedClients || [],
allowedModels: user.allowedModels ?? [],
keys: keys.map((key) => {
const stats = statisticsLookup.get(key.id);
const canUserManageKey = canExposeFullKey(session, user, isAdmin);
return {
id: key.id,
name: key.name,
maskedKey: maskKey(key.key),
canReveal: canUserManageKey,
canCopy: canUserManageKey,
expiresAt: key.expiresAt
? key.expiresAt.toISOString().split("T")[0]
: t("neverExpires"),
status: key.isEnabled ? "enabled" : ("disabled" as const),
createdAt: key.createdAt,
createdAtFormatted: key.createdAt.toLocaleString(locale, {
year: "numeric",
month: "2-digit",
day: "2-digit",
hour: "2-digit",
minute: "2-digit",
second: "2-digit",
}),
todayUsage: usageLookup.get(key.id)?.totalCost ?? 0,
todayTokens: usageLookup.get(key.id)?.totalTokens ?? 0,
todayCallCount: stats?.todayCallCount ?? 0,
lastUsedAt: stats?.lastUsedAt ?? null,
lastProviderName: stats?.lastProviderName ?? null,
modelStats: stats?.modelStats ?? [],
// Web UI 登录权限控制
canLoginWebUi: key.canLoginWebUi,
// 限额配置
limit5hUsd: key.limit5hUsd,
limit5hResetMode: key.limit5hResetMode,
limitDailyUsd: key.limitDailyUsd,
dailyResetMode: key.dailyResetMode,
dailyResetTime: key.dailyResetTime,
limitWeeklyUsd: key.limitWeeklyUsd,
limitMonthlyUsd: key.limitMonthlyUsd,
limitTotalUsd: key.limitTotalUsd,
limitConcurrentSessions: key.limitConcurrentSessions || 0,
costResetAt: key.costResetAt?.toISOString() ?? null,
providerGroup: key.providerGroup,
};
}),
};
} catch (error) {
logger.error(`Failed to process keys for user ${user.id}:`, error);
return {
id: user.id,
name: user.name,
note: user.description || undefined,
role: user.role,
rpm: user.rpm,
dailyQuota: user.dailyQuota,
providerGroup: user.providerGroup || undefined,
tags: user.tags || [],
limit5hUsd: user.limit5hUsd ?? null,
limit5hResetMode: user.limit5hResetMode,
limitWeeklyUsd: user.limitWeeklyUsd ?? null,
limitMonthlyUsd: user.limitMonthlyUsd ?? null,
limitTotalUsd: user.limitTotalUsd ?? null,
costResetAt: user.costResetAt ?? null,
limitConcurrentSessions: user.limitConcurrentSessions ?? null,
dailyResetMode: user.dailyResetMode,
dailyResetTime: user.dailyResetTime,
isEnabled: user.isEnabled,
expiresAt: user.expiresAt ?? null,
allowedClients: user.allowedClients || [],
blockedClients: user.blockedClients || [],
allowedModels: user.allowedModels ?? [],
keys: [],
};
}
});
const user = await findUserById(session.user.id);
if (!user) {
return {
ok: false,
error: tError("USER_NOT_FOUND"),
errorCode: ERROR_CODES.NOT_FOUND,
};
}

return userDisplays;
const [displayUser] = await buildUserDisplays([user], session, session.user.role === "admin");
return { ok: true, data: displayUser };
} catch (error) {
logger.error("Failed to fetch user data:", error);
return [];
logger.error("Failed to fetch current user display data:", error);
const message =
error instanceof Error ? error.message : "Failed to fetch current user display data";
return { ok: false, error: message, errorCode: ERROR_CODES.INTERNAL_ERROR };
}
}

Expand Down
23 changes: 15 additions & 8 deletions src/app/api/v1/resources/users/handlers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,19 +78,23 @@ export async function listCurrentUser(c: Context): Promise<Response> {
});
}
const actions = await import("@/actions/users");
const result = await callAction(
c,
actions.getUserById,
[currentUserId] as never[],
c.get("auth")
);
const result = await callAction(c, actions.getCurrentUserDisplay, [] as never[], c.get("auth"));
if (!result.ok) return actionError(c, result);
if (result.data.id !== currentUserId) {
return createProblemResponse({
status: 404,
instance: new URL(c.req.url).pathname,
errorCode: "resource.not_found",
detail: "Current user was not found.",
});
}
const items = [redactUserKeys(result.data)];
return jsonResponse({
items: [redactUserKeys(result.data)],
items,
pageInfo: {
nextCursor: null,
hasMore: false,
limit: 1,
limit: items.length,
},
});
}
Expand Down Expand Up @@ -353,6 +357,9 @@ function redactUserKeys(value: unknown): unknown {
if (!value || typeof value !== "object") {
return value;
}
if (value instanceof Date) {
return value;
}

const entries = Object.entries(value as Record<string, unknown>)
.filter(([key]) => key !== "fullKey")
Expand Down
Loading