From 56fd33e4fe6c5653002e223d16ad7b66e1076181 Mon Sep 17 00:00:00 2001
From: Arjun <6592213+arkml@users.noreply.github.com>
Date: Thu, 12 Feb 2026 14:13:54 +0530
Subject: [PATCH] fix google disconnect issue

---
 apps/x/packages/core/src/auth/oauth-client.ts | 5 +++--
 apps/x/packages/core/src/auth/repo.ts         | 7 +++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/x/packages/core/src/auth/oauth-client.ts b/apps/x/packages/core/src/auth/oauth-client.ts
index 613cee2e..4463168b 100644
--- a/apps/x/packages/core/src/auth/oauth-client.ts
+++ b/apps/x/packages/core/src/auth/oauth-client.ts
@@ -213,11 +213,12 @@ export async function refreshTokens(
 }
 
 /**
- * Check if tokens are expired
+ * Check if tokens are expired (or will expire within the buffer period)
  */
+const EXPIRY_BUFFER_SECONDS = 5 * 60; // Refresh 5 minutes before expiry
 export function isTokenExpired(tokens: OAuthTokens): boolean {
   const now = Math.floor(Date.now() / 1000);
-  return tokens.expires_at <= now;
+  return tokens.expires_at <= now + EXPIRY_BUFFER_SECONDS;
 }
 
 /**
diff --git a/apps/x/packages/core/src/auth/repo.ts b/apps/x/packages/core/src/auth/repo.ts
index 3e8a3f9a..373fe3af 100644
--- a/apps/x/packages/core/src/auth/repo.ts
+++ b/apps/x/packages/core/src/auth/repo.ts
@@ -79,10 +79,9 @@ export class FSOAuthRepo implements IOAuthRepo {
     if (!tokens) {
       return false;
     }
-    
-    // Check if token is expired
-    const now = Math.floor(Date.now() / 1000);
-    return tokens.expires_at > now;
+
+    // Connected as long as we have a refresh token (access tokens can be refreshed on demand)
+    return tokens.refresh_token != null;
   }
 
   async getConnectedProviders(): Promise<string[]> {