Skip to content

chore: Update gmail recipe to reauth if receiving a 401 and retrying #1095

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
merged 1 commit into from
Apr 24, 2025
Merged

chore: Update gmail recipe to reauth if receiving a 401 and retrying #1095

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
81 changes: 50 additions & 31 deletions recipes/gmail.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,15 +180,16 @@ const refreshAuthToken = async (auth: Cell<Auth>) => {

console.log("refreshAuthToken", body);

const refresh_response = await fetch(
const res = await fetch(
new URL("/api/integrations/google-oauth/refresh", env.apiUrl),
{
method: "POST",
body: JSON.stringify(body),
},
).then((res) => res.json());

return refresh_response.tokenInfo as Auth;
);
const json = await res.json();
const authData = json.tokenInfo as Auth;
auth.update(authData);
};

const googleUpdater = handler(
Expand All @@ -214,7 +215,7 @@ const googleUpdater = handler(

console.log("gmailFilterQuery", gmailFilterQuery);

return fetchEmail(
return process(
state.auth,
state.settings.limit,
gmailFilterQuery,
Expand Down Expand Up @@ -395,25 +396,48 @@ Accept: application/json
}).filter((message): message is Email => message !== null);
}

export async function fetchEmail(
async function fetchEmail(
auth: Cell<Auth>,
maxResults: number = 100,
gmailFilterQuery: string = "in:INBOX",
): Promise<object | undefined> {
const url = `https://gmail.googleapis.com/gmail/v1/users/me/messages?q=${
encodeURIComponent(gmailFilterQuery)
}&maxResults=${maxResults}`;
const query = async (auth: Cell<Auth>): Promise<Response> => {
const authData = auth.get();
const res = await fetch(url, {
headers: {
Authorization: `Bearer ${authData.token}`,
},
});
console.log(`${url}: ${res.status} ${res.statusText}`);
return res;
};

const res = await query(auth);
if (res.status === 200) {
return await res.json();
} else if (res.status === 401) {
await refreshAuthToken(auth);
const res = await query(auth);
if (res.status === 200) {
return await res.json();
}
throw new Error("Fetching email failed upon reauthorization.");
}
}

export async function process(
auth: Cell<Auth>,
maxResults: number = 100,
gmailFilterQuery: string = "in:INBOX",
state: {
emails: Cell<Email[]>;
},
) {
let cur = auth.get();

if (cur.expiresAt && Date.now() > cur.expiresAt) {
const resp = await refreshAuthToken(auth);
auth.update(resp);
console.log("refresh_data", resp);
}

cur = auth.get();

if (!cur.token) {
const authData = auth.get();
if (!authData.token) {
console.warn("no token");
return;
}
Expand All @@ -422,21 +446,16 @@ export async function fetchEmail(
state.emails.get().map((email) => email.id),
);

const listResponse = await fetch(
`https://gmail.googleapis.com/gmail/v1/users/me/messages?q=${
encodeURIComponent(gmailFilterQuery)
}&maxResults=${maxResults}`,
{
headers: {
Authorization: `Bearer ${cur.token}`,
},
},
const listData = await fetchEmail(
auth,
maxResults,
gmailFilterQuery,
);

const listData = await listResponse.json();

if (!listData.messages || !Array.isArray(listData.messages)) {
console.log("No messages found in response");
if (
!listData || !("messages" in listData) || !Array.isArray(listData.messages)
) {
console.log(`No messages found in response: ${JSON.stringify(listData)}`);
return;
}

Expand All @@ -463,7 +482,7 @@ export async function fetchEmail(
);

try {
const emails = await processBatch(batchMessages, cur.token);
const emails = await processBatch(batchMessages, authData.token);

// Filter out any duplicates by ID
const newEmails = emails.filter((email) =>
Expand Down