@hasna/connectors 0.3.3 → 0.3.5

package/bin/index.js

@@ -6701,7 +6701,7 @@ var PRESETS = {
   commerce: { description: "Commerce and finance", connectors: ["stripe", "shopify", "revolut", "mercury", "pandadoc"] }
 };
 var program2 = new Command;
-program2.name("connectors").description("Install API connectors for your project").version("0.3.3");
+program2.name("connectors").description("Install API connectors for your project").version("0.3.5");
 program2.command("interactive", { isDefault: true }).alias("i").description("Interactive connector browser").action(() => {
   if (!isTTY) {
     console.log(`Non-interactive environment detected. Use a subcommand:

package/bin/mcp.js

@@ -20309,7 +20309,7 @@ async function getConnectorCommandHelp(name, command) {
 loadConnectorVersions();
 var server = new McpServer({
   name: "connectors",
-  version: "0.3.3"
+  version: "0.3.5"
 });
 server.registerTool("search_connectors", {
   title: "Search Connectors",

package/connectors/connect-google/src/api/client.ts

@@ -1,5 +1,6 @@
 import type { GoogleConfig, OutputFormat } from '../types';
 import { GoogleApiError } from '../types';
+import { getValidAccessToken } from '../utils/config';
 
 // Google API base URLs
 const BASE_URLS = {
@@ -21,14 +22,16 @@ export interface RequestOptions {
 }
 
 export class GoogleClient {
-  private readonly accessToken: string;
+  private accessToken: string;
   private readonly baseUrls: Record<GoogleService, string>;
+  private readonly useAutoRefresh: boolean;
 
   constructor(config: GoogleConfig) {
     if (!config.accessToken) {
       throw new Error('Access token is required');
     }
     this.accessToken = config.accessToken;
+    this.useAutoRefresh = config.autoRefresh !== false; // defaults to true
     this.baseUrls = {
       gmail: config.baseUrls?.gmail || BASE_URLS.gmail,
       drive: config.baseUrls?.drive || BASE_URLS.drive,
@@ -58,6 +61,15 @@ export class GoogleClient {
   async request<T>(service: GoogleService, path: string, options: RequestOptions = {}): Promise<T> {
     const { method = 'GET', params, body, headers = {} } = options;
 
+    // Auto-refresh token if enabled
+    if (this.useAutoRefresh) {
+      try {
+        this.accessToken = await getValidAccessToken();
+      } catch {
+        // Fall through to use current token if refresh fails
+      }
+    }
+
     const url = this.buildUrl(service, path, params);
 
     const requestHeaders: Record<string, string> = {

package/connectors/connect-google/src/types/index.ts

@@ -6,6 +6,7 @@
 
 export interface GoogleConfig {
   accessToken: string;
+  autoRefresh?: boolean; // Enable auto-refresh of access token (default: true)
   baseUrls?: {
     gmail?: string;
     drive?: string;

package/connectors/connect-google/src/utils/config.ts

@@ -11,6 +11,7 @@ export interface ProfileConfig {
   refreshToken?: string;
   clientId?: string;
   clientSecret?: string;
+  expiresAt?: number;
 }
 
 // Store for --profile flag override (set by CLI before commands run)
@@ -219,6 +220,96 @@ export function setRefreshToken(refreshToken: string): void {
   saveProfile(config);
 }
 
+// ============================================
+// Token Refresh
+// ============================================
+
+const GOOGLE_TOKEN_URL = 'https://oauth2.googleapis.com/token';
+
+export function getClientId(): string | undefined {
+  return process.env.GOOGLE_CLIENT_ID || loadProfile().clientId;
+}
+
+export function getClientSecret(): string | undefined {
+  return process.env.GOOGLE_CLIENT_SECRET || loadProfile().clientSecret;
+}
+
+/**
+ * Refresh the access token using the refresh token and client credentials
+ */
+export async function refreshAccessToken(): Promise<ProfileConfig> {
+  const profile = loadProfile();
+  const clientId = process.env.GOOGLE_CLIENT_ID || profile.clientId;
+  const clientSecret = process.env.GOOGLE_CLIENT_SECRET || profile.clientSecret;
+  const refreshToken = process.env.GOOGLE_REFRESH_TOKEN || profile.refreshToken;
+
+  if (!clientId || !clientSecret) {
+    throw new Error('OAuth client credentials not configured. Set clientId/clientSecret in profile or GOOGLE_CLIENT_ID/GOOGLE_CLIENT_SECRET env vars.');
+  }
+
+  if (!refreshToken) {
+    throw new Error('No refresh token available. Please re-authenticate.');
+  }
+
+  const response = await fetch(GOOGLE_TOKEN_URL, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
+    },
+    body: new URLSearchParams({
+      client_id: clientId,
+      client_secret: clientSecret,
+      refresh_token: refreshToken,
+      grant_type: 'refresh_token',
+    }),
+  });
+
+  if (!response.ok) {
+    const error = await response.json() as { error_description?: string; error?: string };
+    throw new Error(`Token refresh failed: ${error.error_description || error.error}`);
+  }
+
+  const data = await response.json() as { access_token: string; expires_in: number };
+
+  const updatedProfile: ProfileConfig = {
+    ...profile,
+    accessToken: data.access_token,
+    refreshToken: refreshToken, // Keep original refresh token
+    expiresAt: Date.now() + data.expires_in * 1000,
+  };
+
+  saveProfile(updatedProfile);
+  return updatedProfile;
+}
+
+/**
+ * Get a valid access token, refreshing if necessary.
+ * Returns the current token if not expired, otherwise refreshes it.
+ */
+export async function getValidAccessToken(): Promise<string> {
+  // Env var override always wins (no refresh possible)
+  if (process.env.GOOGLE_ACCESS_TOKEN) {
+    return process.env.GOOGLE_ACCESS_TOKEN;
+  }
+
+  const profile = loadProfile();
+
+  if (!profile.accessToken) {
+    throw new Error('Not authenticated. Run "connect-google config set-token <token>" or set GOOGLE_ACCESS_TOKEN.');
+  }
+
+  // If we have expiry info and a refresh token, check if refresh is needed
+  if (profile.expiresAt && profile.refreshToken) {
+    // Refresh if token expires within 5 minutes
+    if (Date.now() >= profile.expiresAt - 5 * 60 * 1000) {
+      const updated = await refreshAccessToken();
+      return updated.accessToken!;
+    }
+  }
+
+  return profile.accessToken;
+}
+
 // ============================================
 // Utility Functions
 // ============================================

package/connectors/connect-googlecalendar/src/api/client.ts

@@ -1,5 +1,6 @@
 import type { GoogleCalendarConfig, OutputFormat, GoogleApiErrorResponse } from '../types';
 import { GoogleCalendarApiError } from '../types';
+import { isTokenExpired, setTokens } from '../utils/config';
 
 const DEFAULT_BASE_URL = 'https://www.googleapis.com/calendar/v3';
 const OAUTH_TOKEN_URL = 'https://oauth2.googleapis.com/token';
@@ -141,6 +142,13 @@ export class GoogleCalendarClient {
     const data = await response.json();
     this.accessToken = data.access_token;
 
+    // Save refreshed tokens to disk
+    setTokens({
+      accessToken: data.access_token,
+      refreshToken: this.refreshToken,
+      expiresIn: data.expires_in,
+    });
+
     return {
       accessToken: data.access_token,
       expiresIn: data.expires_in,
@@ -167,6 +175,11 @@ export class GoogleCalendarClient {
   async request<T>(path: string, options: RequestOptions = {}): Promise<T> {
     const { method = 'GET', params, body, headers = {} } = options;
 
+    // Auto-refresh token if expired
+    if (isTokenExpired() && this.refreshToken && this.clientId && this.clientSecret) {
+      await this.refreshAccessToken();
+    }
+
     const url = this.buildUrl(path, params);
 
     const requestHeaders: Record<string, string> = {

package/connectors/connect-googlecalendar/src/utils/config.ts

@@ -170,6 +170,49 @@ export function saveProfile(config: ProfileConfig, profile?: string): void {
   writeFileSync(getProfilePath(profileName), JSON.stringify(config, null, 2));
 }
 
+// ============================================
+// OAuth2 Credentials (Client ID/Secret) - Root credentials.json (shared across profiles)
+// ============================================
+
+const CREDENTIALS_FILE = join(CONFIG_DIR, 'credentials.json');
+
+interface CredentialsConfig {
+  clientId?: string;
+  clientSecret?: string;
+}
+
+function loadCredentials(): CredentialsConfig {
+  ensureConfigDir();
+
+  if (!existsSync(CREDENTIALS_FILE)) {
+    // Migration: check if credentials exist in any profile and copy to base
+    const profiles = listProfiles();
+    for (const prof of profiles) {
+      const profileConfig = loadProfile(prof);
+      if (profileConfig.clientId && profileConfig.clientSecret) {
+        const creds = {
+          clientId: profileConfig.clientId,
+          clientSecret: profileConfig.clientSecret,
+        };
+        writeFileSync(CREDENTIALS_FILE, JSON.stringify(creds, null, 2), { mode: 0o600 });
+        return creds;
+      }
+    }
+    return {};
+  }
+
+  try {
+    return JSON.parse(readFileSync(CREDENTIALS_FILE, 'utf-8'));
+  } catch {
+    return {};
+  }
+}
+
+function saveCredentials(creds: CredentialsConfig): void {
+  ensureConfigDir();
+  writeFileSync(CREDENTIALS_FILE, JSON.stringify(creds, null, 2), { mode: 0o600 });
+}
+
 // ============================================
 // Token Management
 // ============================================
@@ -195,23 +238,23 @@ export function setRefreshToken(refreshToken: string): void {
 }
 
 export function getClientId(): string | undefined {
-  return process.env.GOOGLE_CALENDAR_CLIENT_ID || loadProfile().clientId;
+  return process.env.GOOGLE_CALENDAR_CLIENT_ID || loadCredentials().clientId || loadProfile().clientId;
 }
 
 export function setClientId(clientId: string): void {
-  const config = loadProfile();
-  config.clientId = clientId;
-  saveProfile(config);
+  const creds = loadCredentials();
+  creds.clientId = clientId;
+  saveCredentials(creds);
 }
 
 export function getClientSecret(): string | undefined {
-  return process.env.GOOGLE_CALENDAR_CLIENT_SECRET || loadProfile().clientSecret;
+  return process.env.GOOGLE_CALENDAR_CLIENT_SECRET || loadCredentials().clientSecret || loadProfile().clientSecret;
 }
 
 export function setClientSecret(clientSecret: string): void {
-  const config = loadProfile();
-  config.clientSecret = clientSecret;
-  saveProfile(config);
+  const creds = loadCredentials();
+  creds.clientSecret = clientSecret;
+  saveCredentials(creds);
 }
 
 export function setTokens(tokens: { accessToken: string; refreshToken?: string; expiresIn?: number }): void {

package/connectors/connect-googlecontacts/src/api/client.ts

@@ -1,5 +1,6 @@
 import type { GoogleContactsConfig, OAuthTokenResponse, OAuthTokens } from '../types';
 import { GoogleContactsApiError, AuthError, RateLimitError } from '../types';
+import { saveTokens } from '../utils/config';
 
 const DEFAULT_BASE_URL = 'https://people.googleapis.com';
 const OAUTH_TOKEN_URL = 'https://oauth2.googleapis.com/token';
@@ -118,6 +119,14 @@ export class GoogleContactsClient {
     }
 
     this.tokens = newTokens;
+
+    // Persist refreshed tokens to disk so they survive process exit
+    saveTokens({
+      accessToken: newTokens.accessToken,
+      refreshToken: newTokens.refreshToken,
+      expiresIn: newTokens.expiresIn,
+    });
+
     return this.tokens;
   }
 

package/connectors/connect-googledocs/src/api/client.ts

@@ -1,5 +1,6 @@
 import type { GoogleDocsConfig, OutputFormat } from '../types';
 import { GoogleDocsApiError } from '../types';
+import { getValidAccessToken } from '../utils/config';
 
 const DEFAULT_BASE_URL = 'https://docs.googleapis.com/v1';
 
@@ -13,8 +14,9 @@ export interface RequestOptions {
 
 export class GoogleDocsClient {
   private readonly apiKey?: string;
-  private readonly accessToken?: string;
+  private accessToken?: string;
   private readonly baseUrl: string;
+  private readonly useAutoRefresh: boolean;
 
   constructor(config: GoogleDocsConfig) {
     if (!config.apiKey && !config.accessToken) {
@@ -22,6 +24,7 @@ export class GoogleDocsClient {
     }
     this.apiKey = config.apiKey;
     this.accessToken = config.accessToken;
+    this.useAutoRefresh = config.autoRefresh !== false; // defaults to true
     this.baseUrl = config.baseUrl || DEFAULT_BASE_URL;
   }
 
@@ -51,6 +54,15 @@ export class GoogleDocsClient {
   async request<T>(path: string, options: RequestOptions = {}): Promise<T> {
     const { method = 'GET', params, body, headers = {} } = options;
 
+    // Auto-refresh token if enabled and using OAuth
+    if (this.accessToken && this.useAutoRefresh) {
+      try {
+        this.accessToken = await getValidAccessToken();
+      } catch {
+        // Fall through to use current token if refresh fails
+      }
+    }
+
     const url = this.buildUrl(path, params);
 
     const requestHeaders: Record<string, string> = {

package/connectors/connect-googledocs/src/types/index.ts

@@ -8,6 +8,7 @@
 export interface GoogleDocsConfig {
   apiKey?: string;        // API key for read-only public documents
   accessToken?: string;   // OAuth2 access token for full access
+  autoRefresh?: boolean;  // Enable auto-refresh of access token (default: true)
   baseUrl?: string;       // Override default base URL
 }
 

package/connectors/connect-googledocs/src/utils/config.ts

@@ -8,6 +8,10 @@ const DEFAULT_PROFILE = 'default';
 export interface ProfileConfig {
   apiKey?: string;
   accessToken?: string;
+  refreshToken?: string;
+  clientId?: string;
+  clientSecret?: string;
+  expiresAt?: number;
 }
 
 // Store for --profile flag override (set by CLI before commands run)
@@ -191,6 +195,100 @@ export function setAccessToken(accessToken: string): void {
   saveProfile(config);
 }
 
+// ============================================
+// Token Refresh
+// ============================================
+
+const GOOGLE_TOKEN_URL = 'https://oauth2.googleapis.com/token';
+
+export function getClientId(): string | undefined {
+  return process.env.GOOGLE_CLIENT_ID || loadProfile().clientId;
+}
+
+export function getClientSecret(): string | undefined {
+  return process.env.GOOGLE_CLIENT_SECRET || loadProfile().clientSecret;
+}
+
+export function getRefreshToken(): string | undefined {
+  return process.env.GOOGLE_REFRESH_TOKEN || loadProfile().refreshToken;
+}
+
+/**
+ * Refresh the access token using the refresh token and client credentials
+ */
+export async function refreshAccessToken(): Promise<ProfileConfig> {
+  const profile = loadProfile();
+  const clientId = process.env.GOOGLE_CLIENT_ID || profile.clientId;
+  const clientSecret = process.env.GOOGLE_CLIENT_SECRET || profile.clientSecret;
+  const refreshToken = process.env.GOOGLE_REFRESH_TOKEN || profile.refreshToken;
+
+  if (!clientId || !clientSecret) {
+    throw new Error('OAuth client credentials not configured. Set clientId/clientSecret in profile or GOOGLE_CLIENT_ID/GOOGLE_CLIENT_SECRET env vars.');
+  }
+
+  if (!refreshToken) {
+    throw new Error('No refresh token available. Please re-authenticate.');
+  }
+
+  const response = await fetch(GOOGLE_TOKEN_URL, {
+    method: 'POST',
+    headers: {
+      'Content-Type': 'application/x-www-form-urlencoded',
+    },
+    body: new URLSearchParams({
+      client_id: clientId,
+      client_secret: clientSecret,
+      refresh_token: refreshToken,
+      grant_type: 'refresh_token',
+    }),
+  });
+
+  if (!response.ok) {
+    const error = await response.json() as { error_description?: string; error?: string };
+    throw new Error(`Token refresh failed: ${error.error_description || error.error}`);
+  }
+
+  const data = await response.json() as { access_token: string; expires_in: number };
+
+  const updatedProfile: ProfileConfig = {
+    ...profile,
+    accessToken: data.access_token,
+    refreshToken: refreshToken, // Keep original refresh token
+    expiresAt: Date.now() + data.expires_in * 1000,
+  };
+
+  saveProfile(updatedProfile);
+  return updatedProfile;
+}
+
+/**
+ * Get a valid access token, refreshing if necessary.
+ * Returns the current token if not expired, otherwise refreshes it.
+ */
+export async function getValidAccessToken(): Promise<string> {
+  // Env var override always wins (no refresh possible)
+  if (process.env.GOOGLE_ACCESS_TOKEN) {
+    return process.env.GOOGLE_ACCESS_TOKEN;
+  }
+
+  const profile = loadProfile();
+
+  if (!profile.accessToken) {
+    throw new Error('Not authenticated. Run "connect-googledocs config set-token <token>" or set GOOGLE_ACCESS_TOKEN.');
+  }
+
+  // If we have expiry info and a refresh token, check if refresh is needed
+  if (profile.expiresAt && profile.refreshToken) {
+    // Refresh if token expires within 5 minutes
+    if (Date.now() >= profile.expiresAt - 5 * 60 * 1000) {
+      const updated = await refreshAccessToken();
+      return updated.accessToken!;
+    }
+  }
+
+  return profile.accessToken;
+}
+
 // ============================================
 // Utility Functions
 // ============================================

package/connectors/connect-googlesheets/src/api/client.ts

@@ -1,5 +1,6 @@
 import type { GoogleSheetsConfig, OutputFormat } from '../types';
 import { GoogleSheetsApiError } from '../types';
+import { setAccessToken as saveAccessToken } from '../utils/config';
 
 const DEFAULT_BASE_URL = 'https://sheets.googleapis.com/v4';
 
@@ -89,6 +90,9 @@ export class GoogleSheetsClient {
     this.accessToken = data.access_token;
     this.tokenExpiresAt = Date.now() + data.expires_in * 1000;
 
+    // Persist refreshed token to disk so it survives process exit
+    saveAccessToken(data.access_token, this.tokenExpiresAt);
+
     return data.access_token;
   }
 

package/connectors/connect-googlesheets/src/utils/config.ts

@@ -191,6 +191,49 @@ export function setApiKey(apiKey: string): void {
   saveProfile(config);
 }
 
+// ============================================
+// OAuth2 Credentials (Client ID/Secret) - Root credentials.json (shared across profiles)
+// ============================================
+
+const CREDENTIALS_FILE = join(CONFIG_DIR, 'credentials.json');
+
+interface CredentialsConfig {
+  clientId?: string;
+  clientSecret?: string;
+}
+
+function loadCredentials(): CredentialsConfig {
+  ensureConfigDir();
+
+  if (!existsSync(CREDENTIALS_FILE)) {
+    // Migration: check if credentials exist in any profile and copy to base
+    const profiles = listProfiles();
+    for (const prof of profiles) {
+      const profileConfig = loadProfile(prof);
+      if (profileConfig.clientId && profileConfig.clientSecret) {
+        const creds = {
+          clientId: profileConfig.clientId,
+          clientSecret: profileConfig.clientSecret,
+        };
+        writeFileSync(CREDENTIALS_FILE, JSON.stringify(creds, null, 2), { mode: 0o600 });
+        return creds;
+      }
+    }
+    return {};
+  }
+
+  try {
+    return JSON.parse(readFileSync(CREDENTIALS_FILE, 'utf-8'));
+  } catch {
+    return {};
+  }
+}
+
+function saveCredentials(creds: CredentialsConfig): void {
+  ensureConfigDir();
+  writeFileSync(CREDENTIALS_FILE, JSON.stringify(creds, null, 2), { mode: 0o600 });
+}
+
 // ============================================
 // OAuth Token Management
 // ============================================
@@ -219,23 +262,23 @@ export function setRefreshToken(refreshToken: string): void {
 }
 
 export function getClientId(): string | undefined {
-  return process.env.GOOGLE_CLIENT_ID || loadProfile().clientId;
+  return process.env.GOOGLE_CLIENT_ID || loadCredentials().clientId || loadProfile().clientId;
 }
 
 export function setClientId(clientId: string): void {
-  const config = loadProfile();
-  config.clientId = clientId;
-  saveProfile(config);
+  const creds = loadCredentials();
+  creds.clientId = clientId;
+  saveCredentials(creds);
 }
 
 export function getClientSecret(): string | undefined {
-  return process.env.GOOGLE_CLIENT_SECRET || loadProfile().clientSecret;
+  return process.env.GOOGLE_CLIENT_SECRET || loadCredentials().clientSecret || loadProfile().clientSecret;
 }
 
 export function setClientSecret(clientSecret: string): void {
-  const config = loadProfile();
-  config.clientSecret = clientSecret;
-  saveProfile(config);
+  const creds = loadCredentials();
+  creds.clientSecret = clientSecret;
+  saveCredentials(creds);
 }
 
 export function setOAuthTokens(accessToken: string, refreshToken?: string, expiresAt?: number): void {

package/connectors/connect-googletasks/src/utils/config.ts

@@ -193,28 +193,71 @@ export function saveProfile(config: ProfileConfig, profile?: string): void {
   writeFileSync(join(profileDir, 'config.json'), JSON.stringify(config, null, 2));
 }
 
+// ============================================
+// OAuth2 Credentials (Client ID/Secret) - Root credentials.json (shared across profiles)
+// ============================================
+
+const CREDENTIALS_FILE = join(BASE_CONFIG_DIR, 'credentials.json');
+
+interface CredentialsConfig {
+  clientId?: string;
+  clientSecret?: string;
+}
+
+function loadCredentials(): CredentialsConfig {
+  ensureBaseConfigDir();
+
+  if (!existsSync(CREDENTIALS_FILE)) {
+    // Migration: check if credentials exist in any profile and copy to base
+    const profiles = listProfiles();
+    for (const prof of profiles) {
+      const profileConfig = loadProfile(prof);
+      if (profileConfig.clientId && profileConfig.clientSecret) {
+        const creds = {
+          clientId: profileConfig.clientId,
+          clientSecret: profileConfig.clientSecret,
+        };
+        writeFileSync(CREDENTIALS_FILE, JSON.stringify(creds, null, 2), { mode: 0o600 });
+        return creds;
+      }
+    }
+    return {};
+  }
+
+  try {
+    return JSON.parse(readFileSync(CREDENTIALS_FILE, 'utf-8'));
+  } catch {
+    return {};
+  }
+}
+
+function saveCredentials(creds: CredentialsConfig): void {
+  ensureBaseConfigDir();
+  writeFileSync(CREDENTIALS_FILE, JSON.stringify(creds, null, 2), { mode: 0o600 });
+}
+
 // ============================================
 // OAuth Credentials
 // ============================================
 
 export function getClientId(): string | undefined {
-  return process.env.GOOGLE_CLIENT_ID || loadProfile().clientId;
+  return process.env.GOOGLE_CLIENT_ID || loadCredentials().clientId || loadProfile().clientId;
 }
 
 export function setClientId(clientId: string): void {
-  const config = loadProfile();
-  config.clientId = clientId;
-  saveProfile(config);
+  const creds = loadCredentials();
+  creds.clientId = clientId;
+  saveCredentials(creds);
 }
 
 export function getClientSecret(): string | undefined {
-  return process.env.GOOGLE_CLIENT_SECRET || loadProfile().clientSecret;
+  return process.env.GOOGLE_CLIENT_SECRET || loadCredentials().clientSecret || loadProfile().clientSecret;
 }
 
 export function setClientSecret(clientSecret: string): void {
-  const config = loadProfile();
-  config.clientSecret = clientSecret;
-  saveProfile(config);
+  const creds = loadCredentials();
+  creds.clientSecret = clientSecret;
+  saveCredentials(creds);
 }
 
 export function getAccessToken(): string | undefined {
@@ -248,10 +291,7 @@ export function setTokenExpiry(expiry: number): void {
 }
 
 export function setCredentials(clientId: string, clientSecret: string): void {
-  const config = loadProfile();
-  config.clientId = clientId;
-  config.clientSecret = clientSecret;
-  saveProfile(config);
+  saveCredentials({ clientId, clientSecret });
 }
 
 export function setTokens(accessToken: string, refreshToken: string | undefined, expiresIn: number): void {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hasna/connectors",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "Open source connector library - Install API connectors with a single command",
   "type": "module",
   "bin": {