fix: prefer config tokens over env for discord/telegram
This commit is contained in:
@@ -16,12 +16,22 @@ describe("resolveTelegramToken", () => {
|
||||
vi.unstubAllEnvs();
|
||||
});
|
||||
|
||||
it("prefers env token over config", () => {
|
||||
it("prefers config token over env", () => {
|
||||
vi.stubEnv("TELEGRAM_BOT_TOKEN", "env-token");
|
||||
const cfg = {
|
||||
channels: { telegram: { botToken: "cfg-token" } },
|
||||
} as ClawdbotConfig;
|
||||
const res = resolveTelegramToken(cfg);
|
||||
expect(res.token).toBe("cfg-token");
|
||||
expect(res.source).toBe("config");
|
||||
});
|
||||
|
||||
it("uses env token when config is missing", () => {
|
||||
vi.stubEnv("TELEGRAM_BOT_TOKEN", "env-token");
|
||||
const cfg = {
|
||||
channels: { telegram: {} },
|
||||
} as ClawdbotConfig;
|
||||
const res = resolveTelegramToken(cfg);
|
||||
expect(res.token).toBe("env-token");
|
||||
expect(res.source).toBe("env");
|
||||
});
|
||||
|
||||
@@ -54,11 +54,6 @@ export function resolveTelegramToken(
|
||||
}
|
||||
|
||||
const allowEnv = accountId === DEFAULT_ACCOUNT_ID;
|
||||
const envToken = allowEnv ? (opts.envToken ?? process.env.TELEGRAM_BOT_TOKEN)?.trim() : "";
|
||||
if (envToken) {
|
||||
return { token: envToken, source: "env" };
|
||||
}
|
||||
|
||||
const tokenFile = telegramCfg?.tokenFile?.trim();
|
||||
if (tokenFile && allowEnv) {
|
||||
if (!fs.existsSync(tokenFile)) {
|
||||
@@ -81,5 +76,10 @@ export function resolveTelegramToken(
|
||||
return { token: configToken, source: "config" };
|
||||
}
|
||||
|
||||
const envToken = allowEnv ? (opts.envToken ?? process.env.TELEGRAM_BOT_TOKEN)?.trim() : "";
|
||||
if (envToken) {
|
||||
return { token: envToken, source: "env" };
|
||||
}
|
||||
|
||||
return { token: "", source: "none" };
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user