@hasna/connectors 0.3.4 → 0.3.6

package/bin/index.js

@@ -4280,8 +4280,8 @@ function saveApiKey(name, key, field) {
     writeFileSync2(configFile, JSON.stringify(config, null, 2));
     return;
   }
-  mkdirSync2(join3(configDir, "profiles"), { recursive: true });
-  writeFileSync2(profileFile, JSON.stringify({ [keyField]: key }, null, 2));
+  mkdirSync2(profileDir, { recursive: true });
+  writeFileSync2(join3(profileDir, "config.json"), JSON.stringify({ [keyField]: key }, null, 2));
 }
 function guessKeyField(name) {
   const docs = getConnectorDocs(name);
@@ -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.4");
+program2.name("connectors").description("Install API connectors for your project").version("0.3.6");
 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

@@ -20188,8 +20188,8 @@ function saveApiKey(name, key, field) {
     writeFileSync2(configFile, JSON.stringify(config2, null, 2));
     return;
   }
-  mkdirSync2(join3(configDir, "profiles"), { recursive: true });
-  writeFileSync2(profileFile, JSON.stringify({ [keyField]: key }, null, 2));
+  mkdirSync2(profileDir, { recursive: true });
+  writeFileSync2(join3(profileDir, "config.json"), JSON.stringify({ [keyField]: key }, null, 2));
 }
 function guessKeyField(name) {
   const docs = getConnectorDocs(name);
@@ -20309,7 +20309,7 @@ async function getConnectorCommandHelp(name, command) {
 loadConnectorVersions();
 var server = new McpServer({
   name: "connectors",
-  version: "0.3.4"
+  version: "0.3.6"
 });
 server.registerTool("search_connectors", {
   title: "Search Connectors",

package/bin/serve.js

@@ -790,8 +790,8 @@ function saveApiKey(name, key, field) {
     writeFileSync2(configFile, JSON.stringify(config, null, 2));
     return;
   }
-  mkdirSync2(join3(configDir, "profiles"), { recursive: true });
-  writeFileSync2(profileFile, JSON.stringify({ [keyField]: key }, null, 2));
+  mkdirSync2(profileDir, { recursive: true });
+  writeFileSync2(join3(profileDir, "config.json"), JSON.stringify({ [keyField]: key }, null, 2));
 }
 function guessKeyField(name) {
   const docs = getConnectorDocs(name);

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-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.4",
+  "version": "0.3.6",
   "description": "Open source connector library - Install API connectors with a single command",
   "type": "module",
   "bin": {