refactor: share Discord account token inspection

vincentkoc · vincentkoc · commit b9933b2ec119 · 2026-05-30T06:47:40.000+02:00
diff --git a/extensions/discord/src/account-inspect.ts b/extensions/discord/src/account-inspect.ts
@@ -1,9 +1,7 @@
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
-import {
-  hasConfiguredSecretInput,
-  normalizeSecretInputString,
-} from "openclaw/plugin-sdk/secret-input";
+import { normalizeSecretInputString } from "openclaw/plugin-sdk/secret-input";
 import { normalizeOptionalString } from "openclaw/plugin-sdk/string-coerce-runtime";
+import { inspectDiscordConfiguredToken } from "./account-token-inspect.js";
 import {
   mergeDiscordAccountConfig,
   resolveDefaultDiscordAccountId,
@@ -23,29 +21,6 @@ export type InspectedDiscordAccount = {
   config: DiscordAccountConfig;
 };
 
-function inspectDiscordTokenValue(value: unknown): {
-  token: string;
-  tokenSource: "config";
-  tokenStatus: Exclude<DiscordCredentialStatus, "missing">;
-} | null {
-  const normalized = normalizeSecretInputString(value);
-  if (normalized) {
-    return {
-      token: normalized.replace(/^Bot\s+/i, ""),
-      tokenSource: "config",
-      tokenStatus: "available",
-    };
-  }
-  if (hasConfiguredSecretInput(value)) {
-    return {
-      token: "",
-      tokenSource: "config",
-      tokenStatus: "configured_unavailable",
-    };
-  }
-  return null;
-}
-
 export function inspectDiscordAccount(params: {
   cfg: OpenClawConfig;
   accountId?: string | null;
@@ -61,7 +36,7 @@ export function inspectDiscordAccount(params: {
     accountConfig &&
     Object.prototype.hasOwnProperty.call(accountConfig as Record<string, unknown>, "token"),
   );
-  const accountToken = inspectDiscordTokenValue(accountConfig?.token);
+  const accountToken = inspectDiscordConfiguredToken(accountConfig?.token);
   if (accountToken) {
     return {
       accountId,
@@ -87,7 +62,7 @@ export function inspectDiscordAccount(params: {
     };
   }
 
-  const channelToken = inspectDiscordTokenValue(params.cfg.channels?.discord?.token);
+  const channelToken = inspectDiscordConfiguredToken(params.cfg.channels?.discord?.token);
   if (channelToken) {
     return {
       accountId,
diff --git a/extensions/discord/src/account-token-inspect.ts b/extensions/discord/src/account-token-inspect.ts
@@ -0,0 +1,32 @@
+import {
+  hasConfiguredSecretInput,
+  normalizeSecretInputString,
+} from "openclaw/plugin-sdk/secret-input";
+import type { DiscordCredentialStatus } from "./token.js";
+
+export type InspectedDiscordConfiguredToken = {
+  token: string;
+  tokenSource: "config";
+  tokenStatus: Exclude<DiscordCredentialStatus, "missing">;
+};
+
+export function inspectDiscordConfiguredToken(
+  value: unknown,
+): InspectedDiscordConfiguredToken | null {
+  const normalized = normalizeSecretInputString(value);
+  if (normalized) {
+    return {
+      token: normalized.replace(/^Bot\s+/i, ""),
+      tokenSource: "config",
+      tokenStatus: "available",
+    };
+  }
+  if (hasConfiguredSecretInput(value)) {
+    return {
+      token: "",
+      tokenSource: "config",
+      tokenStatus: "configured_unavailable",
+    };
+  }
+  return null;
+}
diff --git a/extensions/discord/src/setup-account-state.ts b/extensions/discord/src/setup-account-state.ts
@@ -1,10 +1,7 @@
 import { DEFAULT_ACCOUNT_ID, normalizeAccountId } from "openclaw/plugin-sdk/account-id";
 import { listCombinedAccountIds } from "openclaw/plugin-sdk/account-resolution";
 import type { OpenClawConfig } from "openclaw/plugin-sdk/config-contracts";
-import {
-  hasConfiguredSecretInput,
-  normalizeSecretInputString,
-} from "openclaw/plugin-sdk/secret-input";
+import { inspectDiscordConfiguredToken } from "./account-token-inspect.js";
 import { resolveDefaultDiscordAccountId } from "./accounts.js";
 import { mergeDiscordAccountConfig, resolveDiscordAccountConfig } from "./accounts.js";
 import type { DiscordAccountConfig } from "./runtime-api.js";
@@ -20,29 +17,6 @@ type InspectedDiscordSetupAccount = {
   config: DiscordAccountConfig;
 };
 
-function inspectConfiguredToken(value: unknown): {
-  token: string;
-  tokenSource: "config";
-  tokenStatus: "available" | "configured_unavailable";
-} | null {
-  const normalized = normalizeSecretInputString(value);
-  if (normalized) {
-    return {
-      token: normalized.replace(/^Bot\s+/i, ""),
-      tokenSource: "config",
-      tokenStatus: "available",
-    };
-  }
-  if (hasConfiguredSecretInput(value)) {
-    return {
-      token: "",
-      tokenSource: "config",
-      tokenStatus: "configured_unavailable",
-    };
-  }
-  return null;
-}
-
 export function listDiscordSetupAccountIds(cfg: OpenClawConfig): string[] {
   const accounts = cfg.channels?.discord?.accounts;
   return listCombinedAccountIds({
@@ -82,7 +56,7 @@ export function inspectDiscordSetupAccount(params: {
     accountConfig &&
     Object.prototype.hasOwnProperty.call(accountConfig as Record<string, unknown>, "token"),
   );
-  const accountToken = inspectConfiguredToken(accountConfig?.token);
+  const accountToken = inspectDiscordConfiguredToken(accountConfig?.token);
   if (accountToken) {
     return {
       accountId,
@@ -106,7 +80,7 @@ export function inspectDiscordSetupAccount(params: {
     };
   }
 
-  const channelToken = inspectConfiguredToken(params.cfg.channels?.discord?.token);
+  const channelToken = inspectDiscordConfiguredToken(params.cfg.channels?.discord?.token);
   if (channelToken) {
     return {
       accountId,
