Merge 9ae9175 into 23f65f3

Author: Paveltarno

AGENTS.md

@@ -80,6 +80,14 @@ cli/
 │   │   │   │   ├── resource.ts
 │   │   │   │   ├── api.ts
 │   │   │   │   └── index.ts
+│   │   │   ├── connector/
+│   │   │   │   ├── schema.ts
+│   │   │   │   ├── config.ts
+│   │   │   │   ├── resource.ts
+│   │   │   │   ├── api.ts
+│   │   │   │   ├── push.ts
+│   │   │   │   ├── oauth.ts
+│   │   │   │   └── index.ts
 │   │   │   └── index.ts
 │   │   ├── site/                 # Site deployment (NOT a Resource)
 │   │   │   ├── schema.ts         # DeployResponse Zod schema
@@ -120,6 +128,9 @@ cli/
 │       │   │   ├── index.ts      # getAgentsCommand(context) - parent command
 │       │   │   ├── pull.ts
 │       │   │   └── push.ts
+│       │   ├── connectors/
+│       │   │   ├── index.ts      # getConnectorsCommand(context) - parent command
+│       │   │   └── push.ts
 │       │   ├── functions/
 │       │   │   └── deploy.ts
 │       │   ├── site/

src/cli/commands/connectors/push.ts

@@ -1,8 +1,7 @@
 import { confirm, isCancel, log } from "@clack/prompts";
-import chalk from "chalk";
 import { Command } from "commander";
 import type { CLIContext } from "@/cli/types.js";
-import { runCommand, runTask } from "@/cli/utils/index.js";
+import { runCommand, runTask, theme } from "@/cli/utils/index.js";
 import type { RunCommandResult } from "@/cli/utils/runCommand.js";
 import { readProjectConfig } from "@/core/index.js";
 import {
@@ -54,19 +53,19 @@ function printSummary(
   }
 
   log.info("");
-  log.info(chalk.bold("Summary:"));
+  log.info(theme.styles.bold("Summary:"));
 
   if (synced.length > 0) {
-    log.info(chalk.green(`  Synced: ${synced.join(", ")}`));
+    log.success(`Synced: ${synced.join(", ")}`);
   }
   if (added.length > 0) {
-    log.info(chalk.green(`  Added: ${added.join(", ")}`));
+    log.success(`Added: ${added.join(", ")}`);
   }
   if (removed.length > 0) {
-    log.info(chalk.dim(`  Removed: ${removed.join(", ")}`));
+    log.info(theme.styles.dim(`Removed: ${removed.join(", ")}`));
   }
   for (const r of failed) {
-    log.info(chalk.red(`  Failed: ${r.type}${r.error ? ` - ${r.error}` : ""}`));
+    log.error(`Failed: ${r.type}${r.error ? ` - ${r.error}` : ""}`);
   }
 }
 
@@ -101,13 +100,11 @@ async function pushConnectorsAction(): Promise<RunCommandResult> {
 
   if (needsOAuth.length > 0) {
     log.info("");
-    log.info(
-      chalk.yellow(
-        `${needsOAuth.length} connector(s) require authorization in your browser:`
-      )
+    log.warn(
+      `${needsOAuth.length} connector(s) require authorization in your browser:`
     );
     for (const connector of needsOAuth) {
-      log.info(`  ${connector.type}: ${chalk.dim(connector.redirectUrl)}`);
+      log.info(`  ${connector.type}: ${theme.styles.dim(connector.redirectUrl)}`);
     }
 
     const pending = needsOAuth.map((c) => c.type).join(", ");

src/core/resources/connector/config.ts

@@ -1,5 +1,5 @@
 import { globby } from "globby";
-import { SchemaValidationError } from "@/core/errors.js";
+import { InvalidInputError, SchemaValidationError } from "@/core/errors.js";
 import { CONFIG_FILE_EXTENSION_GLOB } from "../../consts.js";
 import { pathExists, readJsonFile } from "../../utils/fs.js";
 import type { ConnectorResource } from "./schema.js";
@@ -45,7 +45,16 @@ export async function readAllConnectors(
   const types = new Set<string>();
   for (const connector of connectors) {
     if (types.has(connector.type)) {
-      throw new Error(`Duplicate connector type "${connector.type}"`);
+      throw new InvalidInputError(
+        `Duplicate connector type "${connector.type}"`,
+        {
+          hints: [
+            {
+              message: `Remove duplicate connectors with type "${connector.type}" - only one connector per type is allowed`,
+            },
+          ],
+        }
+      );
     }
     types.add(connector.type);
   }

src/core/resources/connector/push.ts

@@ -68,7 +68,7 @@ function setResponseToResult(
       action: "error",
       error:
         response.error_message ||
-        `Already connected by ${response.other_user_email}`,
+        `Already connected by ${response.other_user_email ?? "another user"}`,
     };
   }
 

src/core/resources/connector/schema.ts

@@ -72,7 +72,17 @@ export const TikTokConnectorSchema = z.object({
   scopes: z.array(z.string()).default([]),
 });
 
-export const ConnectorResourceSchema = z.discriminatedUnion("type", [
+/** Generic connector schema for arbitrary providers */
+const GenericConnectorSchema = z.object({
+  type: z.string().min(1).regex(/^[a-z0-9_-]+$/i),
+  scopes: z.array(z.string()).default([]),
+});
+
+/**
+ * Connector resource schema that accepts both known providers (with specific schemas)
+ * and arbitrary provider strings (with generic schema).
+ */
+export const ConnectorResourceSchema = z.union([
   GoogleCalendarConnectorSchema,
   GoogleDriveConnectorSchema,
   GmailConnectorSchema,
@@ -85,11 +95,13 @@ export const ConnectorResourceSchema = z.discriminatedUnion("type", [
   HubspotConnectorSchema,
   LinkedInConnectorSchema,
   TikTokConnectorSchema,
+  GenericConnectorSchema,
 ]);
 
 export type ConnectorResource = z.infer<typeof ConnectorResourceSchema>;
 
-export const IntegrationTypeSchema = z.enum([
+/** Known integration types with first-class support */
+export const KnownIntegrationTypes = [
   "googlecalendar",
   "googledrive",
   "gmail",
@@ -102,6 +114,15 @@ export const IntegrationTypeSchema = z.enum([
   "hubspot",
   "linkedin",
   "tiktok",
+] as const;
+
+/**
+ * Integration type schema that accepts both known providers and arbitrary strings.
+ * This allows users to use custom OAuth providers not yet supported by Base44.
+ */
+export const IntegrationTypeSchema = z.union([
+  z.enum(KnownIntegrationTypes),
+  z.string().min(1).regex(/^[a-z0-9_-]+$/i),
 ]);
 
 export type IntegrationType = z.infer<typeof IntegrationTypeSchema>;

tests/cli/connectors_push.spec.ts

@@ -59,7 +59,7 @@ describe("connectors push command", () => {
     await t.givenLoggedInWithProject(fixture("basic"));
     t.api.mockConnectorsList({
       integrations: [
-        { integration_type: "slack", status: "ACTIVE", scopes: ["chat:write"] },
+        { integration_type: "slack", status: "active", scopes: ["chat:write"] },
       ],
     });
     t.api.mockConnectorRemove({ status: "removed", integration_type: "slack" });

tests/core/connectors.spec.ts

@@ -1,5 +1,6 @@
 import { resolve } from "node:path";
 import { beforeEach, describe, expect, it, vi } from "vitest";
+import { InvalidInputError } from "../../src/core/errors.js";
 import * as api from "../../src/core/resources/connector/api.js";
 import { readAllConnectors } from "../../src/core/resources/connector/config.js";
 import {
@@ -40,10 +41,21 @@ describe("IntegrationTypeSchema", () => {
     }
   });
 
-  it("rejects invalid integration types", () => {
-    const invalidTypes = ["invalid", "google", "facebook", "twitter", ""];
+  it("accepts arbitrary integration types (including custom providers)", () => {
+    const arbitraryTypes = ["invalid", "google", "facebook", "twitter", "custom-oauth-provider"];
 
-    for (const type of invalidTypes) {
+    for (const type of arbitraryTypes) {
+      expect(IntegrationTypeSchema.safeParse(type).success).toBe(true);
+    }
+  });
+
+  it("rejects empty strings", () => {
+    expect(IntegrationTypeSchema.safeParse("").success).toBe(false);
+  });
+
+  it("rejects path traversal strings", () => {
+    const malicious = ["../admin", "../../endpoint", "type/with/slashes", "type with spaces"];
+    for (const type of malicious) {
       expect(IntegrationTypeSchema.safeParse(type).success).toBe(false);
     }
   });
@@ -92,14 +104,18 @@ describe("ConnectorResourceSchema", () => {
     }
   });
 
-  it("rejects connector with invalid type", () => {
+  it("accepts connector with arbitrary provider type", () => {
     const connector = {
-      type: "invalid",
-      scopes: [],
+      type: "custom-oauth-provider",
+      scopes: ["scope1", "scope2"],
     };
 
     const result = ConnectorResourceSchema.safeParse(connector);
-    expect(result.success).toBe(false);
+    expect(result.success).toBe(true);
+    if (result.success) {
+      expect(result.data.type).toBe("custom-oauth-provider");
+      expect(result.data.scopes).toEqual(["scope1", "scope2"]);
+    }
   });
 
   it("rejects connector without type", () => {
@@ -144,6 +160,17 @@ describe("readAllConnectors", () => {
       "Invalid connector file"
     );
   });
+
+  it("throws InvalidInputError for duplicate connector types", async () => {
+    const connectorsDir = resolve(FIXTURES_DIR, "duplicate-connectors/connectors");
+
+    await expect(readAllConnectors(connectorsDir)).rejects.toThrow(
+      InvalidInputError
+    );
+    await expect(readAllConnectors(connectorsDir)).rejects.toThrow(
+      'Duplicate connector type "slack"'
+    );
+  });
 });
 
 const mockListConnectors = vi.mocked(api.listConnectors);
@@ -183,7 +210,7 @@ describe("pushConnectors", () => {
   it("removes upstream-only connectors", async () => {
     mockListConnectors.mockResolvedValue({
       integrations: [
-        { integration_type: "slack", status: "ACTIVE", scopes: ["chat:write"] },
+        { integration_type: "slack", status: "active", scopes: ["chat:write"] },
       ],
     });
     mockRemoveConnector.mockResolvedValue({
@@ -203,7 +230,7 @@ describe("pushConnectors", () => {
     ];
     mockListConnectors.mockResolvedValue({
       integrations: [
-        { integration_type: "slack", status: "ACTIVE", scopes: ["chat:write"] },
+        { integration_type: "slack", status: "active", scopes: ["chat:write"] },
       ],
     });
     mockSetConnector.mockResolvedValue({
@@ -236,7 +263,7 @@ describe("pushConnectors", () => {
       integrations: [
         {
           integration_type: "gmail",
-          status: "ACTIVE",
+          status: "active",
           scopes: ["https://mail.google.com/"],
         },
       ],
@@ -299,6 +326,30 @@ describe("pushConnectors", () => {
     ]);
   });
 
+  it("returns fallback message when different_user has no error_message or email", async () => {
+    const local: ConnectorResource[] = [
+      { type: "gmail", scopes: ["https://mail.google.com/"] },
+    ];
+    mockSetConnector.mockResolvedValue({
+      redirect_url: null,
+      connection_id: null,
+      already_authorized: false,
+      error: "different_user",
+      error_message: null,
+      other_user_email: null,
+    });
+
+    const result = await pushConnectors(local);
+
+    expect(result.results).toEqual([
+      {
+        type: "gmail",
+        action: "error",
+        error: "Already connected by another user",
+      },
+    ]);
+  });
+
   it("handles sync errors gracefully", async () => {
     const local: ConnectorResource[] = [
       { type: "gmail", scopes: ["https://mail.google.com/"] },
@@ -315,7 +366,7 @@ describe("pushConnectors", () => {
   it("handles remove errors gracefully", async () => {
     mockListConnectors.mockResolvedValue({
       integrations: [
-        { integration_type: "slack", status: "ACTIVE", scopes: ["chat:write"] },
+        { integration_type: "slack", status: "active", scopes: ["chat:write"] },
       ],
     });
     mockRemoveConnector.mockRejectedValue(new Error("Remove failed"));

tests/fixtures/duplicate-connectors/base44/.app.jsonc

@@ -0,0 +1,4 @@
+// Base44 App Configuration
+{
+    "id": "test-app-id"
+}

tests/fixtures/duplicate-connectors/config.jsonc

@@ -0,0 +1,3 @@
+{
+  "name": "Project with Duplicate Connectors"
+}

tests/fixtures/duplicate-connectors/connectors/slack1.jsonc

@@ -0,0 +1,4 @@
+{
+  "type": "slack",
+  "scopes": ["chat:write"]
+}