@bobfrankston/mailx 1.0.69 → 1.0.73

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/mailx",
-  "version": "1.0.69",
+  "version": "1.0.73",
   "description": "Local-first email client with IMAP sync and standalone native app",
   "type": "module",
   "main": "bin/mailx.js",
@@ -20,9 +20,9 @@
     "postinstall": "node launcher/builder/postinstall.js"
   },
   "dependencies": {
-    "@bobfrankston/iflow": "^1.0.32",
+    "@bobfrankston/iflow": "^1.0.33",
     "@bobfrankston/miscinfo": "^1.0.6",
-    "@bobfrankston/oauthsupport": "^1.0.17",
+    "@bobfrankston/oauthsupport": "^1.0.18",
     "@bobfrankston/rust-builder": "^0.1.2",
     "@capacitor/android": "^8.3.0",
     "@capacitor/cli": "^8.3.0",

package/packages/mailx-imap/index.d.ts

@@ -112,7 +112,8 @@ export declare class ImapManager extends EventEmitter {
     /** Stop Outbox worker */
     stopOutboxWorker(): void;
     private contactsSyncToken;
-    /** Get an OAuth token for Google Contacts API */
+    /** Get an OAuth token for Google APIs (contacts, calendar, etc.)
+     *  Uses the SAME token as IMAP — scopes are combined in one grant */
     private getContactsToken;
     /** Sync contacts from Google People API */
     syncGoogleContacts(accountId: string): Promise<number>;

package/packages/mailx-imap/index.js

@@ -4,7 +4,6 @@
  * Syncs messages to local store, emits events for new mail.
  */
 import { ImapClient, createAutoImapConfig } from "@bobfrankston/iflow";
-import { authenticateOAuth } from "@bobfrankston/oauthsupport";
 import { FileMessageStore } from "@bobfrankston/mailx-store";
 import { loadSettings, getStorePath, getConfigDir } from "@bobfrankston/mailx-settings";
 import { EventEmitter } from "node:events";
@@ -13,6 +12,15 @@ import * as path from "node:path";
 import { simpleParser } from "mailparser";
 import { createTransport } from "nodemailer";
 import * as os from "node:os";
+/** Extract full error detail from imapflow errors */
+function imapError(err) {
+    const parts = [err.message || "Unknown error"];
+    if (err.responseText)
+        parts.push(err.responseText);
+    if (err.responseStatus)
+        parts.push(`[${err.responseStatus}]`);
+    return parts.join(" — ");
+}
 /** Convert iflow address objects to our EmailAddress */
 function toEmailAddress(addr) {
     return {
@@ -183,8 +191,8 @@ export class ImapManager extends EventEmitter {
                 console.log(`  [auth] ${account.id}: token valid`);
             }
             catch (e) {
-                console.error(`  [auth] ${account.id}: ${e.message}`);
-                this.emit("accountError", account.id, e.message, "Re-authenticate: click the button below or run mailx -setup");
+                console.error(`  [auth] ${account.id}: ${imapError(e)}`);
+                this.emit("accountError", account.id, imapError(e), "Re-authenticate: click the button below or run mailx -setup");
             }
         }
     }
@@ -437,13 +445,13 @@ export class ImapManager extends EventEmitter {
                 }
             }
             catch (e) {
-                this.emit("syncError", accountId, e.message);
-                console.error(`Sync error for ${accountId}: ${e.message}`);
+                this.emit("syncError", accountId, imapError(e));
+                console.error(`Sync error for ${accountId}: ${imapError(e)}`);
                 // Emit user-facing error — always offer re-auth for OAuth accounts
                 const config = this.configs.get(accountId);
                 const isOAuth = !!config?.tokenProvider;
                 const hint = isOAuth ? "Authentication may have expired" : "Check server connectivity";
-                this.emit("accountError", accountId, e.message || "unknown", hint);
+                this.emit("accountError", accountId, imapError(e), hint);
             }
             finally {
                 if (client)
@@ -1169,7 +1177,7 @@ export class ImapManager extends EventEmitter {
                     const prev = this.outboxBackoff.get(accountId);
                     const delay = prev ? Math.min((now - prev + 30000) * 2, 300000) : 30000;
                     this.outboxBackoff.set(accountId, now + delay);
-                    console.error(`  [outbox] Error for ${accountId}: ${e.message} (retry in ${Math.round(delay / 1000)}s)`);
+                    console.error(`  [outbox] Error for ${accountId}: ${imapError(e)} (retry in ${Math.round(delay / 1000)}s)`);
                 }
             }
         };
@@ -1185,40 +1193,11 @@ export class ImapManager extends EventEmitter {
     }
     // ── Google Contacts Sync ──
     contactsSyncToken = null;
-    /** Get an OAuth token for Google Contacts API */
+    /** Get an OAuth token for Google APIs (contacts, calendar, etc.)
+     *  Uses the SAME token as IMAP — scopes are combined in one grant */
     async getContactsToken(accountId) {
-        const settings = loadSettings();
-        const account = settings.accounts.find(a => a.id === accountId);
-        if (!account || account.imap.auth !== "oauth2")
-            return null;
-        // Find iflow-credentials.json from the iflow package
-        const credentialsCandidates = [
-            path.resolve(import.meta.dirname, "..", "..", "node_modules", "@bobfrankston", "iflow", "iflow-credentials.json"),
-            path.resolve(import.meta.dirname, "..", "..", "..", "node_modules", "@bobfrankston", "iflow", "iflow-credentials.json"),
-        ];
-        const credentialsPath = credentialsCandidates.find(p => fs.existsSync(p));
-        if (!credentialsPath) {
-            console.error("  [contacts] iflow-credentials.json not found");
-            return null;
-        }
-        const accountDir = account.imap.user.replace(/[@.]/g, "_");
-        const tokenDir = path.join(getConfigDir(), "tokens", accountDir);
-        const tokenPath = path.join(tokenDir, "contacts-token.json");
-        // If no cached token exists, skip — don't open interactive browser consent for contacts
-        // The user can trigger contacts sync manually or it will be set up during mailx -setup
-        if (!fs.existsSync(tokenPath)) {
-            console.log(`  [contacts] No token for ${accountId} — skipping (run mailx -setup to authorize)`);
-            return null;
-        }
-        const token = await authenticateOAuth(credentialsPath, {
-            scope: "https://www.googleapis.com/auth/contacts.readonly",
-            tokenDirectory: tokenDir,
-            tokenFileName: "contacts-token.json",
-            credentialsKey: "installed",
-            includeOfflineAccess: true,
-            loginHint: account.imap.user,
-        });
-        return token?.access_token || null;
+        // Reuse the IMAP token — it now includes contacts.readonly scope
+        return this.getOAuthToken(accountId);
     }
     /** Sync contacts from Google People API */
     async syncGoogleContacts(accountId) {