vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-03-25 17:02:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: share remaining account config helpers

Browse Source
This commit is contained in:
Peter Steinberger
2026-03-22 19:35:18 +00:00
parent 66beff726b
commit bddb6fca7b
7 changed files with 115 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
extensions/feishu/src/accounts.ts
View File

@@ -1,7 +1,9 @@
import {
DEFAULT_ACCOUNT_ID,
mergeAccountConfig,
createAccountListHelpers,
normalizeAccountId,
normalizeOptionalAccountId,
resolveMergedAccountConfig,
} from "openclaw/plugin-sdk/account-resolution";
import type { ClawdbotConfig } from "../runtime-api.js";
import { normalizeResolvedSecretInputString, normalizeSecretInputString } from "./secret-input.js";
@@ -13,29 +15,15 @@ import type {
ResolvedFeishuAccount,
} from "./types.js";
/**
* List all configured account IDs from the accounts field.
*/
function listConfiguredAccountIds(cfg: ClawdbotConfig): string[] {
const accounts = (cfg.channels?.feishu as FeishuConfig)?.accounts;
if (!accounts || typeof accounts !== "object") {
return [];
}
return Object.keys(accounts).filter(Boolean);
}
const {
listConfiguredAccountIds,
listAccountIds: listFeishuAccountIds,
resolveDefaultAccountId,
} = createAccountListHelpers("feishu", {
allowUnlistedDefaultAccount: true,
});
/**
* List all Feishu account IDs.
* If no accounts are configured, returns [DEFAULT_ACCOUNT_ID] for backward compatibility.
*/
export function listFeishuAccountIds(cfg: ClawdbotConfig): string[] {
const ids = listConfiguredAccountIds(cfg);
if (ids.length === 0) {
// Backward compatibility: no accounts configured, use default
return [DEFAULT_ACCOUNT_ID];
}
return [...ids].toSorted((a, b) => a.localeCompare(b));
}
export { listFeishuAccountIds };
/**
* Resolve the default account selection and its source.
@@ -44,8 +32,9 @@ export function resolveDefaultFeishuAccountSelection(cfg: ClawdbotConfig): {
accountId: string;
source: FeishuDefaultAccountSelectionSource;
} {
const preferredRaw = (cfg.channels?.feishu as FeishuConfig | undefined)?.defaultAccount?.trim();
const preferred = preferredRaw ? normalizeAccountId(preferredRaw) : undefined;
const preferred = normalizeOptionalAccountId(
(cfg.channels?.feishu as FeishuConfig | undefined)?.defaultAccount,
);
if (preferred) {
return {
accountId: preferred,
@@ -69,21 +58,7 @@ export function resolveDefaultFeishuAccountSelection(cfg: ClawdbotConfig): {
* Resolve the default account ID.
*/
export function resolveDefaultFeishuAccountId(cfg: ClawdbotConfig): string {
return resolveDefaultFeishuAccountSelection(cfg).accountId;
}
/**
* Get the raw account-specific config.
*/
function resolveAccountConfig(
cfg: ClawdbotConfig,
accountId: string,
): FeishuAccountConfig | undefined {
const accounts = (cfg.channels?.feishu as FeishuConfig)?.accounts;
if (!accounts || typeof accounts !== "object") {
return undefined;
}
return accounts[accountId];
return resolveDefaultAccountId(cfg);
}
/**
@@ -92,9 +67,10 @@ function resolveAccountConfig(
*/
function mergeFeishuAccountConfig(cfg: ClawdbotConfig, accountId: string): FeishuConfig {
const feishuCfg = cfg.channels?.feishu as FeishuConfig | undefined;
return mergeAccountConfig<FeishuConfig>({
return resolveMergedAccountConfig<FeishuConfig>({
channelConfig: feishuCfg,
accountConfig: resolveAccountConfig(cfg, accountId),
accounts: feishuCfg?.accounts as Record<string, Partial<FeishuConfig>> | undefined,
accountId,
omitKeys: ["defaultAccount"],
});
}