af9881b9c5
When a bare Slack user ID (U-prefix) is passed as the send target
without an explicit `user:` prefix, `parseSlackTarget` classifies it as
kind="channel". `resolveChannelId` then passes it through to callers
without calling `conversations.open`.
This works for `chat.postMessage` (which tolerates user IDs), but
`files.uploadV2` delegates to `completeUploadExternal` which validates
`channel_id` against `^[CGDZ][A-Z0-9]{8,}$` — rejecting U-prefixed
IDs with `invalid_arguments`.
Fix: detect U-prefixed IDs in `resolveChannelId` regardless of the
parsed `kind`, and always resolve them via `conversations.open` to
obtain the DM channel ID (D-prefix).
Includes test coverage for bare, prefixed, and mention-style user ID
targets with file uploads, plus a channel-target negative case.
124 lines
3.4 KiB
TypeScript
124 lines
3.4 KiB
TypeScript
import type { WebClient } from "@slack/web-api";
|
|
import { describe, expect, it, vi } from "vitest";
|
|
|
|
// --- Module mocks (must precede dynamic import) ---
|
|
|
|
vi.mock("../config/config.js", () => ({
|
|
loadConfig: () => ({}),
|
|
}));
|
|
|
|
vi.mock("./accounts.js", () => ({
|
|
resolveSlackAccount: () => ({
|
|
accountId: "default",
|
|
botToken: "xoxb-test",
|
|
botTokenSource: "config",
|
|
config: {},
|
|
}),
|
|
}));
|
|
|
|
vi.mock("../web/media.js", () => ({
|
|
loadWebMedia: vi.fn(async () => ({
|
|
buffer: Buffer.from("fake-image"),
|
|
contentType: "image/png",
|
|
kind: "image",
|
|
fileName: "screenshot.png",
|
|
})),
|
|
}));
|
|
|
|
const { sendMessageSlack } = await import("./send.js");
|
|
|
|
type UploadTestClient = WebClient & {
|
|
conversations: { open: ReturnType<typeof vi.fn> };
|
|
chat: { postMessage: ReturnType<typeof vi.fn> };
|
|
files: { uploadV2: ReturnType<typeof vi.fn> };
|
|
};
|
|
|
|
function createUploadTestClient(): UploadTestClient {
|
|
return {
|
|
conversations: {
|
|
open: vi.fn(async () => ({ channel: { id: "D99RESOLVED" } })),
|
|
},
|
|
chat: {
|
|
postMessage: vi.fn(async () => ({ ts: "171234.567" })),
|
|
},
|
|
files: {
|
|
uploadV2: vi.fn(async () => ({ files: [{ id: "F001" }] })),
|
|
},
|
|
} as unknown as UploadTestClient;
|
|
}
|
|
|
|
describe("sendMessageSlack file upload with user IDs", () => {
|
|
it("resolves bare user ID to DM channel before files.uploadV2", async () => {
|
|
const client = createUploadTestClient();
|
|
|
|
// Bare user ID — parseSlackTarget classifies this as kind="channel"
|
|
await sendMessageSlack("U2ZH3MFSR", "screenshot", {
|
|
token: "xoxb-test",
|
|
client,
|
|
mediaUrl: "/tmp/screenshot.png",
|
|
});
|
|
|
|
// Should call conversations.open to resolve user ID → DM channel
|
|
expect(client.conversations.open).toHaveBeenCalledWith({
|
|
users: "U2ZH3MFSR",
|
|
});
|
|
|
|
// files.uploadV2 should receive the resolved DM channel ID, not the user ID
|
|
expect(client.files.uploadV2).toHaveBeenCalledWith(
|
|
expect.objectContaining({
|
|
channel_id: "D99RESOLVED",
|
|
filename: "screenshot.png",
|
|
}),
|
|
);
|
|
});
|
|
|
|
it("resolves prefixed user ID to DM channel before files.uploadV2", async () => {
|
|
const client = createUploadTestClient();
|
|
|
|
await sendMessageSlack("user:UABC123", "image", {
|
|
token: "xoxb-test",
|
|
client,
|
|
mediaUrl: "/tmp/photo.png",
|
|
});
|
|
|
|
expect(client.conversations.open).toHaveBeenCalledWith({
|
|
users: "UABC123",
|
|
});
|
|
expect(client.files.uploadV2).toHaveBeenCalledWith(
|
|
expect.objectContaining({ channel_id: "D99RESOLVED" }),
|
|
);
|
|
});
|
|
|
|
it("sends file directly to channel without conversations.open", async () => {
|
|
const client = createUploadTestClient();
|
|
|
|
await sendMessageSlack("channel:C123CHAN", "chart", {
|
|
token: "xoxb-test",
|
|
client,
|
|
mediaUrl: "/tmp/chart.png",
|
|
});
|
|
|
|
expect(client.conversations.open).not.toHaveBeenCalled();
|
|
expect(client.files.uploadV2).toHaveBeenCalledWith(
|
|
expect.objectContaining({ channel_id: "C123CHAN" }),
|
|
);
|
|
});
|
|
|
|
it("resolves mention-style user ID before file upload", async () => {
|
|
const client = createUploadTestClient();
|
|
|
|
await sendMessageSlack("<@U777TEST>", "report", {
|
|
token: "xoxb-test",
|
|
client,
|
|
mediaUrl: "/tmp/report.png",
|
|
});
|
|
|
|
expect(client.conversations.open).toHaveBeenCalledWith({
|
|
users: "U777TEST",
|
|
});
|
|
expect(client.files.uploadV2).toHaveBeenCalledWith(
|
|
expect.objectContaining({ channel_id: "D99RESOLVED" }),
|
|
);
|
|
});
|
|
});
|