Skip to content

Commit 33e157d

Browse files
Verify owpenbot telegram token on save (anomalyco#361)
* fix: verify owpenbot telegram token on save * chore: remove demo session guard
1 parent 67d0515 commit 33e157d

3 files changed

Lines changed: 133 additions & 10 deletions

File tree

‎packages/app/src/app/app.tsx‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -781,10 +781,6 @@ export default function App() {
781781
async function deleteSessionById(sessionID: string) {
782782
const trimmed = sessionID.trim();
783783
if (!trimmed) return;
784-
if (isDemoMode()) {
785-
throw new Error("Demo sessions can't be deleted");
786-
}
787-
788784
const c = client();
789785
if (!c) {
790786
throw new Error("Not connected to a server");

‎packages/app/src/app/lib/tauri.ts‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -535,6 +535,10 @@ export type OwpenbotStatus = {
535535
opencode: OwpenbotOpencodeStatus;
536536
};
537537

538+
export type OwpenbotStatusResult =
539+
| { ok: true; status: OwpenbotStatus }
540+
| { ok: false; error: string };
541+
538542
export type OwpenbotInfo = {
539543
running: boolean;
540544
workspacePath: string | null;
@@ -568,6 +572,15 @@ export async function getOwpenbotStatus(): Promise<OwpenbotStatus | null> {
568572
}
569573
}
570574

575+
export async function getOwpenbotStatusDetailed(): Promise<OwpenbotStatusResult> {
576+
try {
577+
const status = await invoke<OwpenbotStatus>("owpenbot_status");
578+
return { ok: true, status };
579+
} catch (error) {
580+
return { ok: false, error: String(error) };
581+
}
582+
}
583+
571584
export async function owpenbotInfo(): Promise<OwpenbotInfo> {
572585
return invoke<OwpenbotInfo>("owpenbot_info");
573586
}

‎packages/app/src/app/pages/settings.tsx‎

Lines changed: 120 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ import type {
1818
} from "../lib/tauri";
1919
import {
2020
getOwpenbotStatus,
21+
getOwpenbotStatusDetailed,
2122
getOwpenbotQr,
2223
setOwpenbotDmPolicy,
2324
setOwpenbotAllowlist,
@@ -121,6 +122,11 @@ function OwpenbotSettings(props: { busy: boolean }) {
121122
const [savingPolicy, setSavingPolicy] = createSignal(false);
122123
const [savingAllowlist, setSavingAllowlist] = createSignal(false);
123124
const [savingTelegram, setSavingTelegram] = createSignal(false);
125+
const [telegramCheckState, setTelegramCheckState] = createSignal<
126+
"idle" | "checking" | "success" | "warning" | "error"
127+
>("idle");
128+
const [telegramCheckMessage, setTelegramCheckMessage] = createSignal<string | null>(null);
129+
const [telegramCheckDetail, setTelegramCheckDetail] = createSignal<string | null>(null);
124130

125131
// Load owpenbot status on mount
126132
onMount(async () => {
@@ -138,6 +144,47 @@ function OwpenbotSettings(props: { busy: boolean }) {
138144
setPairingRequests(requests);
139145
};
140146

147+
const setTelegramFeedback = (
148+
state: "checking" | "success" | "warning" | "error",
149+
message: string,
150+
detail?: string | null,
151+
) => {
152+
setTelegramCheckState(state);
153+
setTelegramCheckMessage(message);
154+
setTelegramCheckDetail(detail ?? null);
155+
};
156+
157+
const resetTelegramFeedback = () => {
158+
setTelegramCheckState("idle");
159+
setTelegramCheckMessage(null);
160+
setTelegramCheckDetail(null);
161+
};
162+
163+
const normalizeTelegramError = (raw: string) =>
164+
raw.replace(/^Error:\s*/i, "").replace(/^Failed to [^:]+:\s*/i, "").trim();
165+
166+
const formatTelegramError = (raw: string) => {
167+
const cleaned = normalizeTelegramError(raw);
168+
const lower = cleaned.toLowerCase();
169+
if (lower.includes("401") || lower.includes("unauthorized") || lower.includes("token is wrong")) {
170+
return {
171+
summary: "Telegram rejected this token.",
172+
detail: "Check the token in @BotFather and try again.",
173+
};
174+
}
175+
if (lower.includes("409") || lower.includes("conflict") || lower.includes("getupdates")) {
176+
return {
177+
summary: "Another owpenbot instance is already running.",
178+
detail: "Stop extra instances or revoke the token, then retry.",
179+
};
180+
}
181+
const detail = cleaned.length > 180 ? `${cleaned.slice(0, 177)}...` : cleaned;
182+
return {
183+
summary: "Telegram check failed.",
184+
detail: detail || null,
185+
};
186+
};
187+
141188
const showQrCode = async () => {
142189
setQrLoading(true);
143190
try {
@@ -194,12 +241,51 @@ function OwpenbotSettings(props: { busy: boolean }) {
194241

195242
const handleSaveTelegramToken = async () => {
196243
const token = telegramToken().trim();
197-
if (!token) return;
198-
244+
if (!token || savingTelegram()) return;
245+
199246
setSavingTelegram(true);
247+
setTelegramFeedback("checking", "Saving token and verifying Telegram...");
200248
try {
201-
await setOwpenbotTelegramToken(token);
202-
await refreshStatus();
249+
const result = await setOwpenbotTelegramToken(token);
250+
if (!result.ok) {
251+
const detail = normalizeTelegramError(result.stderr || "");
252+
setTelegramFeedback("error", "Failed to save token.", detail || null);
253+
return;
254+
}
255+
256+
const statusResult = await getOwpenbotStatusDetailed();
257+
if (!statusResult.ok) {
258+
const parsed = formatTelegramError(statusResult.error || "Failed to verify Telegram.");
259+
setOwpenbotStatus(null);
260+
setTelegramFeedback("error", parsed.summary, parsed.detail);
261+
return;
262+
}
263+
264+
const status = statusResult.status;
265+
setOwpenbotStatus(status);
266+
267+
if (!status.telegram.configured) {
268+
setTelegramFeedback("error", "Token saved, but Telegram is still unconfigured.", "Check the token and try again.");
269+
return;
270+
}
271+
if (!status.running) {
272+
setTelegramFeedback(
273+
"warning",
274+
"Token saved, but the messaging bridge is offline.",
275+
"Start OpenWork to activate Telegram.",
276+
);
277+
return;
278+
}
279+
if (!status.telegram.enabled) {
280+
setTelegramFeedback(
281+
"warning",
282+
"Token saved, but Telegram is disabled.",
283+
"Enable the bot or review owpenbot settings.",
284+
);
285+
return;
286+
}
287+
288+
setTelegramFeedback("success", "Telegram connected.");
203289
setTelegramToken("");
204290
} finally {
205291
setSavingTelegram(false);
@@ -237,6 +323,21 @@ function OwpenbotSettings(props: { busy: boolean }) {
237323
return "text-gray-9";
238324
});
239325

326+
const telegramCheckStyle = createMemo(() => {
327+
switch (telegramCheckState()) {
328+
case "success":
329+
return "bg-green-7/10 text-green-11 border-green-7/20";
330+
case "warning":
331+
return "bg-amber-7/10 text-amber-11 border-amber-7/20";
332+
case "error":
333+
return "bg-red-7/10 text-red-11 border-red-7/20";
334+
case "checking":
335+
return "bg-gray-4/60 text-gray-11 border-gray-7/50";
336+
default:
337+
return "bg-gray-4/60 text-gray-11 border-gray-7/50";
338+
}
339+
});
340+
240341
const dmPolicyOptions: { value: OwpenbotStatus["whatsapp"]["dmPolicy"]; label: string; description: string }[] = [
241342
{ value: "pairing", label: "Pairing", description: "Requires approval for new contacts" },
242343
{ value: "allowlist", label: "Allowlist", description: "Only specific numbers can message" },
@@ -280,7 +381,12 @@ function OwpenbotSettings(props: { busy: boolean }) {
280381
<input
281382
type={telegramTokenVisible() ? "text" : "password"}
282383
value={telegramToken()}
283-
onInput={(e) => setTelegramToken(e.currentTarget.value)}
384+
onInput={(e) => {
385+
setTelegramToken(e.currentTarget.value);
386+
if (telegramCheckState() !== "idle") {
387+
resetTelegramFeedback();
388+
}
389+
}}
284390
placeholder="Paste token from @BotFather"
285391
class="flex-1 rounded-lg bg-gray-2/60 px-3 py-2 text-sm text-gray-12 placeholder:text-gray-10 shadow-[0_0_0_1px_rgba(255,255,255,0.08)] focus:outline-none focus:ring-2 focus:ring-gray-6/20"
286392
disabled={props.busy || savingTelegram()}
@@ -299,9 +405,17 @@ function OwpenbotSettings(props: { busy: boolean }) {
299405
onClick={handleSaveTelegramToken}
300406
disabled={props.busy || savingTelegram() || !telegramToken().trim()}
301407
>
302-
Save
408+
{savingTelegram() ? "Saving..." : "Save"}
303409
</Button>
304410
</div>
411+
<Show when={telegramCheckState() !== "idle"}>
412+
<div class={`text-[11px] px-2 py-1 rounded-lg border ${telegramCheckStyle()}`}>
413+
{telegramCheckMessage()}
414+
</div>
415+
<Show when={telegramCheckDetail()}>
416+
<div class="text-[11px] text-gray-9">{telegramCheckDetail()}</div>
417+
</Show>
418+
</Show>
305419
<div class="text-[11px] text-gray-8">
306420
Create a bot with <span class="font-mono">@BotFather</span> on Telegram and paste the token here.
307421
</div>

0 commit comments

Comments
 (0)