Skip to content

Gmail settings keep the on/off switch after connecting #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SoryAK merged 2 commits into from
Oct 18, 2026
Merged

Gmail settings keep the on/off switch after connecting #121

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2342ed4
Keep the Gmail on or off switch right after connecting, so the settin…
SoryAK Oct 18, 2026
a6a8b4d
Merge branch 'main' into fix/gmail-settings-types
SoryAK Oct 18, 2026
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
11 changes: 8 additions & 3 deletions web/src/GmailSettings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,19 +321,24 @@ function openSignInWindow(): Window | null {
);
}

async function waitForSignIn(): Promise<{ connected: true; email: string } | null> {
type ConnectedGmail = Extract<GmailAccount, { connected: true }>;

async function waitForSignIn(): Promise<ConnectedGmail | null> {
const started = Date.now();
while (Date.now() - started < 120_000) {
await new Promise((resolve) => setTimeout(resolve, 1000));
const response = await fetch("/api/sign-in/gmail/ready", { method: "POST" });
if (!response.ok) continue;
const body = (await response.json()) as { connected?: boolean; email?: string };
if (body.connected && body.email) return { connected: true, email: body.email };
if (!body.connected || !body.email) continue;
const saved = await fetch("/api/gmail");
const account = saved.ok ? ((await saved.json()) as GmailAccount) : null;
return account?.connected ? account : { connected: true, email: body.email, enabled: true };
}
return null;
}

async function waitForGmail(): Promise<{ connected: true; email: string } | null> {
async function waitForGmail(): Promise<ConnectedGmail | null> {
const started = Date.now();
while (Date.now() - started < 120_000) {
await new Promise((resolve) => setTimeout(resolve, 1000));
Expand Down
Loading