Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions connectors/slack/src/slack.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -460,3 +460,64 @@ describe("startIncrementalSync — coalesced scheduling", () => {
expect(options.runAt.getTime()).toBeGreaterThan(Date.now());
});
});

describe("onSlackWebhook — deauthorization events", () => {
function makeDeauthSlack(opts: {
integrationsGet?: ReturnType<typeof vi.fn>;
markNeedsReauth: ReturnType<typeof vi.fn>;
}): Slack {
const tools = {
store: makeStore(),
integrations: {
get: opts.integrationsGet ?? vi.fn().mockResolvedValue(null),
markNeedsReauth: opts.markNeedsReauth,
},
network: {},
files: {},
};
return new Slack(
"twist-instance-1" as never,
{ getTools: () => tools } as never
);
}

// onSlackWebhook reads request.body.event.
const req = (event: unknown) => ({ body: { event } }) as never;

it("flags re-auth when the app is uninstalled from the workspace", async () => {
const markNeedsReauth = vi.fn().mockResolvedValue(undefined);
const slack = makeDeauthSlack({ markNeedsReauth });
await slack.onSlackWebhook(req({ type: "app_uninstalled" }), "C123");
expect(markNeedsReauth).toHaveBeenCalledWith("C123");
});

it("flags re-auth when this connection's own token is revoked", async () => {
const markNeedsReauth = vi.fn().mockResolvedValue(undefined);
const integrationsGet = vi.fn().mockResolvedValue({
token: "xoxp-test",
provider: { authed_user_id: "U_SELF" },
});
const slack = makeDeauthSlack({ integrationsGet, markNeedsReauth });
await slack.onSlackWebhook(
req({ type: "tokens_revoked", tokens: { oauth: ["U_SELF"] } }),
"C123"
);
expect(markNeedsReauth).toHaveBeenCalledWith("C123");
});

it("ignores tokens_revoked for a different user on the same team", async () => {
// The event fans out to every callback registered for the team, so a
// teammate revoking their token must NOT tear down this user's connection.
const markNeedsReauth = vi.fn().mockResolvedValue(undefined);
const integrationsGet = vi.fn().mockResolvedValue({
token: "xoxp-test",
provider: { authed_user_id: "U_SELF" },
});
const slack = makeDeauthSlack({ integrationsGet, markNeedsReauth });
await slack.onSlackWebhook(
req({ type: "tokens_revoked", tokens: { oauth: ["U_OTHER"] } }),
"C123"
);
expect(markNeedsReauth).not.toHaveBeenCalled();
});
});
65 changes: 54 additions & 11 deletions connectors/slack/src/slack.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,17 +61,28 @@ import { slackFacets } from "./slack-facets";
* - Batch processing for large channels
* - Star-based to-do sync against the user's saved items
*
* **Required OAuth User Scopes:**
* - `channels:history` - Read public channel messages
* - `channels:read` - View basic channel info
* - `groups:history` - Read private channel messages
* - `groups:read` - View basic private channel info
* - `users:read` - View users in workspace
* - `users:read.email` - View user email addresses
* - `chat:write` - Post messages as the user (for Plot → Slack replies)
* - `im:history` - Read direct messages
* - `mpim:history` - Read group direct messages
* - `stars:read` / `stars:write` - Read and manage the user's saved items
* **Required OAuth User Scopes** (each backs a shipped, user-visible feature —
* kept in sync with the authoritative {@link Slack.SCOPES} array below):
* - `channels:history` — read messages in public channels the user syncs
* - `channels:read` — list/enumerate public channels the user is in
* - `groups:history` — read messages in private channels the user syncs
* - `groups:read` — list/enumerate private channels the user is in
* - `im:history` — read direct messages
* - `im:write` — open a DM to compose a new direct message from Plot
* - `mpim:history` — read group direct messages
* - `mpim:write` — open a group DM to compose from Plot
* - `users:read` — resolve message authors/reactors to names + avatars
* - `users:read.email` — match Slack users to Plot contacts by email
* - `chat:write` — post the replies and messages the user writes in Plot
* - `files:write` — upload the file attachments the user adds to a message
* (both link types advertise `supportsFileAttachments`)
* - `stars:read` / `stars:write` — read and manage the user's saved (starred)
* items, surfaced as Plot to-dos
* - `reactions:read` / `reactions:write` — read reactions during sync and
* round-trip the emoji reactions the user adds/removes in Plot
*
* **Optional** (connect-time toggle):
* - `emoji:read` — render the workspace's custom emoji in reactions
*/

/**
Expand All@@ -93,6 +104,13 @@ export class Slack extends Connector<Slack> {
"users:read",
"users:read.email",
"chat:write",
// File attachments: both link types advertise `supportsFileAttachments`,
// and onNoteCreated uploads them via files.getUploadURLExternal /
// files.completeUploadExternal. Without this scope those calls fail with
// `missing_scope` and the attachment is silently dropped (the text still
// sends). Existing connections must reconnect to grant it; the upload
// path already degrades gracefully (logs + continues) when it's absent.
"files:write",
"im:history",
"im:write",
"mpim:history",
Expand DownExpand Up@@ -636,6 +654,31 @@ export class Slack extends Connector<Slack> {
const event = bodyObj.event;
if (!event) return;

// Deauthorization events. `app_uninstalled` fires when a workspace admin
// removes Plot (team-wide); `tokens_revoked` fires when a user revokes their
// own token and lists the affected user ids in `event.tokens.oauth`. Both
// are fanned out to every callback registered for the team, so gate
// `tokens_revoked` on THIS connection's own Slack user id to avoid tearing
// down other users who are still connected. The action mirrors what the
// connector already does lazily when a later API call returns an auth error
// (integrations.markNeedsReauth) — doing it here just makes the reconnect
// prompt appear immediately instead of on the next sync attempt. Delivery
// requires `app_uninstalled` / `tokens_revoked` to be enabled in the Slack
// app's Event Subscriptions.
if (event.type === "app_uninstalled") {
await this.tools.integrations.markNeedsReauth(channelId);
return;
}
if (event.type === "tokens_revoked") {
const revokedUserIds: string[] = event.tokens?.oauth ?? [];
const token = await this.tools.integrations.get(channelId);
const ownUserId = token?.provider?.authed_user_id;
if (ownUserId && revokedUserIds.includes(ownUserId)) {
await this.tools.integrations.markNeedsReauth(channelId);
}
return;
}

if (event.type === "star_added" || event.type === "star_removed") {
await this.handleStarEvent(event, event.type === "star_added");
return;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(slack): declare files:write and handle deauthorization events by KrisBraun · Pull Request #276 · plotday/plot · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions connectors/slack/src/slack.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -460,3 +460,64 @@ describe("startIncrementalSync — coalesced scheduling", () => {
expect(options.runAt.getTime()).toBeGreaterThan(Date.now());
});
});

describe("onSlackWebhook — deauthorization events", () => {
function makeDeauthSlack(opts: {
integrationsGet?: ReturnType<typeof vi.fn>;
markNeedsReauth: ReturnType<typeof vi.fn>;
}): Slack {
const tools = {
store: makeStore(),
integrations: {
get: opts.integrationsGet ?? vi.fn().mockResolvedValue(null),
markNeedsReauth: opts.markNeedsReauth,
},
network: {},
files: {},
};
return new Slack(
"twist-instance-1" as never,
{ getTools: () => tools } as never
);
}

// onSlackWebhook reads request.body.event.
const req = (event: unknown) => ({ body: { event } }) as never;

it("flags re-auth when the app is uninstalled from the workspace", async () => {
const markNeedsReauth = vi.fn().mockResolvedValue(undefined);
const slack = makeDeauthSlack({ markNeedsReauth });
await slack.onSlackWebhook(req({ type: "app_uninstalled" }), "C123");
expect(markNeedsReauth).toHaveBeenCalledWith("C123");
});

it("flags re-auth when this connection's own token is revoked", async () => {
const markNeedsReauth = vi.fn().mockResolvedValue(undefined);
const integrationsGet = vi.fn().mockResolvedValue({
token: "xoxp-test",
provider: { authed_user_id: "U_SELF" },
});
const slack = makeDeauthSlack({ integrationsGet, markNeedsReauth });
await slack.onSlackWebhook(
req({ type: "tokens_revoked", tokens: { oauth: ["U_SELF"] } }),
"C123"
);
expect(markNeedsReauth).toHaveBeenCalledWith("C123");
});

it("ignores tokens_revoked for a different user on the same team", async () => {
// The event fans out to every callback registered for the team, so a
// teammate revoking their token must NOT tear down this user's connection.
const markNeedsReauth = vi.fn().mockResolvedValue(undefined);
const integrationsGet = vi.fn().mockResolvedValue({
token: "xoxp-test",
provider: { authed_user_id: "U_SELF" },
});
const slack = makeDeauthSlack({ integrationsGet, markNeedsReauth });
await slack.onSlackWebhook(
req({ type: "tokens_revoked", tokens: { oauth: ["U_OTHER"] } }),
"C123"
);
expect(markNeedsReauth).not.toHaveBeenCalled();
});
});
65 changes: 54 additions & 11 deletions connectors/slack/src/slack.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,17 +61,28 @@ import { slackFacets } from "./slack-facets";
* - Batch processing for large channels
* - Star-based to-do sync against the user's saved items
*
* **Required OAuth User Scopes:**
* - `channels:history` - Read public channel messages
* - `channels:read` - View basic channel info
* - `groups:history` - Read private channel messages
* - `groups:read` - View basic private channel info
* - `users:read` - View users in workspace
* - `users:read.email` - View user email addresses
* - `chat:write` - Post messages as the user (for Plot → Slack replies)
* - `im:history` - Read direct messages
* - `mpim:history` - Read group direct messages
* - `stars:read` / `stars:write` - Read and manage the user's saved items
* **Required OAuth User Scopes** (each backs a shipped, user-visible feature —
* kept in sync with the authoritative {@link Slack.SCOPES} array below):
* - `channels:history` — read messages in public channels the user syncs
* - `channels:read` — list/enumerate public channels the user is in
* - `groups:history` — read messages in private channels the user syncs
* - `groups:read` — list/enumerate private channels the user is in
* - `im:history` — read direct messages
* - `im:write` — open a DM to compose a new direct message from Plot
* - `mpim:history` — read group direct messages
* - `mpim:write` — open a group DM to compose from Plot
* - `users:read` — resolve message authors/reactors to names + avatars
* - `users:read.email` — match Slack users to Plot contacts by email
* - `chat:write` — post the replies and messages the user writes in Plot
* - `files:write` — upload the file attachments the user adds to a message
* (both link types advertise `supportsFileAttachments`)
* - `stars:read` / `stars:write` — read and manage the user's saved (starred)
* items, surfaced as Plot to-dos
* - `reactions:read` / `reactions:write` — read reactions during sync and
* round-trip the emoji reactions the user adds/removes in Plot
*
* **Optional** (connect-time toggle):
* - `emoji:read` — render the workspace's custom emoji in reactions
*/

/**
Expand All@@ -93,6 +104,13 @@ export class Slack extends Connector<Slack> {
"users:read",
"users:read.email",
"chat:write",
// File attachments: both link types advertise `supportsFileAttachments`,
// and onNoteCreated uploads them via files.getUploadURLExternal /
// files.completeUploadExternal. Without this scope those calls fail with
// `missing_scope` and the attachment is silently dropped (the text still
// sends). Existing connections must reconnect to grant it; the upload
// path already degrades gracefully (logs + continues) when it's absent.
"files:write",
"im:history",
"im:write",
"mpim:history",
Expand DownExpand Up@@ -636,6 +654,31 @@ export class Slack extends Connector<Slack> {
const event = bodyObj.event;
if (!event) return;

// Deauthorization events. `app_uninstalled` fires when a workspace admin
// removes Plot (team-wide); `tokens_revoked` fires when a user revokes their
// own token and lists the affected user ids in `event.tokens.oauth`. Both
// are fanned out to every callback registered for the team, so gate
// `tokens_revoked` on THIS connection's own Slack user id to avoid tearing
// down other users who are still connected. The action mirrors what the
// connector already does lazily when a later API call returns an auth error
// (integrations.markNeedsReauth) — doing it here just makes the reconnect
// prompt appear immediately instead of on the next sync attempt. Delivery
// requires `app_uninstalled` / `tokens_revoked` to be enabled in the Slack
// app's Event Subscriptions.
if (event.type === "app_uninstalled") {
await this.tools.integrations.markNeedsReauth(channelId);
return;
}
if (event.type === "tokens_revoked") {
const revokedUserIds: string[] = event.tokens?.oauth ?? [];
const token = await this.tools.integrations.get(channelId);
const ownUserId = token?.provider?.authed_user_id;
if (ownUserId && revokedUserIds.includes(ownUserId)) {
await this.tools.integrations.markNeedsReauth(channelId);
}
return;
}

if (event.type === "star_added" || event.type === "star_removed") {
await this.handleStarEvent(event, event.type === "star_added");
return;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(slack): declare files:write and handle deauthorization events by KrisBraun · Pull Request #276 · plotday/plot · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions connectors/slack/src/slack.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -460,3 +460,64 @@ describe("startIncrementalSync — coalesced scheduling", () => {
expect(options.runAt.getTime()).toBeGreaterThan(Date.now());
});
});

describe("onSlackWebhook — deauthorization events", () => {
function makeDeauthSlack(opts: {
integrationsGet?: ReturnType<typeof vi.fn>;
markNeedsReauth: ReturnType<typeof vi.fn>;
}): Slack {
const tools = {
store: makeStore(),
integrations: {
get: opts.integrationsGet ?? vi.fn().mockResolvedValue(null),
markNeedsReauth: opts.markNeedsReauth,
},
network: {},
files: {},
};
return new Slack(
"twist-instance-1" as never,
{ getTools: () => tools } as never
);
}

// onSlackWebhook reads request.body.event.
const req = (event: unknown) => ({ body: { event } }) as never;

it("flags re-auth when the app is uninstalled from the workspace", async () => {
const markNeedsReauth = vi.fn().mockResolvedValue(undefined);
const slack = makeDeauthSlack({ markNeedsReauth });
await slack.onSlackWebhook(req({ type: "app_uninstalled" }), "C123");
expect(markNeedsReauth).toHaveBeenCalledWith("C123");
});

it("flags re-auth when this connection's own token is revoked", async () => {
const markNeedsReauth = vi.fn().mockResolvedValue(undefined);
const integrationsGet = vi.fn().mockResolvedValue({
token: "xoxp-test",
provider: { authed_user_id: "U_SELF" },
});
const slack = makeDeauthSlack({ integrationsGet, markNeedsReauth });
await slack.onSlackWebhook(
req({ type: "tokens_revoked", tokens: { oauth: ["U_SELF"] } }),
"C123"
);
expect(markNeedsReauth).toHaveBeenCalledWith("C123");
});

it("ignores tokens_revoked for a different user on the same team", async () => {
// The event fans out to every callback registered for the team, so a
// teammate revoking their token must NOT tear down this user's connection.
const markNeedsReauth = vi.fn().mockResolvedValue(undefined);
const integrationsGet = vi.fn().mockResolvedValue({
token: "xoxp-test",
provider: { authed_user_id: "U_SELF" },
});
const slack = makeDeauthSlack({ integrationsGet, markNeedsReauth });
await slack.onSlackWebhook(
req({ type: "tokens_revoked", tokens: { oauth: ["U_OTHER"] } }),
"C123"
);
expect(markNeedsReauth).not.toHaveBeenCalled();
});
});
65 changes: 54 additions & 11 deletions connectors/slack/src/slack.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,17 +61,28 @@ import { slackFacets } from "./slack-facets";
* - Batch processing for large channels
* - Star-based to-do sync against the user's saved items
*
* **Required OAuth User Scopes:**
* - `channels:history` - Read public channel messages
* - `channels:read` - View basic channel info
* - `groups:history` - Read private channel messages
* - `groups:read` - View basic private channel info
* - `users:read` - View users in workspace
* - `users:read.email` - View user email addresses
* - `chat:write` - Post messages as the user (for Plot → Slack replies)
* - `im:history` - Read direct messages
* - `mpim:history` - Read group direct messages
* - `stars:read` / `stars:write` - Read and manage the user's saved items
* **Required OAuth User Scopes** (each backs a shipped, user-visible feature —
* kept in sync with the authoritative {@link Slack.SCOPES} array below):
* - `channels:history` — read messages in public channels the user syncs
* - `channels:read` — list/enumerate public channels the user is in
* - `groups:history` — read messages in private channels the user syncs
* - `groups:read` — list/enumerate private channels the user is in
* - `im:history` — read direct messages
* - `im:write` — open a DM to compose a new direct message from Plot
* - `mpim:history` — read group direct messages
* - `mpim:write` — open a group DM to compose from Plot
* - `users:read` — resolve message authors/reactors to names + avatars
* - `users:read.email` — match Slack users to Plot contacts by email
* - `chat:write` — post the replies and messages the user writes in Plot
* - `files:write` — upload the file attachments the user adds to a message
* (both link types advertise `supportsFileAttachments`)
* - `stars:read` / `stars:write` — read and manage the user's saved (starred)
* items, surfaced as Plot to-dos
* - `reactions:read` / `reactions:write` — read reactions during sync and
* round-trip the emoji reactions the user adds/removes in Plot
*
* **Optional** (connect-time toggle):
* - `emoji:read` — render the workspace's custom emoji in reactions
*/

/**
Expand All@@ -93,6 +104,13 @@ export class Slack extends Connector<Slack> {
"users:read",
"users:read.email",
"chat:write",
// File attachments: both link types advertise `supportsFileAttachments`,
// and onNoteCreated uploads them via files.getUploadURLExternal /
// files.completeUploadExternal. Without this scope those calls fail with
// `missing_scope` and the attachment is silently dropped (the text still
// sends). Existing connections must reconnect to grant it; the upload
// path already degrades gracefully (logs + continues) when it's absent.
"files:write",
"im:history",
"im:write",
"mpim:history",
Expand DownExpand Up@@ -636,6 +654,31 @@ export class Slack extends Connector<Slack> {
const event = bodyObj.event;
if (!event) return;

// Deauthorization events. `app_uninstalled` fires when a workspace admin
// removes Plot (team-wide); `tokens_revoked` fires when a user revokes their
// own token and lists the affected user ids in `event.tokens.oauth`. Both
// are fanned out to every callback registered for the team, so gate
// `tokens_revoked` on THIS connection's own Slack user id to avoid tearing
// down other users who are still connected. The action mirrors what the
// connector already does lazily when a later API call returns an auth error
// (integrations.markNeedsReauth) — doing it here just makes the reconnect
// prompt appear immediately instead of on the next sync attempt. Delivery
// requires `app_uninstalled` / `tokens_revoked` to be enabled in the Slack
// app's Event Subscriptions.
if (event.type === "app_uninstalled") {
await this.tools.integrations.markNeedsReauth(channelId);
return;
}
if (event.type === "tokens_revoked") {
const revokedUserIds: string[] = event.tokens?.oauth ?? [];
const token = await this.tools.integrations.get(channelId);
const ownUserId = token?.provider?.authed_user_id;
if (ownUserId && revokedUserIds.includes(ownUserId)) {
await this.tools.integrations.markNeedsReauth(channelId);
}
return;
}

if (event.type === "star_added" || event.type === "star_removed") {
await this.handleStarEvent(event, event.type === "star_added");
return;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(slack): declare files:write and handle deauthorization events by KrisBraun · Pull Request #276 · plotday/plot · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions connectors/slack/src/slack.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -460,3 +460,64 @@ describe("startIncrementalSync — coalesced scheduling", () => {
expect(options.runAt.getTime()).toBeGreaterThan(Date.now());
});
});

describe("onSlackWebhook — deauthorization events", () => {
function makeDeauthSlack(opts: {
integrationsGet?: ReturnType<typeof vi.fn>;
markNeedsReauth: ReturnType<typeof vi.fn>;
}): Slack {
const tools = {
store: makeStore(),
integrations: {
get: opts.integrationsGet ?? vi.fn().mockResolvedValue(null),
markNeedsReauth: opts.markNeedsReauth,
},
network: {},
files: {},
};
return new Slack(
"twist-instance-1" as never,
{ getTools: () => tools } as never
);
}

// onSlackWebhook reads request.body.event.
const req = (event: unknown) => ({ body: { event } }) as never;

it("flags re-auth when the app is uninstalled from the workspace", async () => {
const markNeedsReauth = vi.fn().mockResolvedValue(undefined);
const slack = makeDeauthSlack({ markNeedsReauth });
await slack.onSlackWebhook(req({ type: "app_uninstalled" }), "C123");
expect(markNeedsReauth).toHaveBeenCalledWith("C123");
});

it("flags re-auth when this connection's own token is revoked", async () => {
const markNeedsReauth = vi.fn().mockResolvedValue(undefined);
const integrationsGet = vi.fn().mockResolvedValue({
token: "xoxp-test",
provider: { authed_user_id: "U_SELF" },
});
const slack = makeDeauthSlack({ integrationsGet, markNeedsReauth });
await slack.onSlackWebhook(
req({ type: "tokens_revoked", tokens: { oauth: ["U_SELF"] } }),
"C123"
);
expect(markNeedsReauth).toHaveBeenCalledWith("C123");
});

it("ignores tokens_revoked for a different user on the same team", async () => {
// The event fans out to every callback registered for the team, so a
// teammate revoking their token must NOT tear down this user's connection.
const markNeedsReauth = vi.fn().mockResolvedValue(undefined);
const integrationsGet = vi.fn().mockResolvedValue({
token: "xoxp-test",
provider: { authed_user_id: "U_SELF" },
});
const slack = makeDeauthSlack({ integrationsGet, markNeedsReauth });
await slack.onSlackWebhook(
req({ type: "tokens_revoked", tokens: { oauth: ["U_OTHER"] } }),
"C123"
);
expect(markNeedsReauth).not.toHaveBeenCalled();
});
});
65 changes: 54 additions & 11 deletions connectors/slack/src/slack.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,17 +61,28 @@ import { slackFacets } from "./slack-facets";
* - Batch processing for large channels
* - Star-based to-do sync against the user's saved items
*
* **Required OAuth User Scopes:**
* - `channels:history` - Read public channel messages
* - `channels:read` - View basic channel info
* - `groups:history` - Read private channel messages
* - `groups:read` - View basic private channel info
* - `users:read` - View users in workspace
* - `users:read.email` - View user email addresses
* - `chat:write` - Post messages as the user (for Plot → Slack replies)
* - `im:history` - Read direct messages
* - `mpim:history` - Read group direct messages
* - `stars:read` / `stars:write` - Read and manage the user's saved items
* **Required OAuth User Scopes** (each backs a shipped, user-visible feature —
* kept in sync with the authoritative {@link Slack.SCOPES} array below):
* - `channels:history` — read messages in public channels the user syncs
* - `channels:read` — list/enumerate public channels the user is in
* - `groups:history` — read messages in private channels the user syncs
* - `groups:read` — list/enumerate private channels the user is in
* - `im:history` — read direct messages
* - `im:write` — open a DM to compose a new direct message from Plot
* - `mpim:history` — read group direct messages
* - `mpim:write` — open a group DM to compose from Plot
* - `users:read` — resolve message authors/reactors to names + avatars
* - `users:read.email` — match Slack users to Plot contacts by email
* - `chat:write` — post the replies and messages the user writes in Plot
* - `files:write` — upload the file attachments the user adds to a message
* (both link types advertise `supportsFileAttachments`)
* - `stars:read` / `stars:write` — read and manage the user's saved (starred)
* items, surfaced as Plot to-dos
* - `reactions:read` / `reactions:write` — read reactions during sync and
* round-trip the emoji reactions the user adds/removes in Plot
*
* **Optional** (connect-time toggle):
* - `emoji:read` — render the workspace's custom emoji in reactions
*/

/**
Expand All@@ -93,6 +104,13 @@ export class Slack extends Connector<Slack> {
"users:read",
"users:read.email",
"chat:write",
// File attachments: both link types advertise `supportsFileAttachments`,
// and onNoteCreated uploads them via files.getUploadURLExternal /
// files.completeUploadExternal. Without this scope those calls fail with
// `missing_scope` and the attachment is silently dropped (the text still
// sends). Existing connections must reconnect to grant it; the upload
// path already degrades gracefully (logs + continues) when it's absent.
"files:write",
"im:history",
"im:write",
"mpim:history",
Expand DownExpand Up@@ -636,6 +654,31 @@ export class Slack extends Connector<Slack> {
const event = bodyObj.event;
if (!event) return;

// Deauthorization events. `app_uninstalled` fires when a workspace admin
// removes Plot (team-wide); `tokens_revoked` fires when a user revokes their
// own token and lists the affected user ids in `event.tokens.oauth`. Both
// are fanned out to every callback registered for the team, so gate
// `tokens_revoked` on THIS connection's own Slack user id to avoid tearing
// down other users who are still connected. The action mirrors what the
// connector already does lazily when a later API call returns an auth error
// (integrations.markNeedsReauth) — doing it here just makes the reconnect
// prompt appear immediately instead of on the next sync attempt. Delivery
// requires `app_uninstalled` / `tokens_revoked` to be enabled in the Slack
// app's Event Subscriptions.
if (event.type === "app_uninstalled") {
await this.tools.integrations.markNeedsReauth(channelId);
return;
}
if (event.type === "tokens_revoked") {
const revokedUserIds: string[] = event.tokens?.oauth ?? [];
const token = await this.tools.integrations.get(channelId);
const ownUserId = token?.provider?.authed_user_id;
if (ownUserId && revokedUserIds.includes(ownUserId)) {
await this.tools.integrations.markNeedsReauth(channelId);
}
return;
}

if (event.type === "star_added" || event.type === "star_removed") {
await this.handleStarEvent(event, event.type === "star_added");
return;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' fix(slack): declare files:write and handle deauthorization events by KrisBraun · Pull Request #276 · plotday/plot · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions connectors/slack/src/slack.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -460,3 +460,64 @@ describe("startIncrementalSync — coalesced scheduling", () => {
expect(options.runAt.getTime()).toBeGreaterThan(Date.now());
});
});

describe("onSlackWebhook — deauthorization events", () => {
function makeDeauthSlack(opts: {
integrationsGet?: ReturnType<typeof vi.fn>;
markNeedsReauth: ReturnType<typeof vi.fn>;
}): Slack {
const tools = {
store: makeStore(),
integrations: {
get: opts.integrationsGet ?? vi.fn().mockResolvedValue(null),
markNeedsReauth: opts.markNeedsReauth,
},
network: {},
files: {},
};
return new Slack(
"twist-instance-1" as never,
{ getTools: () => tools } as never
);
}

// onSlackWebhook reads request.body.event.
const req = (event: unknown) => ({ body: { event } }) as never;

it("flags re-auth when the app is uninstalled from the workspace", async () => {
const markNeedsReauth = vi.fn().mockResolvedValue(undefined);
const slack = makeDeauthSlack({ markNeedsReauth });
await slack.onSlackWebhook(req({ type: "app_uninstalled" }), "C123");
expect(markNeedsReauth).toHaveBeenCalledWith("C123");
});

it("flags re-auth when this connection's own token is revoked", async () => {
const markNeedsReauth = vi.fn().mockResolvedValue(undefined);
const integrationsGet = vi.fn().mockResolvedValue({
token: "xoxp-test",
provider: { authed_user_id: "U_SELF" },
});
const slack = makeDeauthSlack({ integrationsGet, markNeedsReauth });
await slack.onSlackWebhook(
req({ type: "tokens_revoked", tokens: { oauth: ["U_SELF"] } }),
"C123"
);
expect(markNeedsReauth).toHaveBeenCalledWith("C123");
});

it("ignores tokens_revoked for a different user on the same team", async () => {
// The event fans out to every callback registered for the team, so a
// teammate revoking their token must NOT tear down this user's connection.
const markNeedsReauth = vi.fn().mockResolvedValue(undefined);
const integrationsGet = vi.fn().mockResolvedValue({
token: "xoxp-test",
provider: { authed_user_id: "U_SELF" },
});
const slack = makeDeauthSlack({ integrationsGet, markNeedsReauth });
await slack.onSlackWebhook(
req({ type: "tokens_revoked", tokens: { oauth: ["U_OTHER"] } }),
"C123"
);
expect(markNeedsReauth).not.toHaveBeenCalled();
});
});
65 changes: 54 additions & 11 deletions connectors/slack/src/slack.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,17 +61,28 @@ import { slackFacets } from "./slack-facets";
* - Batch processing for large channels
* - Star-based to-do sync against the user's saved items
*
* **Required OAuth User Scopes:**
* - `channels:history` - Read public channel messages
* - `channels:read` - View basic channel info
* - `groups:history` - Read private channel messages
* - `groups:read` - View basic private channel info
* - `users:read` - View users in workspace
* - `users:read.email` - View user email addresses
* - `chat:write` - Post messages as the user (for Plot → Slack replies)
* - `im:history` - Read direct messages
* - `mpim:history` - Read group direct messages
* - `stars:read` / `stars:write` - Read and manage the user's saved items
* **Required OAuth User Scopes** (each backs a shipped, user-visible feature —
* kept in sync with the authoritative {@link Slack.SCOPES} array below):
* - `channels:history` — read messages in public channels the user syncs
* - `channels:read` — list/enumerate public channels the user is in
* - `groups:history` — read messages in private channels the user syncs
* - `groups:read` — list/enumerate private channels the user is in
* - `im:history` — read direct messages
* - `im:write` — open a DM to compose a new direct message from Plot
* - `mpim:history` — read group direct messages
* - `mpim:write` — open a group DM to compose from Plot
* - `users:read` — resolve message authors/reactors to names + avatars
* - `users:read.email` — match Slack users to Plot contacts by email
* - `chat:write` — post the replies and messages the user writes in Plot
* - `files:write` — upload the file attachments the user adds to a message
* (both link types advertise `supportsFileAttachments`)
* - `stars:read` / `stars:write` — read and manage the user's saved (starred)
* items, surfaced as Plot to-dos
* - `reactions:read` / `reactions:write` — read reactions during sync and
* round-trip the emoji reactions the user adds/removes in Plot
*
* **Optional** (connect-time toggle):
* - `emoji:read` — render the workspace's custom emoji in reactions
*/

/**
Expand All@@ -93,6 +104,13 @@ export class Slack extends Connector<Slack> {
"users:read",
"users:read.email",
"chat:write",
// File attachments: both link types advertise `supportsFileAttachments`,
// and onNoteCreated uploads them via files.getUploadURLExternal /
// files.completeUploadExternal. Without this scope those calls fail with
// `missing_scope` and the attachment is silently dropped (the text still
// sends). Existing connections must reconnect to grant it; the upload
// path already degrades gracefully (logs + continues) when it's absent.
"files:write",
"im:history",
"im:write",
"mpim:history",
Expand DownExpand Up@@ -636,6 +654,31 @@ export class Slack extends Connector<Slack> {
const event = bodyObj.event;
if (!event) return;

// Deauthorization events. `app_uninstalled` fires when a workspace admin
// removes Plot (team-wide); `tokens_revoked` fires when a user revokes their
// own token and lists the affected user ids in `event.tokens.oauth`. Both
// are fanned out to every callback registered for the team, so gate
// `tokens_revoked` on THIS connection's own Slack user id to avoid tearing
// down other users who are still connected. The action mirrors what the
// connector already does lazily when a later API call returns an auth error
// (integrations.markNeedsReauth) — doing it here just makes the reconnect
// prompt appear immediately instead of on the next sync attempt. Delivery
// requires `app_uninstalled` / `tokens_revoked` to be enabled in the Slack
// app's Event Subscriptions.
if (event.type === "app_uninstalled") {
await this.tools.integrations.markNeedsReauth(channelId);
return;
}
if (event.type === "tokens_revoked") {
const revokedUserIds: string[] = event.tokens?.oauth ?? [];
const token = await this.tools.integrations.get(channelId);
const ownUserId = token?.provider?.authed_user_id;
if (ownUserId && revokedUserIds.includes(ownUserId)) {
await this.tools.integrations.markNeedsReauth(channelId);
}
return;
}

if (event.type === "star_added" || event.type === "star_removed") {
await this.handleStarEvent(event, event.type === "star_added");
return;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(slack): declare files:write and handle deauthorization events by KrisBraun · Pull Request #276 · plotday/plot · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions connectors/slack/src/slack.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -460,3 +460,64 @@ describe("startIncrementalSync — coalesced scheduling", () => {
expect(options.runAt.getTime()).toBeGreaterThan(Date.now());
});
});

describe("onSlackWebhook — deauthorization events", () => {
function makeDeauthSlack(opts: {
integrationsGet?: ReturnType<typeof vi.fn>;
markNeedsReauth: ReturnType<typeof vi.fn>;
}): Slack {
const tools = {
store: makeStore(),
integrations: {
get: opts.integrationsGet ?? vi.fn().mockResolvedValue(null),
markNeedsReauth: opts.markNeedsReauth,
},
network: {},
files: {},
};
return new Slack(
"twist-instance-1" as never,
{ getTools: () => tools } as never
);
}

// onSlackWebhook reads request.body.event.
const req = (event: unknown) => ({ body: { event } }) as never;

it("flags re-auth when the app is uninstalled from the workspace", async () => {
const markNeedsReauth = vi.fn().mockResolvedValue(undefined);
const slack = makeDeauthSlack({ markNeedsReauth });
await slack.onSlackWebhook(req({ type: "app_uninstalled" }), "C123");
expect(markNeedsReauth).toHaveBeenCalledWith("C123");
});

it("flags re-auth when this connection's own token is revoked", async () => {
const markNeedsReauth = vi.fn().mockResolvedValue(undefined);
const integrationsGet = vi.fn().mockResolvedValue({
token: "xoxp-test",
provider: { authed_user_id: "U_SELF" },
});
const slack = makeDeauthSlack({ integrationsGet, markNeedsReauth });
await slack.onSlackWebhook(
req({ type: "tokens_revoked", tokens: { oauth: ["U_SELF"] } }),
"C123"
);
expect(markNeedsReauth).toHaveBeenCalledWith("C123");
});

it("ignores tokens_revoked for a different user on the same team", async () => {
// The event fans out to every callback registered for the team, so a
// teammate revoking their token must NOT tear down this user's connection.
const markNeedsReauth = vi.fn().mockResolvedValue(undefined);
const integrationsGet = vi.fn().mockResolvedValue({
token: "xoxp-test",
provider: { authed_user_id: "U_SELF" },
});
const slack = makeDeauthSlack({ integrationsGet, markNeedsReauth });
await slack.onSlackWebhook(
req({ type: "tokens_revoked", tokens: { oauth: ["U_OTHER"] } }),
"C123"
);
expect(markNeedsReauth).not.toHaveBeenCalled();
});
});
65 changes: 54 additions & 11 deletions connectors/slack/src/slack.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,17 +61,28 @@ import { slackFacets } from "./slack-facets";
* - Batch processing for large channels
* - Star-based to-do sync against the user's saved items
*
* **Required OAuth User Scopes:**
* - `channels:history` - Read public channel messages
* - `channels:read` - View basic channel info
* - `groups:history` - Read private channel messages
* - `groups:read` - View basic private channel info
* - `users:read` - View users in workspace
* - `users:read.email` - View user email addresses
* - `chat:write` - Post messages as the user (for Plot → Slack replies)
* - `im:history` - Read direct messages
* - `mpim:history` - Read group direct messages
* - `stars:read` / `stars:write` - Read and manage the user's saved items
* **Required OAuth User Scopes** (each backs a shipped, user-visible feature —
* kept in sync with the authoritative {@link Slack.SCOPES} array below):
* - `channels:history` — read messages in public channels the user syncs
* - `channels:read` — list/enumerate public channels the user is in
* - `groups:history` — read messages in private channels the user syncs
* - `groups:read` — list/enumerate private channels the user is in
* - `im:history` — read direct messages
* - `im:write` — open a DM to compose a new direct message from Plot
* - `mpim:history` — read group direct messages
* - `mpim:write` — open a group DM to compose from Plot
* - `users:read` — resolve message authors/reactors to names + avatars
* - `users:read.email` — match Slack users to Plot contacts by email
* - `chat:write` — post the replies and messages the user writes in Plot
* - `files:write` — upload the file attachments the user adds to a message
* (both link types advertise `supportsFileAttachments`)
* - `stars:read` / `stars:write` — read and manage the user's saved (starred)
* items, surfaced as Plot to-dos
* - `reactions:read` / `reactions:write` — read reactions during sync and
* round-trip the emoji reactions the user adds/removes in Plot
*
* **Optional** (connect-time toggle):
* - `emoji:read` — render the workspace's custom emoji in reactions
*/

/**
Expand All@@ -93,6 +104,13 @@ export class Slack extends Connector<Slack> {
"users:read",
"users:read.email",
"chat:write",
// File attachments: both link types advertise `supportsFileAttachments`,
// and onNoteCreated uploads them via files.getUploadURLExternal /
// files.completeUploadExternal. Without this scope those calls fail with
// `missing_scope` and the attachment is silently dropped (the text still
// sends). Existing connections must reconnect to grant it; the upload
// path already degrades gracefully (logs + continues) when it's absent.
"files:write",
"im:history",
"im:write",
"mpim:history",
Expand DownExpand Up@@ -636,6 +654,31 @@ export class Slack extends Connector<Slack> {
const event = bodyObj.event;
if (!event) return;

// Deauthorization events. `app_uninstalled` fires when a workspace admin
// removes Plot (team-wide); `tokens_revoked` fires when a user revokes their
// own token and lists the affected user ids in `event.tokens.oauth`. Both
// are fanned out to every callback registered for the team, so gate
// `tokens_revoked` on THIS connection's own Slack user id to avoid tearing
// down other users who are still connected. The action mirrors what the
// connector already does lazily when a later API call returns an auth error
// (integrations.markNeedsReauth) — doing it here just makes the reconnect
// prompt appear immediately instead of on the next sync attempt. Delivery
// requires `app_uninstalled` / `tokens_revoked` to be enabled in the Slack
// app's Event Subscriptions.
if (event.type === "app_uninstalled") {
await this.tools.integrations.markNeedsReauth(channelId);
return;
}
if (event.type === "tokens_revoked") {
const revokedUserIds: string[] = event.tokens?.oauth ?? [];
const token = await this.tools.integrations.get(channelId);
const ownUserId = token?.provider?.authed_user_id;
if (ownUserId && revokedUserIds.includes(ownUserId)) {
await this.tools.integrations.markNeedsReauth(channelId);
}
return;
}

if (event.type === "star_added" || event.type === "star_removed") {
await this.handleStarEvent(event, event.type === "star_added");
return;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' fix(slack): declare files:write and handle deauthorization events by KrisBraun · Pull Request #276 · plotday/plot · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions connectors/slack/src/slack.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -460,3 +460,64 @@ describe("startIncrementalSync — coalesced scheduling", () => {
expect(options.runAt.getTime()).toBeGreaterThan(Date.now());
});
});

describe("onSlackWebhook — deauthorization events", () => {
function makeDeauthSlack(opts: {
integrationsGet?: ReturnType<typeof vi.fn>;
markNeedsReauth: ReturnType<typeof vi.fn>;
}): Slack {
const tools = {
store: makeStore(),
integrations: {
get: opts.integrationsGet ?? vi.fn().mockResolvedValue(null),
markNeedsReauth: opts.markNeedsReauth,
},
network: {},
files: {},
};
return new Slack(
"twist-instance-1" as never,
{ getTools: () => tools } as never
);
}

// onSlackWebhook reads request.body.event.
const req = (event: unknown) => ({ body: { event } }) as never;

it("flags re-auth when the app is uninstalled from the workspace", async () => {
const markNeedsReauth = vi.fn().mockResolvedValue(undefined);
const slack = makeDeauthSlack({ markNeedsReauth });
await slack.onSlackWebhook(req({ type: "app_uninstalled" }), "C123");
expect(markNeedsReauth).toHaveBeenCalledWith("C123");
});

it("flags re-auth when this connection's own token is revoked", async () => {
const markNeedsReauth = vi.fn().mockResolvedValue(undefined);
const integrationsGet = vi.fn().mockResolvedValue({
token: "xoxp-test",
provider: { authed_user_id: "U_SELF" },
});
const slack = makeDeauthSlack({ integrationsGet, markNeedsReauth });
await slack.onSlackWebhook(
req({ type: "tokens_revoked", tokens: { oauth: ["U_SELF"] } }),
"C123"
);
expect(markNeedsReauth).toHaveBeenCalledWith("C123");
});

it("ignores tokens_revoked for a different user on the same team", async () => {
// The event fans out to every callback registered for the team, so a
// teammate revoking their token must NOT tear down this user's connection.
const markNeedsReauth = vi.fn().mockResolvedValue(undefined);
const integrationsGet = vi.fn().mockResolvedValue({
token: "xoxp-test",
provider: { authed_user_id: "U_SELF" },
});
const slack = makeDeauthSlack({ integrationsGet, markNeedsReauth });
await slack.onSlackWebhook(
req({ type: "tokens_revoked", tokens: { oauth: ["U_OTHER"] } }),
"C123"
);
expect(markNeedsReauth).not.toHaveBeenCalled();
});
});
65 changes: 54 additions & 11 deletions connectors/slack/src/slack.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,17 +61,28 @@ import { slackFacets } from "./slack-facets";
* - Batch processing for large channels
* - Star-based to-do sync against the user's saved items
*
* **Required OAuth User Scopes:**
* - `channels:history` - Read public channel messages
* - `channels:read` - View basic channel info
* - `groups:history` - Read private channel messages
* - `groups:read` - View basic private channel info
* - `users:read` - View users in workspace
* - `users:read.email` - View user email addresses
* - `chat:write` - Post messages as the user (for Plot → Slack replies)
* - `im:history` - Read direct messages
* - `mpim:history` - Read group direct messages
* - `stars:read` / `stars:write` - Read and manage the user's saved items
* **Required OAuth User Scopes** (each backs a shipped, user-visible feature —
* kept in sync with the authoritative {@link Slack.SCOPES} array below):
* - `channels:history` — read messages in public channels the user syncs
* - `channels:read` — list/enumerate public channels the user is in
* - `groups:history` — read messages in private channels the user syncs
* - `groups:read` — list/enumerate private channels the user is in
* - `im:history` — read direct messages
* - `im:write` — open a DM to compose a new direct message from Plot
* - `mpim:history` — read group direct messages
* - `mpim:write` — open a group DM to compose from Plot
* - `users:read` — resolve message authors/reactors to names + avatars
* - `users:read.email` — match Slack users to Plot contacts by email
* - `chat:write` — post the replies and messages the user writes in Plot
* - `files:write` — upload the file attachments the user adds to a message
* (both link types advertise `supportsFileAttachments`)
* - `stars:read` / `stars:write` — read and manage the user's saved (starred)
* items, surfaced as Plot to-dos
* - `reactions:read` / `reactions:write` — read reactions during sync and
* round-trip the emoji reactions the user adds/removes in Plot
*
* **Optional** (connect-time toggle):
* - `emoji:read` — render the workspace's custom emoji in reactions
*/

/**
Expand All@@ -93,6 +104,13 @@ export class Slack extends Connector<Slack> {
"users:read",
"users:read.email",
"chat:write",
// File attachments: both link types advertise `supportsFileAttachments`,
// and onNoteCreated uploads them via files.getUploadURLExternal /
// files.completeUploadExternal. Without this scope those calls fail with
// `missing_scope` and the attachment is silently dropped (the text still
// sends). Existing connections must reconnect to grant it; the upload
// path already degrades gracefully (logs + continues) when it's absent.
"files:write",
"im:history",
"im:write",
"mpim:history",
Expand DownExpand Up@@ -636,6 +654,31 @@ export class Slack extends Connector<Slack> {
const event = bodyObj.event;
if (!event) return;

// Deauthorization events. `app_uninstalled` fires when a workspace admin
// removes Plot (team-wide); `tokens_revoked` fires when a user revokes their
// own token and lists the affected user ids in `event.tokens.oauth`. Both
// are fanned out to every callback registered for the team, so gate
// `tokens_revoked` on THIS connection's own Slack user id to avoid tearing
// down other users who are still connected. The action mirrors what the
// connector already does lazily when a later API call returns an auth error
// (integrations.markNeedsReauth) — doing it here just makes the reconnect
// prompt appear immediately instead of on the next sync attempt. Delivery
// requires `app_uninstalled` / `tokens_revoked` to be enabled in the Slack
// app's Event Subscriptions.
if (event.type === "app_uninstalled") {
await this.tools.integrations.markNeedsReauth(channelId);
return;
}
if (event.type === "tokens_revoked") {
const revokedUserIds: string[] = event.tokens?.oauth ?? [];
const token = await this.tools.integrations.get(channelId);
const ownUserId = token?.provider?.authed_user_id;
if (ownUserId && revokedUserIds.includes(ownUserId)) {
await this.tools.integrations.markNeedsReauth(channelId);
}
return;
}

if (event.type === "star_added" || event.type === "star_removed") {
await this.handleStarEvent(event, event.type === "star_added");
return;
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); fix(slack): declare files:write and handle deauthorization events by KrisBraun · Pull Request #276 · plotday/plot · GitHub
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 61 additions & 0 deletions connectors/slack/src/slack.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -460,3 +460,64 @@ describe("startIncrementalSync — coalesced scheduling", () => {
expect(options.runAt.getTime()).toBeGreaterThan(Date.now());
});
});

describe("onSlackWebhook — deauthorization events", () => {
function makeDeauthSlack(opts: {
integrationsGet?: ReturnType<typeof vi.fn>;
markNeedsReauth: ReturnType<typeof vi.fn>;
}): Slack {
const tools = {
store: makeStore(),
integrations: {
get: opts.integrationsGet ?? vi.fn().mockResolvedValue(null),
markNeedsReauth: opts.markNeedsReauth,
},
network: {},
files: {},
};
return new Slack(
"twist-instance-1" as never,
{ getTools: () => tools } as never
);
}

// onSlackWebhook reads request.body.event.
const req = (event: unknown) => ({ body: { event } }) as never;

it("flags re-auth when the app is uninstalled from the workspace", async () => {
const markNeedsReauth = vi.fn().mockResolvedValue(undefined);
const slack = makeDeauthSlack({ markNeedsReauth });
await slack.onSlackWebhook(req({ type: "app_uninstalled" }), "C123");
expect(markNeedsReauth).toHaveBeenCalledWith("C123");
});

it("flags re-auth when this connection's own token is revoked", async () => {
const markNeedsReauth = vi.fn().mockResolvedValue(undefined);
const integrationsGet = vi.fn().mockResolvedValue({
token: "xoxp-test",
provider: { authed_user_id: "U_SELF" },
});
const slack = makeDeauthSlack({ integrationsGet, markNeedsReauth });
await slack.onSlackWebhook(
req({ type: "tokens_revoked", tokens: { oauth: ["U_SELF"] } }),
"C123"
);
expect(markNeedsReauth).toHaveBeenCalledWith("C123");
});

it("ignores tokens_revoked for a different user on the same team", async () => {
// The event fans out to every callback registered for the team, so a
// teammate revoking their token must NOT tear down this user's connection.
const markNeedsReauth = vi.fn().mockResolvedValue(undefined);
const integrationsGet = vi.fn().mockResolvedValue({
token: "xoxp-test",
provider: { authed_user_id: "U_SELF" },
});
const slack = makeDeauthSlack({ integrationsGet, markNeedsReauth });
await slack.onSlackWebhook(
req({ type: "tokens_revoked", tokens: { oauth: ["U_OTHER"] } }),
"C123"
);
expect(markNeedsReauth).not.toHaveBeenCalled();
});
});
65 changes: 54 additions & 11 deletions connectors/slack/src/slack.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,17 +61,28 @@ import { slackFacets } from "./slack-facets";
* - Batch processing for large channels
* - Star-based to-do sync against the user's saved items
*
* **Required OAuth User Scopes:**
* - `channels:history` - Read public channel messages
* - `channels:read` - View basic channel info
* - `groups:history` - Read private channel messages
* - `groups:read` - View basic private channel info
* - `users:read` - View users in workspace
* - `users:read.email` - View user email addresses
* - `chat:write` - Post messages as the user (for Plot → Slack replies)
* - `im:history` - Read direct messages
* - `mpim:history` - Read group direct messages
* - `stars:read` / `stars:write` - Read and manage the user's saved items
* **Required OAuth User Scopes** (each backs a shipped, user-visible feature —
* kept in sync with the authoritative {@link Slack.SCOPES} array below):
* - `channels:history` — read messages in public channels the user syncs
* - `channels:read` — list/enumerate public channels the user is in
* - `groups:history` — read messages in private channels the user syncs
* - `groups:read` — list/enumerate private channels the user is in
* - `im:history` — read direct messages
* - `im:write` — open a DM to compose a new direct message from Plot
* - `mpim:history` — read group direct messages
* - `mpim:write` — open a group DM to compose from Plot
* - `users:read` — resolve message authors/reactors to names + avatars
* - `users:read.email` — match Slack users to Plot contacts by email
* - `chat:write` — post the replies and messages the user writes in Plot
* - `files:write` — upload the file attachments the user adds to a message
* (both link types advertise `supportsFileAttachments`)
* - `stars:read` / `stars:write` — read and manage the user's saved (starred)
* items, surfaced as Plot to-dos
* - `reactions:read` / `reactions:write` — read reactions during sync and
* round-trip the emoji reactions the user adds/removes in Plot
*
* **Optional** (connect-time toggle):
* - `emoji:read` — render the workspace's custom emoji in reactions
*/

/**
Expand All@@ -93,6 +104,13 @@ export class Slack extends Connector<Slack> {
"users:read",
"users:read.email",
"chat:write",
// File attachments: both link types advertise `supportsFileAttachments`,
// and onNoteCreated uploads them via files.getUploadURLExternal /
// files.completeUploadExternal. Without this scope those calls fail with
// `missing_scope` and the attachment is silently dropped (the text still
// sends). Existing connections must reconnect to grant it; the upload
// path already degrades gracefully (logs + continues) when it's absent.
"files:write",
"im:history",
"im:write",
"mpim:history",
Expand DownExpand Up@@ -636,6 +654,31 @@ export class Slack extends Connector<Slack> {
const event = bodyObj.event;
if (!event) return;

// Deauthorization events. `app_uninstalled` fires when a workspace admin
// removes Plot (team-wide); `tokens_revoked` fires when a user revokes their
// own token and lists the affected user ids in `event.tokens.oauth`. Both
// are fanned out to every callback registered for the team, so gate
// `tokens_revoked` on THIS connection's own Slack user id to avoid tearing
// down other users who are still connected. The action mirrors what the
// connector already does lazily when a later API call returns an auth error
// (integrations.markNeedsReauth) — doing it here just makes the reconnect
// prompt appear immediately instead of on the next sync attempt. Delivery
// requires `app_uninstalled` / `tokens_revoked` to be enabled in the Slack
// app's Event Subscriptions.
if (event.type === "app_uninstalled") {
await this.tools.integrations.markNeedsReauth(channelId);
return;
}
if (event.type === "tokens_revoked") {
const revokedUserIds: string[] = event.tokens?.oauth ?? [];
const token = await this.tools.integrations.get(channelId);
const ownUserId = token?.provider?.authed_user_id;
if (ownUserId && revokedUserIds.includes(ownUserId)) {
await this.tools.integrations.markNeedsReauth(channelId);
}
return;
}

if (event.type === "star_added" || event.type === "star_removed") {
await this.handleStarEvent(event, event.type === "star_added");
return;
Expand Down
Loading