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

chore: Update gmail recipe to reauth if receiving a 401 and retrying. If still unable to request, considered a failure and stop charm.

Author: jsantell

recipes/gmail.tsx

@@ -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(
@@ -214,7 +215,7 @@ const googleUpdater = handler(
 
     console.log("gmailFilterQuery", gmailFilterQuery);
 
-    return fetchEmail(
+    return process(
       state.auth,
       state.settings.limit,
       gmailFilterQuery,
@@ -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;
   }
@@ -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;
   }
 
@@ -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) =>