refactor: share Discord account token inspection · opencl...

Recent Commits to openclaw:main

vincentkoc · 2026-05-30 · via Recent Commits to openclaw:main

Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,7 @@`
`1`	`1`	`import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";`
`2`		`-import {`
`3`		`-hasConfiguredSecretInput,`
`4`		`-normalizeSecretInputString,`
`5`		`-} from "openclaw/plugin-sdk/secret-input";`
	`2`	`+import { normalizeSecretInputString } from "openclaw/plugin-sdk/secret-input";`
`6`	`3`	`import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";`
	`4`	`+import { inspectDiscordConfiguredToken } from "./account-token-inspect.js";`
`7`	`5`	`import {`
`8`	`6`	`mergeDiscordAccountConfig,`
`9`	`7`	`resolveDefaultDiscordAccountId,`
`@@ -23,29 +21,6 @@ export type InspectedDiscordAccount = {`
`23`	`21`	`config: DiscordAccountConfig;`
`24`	`22`	`};`
`25`	`23`
`26`		`-function inspectDiscordTokenValue(value: unknown): {`
`27`		`-token: string;`
`28`		`-tokenSource: "config";`
`29`		`-tokenStatus: Exclude<DiscordCredentialStatus, "missing">;`
`30`		`-} \| null {`
`31`		`-const normalized = normalizeSecretInputString(value);`
`32`		`-if (normalized) {`
`33`		`-return {`
`34`		`-token: normalized.replace(/^Bot\s+/i, ""),`
`35`		`-tokenSource: "config",`
`36`		`-tokenStatus: "available",`
`37`		`-};`
`38`		`-}`
`39`		`-if (hasConfiguredSecretInput(value)) {`
`40`		`-return {`
`41`		`-token: "",`
`42`		`-tokenSource: "config",`
`43`		`-tokenStatus: "configured_unavailable",`
`44`		`-};`
`45`		`-}`
`46`		`-return null;`
`47`		`-}`
`48`		`-`
`49`	`24`	`export function inspectDiscordAccount(params: {`
`50`	`25`	`cfg: OpenClawConfig;`
`51`	`26`	`accountId?: string \| null;`
`@@ -61,7 +36,7 @@ export function inspectDiscordAccount(params: {`
`61`	`36`	`accountConfig &&`
`62`	`37`	`Object.prototype.hasOwnProperty.call(accountConfig as Record<string, unknown>, "token"),`
`63`	`38`	`);`
`64`		`-const accountToken = inspectDiscordTokenValue(accountConfig?.token);`
	`39`	`+const accountToken = inspectDiscordConfiguredToken(accountConfig?.token);`
`65`	`40`	`if (accountToken) {`
`66`	`41`	`return {`
`67`	`42`	`accountId,`
`@@ -87,7 +62,7 @@ export function inspectDiscordAccount(params: {`
`87`	`62`	`};`
`88`	`63`	`}`
`89`	`64`
`90`		`-const channelToken = inspectDiscordTokenValue(params.cfg.channels?.discord?.token);`
	`65`	`+const channelToken = inspectDiscordConfiguredToken(params.cfg.channels?.discord?.token);`
`91`	`66`	`if (channelToken) {`
`92`	`67`	`return {`
`93`	`68`	`accountId,`

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,32 @@`
	`1`	`+import {`
	`2`	`+hasConfiguredSecretInput,`
	`3`	`+normalizeSecretInputString,`
	`4`	`+} from "openclaw/plugin-sdk/secret-input";`
	`5`	`+import type { DiscordCredentialStatus } from "./token.js";`
	`6`	`+`
	`7`	`+export type InspectedDiscordConfiguredToken = {`
	`8`	`+token: string;`
	`9`	`+tokenSource: "config";`
	`10`	`+tokenStatus: Exclude<DiscordCredentialStatus, "missing">;`
	`11`	`+};`
	`12`	`+`
	`13`	`+export function inspectDiscordConfiguredToken(`
	`14`	`+value: unknown,`
	`15`	`+): InspectedDiscordConfiguredToken \| null {`
	`16`	`+const normalized = normalizeSecretInputString(value);`
	`17`	`+if (normalized) {`
	`18`	`+return {`
	`19`	`+token: normalized.replace(/^Bot\s+/i, ""),`
	`20`	`+tokenSource: "config",`
	`21`	`+tokenStatus: "available",`
	`22`	`+};`
	`23`	`+}`
	`24`	`+if (hasConfiguredSecretInput(value)) {`
	`25`	`+return {`
	`26`	`+token: "",`
	`27`	`+tokenSource: "config",`
	`28`	`+tokenStatus: "configured_unavailable",`
	`29`	`+};`
	`30`	`+}`
	`31`	`+return null;`
	`32`	`+}`

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,7 @@`
`1`	`1`	`import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";`
`2`	`2`	`import { listCombinedAccountIds } from "openclaw/plugin-sdk/account-resolution";`
`3`	`3`	`import type { OpenClawConfig } from "openclaw/plugin-sdk/config-contracts";`
`4`		`-import {`
`5`		`-hasConfiguredSecretInput,`
`6`		`-normalizeSecretInputString,`
`7`		`-} from "openclaw/plugin-sdk/secret-input";`
	`4`	`+import { inspectDiscordConfiguredToken } from "./account-token-inspect.js";`
`8`	`5`	`import { resolveDefaultDiscordAccountId } from "./accounts.js";`
`9`	`6`	`import { mergeDiscordAccountConfig, resolveDiscordAccountConfig } from "./accounts.js";`
`10`	`7`	`import type { DiscordAccountConfig } from "./runtime-api.js";`
`@@ -20,29 +17,6 @@ type InspectedDiscordSetupAccount = {`
`20`	`17`	`config: DiscordAccountConfig;`
`21`	`18`	`};`
`22`	`19`
`23`		`-function inspectConfiguredToken(value: unknown): {`
`24`		`-token: string;`
`25`		`-tokenSource: "config";`
`26`		`-tokenStatus: "available" \| "configured_unavailable";`
`27`		`-} \| null {`
`28`		`-const normalized = normalizeSecretInputString(value);`
`29`		`-if (normalized) {`
`30`		`-return {`
`31`		`-token: normalized.replace(/^Bot\s+/i, ""),`
`32`		`-tokenSource: "config",`
`33`		`-tokenStatus: "available",`
`34`		`-};`
`35`		`-}`
`36`		`-if (hasConfiguredSecretInput(value)) {`
`37`		`-return {`
`38`		`-token: "",`
`39`		`-tokenSource: "config",`
`40`		`-tokenStatus: "configured_unavailable",`
`41`		`-};`
`42`		`-}`
`43`		`-return null;`
`44`		`-}`
`45`		`-`
`46`	`20`	`export function listDiscordSetupAccountIds(cfg: OpenClawConfig): string[] {`
`47`	`21`	`const accounts = cfg.channels?.discord?.accounts;`
`48`	`22`	`return listCombinedAccountIds({`
`@@ -82,7 +56,7 @@ export function inspectDiscordSetupAccount(params: {`
`82`	`56`	`accountConfig &&`
`83`	`57`	`Object.prototype.hasOwnProperty.call(accountConfig as Record<string, unknown>, "token"),`
`84`	`58`	`);`
`85`		`-const accountToken = inspectConfiguredToken(accountConfig?.token);`
	`59`	`+const accountToken = inspectDiscordConfiguredToken(accountConfig?.token);`
`86`	`60`	`if (accountToken) {`
`87`	`61`	`return {`
`88`	`62`	`accountId,`
`@@ -106,7 +80,7 @@ export function inspectDiscordSetupAccount(params: {`
`106`	`80`	`};`
`107`	`81`	`}`
`108`	`82`
`109`		`-const channelToken = inspectConfiguredToken(params.cfg.channels?.discord?.token);`
	`83`	`+const channelToken = inspectDiscordConfiguredToken(params.cfg.channels?.discord?.token);`
`110`	`84`	`if (channelToken) {`
`111`	`85`	`return {`
`112`	`86`	`accountId,`

此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。原文来自 — 版权归原作者所有。

推荐订阅源

Recent Commits to openclaw:main