Merge pull request #2651 from ankaboot-source/docs/update-readme-features

fix(campaigns): refactor token expiration check and fix schema issue

Author: baderdean

supabase/functions/email-campaigns/index.ts

@@ -11,6 +11,7 @@ import { resolveCampaignBaseUrlFromEnv } from "../_shared/url.ts";
 import { sendEmail, verifyTransport } from "./email.ts";
 import {
   getSenderCredentialIssue,
+  isTokenExpired,
   listUniqueSenderSources,
   refreshOAuthToken,
   updateMiningSourceCredentials,
@@ -662,19 +663,15 @@ async function resolveSenderOptions(authorization: string, userEmail: string) {
   }
 
   for (const source of sources) {
-    const expiresAt = source.credentials.expiresAt;
     const nowMs = Date.now();
+    const expired = isTokenExpired(source.credentials, nowMs);
     console.log(
       "[OAuth] Checking source:",
       source.email,
       "- type:",
       source.type,
-      "- expiresAt:",
-      expiresAt,
-      "- now:",
-      nowMs,
       "- isExpired:",
-      expiresAt && expiresAt <= nowMs,
+      expired,
     );
 
     const credentialIssue = getSenderCredentialIssue(source);

supabase/functions/email-campaigns/sender-options.ts

@@ -132,6 +132,7 @@ export async function updateMiningSourceCredentials(
   }
 
   const { error } = await supabaseAdmin
+    .schema("private")
     .from("mining_sources")
     .update({ credentials })
     .eq("email", email);
@@ -169,24 +170,13 @@ export function getSenderCredentialIssue(
     return null;
   }
 
-  let expiresAt = source.credentials.expiresAt;
-
-  // Handle both numeric timestamp and ISO date string
-  if (typeof expiresAt === "string") {
-    expiresAt = new Date(expiresAt).getTime();
-  }
-
-  const numericExpiresAt = Number(expiresAt);
-  if (
-    Number.isFinite(numericExpiresAt) &&
-    numericExpiresAt > 0 &&
-    numericExpiresAt <= nowMs
-  ) {
+  const expired = isTokenExpired(source.credentials, nowMs);
+  if (expired) {
     console.log(
       "[OAuth] Token IS EXPIRED for:",
       source.email,
       "- expiresAt:",
-      numericExpiresAt,
+      source.credentials.expiresAt,
       "- now:",
       nowMs,
     );
@@ -195,3 +185,22 @@ export function getSenderCredentialIssue(
 
   return null;
 }
+
+export function isTokenExpired(
+  credentials: Record<string, unknown>,
+  nowMs = Date.now(),
+): boolean {
+  let expiresAt = credentials.expiresAt;
+
+  // Handle both numeric timestamp and ISO date string
+  if (typeof expiresAt === "string") {
+    expiresAt = new Date(expiresAt).getTime();
+  }
+
+  const numericExpiresAt = Number(expiresAt);
+  return (
+    Number.isFinite(numericExpiresAt) &&
+    numericExpiresAt > 0 &&
+    numericExpiresAt <= nowMs
+  );
+}