From cebb8c785324d2dfcd1333c9d3764fbf27152fd9 Mon Sep 17 00:00:00 2001
From: joshavant <830519+joshavant@users.noreply.github.com>
Date: Tue, 3 Mar 2026 18:48:20 -0600
Subject: [PATCH] tests(feishu): fix SecretRef typing (openclaw#30903) thanks
 @LiaoyuanNing

---
 extensions/feishu/src/accounts.test.ts   | 59 ++++++++++++++----------
 extensions/feishu/src/accounts.ts        |  6 +--
 extensions/feishu/src/onboarding.test.ts | 15 ++++++
 3 files changed, 52 insertions(+), 28 deletions(-)

diff --git a/extensions/feishu/src/accounts.test.ts b/extensions/feishu/src/accounts.test.ts
index cb22e2069bb..bc04d4c56c2 100644
--- a/extensions/feishu/src/accounts.test.ts
+++ b/extensions/feishu/src/accounts.test.ts
@@ -5,6 +5,9 @@ import {
   resolveFeishuAccount,
   resolveFeishuCredentials,
 } from "./accounts.js";
+import type { FeishuConfig } from "./types.js";
+
+const asConfig = (value: Partial<FeishuConfig>) => value as FeishuConfig;
 
 describe("resolveDefaultFeishuAccountId", () => {
   it("prefers channels.feishu.defaultAccount when configured", () => {
@@ -102,19 +105,21 @@ describe("resolveDefaultFeishuAccountId", () => {
 describe("resolveFeishuCredentials", () => {
   it("throws unresolved SecretRef errors by default for unsupported secret sources", () => {
     expect(() =>
-      resolveFeishuCredentials({
-        appId: "cli_123",
-        appSecret: { source: "file", provider: "default", id: "path/to/secret" } as never,
-      }),
+      resolveFeishuCredentials(
+        asConfig({
+          appId: "cli_123",
+          appSecret: { source: "file", provider: "default", id: "path/to/secret" } as never,
+        }),
+      ),
     ).toThrow(/unresolved SecretRef/i);
   });
 
   it("returns null (without throwing) when unresolved SecretRef is allowed", () => {
     const creds = resolveFeishuCredentials(
-      {
+      asConfig({
         appId: "cli_123",
         appSecret: { source: "file", provider: "default", id: "path/to/secret" } as never,
-      },
+      }),
       { allowUnresolvedSecretRef: true },
     );
 
@@ -127,10 +132,12 @@ describe("resolveFeishuCredentials", () => {
     delete process.env[key];
     try {
       expect(() =>
-        resolveFeishuCredentials({
-          appId: "cli_123",
-          appSecret: { source: "env", provider: "default", id: key } as never,
-        }),
+        resolveFeishuCredentials(
+          asConfig({
+            appId: "cli_123",
+            appSecret: { source: "env", provider: "default", id: key } as never,
+          }),
+        ),
       ).toThrow(/unresolved SecretRef/i);
     } finally {
       if (prev === undefined) {
@@ -148,10 +155,10 @@ describe("resolveFeishuCredentials", () => {
 
     try {
       const creds = resolveFeishuCredentials(
-        {
+        asConfig({
           appId: "cli_123",
           appSecret: { source: "env", provider: "default", id: key } as never,
-        },
+        }),
         { allowUnresolvedSecretRef: true },
       );
 
@@ -178,10 +185,10 @@ describe("resolveFeishuCredentials", () => {
 
     try {
       const creds = resolveFeishuCredentials(
-        {
+        asConfig({
           appId: "cli_123",
           appSecret: { source: "env", provider: "corp-env", id: key } as never,
-        },
+        }),
         { allowUnresolvedSecretRef: true },
       );
 
@@ -201,10 +208,12 @@ describe("resolveFeishuCredentials", () => {
     process.env[key] = "secret_from_env";
     try {
       expect(() =>
-        resolveFeishuCredentials({
-          appId: "cli_123",
-          appSecret: { source: "env", provider: "default", id: key } as never,
-        }),
+        resolveFeishuCredentials(
+          asConfig({
+            appId: "cli_123",
+            appSecret: { source: "env", provider: "default", id: key } as never,
+          }),
+        ),
       ).toThrow(/unresolved SecretRef/i);
     } finally {
       if (prev === undefined) {
@@ -216,12 +225,14 @@ describe("resolveFeishuCredentials", () => {
   });
 
   it("trims and returns credentials when values are valid strings", () => {
-    const creds = resolveFeishuCredentials({
-      appId: " cli_123 ",
-      appSecret: " secret_456 ",
-      encryptKey: " enc ",
-      verificationToken: " vt ",
-    });
+    const creds = resolveFeishuCredentials(
+      asConfig({
+        appId: " cli_123 ",
+        appSecret: " secret_456 ",
+        encryptKey: " enc ",
+        verificationToken: " vt ",
+      }),
+    );
 
     expect(creds).toEqual({
       appId: "cli_123",
diff --git a/extensions/feishu/src/accounts.ts b/extensions/feishu/src/accounts.ts
index 7a1c0469f41..39194cda066 100644
--- a/extensions/feishu/src/accounts.ts
+++ b/extensions/feishu/src/accounts.ts
@@ -213,16 +213,14 @@ export function resolveFeishuAccount(params: {
 
   // Resolve credentials from merged config
   const creds = resolveFeishuCredentials(merged);
+  const accountName = (merged as FeishuAccountConfig).name;
 
   return {
     accountId,
     selectionSource,
     enabled,
     configured: Boolean(creds),
-    name:
-      typeof (merged as FeishuAccountConfig).name === "string"
-        ? (merged as FeishuAccountConfig).name.trim() || undefined
-        : undefined,
+    name: typeof accountName === "string" ? accountName.trim() || undefined : undefined,
     appId: creds?.appId,
     appSecret: creds?.appSecret,
     encryptKey: creds?.encryptKey,
diff --git a/extensions/feishu/src/onboarding.test.ts b/extensions/feishu/src/onboarding.test.ts
index 8f1b4200811..dbb71448508 100644
--- a/extensions/feishu/src/onboarding.test.ts
+++ b/extensions/feishu/src/onboarding.test.ts
@@ -6,6 +6,17 @@ vi.mock("./probe.js", () => ({
 
 import { feishuOnboardingAdapter } from "./onboarding.js";
 
+const baseConfigureContext = {
+  runtime: {} as never,
+  accountOverrides: {},
+  shouldPromptAccountIds: false,
+  forceAllowFrom: false,
+};
+
+const baseStatusContext = {
+  accountOverrides: {},
+};
+
 describe("feishuOnboardingAdapter.configure", () => {
   it("does not throw when config appId/appSecret are SecretRef objects", async () => {
     const text = vi
@@ -34,6 +45,7 @@ describe("feishuOnboardingAdapter.configure", () => {
           },
         } as never,
         prompter,
+        ...baseConfigureContext,
       }),
     ).resolves.toBeTruthy();
   });
@@ -55,6 +67,7 @@ describe("feishuOnboardingAdapter.getStatus", () => {
           },
         },
       } as never,
+      ...baseStatusContext,
     });
 
     expect(status.configured).toBe(false);
@@ -78,6 +91,7 @@ describe("feishuOnboardingAdapter.getStatus", () => {
             },
           },
         } as never,
+        ...baseStatusContext,
       });
 
       expect(status.configured).toBe(false);
@@ -113,6 +127,7 @@ describe("feishuOnboardingAdapter.getStatus", () => {
             },
           },
         } as never,
+        ...baseStatusContext,
       });
 
       expect(status.configured).toBe(true);