mirror of
https://github.com/NousResearch/hermes-agent.git
synced 2026-06-22 10:32:00 +00:00
Add Slack setup hints and field validation
This commit is contained in:
parent
f741e70791
commit
d9190491a6
5 changed files with 106 additions and 8 deletions
|
|
@ -3426,6 +3426,7 @@ OPTIONAL_ENV_VARS = {
|
|||
"Required scopes: chat:write, app_mentions:read, channels:history, groups:history, "
|
||||
"im:history, im:read, im:write, users:read, files:read, files:write",
|
||||
"prompt": "Slack Bot Token (xoxb-...)",
|
||||
"help": "In your Slack app, add the required bot scopes, install the app to the workspace, then copy OAuth & Permissions > Bot User OAuth Token.",
|
||||
"url": "https://api.slack.com/apps",
|
||||
"password": True,
|
||||
"category": "messaging",
|
||||
|
|
@ -3435,6 +3436,7 @@ OPTIONAL_ENV_VARS = {
|
|||
"App-Level Tokens. Also ensure Event Subscriptions include: message.im, "
|
||||
"message.channels, message.groups, app_mention",
|
||||
"prompt": "Slack App Token (xapp-...)",
|
||||
"help": "In your Slack app, enable Socket Mode, then create Basic Information > App-Level Tokens with the connections:write scope.",
|
||||
"url": "https://api.slack.com/apps",
|
||||
"password": True,
|
||||
"category": "messaging",
|
||||
|
|
@ -3442,6 +3444,7 @@ OPTIONAL_ENV_VARS = {
|
|||
"SLACK_ALLOWED_USERS": {
|
||||
"description": "Comma-separated Slack member IDs allowed to use Hermes, e.g. U01ABC2DEF3. Without this, Slack may connect but deny messages by default.",
|
||||
"prompt": "Allowed Slack member IDs",
|
||||
"help": "In Slack, open your profile, choose More or the three-dot menu, then Copy member ID. Add multiple IDs comma-separated.",
|
||||
"url": "https://api.slack.com/apps",
|
||||
"password": False,
|
||||
"category": "messaging",
|
||||
|
|
|
|||
|
|
@ -2340,6 +2340,18 @@ def _validate_messaging_env_value(platform_id: str, key: str, value: str) -> Non
|
|||
status_code=400,
|
||||
detail="Slack App Token must start with xapp-. Paste the app-level token from Basic Information > App-Level Tokens.",
|
||||
)
|
||||
if key == "SLACK_ALLOWED_USERS":
|
||||
user_ids = [part.strip() for part in value.split(",")]
|
||||
invalid = [
|
||||
user_id
|
||||
for user_id in user_ids
|
||||
if not user_id or not re.fullmatch(r"[UW][A-Z0-9]{2,}", user_id)
|
||||
]
|
||||
if invalid:
|
||||
raise HTTPException(
|
||||
status_code=400,
|
||||
detail="Slack allowed user IDs must be comma-separated member IDs like U01ABC2DEF3.",
|
||||
)
|
||||
|
||||
|
||||
def _spawn_gateway_restart(profile: Optional[str] = None) -> Tuple[subprocess.Popen, bool]:
|
||||
|
|
@ -4659,6 +4671,7 @@ def _messaging_env_info(key: str) -> dict[str, Any]:
|
|||
return {
|
||||
"description": info.get("description", ""),
|
||||
"prompt": info.get("prompt", key),
|
||||
"help": info.get("help", ""),
|
||||
"url": info.get("url"),
|
||||
"is_password": info.get("password", False),
|
||||
"advanced": info.get("advanced", False),
|
||||
|
|
|
|||
|
|
@ -1569,6 +1569,9 @@ class TestWebServerEndpoints:
|
|||
assert fields["SLACK_ALLOWED_USERS"]["prompt"] == "Allowed Slack member IDs"
|
||||
assert fields["SLACK_ALLOWED_USERS"]["is_password"] is False
|
||||
assert "member IDs" in fields["SLACK_ALLOWED_USERS"]["description"]
|
||||
assert "Bot User OAuth Token" in fields["SLACK_BOT_TOKEN"]["help"]
|
||||
assert "App-Level Tokens" in fields["SLACK_APP_TOKEN"]["help"]
|
||||
assert "Copy member ID" in fields["SLACK_ALLOWED_USERS"]["help"]
|
||||
|
||||
def test_weixin_messaging_metadata_describes_personal_ilink_setup(self):
|
||||
resp = self.client.get("/api/messaging/platforms")
|
||||
|
|
@ -1675,6 +1678,15 @@ class TestWebServerEndpoints:
|
|||
assert resp.status_code == 400
|
||||
assert "xapp-" in resp.json()["detail"]
|
||||
|
||||
def test_update_messaging_platform_rejects_invalid_slack_allowed_users(self):
|
||||
resp = self.client.put(
|
||||
"/api/messaging/platforms/slack",
|
||||
json={"env": {"SLACK_ALLOWED_USERS": "U01ABC2DEF3,not-a-user"}},
|
||||
)
|
||||
|
||||
assert resp.status_code == 400
|
||||
assert "member IDs" in resp.json()["detail"]
|
||||
|
||||
def test_messaging_platform_test_reports_missing_required_setup(self):
|
||||
resp = self.client.put("/api/messaging/platforms/discord", json={"enabled": True})
|
||||
assert resp.status_code == 200
|
||||
|
|
|
|||
|
|
@ -1346,6 +1346,7 @@ export interface MessagingPlatformEnvVar {
|
|||
redacted_value: string | null;
|
||||
description: string;
|
||||
prompt: string;
|
||||
help: string;
|
||||
url: string | null;
|
||||
is_password: boolean;
|
||||
advanced: boolean;
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import {
|
|||
Check,
|
||||
CheckCircle2,
|
||||
ExternalLink,
|
||||
Info,
|
||||
PlugZap,
|
||||
QrCode,
|
||||
Radio,
|
||||
|
|
@ -55,6 +56,34 @@ function stateBadge(state: string) {
|
|||
}
|
||||
|
||||
const TELEGRAM_USER_ID_RE = /^\d+$/;
|
||||
const SLACK_MEMBER_ID_RE = /^[UW][A-Z0-9]{2,}$/;
|
||||
const SLACK_TOKEN_PREFIXES: Record<string, string> = {
|
||||
SLACK_BOT_TOKEN: "xoxb-",
|
||||
SLACK_APP_TOKEN: "xapp-",
|
||||
};
|
||||
|
||||
function validateMessagingEnvField(field: MessagingPlatformEnvVar, value: string): string | null {
|
||||
const trimmed = value.trim();
|
||||
if (!trimmed) return null;
|
||||
|
||||
const expectedPrefix = SLACK_TOKEN_PREFIXES[field.key];
|
||||
if (expectedPrefix && !trimmed.startsWith(expectedPrefix)) {
|
||||
return `${field.prompt || field.key} must start with ${expectedPrefix}`;
|
||||
}
|
||||
|
||||
if (field.key === "SLACK_ALLOWED_USERS") {
|
||||
const parts = trimmed.split(",").map((part) => part.trim());
|
||||
if (parts.some((part) => !part)) {
|
||||
return "Slack member IDs must be comma-separated without empty entries.";
|
||||
}
|
||||
const invalid = parts.find((part) => !SLACK_MEMBER_ID_RE.test(part));
|
||||
if (invalid) {
|
||||
return `${invalid} does not look like a Slack member ID. Use IDs like U01ABC2DEF3.`;
|
||||
}
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
function formatExpiry(expiresAt: string): string {
|
||||
const ms = Date.parse(expiresAt) - Date.now();
|
||||
|
|
@ -83,8 +112,12 @@ export default function ChannelsPage() {
|
|||
// Config modal state
|
||||
const [editing, setEditing] = useState<MessagingPlatform | null>(null);
|
||||
const [draftEnv, setDraftEnv] = useState<Record<string, string>>({});
|
||||
const [fieldErrors, setFieldErrors] = useState<Record<string, string>>({});
|
||||
const [saving, setSaving] = useState(false);
|
||||
const closeEdit = useCallback(() => setEditing(null), []);
|
||||
const closeEdit = useCallback(() => {
|
||||
setEditing(null);
|
||||
setFieldErrors({});
|
||||
}, []);
|
||||
const editModalRef = useModalBehavior({ open: editing !== null, onClose: closeEdit });
|
||||
|
||||
// Per-card busy + restart-needed tracking
|
||||
|
|
@ -116,6 +149,7 @@ export default function ChannelsPage() {
|
|||
initial[v.key] = "";
|
||||
});
|
||||
setDraftEnv(initial);
|
||||
setFieldErrors({});
|
||||
setEditing(platform);
|
||||
};
|
||||
|
||||
|
|
@ -138,6 +172,16 @@ export default function ChannelsPage() {
|
|||
showToast(`${missing[0].prompt || missing[0].key} is required`, "error");
|
||||
return;
|
||||
}
|
||||
const nextFieldErrors: Record<string, string> = {};
|
||||
editing.env_vars.forEach((field) => {
|
||||
const message = validateMessagingEnvField(field, draftEnv[field.key] || "");
|
||||
if (message) nextFieldErrors[field.key] = message;
|
||||
});
|
||||
if (Object.keys(nextFieldErrors).length > 0) {
|
||||
setFieldErrors(nextFieldErrors);
|
||||
showToast("Fix the highlighted fields before saving.", "error");
|
||||
return;
|
||||
}
|
||||
setSaving(true);
|
||||
try {
|
||||
const body: MessagingPlatformUpdate = { env, enabled: true };
|
||||
|
|
@ -326,10 +370,22 @@ export default function ChannelsPage() {
|
|||
</p>
|
||||
{editing.env_vars.map((field: MessagingPlatformEnvVar) => (
|
||||
<div className="grid gap-1.5" key={field.key}>
|
||||
<Label htmlFor={`field-${field.key}`}>
|
||||
{field.prompt || field.key}
|
||||
{field.required ? " *" : ""}
|
||||
</Label>
|
||||
<div className="flex items-center gap-1.5">
|
||||
<Label htmlFor={`field-${field.key}`}>
|
||||
{field.prompt || field.key}
|
||||
{field.required ? " *" : ""}
|
||||
</Label>
|
||||
{field.help && (
|
||||
<span
|
||||
aria-label={field.help}
|
||||
className="inline-flex text-muted-foreground hover:text-foreground"
|
||||
role="img"
|
||||
title={field.help}
|
||||
>
|
||||
<Info className="h-3.5 w-3.5" />
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
{field.description && (
|
||||
<span className="text-xs text-muted-foreground">
|
||||
{field.description}
|
||||
|
|
@ -344,10 +400,23 @@ export default function ChannelsPage() {
|
|||
: field.key
|
||||
}
|
||||
value={draftEnv[field.key] ?? ""}
|
||||
onChange={(e) =>
|
||||
setDraftEnv((prev) => ({ ...prev, [field.key]: e.target.value }))
|
||||
}
|
||||
aria-invalid={Boolean(fieldErrors[field.key])}
|
||||
onChange={(e) => {
|
||||
const nextValue = e.target.value;
|
||||
setDraftEnv((prev) => ({ ...prev, [field.key]: nextValue }));
|
||||
setFieldErrors((prev) => {
|
||||
if (!prev[field.key]) return prev;
|
||||
const next = { ...prev };
|
||||
delete next[field.key];
|
||||
return next;
|
||||
});
|
||||
}}
|
||||
/>
|
||||
{fieldErrors[field.key] && (
|
||||
<span className="text-xs text-destructive">
|
||||
{fieldErrors[field.key]}
|
||||
</span>
|
||||
)}
|
||||
</div>
|
||||
))}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue