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
95 changes: 95 additions & 0 deletions connectors/gmail/src/gmail.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -562,3 +562,98 @@ describe("recoverMailboxDelivery — durable recovery on upgrade", () => {
expect(spies.requeueInitialSync).not.toHaveBeenCalled();
});
});

describe("thread-state write-back when the connection has no auth token", () => {
// A Gmail connection whose OAuth has lapsed/been revoked resolves no token
// for its channel. The thread-state write-backs (to-do star, read-state)
// are best-effort label syncs — the user's change already lives in Plot —
// so they must degrade to a silent no-op rather than throwing. Throwing
// pages error tracking on every to-do/read toggle for a re-auth-needed
// connection (PostHog issue 019ed581: "No Google authentication token
// available", 673 occurrences / 296 users).
function makeGmail(token: { token: string; scopes: string[] } | null): {
gmail: Gmail;
integrationsGet: ReturnType<typeof vi.fn>;
} {
const storeMap = new Map<string, unknown>([["enabled_channels", ["INBOX"]]]);
const store = {
get: vi.fn(async (key: string) =>
storeMap.has(key) ? storeMap.get(key) : null
),
set: vi.fn(async (key: string, value: unknown) => {
storeMap.set(key, value);
}),
clear: vi.fn(async (key: string) => {
storeMap.delete(key);
}),
list: vi.fn(async (prefix: string) =>
[...storeMap.keys()].filter((k) => k.startsWith(prefix))
),
};
const integrationsGet = vi.fn().mockResolvedValue(token);
const tools = {
store,
integrations: { get: integrationsGet },
network: {},
files: {},
};
const gmail = new Gmail(
"twist-instance-1" as never,
{ getTools: () => tools } as never
);
return { gmail, integrationsGet };
}

const thread = {
id: "thread-1",
meta: { threadId: "gmail-thread-1", channelId: "INBOX" },
} as never;
const actor = { id: "actor-1" } as never;

it("onThreadToDo resolves without throwing and never calls Gmail", async () => {
const { gmail, integrationsGet } = makeGmail(null);
const fetchSpy = vi
.spyOn(globalThis, "fetch")
.mockResolvedValue(new Response("{}"));

await expect(
gmail.onThreadToDo(thread, actor, true, {})
).resolves.toBeUndefined();

expect(integrationsGet).toHaveBeenCalledWith("INBOX");
expect(fetchSpy).not.toHaveBeenCalled();
fetchSpy.mockRestore();
});

it("onThreadRead resolves without throwing and never calls Gmail", async () => {
const { gmail, integrationsGet } = makeGmail(null);
const fetchSpy = vi
.spyOn(globalThis, "fetch")
.mockResolvedValue(new Response("{}"));

await expect(
gmail.onThreadRead(thread, actor, false)
).resolves.toBeUndefined();

expect(integrationsGet).toHaveBeenCalledWith("INBOX");
expect(fetchSpy).not.toHaveBeenCalled();
fetchSpy.mockRestore();
});

it("onThreadToDo still writes the STARRED/INBOX labels when a token is present", async () => {
const { gmail } = makeGmail({ token: "tok", scopes: [] });
const fetchSpy = vi
.spyOn(globalThis, "fetch")
.mockResolvedValue(new Response("{}"));

await gmail.onThreadToDo(thread, actor, true, {});

expect(fetchSpy).toHaveBeenCalledTimes(1);
const [url, init] = fetchSpy.mock.calls[0];
expect(String(url)).toContain("/threads/gmail-thread-1/modify");
expect(JSON.parse((init as RequestInit).body as string)).toEqual({
addLabelIds: ["STARRED", "INBOX"],
});
fetchSpy.mockRestore();
});
});
33 changes: 31 additions & 2 deletions connectors/gmail/src/sync.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -376,6 +376,26 @@ export async function getApiFn(
return new GmailApi(token.token);
}

/**
* Like {@link getApiFn}, but returns `null` instead of throwing when the
* channel resolves no auth token (lapsed / revoked Google OAuth).
*
* Use this in best-effort write-backs (to-do star, read-state) where a
* re-auth-needed connection should degrade to a silent no-op: the user's
* change already lives in Plot, and the connection's re-auth need is already
* surfaced in the connections UI. Throwing there only pages error tracking on
* every toggle. Sync paths that must surface a missing token still use the
* throwing {@link getApiFn}.
*/
export async function tryGetApiFn(
host: GmailSyncHost,
channelId: string
): Promise<GmailApi | null> {
const token = await host.tools.integrations.get(channelId);
if (!token) return null;
return new GmailApi(token.token);
}

/**
* Returns a Gmail API client authed with any enabled channel's token.
* Auth is per-Google-account (not per-label), so any enabled channelId
Expand DownExpand Up@@ -1515,7 +1535,10 @@ export async function onThreadReadFn(
const threadId = meta.threadId as string;
if (!threadId) return;

const api = await getApiFn(host, channelId);
// Best-effort: if the connection lost its Google auth, skip the label
// write-back instead of throwing (read-state already lives in Plot).
const api = await tryGetApiFn(host, channelId);
if (!api) return;

// Cache the new unread state before modifying Gmail to prevent echo loops
await host.set(`unread:${threadId}`, unread);
Expand DownExpand Up@@ -1545,11 +1568,17 @@ export async function onThreadToDoFn(
return;
}

// Best-effort: if the connection lost its Google auth, skip the star
// write-back instead of throwing (the to-do change already lives in Plot).
// Resolved before the local-state mutation below so a no-token call is a
// complete no-op and leaves no divergent `starred:` marker.
const api = await tryGetApiFn(host, channelId);
if (!api) return;

// Update local state BEFORE calling Gmail, so the webhook fired by our
// own write sees isStarred === wasStarred and doesn't re-propagate.
await host.set(`starred:${threadId}`, todo);

const api = await getApiFn(host, channelId);
if (todo) {
// Add STARRED, and re-add INBOX so an archived email returns to the
// inbox when the user adds it to their agenda in Plot.
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(gmail): no-op thread-state write-backs when Google auth is missing by KrisBraun · Pull Request #229 · 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
95 changes: 95 additions & 0 deletions connectors/gmail/src/gmail.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -562,3 +562,98 @@ describe("recoverMailboxDelivery — durable recovery on upgrade", () => {
expect(spies.requeueInitialSync).not.toHaveBeenCalled();
});
});

describe("thread-state write-back when the connection has no auth token", () => {
// A Gmail connection whose OAuth has lapsed/been revoked resolves no token
// for its channel. The thread-state write-backs (to-do star, read-state)
// are best-effort label syncs — the user's change already lives in Plot —
// so they must degrade to a silent no-op rather than throwing. Throwing
// pages error tracking on every to-do/read toggle for a re-auth-needed
// connection (PostHog issue 019ed581: "No Google authentication token
// available", 673 occurrences / 296 users).
function makeGmail(token: { token: string; scopes: string[] } | null): {
gmail: Gmail;
integrationsGet: ReturnType<typeof vi.fn>;
} {
const storeMap = new Map<string, unknown>([["enabled_channels", ["INBOX"]]]);
const store = {
get: vi.fn(async (key: string) =>
storeMap.has(key) ? storeMap.get(key) : null
),
set: vi.fn(async (key: string, value: unknown) => {
storeMap.set(key, value);
}),
clear: vi.fn(async (key: string) => {
storeMap.delete(key);
}),
list: vi.fn(async (prefix: string) =>
[...storeMap.keys()].filter((k) => k.startsWith(prefix))
),
};
const integrationsGet = vi.fn().mockResolvedValue(token);
const tools = {
store,
integrations: { get: integrationsGet },
network: {},
files: {},
};
const gmail = new Gmail(
"twist-instance-1" as never,
{ getTools: () => tools } as never
);
return { gmail, integrationsGet };
}

const thread = {
id: "thread-1",
meta: { threadId: "gmail-thread-1", channelId: "INBOX" },
} as never;
const actor = { id: "actor-1" } as never;

it("onThreadToDo resolves without throwing and never calls Gmail", async () => {
const { gmail, integrationsGet } = makeGmail(null);
const fetchSpy = vi
.spyOn(globalThis, "fetch")
.mockResolvedValue(new Response("{}"));

await expect(
gmail.onThreadToDo(thread, actor, true, {})
).resolves.toBeUndefined();

expect(integrationsGet).toHaveBeenCalledWith("INBOX");
expect(fetchSpy).not.toHaveBeenCalled();
fetchSpy.mockRestore();
});

it("onThreadRead resolves without throwing and never calls Gmail", async () => {
const { gmail, integrationsGet } = makeGmail(null);
const fetchSpy = vi
.spyOn(globalThis, "fetch")
.mockResolvedValue(new Response("{}"));

await expect(
gmail.onThreadRead(thread, actor, false)
).resolves.toBeUndefined();

expect(integrationsGet).toHaveBeenCalledWith("INBOX");
expect(fetchSpy).not.toHaveBeenCalled();
fetchSpy.mockRestore();
});

it("onThreadToDo still writes the STARRED/INBOX labels when a token is present", async () => {
const { gmail } = makeGmail({ token: "tok", scopes: [] });
const fetchSpy = vi
.spyOn(globalThis, "fetch")
.mockResolvedValue(new Response("{}"));

await gmail.onThreadToDo(thread, actor, true, {});

expect(fetchSpy).toHaveBeenCalledTimes(1);
const [url, init] = fetchSpy.mock.calls[0];
expect(String(url)).toContain("/threads/gmail-thread-1/modify");
expect(JSON.parse((init as RequestInit).body as string)).toEqual({
addLabelIds: ["STARRED", "INBOX"],
});
fetchSpy.mockRestore();
});
});
33 changes: 31 additions & 2 deletions connectors/gmail/src/sync.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -376,6 +376,26 @@ export async function getApiFn(
return new GmailApi(token.token);
}

/**
* Like {@link getApiFn}, but returns `null` instead of throwing when the
* channel resolves no auth token (lapsed / revoked Google OAuth).
*
* Use this in best-effort write-backs (to-do star, read-state) where a
* re-auth-needed connection should degrade to a silent no-op: the user's
* change already lives in Plot, and the connection's re-auth need is already
* surfaced in the connections UI. Throwing there only pages error tracking on
* every toggle. Sync paths that must surface a missing token still use the
* throwing {@link getApiFn}.
*/
export async function tryGetApiFn(
host: GmailSyncHost,
channelId: string
): Promise<GmailApi | null> {
const token = await host.tools.integrations.get(channelId);
if (!token) return null;
return new GmailApi(token.token);
}

/**
* Returns a Gmail API client authed with any enabled channel's token.
* Auth is per-Google-account (not per-label), so any enabled channelId
Expand DownExpand Up@@ -1515,7 +1535,10 @@ export async function onThreadReadFn(
const threadId = meta.threadId as string;
if (!threadId) return;

const api = await getApiFn(host, channelId);
// Best-effort: if the connection lost its Google auth, skip the label
// write-back instead of throwing (read-state already lives in Plot).
const api = await tryGetApiFn(host, channelId);
if (!api) return;

// Cache the new unread state before modifying Gmail to prevent echo loops
await host.set(`unread:${threadId}`, unread);
Expand DownExpand Up@@ -1545,11 +1568,17 @@ export async function onThreadToDoFn(
return;
}

// Best-effort: if the connection lost its Google auth, skip the star
// write-back instead of throwing (the to-do change already lives in Plot).
// Resolved before the local-state mutation below so a no-token call is a
// complete no-op and leaves no divergent `starred:` marker.
const api = await tryGetApiFn(host, channelId);
if (!api) return;

// Update local state BEFORE calling Gmail, so the webhook fired by our
// own write sees isStarred === wasStarred and doesn't re-propagate.
await host.set(`starred:${threadId}`, todo);

const api = await getApiFn(host, channelId);
if (todo) {
// Add STARRED, and re-add INBOX so an archived email returns to the
// inbox when the user adds it to their agenda in Plot.
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(gmail): no-op thread-state write-backs when Google auth is missing by KrisBraun · Pull Request #229 · 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
95 changes: 95 additions & 0 deletions connectors/gmail/src/gmail.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -562,3 +562,98 @@ describe("recoverMailboxDelivery — durable recovery on upgrade", () => {
expect(spies.requeueInitialSync).not.toHaveBeenCalled();
});
});

describe("thread-state write-back when the connection has no auth token", () => {
// A Gmail connection whose OAuth has lapsed/been revoked resolves no token
// for its channel. The thread-state write-backs (to-do star, read-state)
// are best-effort label syncs — the user's change already lives in Plot —
// so they must degrade to a silent no-op rather than throwing. Throwing
// pages error tracking on every to-do/read toggle for a re-auth-needed
// connection (PostHog issue 019ed581: "No Google authentication token
// available", 673 occurrences / 296 users).
function makeGmail(token: { token: string; scopes: string[] } | null): {
gmail: Gmail;
integrationsGet: ReturnType<typeof vi.fn>;
} {
const storeMap = new Map<string, unknown>([["enabled_channels", ["INBOX"]]]);
const store = {
get: vi.fn(async (key: string) =>
storeMap.has(key) ? storeMap.get(key) : null
),
set: vi.fn(async (key: string, value: unknown) => {
storeMap.set(key, value);
}),
clear: vi.fn(async (key: string) => {
storeMap.delete(key);
}),
list: vi.fn(async (prefix: string) =>
[...storeMap.keys()].filter((k) => k.startsWith(prefix))
),
};
const integrationsGet = vi.fn().mockResolvedValue(token);
const tools = {
store,
integrations: { get: integrationsGet },
network: {},
files: {},
};
const gmail = new Gmail(
"twist-instance-1" as never,
{ getTools: () => tools } as never
);
return { gmail, integrationsGet };
}

const thread = {
id: "thread-1",
meta: { threadId: "gmail-thread-1", channelId: "INBOX" },
} as never;
const actor = { id: "actor-1" } as never;

it("onThreadToDo resolves without throwing and never calls Gmail", async () => {
const { gmail, integrationsGet } = makeGmail(null);
const fetchSpy = vi
.spyOn(globalThis, "fetch")
.mockResolvedValue(new Response("{}"));

await expect(
gmail.onThreadToDo(thread, actor, true, {})
).resolves.toBeUndefined();

expect(integrationsGet).toHaveBeenCalledWith("INBOX");
expect(fetchSpy).not.toHaveBeenCalled();
fetchSpy.mockRestore();
});

it("onThreadRead resolves without throwing and never calls Gmail", async () => {
const { gmail, integrationsGet } = makeGmail(null);
const fetchSpy = vi
.spyOn(globalThis, "fetch")
.mockResolvedValue(new Response("{}"));

await expect(
gmail.onThreadRead(thread, actor, false)
).resolves.toBeUndefined();

expect(integrationsGet).toHaveBeenCalledWith("INBOX");
expect(fetchSpy).not.toHaveBeenCalled();
fetchSpy.mockRestore();
});

it("onThreadToDo still writes the STARRED/INBOX labels when a token is present", async () => {
const { gmail } = makeGmail({ token: "tok", scopes: [] });
const fetchSpy = vi
.spyOn(globalThis, "fetch")
.mockResolvedValue(new Response("{}"));

await gmail.onThreadToDo(thread, actor, true, {});

expect(fetchSpy).toHaveBeenCalledTimes(1);
const [url, init] = fetchSpy.mock.calls[0];
expect(String(url)).toContain("/threads/gmail-thread-1/modify");
expect(JSON.parse((init as RequestInit).body as string)).toEqual({
addLabelIds: ["STARRED", "INBOX"],
});
fetchSpy.mockRestore();
});
});
33 changes: 31 additions & 2 deletions connectors/gmail/src/sync.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -376,6 +376,26 @@ export async function getApiFn(
return new GmailApi(token.token);
}

/**
* Like {@link getApiFn}, but returns `null` instead of throwing when the
* channel resolves no auth token (lapsed / revoked Google OAuth).
*
* Use this in best-effort write-backs (to-do star, read-state) where a
* re-auth-needed connection should degrade to a silent no-op: the user's
* change already lives in Plot, and the connection's re-auth need is already
* surfaced in the connections UI. Throwing there only pages error tracking on
* every toggle. Sync paths that must surface a missing token still use the
* throwing {@link getApiFn}.
*/
export async function tryGetApiFn(
host: GmailSyncHost,
channelId: string
): Promise<GmailApi | null> {
const token = await host.tools.integrations.get(channelId);
if (!token) return null;
return new GmailApi(token.token);
}

/**
* Returns a Gmail API client authed with any enabled channel's token.
* Auth is per-Google-account (not per-label), so any enabled channelId
Expand DownExpand Up@@ -1515,7 +1535,10 @@ export async function onThreadReadFn(
const threadId = meta.threadId as string;
if (!threadId) return;

const api = await getApiFn(host, channelId);
// Best-effort: if the connection lost its Google auth, skip the label
// write-back instead of throwing (read-state already lives in Plot).
const api = await tryGetApiFn(host, channelId);
if (!api) return;

// Cache the new unread state before modifying Gmail to prevent echo loops
await host.set(`unread:${threadId}`, unread);
Expand DownExpand Up@@ -1545,11 +1568,17 @@ export async function onThreadToDoFn(
return;
}

// Best-effort: if the connection lost its Google auth, skip the star
// write-back instead of throwing (the to-do change already lives in Plot).
// Resolved before the local-state mutation below so a no-token call is a
// complete no-op and leaves no divergent `starred:` marker.
const api = await tryGetApiFn(host, channelId);
if (!api) return;

// Update local state BEFORE calling Gmail, so the webhook fired by our
// own write sees isStarred === wasStarred and doesn't re-propagate.
await host.set(`starred:${threadId}`, todo);

const api = await getApiFn(host, channelId);
if (todo) {
// Add STARRED, and re-add INBOX so an archived email returns to the
// inbox when the user adds it to their agenda in Plot.
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(gmail): no-op thread-state write-backs when Google auth is missing by KrisBraun · Pull Request #229 · 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
95 changes: 95 additions & 0 deletions connectors/gmail/src/gmail.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -562,3 +562,98 @@ describe("recoverMailboxDelivery — durable recovery on upgrade", () => {
expect(spies.requeueInitialSync).not.toHaveBeenCalled();
});
});

describe("thread-state write-back when the connection has no auth token", () => {
// A Gmail connection whose OAuth has lapsed/been revoked resolves no token
// for its channel. The thread-state write-backs (to-do star, read-state)
// are best-effort label syncs — the user's change already lives in Plot —
// so they must degrade to a silent no-op rather than throwing. Throwing
// pages error tracking on every to-do/read toggle for a re-auth-needed
// connection (PostHog issue 019ed581: "No Google authentication token
// available", 673 occurrences / 296 users).
function makeGmail(token: { token: string; scopes: string[] } | null): {
gmail: Gmail;
integrationsGet: ReturnType<typeof vi.fn>;
} {
const storeMap = new Map<string, unknown>([["enabled_channels", ["INBOX"]]]);
const store = {
get: vi.fn(async (key: string) =>
storeMap.has(key) ? storeMap.get(key) : null
),
set: vi.fn(async (key: string, value: unknown) => {
storeMap.set(key, value);
}),
clear: vi.fn(async (key: string) => {
storeMap.delete(key);
}),
list: vi.fn(async (prefix: string) =>
[...storeMap.keys()].filter((k) => k.startsWith(prefix))
),
};
const integrationsGet = vi.fn().mockResolvedValue(token);
const tools = {
store,
integrations: { get: integrationsGet },
network: {},
files: {},
};
const gmail = new Gmail(
"twist-instance-1" as never,
{ getTools: () => tools } as never
);
return { gmail, integrationsGet };
}

const thread = {
id: "thread-1",
meta: { threadId: "gmail-thread-1", channelId: "INBOX" },
} as never;
const actor = { id: "actor-1" } as never;

it("onThreadToDo resolves without throwing and never calls Gmail", async () => {
const { gmail, integrationsGet } = makeGmail(null);
const fetchSpy = vi
.spyOn(globalThis, "fetch")
.mockResolvedValue(new Response("{}"));

await expect(
gmail.onThreadToDo(thread, actor, true, {})
).resolves.toBeUndefined();

expect(integrationsGet).toHaveBeenCalledWith("INBOX");
expect(fetchSpy).not.toHaveBeenCalled();
fetchSpy.mockRestore();
});

it("onThreadRead resolves without throwing and never calls Gmail", async () => {
const { gmail, integrationsGet } = makeGmail(null);
const fetchSpy = vi
.spyOn(globalThis, "fetch")
.mockResolvedValue(new Response("{}"));

await expect(
gmail.onThreadRead(thread, actor, false)
).resolves.toBeUndefined();

expect(integrationsGet).toHaveBeenCalledWith("INBOX");
expect(fetchSpy).not.toHaveBeenCalled();
fetchSpy.mockRestore();
});

it("onThreadToDo still writes the STARRED/INBOX labels when a token is present", async () => {
const { gmail } = makeGmail({ token: "tok", scopes: [] });
const fetchSpy = vi
.spyOn(globalThis, "fetch")
.mockResolvedValue(new Response("{}"));

await gmail.onThreadToDo(thread, actor, true, {});

expect(fetchSpy).toHaveBeenCalledTimes(1);
const [url, init] = fetchSpy.mock.calls[0];
expect(String(url)).toContain("/threads/gmail-thread-1/modify");
expect(JSON.parse((init as RequestInit).body as string)).toEqual({
addLabelIds: ["STARRED", "INBOX"],
});
fetchSpy.mockRestore();
});
});
33 changes: 31 additions & 2 deletions connectors/gmail/src/sync.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -376,6 +376,26 @@ export async function getApiFn(
return new GmailApi(token.token);
}

/**
* Like {@link getApiFn}, but returns `null` instead of throwing when the
* channel resolves no auth token (lapsed / revoked Google OAuth).
*
* Use this in best-effort write-backs (to-do star, read-state) where a
* re-auth-needed connection should degrade to a silent no-op: the user's
* change already lives in Plot, and the connection's re-auth need is already
* surfaced in the connections UI. Throwing there only pages error tracking on
* every toggle. Sync paths that must surface a missing token still use the
* throwing {@link getApiFn}.
*/
export async function tryGetApiFn(
host: GmailSyncHost,
channelId: string
): Promise<GmailApi | null> {
const token = await host.tools.integrations.get(channelId);
if (!token) return null;
return new GmailApi(token.token);
}

/**
* Returns a Gmail API client authed with any enabled channel's token.
* Auth is per-Google-account (not per-label), so any enabled channelId
Expand DownExpand Up@@ -1515,7 +1535,10 @@ export async function onThreadReadFn(
const threadId = meta.threadId as string;
if (!threadId) return;

const api = await getApiFn(host, channelId);
// Best-effort: if the connection lost its Google auth, skip the label
// write-back instead of throwing (read-state already lives in Plot).
const api = await tryGetApiFn(host, channelId);
if (!api) return;

// Cache the new unread state before modifying Gmail to prevent echo loops
await host.set(`unread:${threadId}`, unread);
Expand DownExpand Up@@ -1545,11 +1568,17 @@ export async function onThreadToDoFn(
return;
}

// Best-effort: if the connection lost its Google auth, skip the star
// write-back instead of throwing (the to-do change already lives in Plot).
// Resolved before the local-state mutation below so a no-token call is a
// complete no-op and leaves no divergent `starred:` marker.
const api = await tryGetApiFn(host, channelId);
if (!api) return;

// Update local state BEFORE calling Gmail, so the webhook fired by our
// own write sees isStarred === wasStarred and doesn't re-propagate.
await host.set(`starred:${threadId}`, todo);

const api = await getApiFn(host, channelId);
if (todo) {
// Add STARRED, and re-add INBOX so an archived email returns to the
// inbox when the user adds it to their agenda in Plot.
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(gmail): no-op thread-state write-backs when Google auth is missing by KrisBraun · Pull Request #229 · 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
95 changes: 95 additions & 0 deletions connectors/gmail/src/gmail.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -562,3 +562,98 @@ describe("recoverMailboxDelivery — durable recovery on upgrade", () => {
expect(spies.requeueInitialSync).not.toHaveBeenCalled();
});
});

describe("thread-state write-back when the connection has no auth token", () => {
// A Gmail connection whose OAuth has lapsed/been revoked resolves no token
// for its channel. The thread-state write-backs (to-do star, read-state)
// are best-effort label syncs — the user's change already lives in Plot —
// so they must degrade to a silent no-op rather than throwing. Throwing
// pages error tracking on every to-do/read toggle for a re-auth-needed
// connection (PostHog issue 019ed581: "No Google authentication token
// available", 673 occurrences / 296 users).
function makeGmail(token: { token: string; scopes: string[] } | null): {
gmail: Gmail;
integrationsGet: ReturnType<typeof vi.fn>;
} {
const storeMap = new Map<string, unknown>([["enabled_channels", ["INBOX"]]]);
const store = {
get: vi.fn(async (key: string) =>
storeMap.has(key) ? storeMap.get(key) : null
),
set: vi.fn(async (key: string, value: unknown) => {
storeMap.set(key, value);
}),
clear: vi.fn(async (key: string) => {
storeMap.delete(key);
}),
list: vi.fn(async (prefix: string) =>
[...storeMap.keys()].filter((k) => k.startsWith(prefix))
),
};
const integrationsGet = vi.fn().mockResolvedValue(token);
const tools = {
store,
integrations: { get: integrationsGet },
network: {},
files: {},
};
const gmail = new Gmail(
"twist-instance-1" as never,
{ getTools: () => tools } as never
);
return { gmail, integrationsGet };
}

const thread = {
id: "thread-1",
meta: { threadId: "gmail-thread-1", channelId: "INBOX" },
} as never;
const actor = { id: "actor-1" } as never;

it("onThreadToDo resolves without throwing and never calls Gmail", async () => {
const { gmail, integrationsGet } = makeGmail(null);
const fetchSpy = vi
.spyOn(globalThis, "fetch")
.mockResolvedValue(new Response("{}"));

await expect(
gmail.onThreadToDo(thread, actor, true, {})
).resolves.toBeUndefined();

expect(integrationsGet).toHaveBeenCalledWith("INBOX");
expect(fetchSpy).not.toHaveBeenCalled();
fetchSpy.mockRestore();
});

it("onThreadRead resolves without throwing and never calls Gmail", async () => {
const { gmail, integrationsGet } = makeGmail(null);
const fetchSpy = vi
.spyOn(globalThis, "fetch")
.mockResolvedValue(new Response("{}"));

await expect(
gmail.onThreadRead(thread, actor, false)
).resolves.toBeUndefined();

expect(integrationsGet).toHaveBeenCalledWith("INBOX");
expect(fetchSpy).not.toHaveBeenCalled();
fetchSpy.mockRestore();
});

it("onThreadToDo still writes the STARRED/INBOX labels when a token is present", async () => {
const { gmail } = makeGmail({ token: "tok", scopes: [] });
const fetchSpy = vi
.spyOn(globalThis, "fetch")
.mockResolvedValue(new Response("{}"));

await gmail.onThreadToDo(thread, actor, true, {});

expect(fetchSpy).toHaveBeenCalledTimes(1);
const [url, init] = fetchSpy.mock.calls[0];
expect(String(url)).toContain("/threads/gmail-thread-1/modify");
expect(JSON.parse((init as RequestInit).body as string)).toEqual({
addLabelIds: ["STARRED", "INBOX"],
});
fetchSpy.mockRestore();
});
});
33 changes: 31 additions & 2 deletions connectors/gmail/src/sync.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -376,6 +376,26 @@ export async function getApiFn(
return new GmailApi(token.token);
}

/**
* Like {@link getApiFn}, but returns `null` instead of throwing when the
* channel resolves no auth token (lapsed / revoked Google OAuth).
*
* Use this in best-effort write-backs (to-do star, read-state) where a
* re-auth-needed connection should degrade to a silent no-op: the user's
* change already lives in Plot, and the connection's re-auth need is already
* surfaced in the connections UI. Throwing there only pages error tracking on
* every toggle. Sync paths that must surface a missing token still use the
* throwing {@link getApiFn}.
*/
export async function tryGetApiFn(
host: GmailSyncHost,
channelId: string
): Promise<GmailApi | null> {
const token = await host.tools.integrations.get(channelId);
if (!token) return null;
return new GmailApi(token.token);
}

/**
* Returns a Gmail API client authed with any enabled channel's token.
* Auth is per-Google-account (not per-label), so any enabled channelId
Expand DownExpand Up@@ -1515,7 +1535,10 @@ export async function onThreadReadFn(
const threadId = meta.threadId as string;
if (!threadId) return;

const api = await getApiFn(host, channelId);
// Best-effort: if the connection lost its Google auth, skip the label
// write-back instead of throwing (read-state already lives in Plot).
const api = await tryGetApiFn(host, channelId);
if (!api) return;

// Cache the new unread state before modifying Gmail to prevent echo loops
await host.set(`unread:${threadId}`, unread);
Expand DownExpand Up@@ -1545,11 +1568,17 @@ export async function onThreadToDoFn(
return;
}

// Best-effort: if the connection lost its Google auth, skip the star
// write-back instead of throwing (the to-do change already lives in Plot).
// Resolved before the local-state mutation below so a no-token call is a
// complete no-op and leaves no divergent `starred:` marker.
const api = await tryGetApiFn(host, channelId);
if (!api) return;

// Update local state BEFORE calling Gmail, so the webhook fired by our
// own write sees isStarred === wasStarred and doesn't re-propagate.
await host.set(`starred:${threadId}`, todo);

const api = await getApiFn(host, channelId);
if (todo) {
// Add STARRED, and re-add INBOX so an archived email returns to the
// inbox when the user adds it to their agenda in Plot.
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(gmail): no-op thread-state write-backs when Google auth is missing by KrisBraun · Pull Request #229 · 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
95 changes: 95 additions & 0 deletions connectors/gmail/src/gmail.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -562,3 +562,98 @@ describe("recoverMailboxDelivery — durable recovery on upgrade", () => {
expect(spies.requeueInitialSync).not.toHaveBeenCalled();
});
});

describe("thread-state write-back when the connection has no auth token", () => {
// A Gmail connection whose OAuth has lapsed/been revoked resolves no token
// for its channel. The thread-state write-backs (to-do star, read-state)
// are best-effort label syncs — the user's change already lives in Plot —
// so they must degrade to a silent no-op rather than throwing. Throwing
// pages error tracking on every to-do/read toggle for a re-auth-needed
// connection (PostHog issue 019ed581: "No Google authentication token
// available", 673 occurrences / 296 users).
function makeGmail(token: { token: string; scopes: string[] } | null): {
gmail: Gmail;
integrationsGet: ReturnType<typeof vi.fn>;
} {
const storeMap = new Map<string, unknown>([["enabled_channels", ["INBOX"]]]);
const store = {
get: vi.fn(async (key: string) =>
storeMap.has(key) ? storeMap.get(key) : null
),
set: vi.fn(async (key: string, value: unknown) => {
storeMap.set(key, value);
}),
clear: vi.fn(async (key: string) => {
storeMap.delete(key);
}),
list: vi.fn(async (prefix: string) =>
[...storeMap.keys()].filter((k) => k.startsWith(prefix))
),
};
const integrationsGet = vi.fn().mockResolvedValue(token);
const tools = {
store,
integrations: { get: integrationsGet },
network: {},
files: {},
};
const gmail = new Gmail(
"twist-instance-1" as never,
{ getTools: () => tools } as never
);
return { gmail, integrationsGet };
}

const thread = {
id: "thread-1",
meta: { threadId: "gmail-thread-1", channelId: "INBOX" },
} as never;
const actor = { id: "actor-1" } as never;

it("onThreadToDo resolves without throwing and never calls Gmail", async () => {
const { gmail, integrationsGet } = makeGmail(null);
const fetchSpy = vi
.spyOn(globalThis, "fetch")
.mockResolvedValue(new Response("{}"));

await expect(
gmail.onThreadToDo(thread, actor, true, {})
).resolves.toBeUndefined();

expect(integrationsGet).toHaveBeenCalledWith("INBOX");
expect(fetchSpy).not.toHaveBeenCalled();
fetchSpy.mockRestore();
});

it("onThreadRead resolves without throwing and never calls Gmail", async () => {
const { gmail, integrationsGet } = makeGmail(null);
const fetchSpy = vi
.spyOn(globalThis, "fetch")
.mockResolvedValue(new Response("{}"));

await expect(
gmail.onThreadRead(thread, actor, false)
).resolves.toBeUndefined();

expect(integrationsGet).toHaveBeenCalledWith("INBOX");
expect(fetchSpy).not.toHaveBeenCalled();
fetchSpy.mockRestore();
});

it("onThreadToDo still writes the STARRED/INBOX labels when a token is present", async () => {
const { gmail } = makeGmail({ token: "tok", scopes: [] });
const fetchSpy = vi
.spyOn(globalThis, "fetch")
.mockResolvedValue(new Response("{}"));

await gmail.onThreadToDo(thread, actor, true, {});

expect(fetchSpy).toHaveBeenCalledTimes(1);
const [url, init] = fetchSpy.mock.calls[0];
expect(String(url)).toContain("/threads/gmail-thread-1/modify");
expect(JSON.parse((init as RequestInit).body as string)).toEqual({
addLabelIds: ["STARRED", "INBOX"],
});
fetchSpy.mockRestore();
});
});
33 changes: 31 additions & 2 deletions connectors/gmail/src/sync.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -376,6 +376,26 @@ export async function getApiFn(
return new GmailApi(token.token);
}

/**
* Like {@link getApiFn}, but returns `null` instead of throwing when the
* channel resolves no auth token (lapsed / revoked Google OAuth).
*
* Use this in best-effort write-backs (to-do star, read-state) where a
* re-auth-needed connection should degrade to a silent no-op: the user's
* change already lives in Plot, and the connection's re-auth need is already
* surfaced in the connections UI. Throwing there only pages error tracking on
* every toggle. Sync paths that must surface a missing token still use the
* throwing {@link getApiFn}.
*/
export async function tryGetApiFn(
host: GmailSyncHost,
channelId: string
): Promise<GmailApi | null> {
const token = await host.tools.integrations.get(channelId);
if (!token) return null;
return new GmailApi(token.token);
}

/**
* Returns a Gmail API client authed with any enabled channel's token.
* Auth is per-Google-account (not per-label), so any enabled channelId
Expand DownExpand Up@@ -1515,7 +1535,10 @@ export async function onThreadReadFn(
const threadId = meta.threadId as string;
if (!threadId) return;

const api = await getApiFn(host, channelId);
// Best-effort: if the connection lost its Google auth, skip the label
// write-back instead of throwing (read-state already lives in Plot).
const api = await tryGetApiFn(host, channelId);
if (!api) return;

// Cache the new unread state before modifying Gmail to prevent echo loops
await host.set(`unread:${threadId}`, unread);
Expand DownExpand Up@@ -1545,11 +1568,17 @@ export async function onThreadToDoFn(
return;
}

// Best-effort: if the connection lost its Google auth, skip the star
// write-back instead of throwing (the to-do change already lives in Plot).
// Resolved before the local-state mutation below so a no-token call is a
// complete no-op and leaves no divergent `starred:` marker.
const api = await tryGetApiFn(host, channelId);
if (!api) return;

// Update local state BEFORE calling Gmail, so the webhook fired by our
// own write sees isStarred === wasStarred and doesn't re-propagate.
await host.set(`starred:${threadId}`, todo);

const api = await getApiFn(host, channelId);
if (todo) {
// Add STARRED, and re-add INBOX so an archived email returns to the
// inbox when the user adds it to their agenda in Plot.
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(gmail): no-op thread-state write-backs when Google auth is missing by KrisBraun · Pull Request #229 · 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
95 changes: 95 additions & 0 deletions connectors/gmail/src/gmail.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -562,3 +562,98 @@ describe("recoverMailboxDelivery — durable recovery on upgrade", () => {
expect(spies.requeueInitialSync).not.toHaveBeenCalled();
});
});

describe("thread-state write-back when the connection has no auth token", () => {
// A Gmail connection whose OAuth has lapsed/been revoked resolves no token
// for its channel. The thread-state write-backs (to-do star, read-state)
// are best-effort label syncs — the user's change already lives in Plot —
// so they must degrade to a silent no-op rather than throwing. Throwing
// pages error tracking on every to-do/read toggle for a re-auth-needed
// connection (PostHog issue 019ed581: "No Google authentication token
// available", 673 occurrences / 296 users).
function makeGmail(token: { token: string; scopes: string[] } | null): {
gmail: Gmail;
integrationsGet: ReturnType<typeof vi.fn>;
} {
const storeMap = new Map<string, unknown>([["enabled_channels", ["INBOX"]]]);
const store = {
get: vi.fn(async (key: string) =>
storeMap.has(key) ? storeMap.get(key) : null
),
set: vi.fn(async (key: string, value: unknown) => {
storeMap.set(key, value);
}),
clear: vi.fn(async (key: string) => {
storeMap.delete(key);
}),
list: vi.fn(async (prefix: string) =>
[...storeMap.keys()].filter((k) => k.startsWith(prefix))
),
};
const integrationsGet = vi.fn().mockResolvedValue(token);
const tools = {
store,
integrations: { get: integrationsGet },
network: {},
files: {},
};
const gmail = new Gmail(
"twist-instance-1" as never,
{ getTools: () => tools } as never
);
return { gmail, integrationsGet };
}

const thread = {
id: "thread-1",
meta: { threadId: "gmail-thread-1", channelId: "INBOX" },
} as never;
const actor = { id: "actor-1" } as never;

it("onThreadToDo resolves without throwing and never calls Gmail", async () => {
const { gmail, integrationsGet } = makeGmail(null);
const fetchSpy = vi
.spyOn(globalThis, "fetch")
.mockResolvedValue(new Response("{}"));

await expect(
gmail.onThreadToDo(thread, actor, true, {})
).resolves.toBeUndefined();

expect(integrationsGet).toHaveBeenCalledWith("INBOX");
expect(fetchSpy).not.toHaveBeenCalled();
fetchSpy.mockRestore();
});

it("onThreadRead resolves without throwing and never calls Gmail", async () => {
const { gmail, integrationsGet } = makeGmail(null);
const fetchSpy = vi
.spyOn(globalThis, "fetch")
.mockResolvedValue(new Response("{}"));

await expect(
gmail.onThreadRead(thread, actor, false)
).resolves.toBeUndefined();

expect(integrationsGet).toHaveBeenCalledWith("INBOX");
expect(fetchSpy).not.toHaveBeenCalled();
fetchSpy.mockRestore();
});

it("onThreadToDo still writes the STARRED/INBOX labels when a token is present", async () => {
const { gmail } = makeGmail({ token: "tok", scopes: [] });
const fetchSpy = vi
.spyOn(globalThis, "fetch")
.mockResolvedValue(new Response("{}"));

await gmail.onThreadToDo(thread, actor, true, {});

expect(fetchSpy).toHaveBeenCalledTimes(1);
const [url, init] = fetchSpy.mock.calls[0];
expect(String(url)).toContain("/threads/gmail-thread-1/modify");
expect(JSON.parse((init as RequestInit).body as string)).toEqual({
addLabelIds: ["STARRED", "INBOX"],
});
fetchSpy.mockRestore();
});
});
33 changes: 31 additions & 2 deletions connectors/gmail/src/sync.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -376,6 +376,26 @@ export async function getApiFn(
return new GmailApi(token.token);
}

/**
* Like {@link getApiFn}, but returns `null` instead of throwing when the
* channel resolves no auth token (lapsed / revoked Google OAuth).
*
* Use this in best-effort write-backs (to-do star, read-state) where a
* re-auth-needed connection should degrade to a silent no-op: the user's
* change already lives in Plot, and the connection's re-auth need is already
* surfaced in the connections UI. Throwing there only pages error tracking on
* every toggle. Sync paths that must surface a missing token still use the
* throwing {@link getApiFn}.
*/
export async function tryGetApiFn(
host: GmailSyncHost,
channelId: string
): Promise<GmailApi | null> {
const token = await host.tools.integrations.get(channelId);
if (!token) return null;
return new GmailApi(token.token);
}

/**
* Returns a Gmail API client authed with any enabled channel's token.
* Auth is per-Google-account (not per-label), so any enabled channelId
Expand DownExpand Up@@ -1515,7 +1535,10 @@ export async function onThreadReadFn(
const threadId = meta.threadId as string;
if (!threadId) return;

const api = await getApiFn(host, channelId);
// Best-effort: if the connection lost its Google auth, skip the label
// write-back instead of throwing (read-state already lives in Plot).
const api = await tryGetApiFn(host, channelId);
if (!api) return;

// Cache the new unread state before modifying Gmail to prevent echo loops
await host.set(`unread:${threadId}`, unread);
Expand DownExpand Up@@ -1545,11 +1568,17 @@ export async function onThreadToDoFn(
return;
}

// Best-effort: if the connection lost its Google auth, skip the star
// write-back instead of throwing (the to-do change already lives in Plot).
// Resolved before the local-state mutation below so a no-token call is a
// complete no-op and leaves no divergent `starred:` marker.
const api = await tryGetApiFn(host, channelId);
if (!api) return;

// Update local state BEFORE calling Gmail, so the webhook fired by our
// own write sees isStarred === wasStarred and doesn't re-propagate.
await host.set(`starred:${threadId}`, todo);

const api = await getApiFn(host, channelId);
if (todo) {
// Add STARRED, and re-add INBOX so an archived email returns to the
// inbox when the user adds it to their agenda in Plot.
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(gmail): no-op thread-state write-backs when Google auth is missing by KrisBraun · Pull Request #229 · 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
95 changes: 95 additions & 0 deletions connectors/gmail/src/gmail.test.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -562,3 +562,98 @@ describe("recoverMailboxDelivery — durable recovery on upgrade", () => {
expect(spies.requeueInitialSync).not.toHaveBeenCalled();
});
});

describe("thread-state write-back when the connection has no auth token", () => {
// A Gmail connection whose OAuth has lapsed/been revoked resolves no token
// for its channel. The thread-state write-backs (to-do star, read-state)
// are best-effort label syncs — the user's change already lives in Plot —
// so they must degrade to a silent no-op rather than throwing. Throwing
// pages error tracking on every to-do/read toggle for a re-auth-needed
// connection (PostHog issue 019ed581: "No Google authentication token
// available", 673 occurrences / 296 users).
function makeGmail(token: { token: string; scopes: string[] } | null): {
gmail: Gmail;
integrationsGet: ReturnType<typeof vi.fn>;
} {
const storeMap = new Map<string, unknown>([["enabled_channels", ["INBOX"]]]);
const store = {
get: vi.fn(async (key: string) =>
storeMap.has(key) ? storeMap.get(key) : null
),
set: vi.fn(async (key: string, value: unknown) => {
storeMap.set(key, value);
}),
clear: vi.fn(async (key: string) => {
storeMap.delete(key);
}),
list: vi.fn(async (prefix: string) =>
[...storeMap.keys()].filter((k) => k.startsWith(prefix))
),
};
const integrationsGet = vi.fn().mockResolvedValue(token);
const tools = {
store,
integrations: { get: integrationsGet },
network: {},
files: {},
};
const gmail = new Gmail(
"twist-instance-1" as never,
{ getTools: () => tools } as never
);
return { gmail, integrationsGet };
}

const thread = {
id: "thread-1",
meta: { threadId: "gmail-thread-1", channelId: "INBOX" },
} as never;
const actor = { id: "actor-1" } as never;

it("onThreadToDo resolves without throwing and never calls Gmail", async () => {
const { gmail, integrationsGet } = makeGmail(null);
const fetchSpy = vi
.spyOn(globalThis, "fetch")
.mockResolvedValue(new Response("{}"));

await expect(
gmail.onThreadToDo(thread, actor, true, {})
).resolves.toBeUndefined();

expect(integrationsGet).toHaveBeenCalledWith("INBOX");
expect(fetchSpy).not.toHaveBeenCalled();
fetchSpy.mockRestore();
});

it("onThreadRead resolves without throwing and never calls Gmail", async () => {
const { gmail, integrationsGet } = makeGmail(null);
const fetchSpy = vi
.spyOn(globalThis, "fetch")
.mockResolvedValue(new Response("{}"));

await expect(
gmail.onThreadRead(thread, actor, false)
).resolves.toBeUndefined();

expect(integrationsGet).toHaveBeenCalledWith("INBOX");
expect(fetchSpy).not.toHaveBeenCalled();
fetchSpy.mockRestore();
});

it("onThreadToDo still writes the STARRED/INBOX labels when a token is present", async () => {
const { gmail } = makeGmail({ token: "tok", scopes: [] });
const fetchSpy = vi
.spyOn(globalThis, "fetch")
.mockResolvedValue(new Response("{}"));

await gmail.onThreadToDo(thread, actor, true, {});

expect(fetchSpy).toHaveBeenCalledTimes(1);
const [url, init] = fetchSpy.mock.calls[0];
expect(String(url)).toContain("/threads/gmail-thread-1/modify");
expect(JSON.parse((init as RequestInit).body as string)).toEqual({
addLabelIds: ["STARRED", "INBOX"],
});
fetchSpy.mockRestore();
});
});
33 changes: 31 additions & 2 deletions connectors/gmail/src/sync.ts
Original file line numberDiff line numberDiff line change
Expand Up@@ -376,6 +376,26 @@ export async function getApiFn(
return new GmailApi(token.token);
}

/**
* Like {@link getApiFn}, but returns `null` instead of throwing when the
* channel resolves no auth token (lapsed / revoked Google OAuth).
*
* Use this in best-effort write-backs (to-do star, read-state) where a
* re-auth-needed connection should degrade to a silent no-op: the user's
* change already lives in Plot, and the connection's re-auth need is already
* surfaced in the connections UI. Throwing there only pages error tracking on
* every toggle. Sync paths that must surface a missing token still use the
* throwing {@link getApiFn}.
*/
export async function tryGetApiFn(
host: GmailSyncHost,
channelId: string
): Promise<GmailApi | null> {
const token = await host.tools.integrations.get(channelId);
if (!token) return null;
return new GmailApi(token.token);
}

/**
* Returns a Gmail API client authed with any enabled channel's token.
* Auth is per-Google-account (not per-label), so any enabled channelId
Expand DownExpand Up@@ -1515,7 +1535,10 @@ export async function onThreadReadFn(
const threadId = meta.threadId as string;
if (!threadId) return;

const api = await getApiFn(host, channelId);
// Best-effort: if the connection lost its Google auth, skip the label
// write-back instead of throwing (read-state already lives in Plot).
const api = await tryGetApiFn(host, channelId);
if (!api) return;

// Cache the new unread state before modifying Gmail to prevent echo loops
await host.set(`unread:${threadId}`, unread);
Expand DownExpand Up@@ -1545,11 +1568,17 @@ export async function onThreadToDoFn(
return;
}

// Best-effort: if the connection lost its Google auth, skip the star
// write-back instead of throwing (the to-do change already lives in Plot).
// Resolved before the local-state mutation below so a no-token call is a
// complete no-op and leaves no divergent `starred:` marker.
const api = await tryGetApiFn(host, channelId);
if (!api) return;

// Update local state BEFORE calling Gmail, so the webhook fired by our
// own write sees isStarred === wasStarred and doesn't re-propagate.
await host.set(`starred:${threadId}`, todo);

const api = await getApiFn(host, channelId);
if (todo) {
// Add STARRED, and re-add INBOX so an archived email returns to the
// inbox when the user adds it to their agenda in Plot.
Expand Down
Loading