@base44-preview/cli 0.0.41-pr.382.5e7988f → 0.0.41-pr.382.5f81bb2

package/dist/cli/index.js

@@ -16481,7 +16481,7 @@ var require_lodash = __commonJS((exports, module) => {
       function nth(array2, n2) {
         return array2 && array2.length ? baseNth(array2, toInteger(n2)) : undefined2;
       }
-      var pull3 = baseRest(pullAll);
+      var pull2 = baseRest(pullAll);
       function pullAll(array2, values2) {
         return array2 && array2.length && values2 && values2.length ? basePullAll(array2, values2) : array2;
       }
@@ -18246,7 +18246,7 @@ __p += '`;
       lodash.pickBy = pickBy;
       lodash.property = property;
       lodash.propertyOf = propertyOf;
-      lodash.pull = pull3;
+      lodash.pull = pull2;
       lodash.pullAll = pullAll;
       lodash.pullAllBy = pullAllBy;
       lodash.pullAllWith = pullAllWith;
@@ -237514,10 +237514,6 @@ var GoogleBigQueryConnectorSchema = exports_external.object({
   type: exports_external.literal("googlebigquery"),
   scopes: exports_external.array(exports_external.string()).default([])
 });
-var StripeConnectorSchema = exports_external.object({
-  type: exports_external.literal("stripe"),
-  scopes: exports_external.array(exports_external.string()).default([])
-});
 var CustomTypeSchema = exports_external.string().min(1).regex(/^[a-z0-9_-]+$/i);
 var GenericConnectorSchema = exports_external.object({
   type: CustomTypeSchema,
@@ -237537,7 +237533,6 @@ var ConnectorResourceSchema = exports_external.union([
   HubspotConnectorSchema,
   LinkedInConnectorSchema,
   TikTokConnectorSchema,
-  StripeConnectorSchema,
   GenericConnectorSchema
 ]);
 var KnownIntegrationTypes = [
@@ -237553,8 +237548,7 @@ var KnownIntegrationTypes = [
   "salesforce",
   "hubspot",
   "linkedin",
-  "tiktok",
-  "stripe"
+  "tiktok"
 ];
 var IntegrationTypeSchema = exports_external.union([
   exports_external.enum(KnownIntegrationTypes),
@@ -237607,24 +237601,6 @@ var RemoveConnectorResponseSchema = exports_external.object({
   status: data.status,
   integrationType: data.integration_type
 }));
-var STRIPE_CONNECTOR_TYPE = "stripe";
-var InstallStripeResponseSchema = exports_external.object({
-  already_installed: exports_external.boolean(),
-  claim_url: exports_external.string().nullable()
-}).transform((data) => ({
-  alreadyInstalled: data.already_installed,
-  claimUrl: data.claim_url
-}));
-var StripeStatusResponseSchema = exports_external.object({
-  stripe_mode: exports_external.enum(["sandbox", "live"]).nullable(),
-  sandbox_claim_url: exports_external.string().nullable().optional()
-}).transform((data) => ({
-  stripeMode: data.stripe_mode,
-  sandboxClaimUrl: data.sandbox_claim_url
-}));
-var RemoveStripeResponseSchema = exports_external.object({
-  success: exports_external.boolean()
-});
 var ConnectionConfigFieldSchema = exports_external.object({
   name: exports_external.string(),
   display_name: exports_external.string(),
@@ -237739,54 +237715,6 @@ async function removeConnector(integrationType) {
   }
   return result.data;
 }
-async function installStripe() {
-  const appClient = getAppClient();
-  let response;
-  try {
-    response = await appClient.post("payments/stripe/install", {
-      timeout: 60000
-    });
-  } catch (error48) {
-    throw await ApiError.fromHttpError(error48, "installing Stripe");
-  }
-  const result = InstallStripeResponseSchema.safeParse(await response.json());
-  if (!result.success) {
-    throw new SchemaValidationError("Invalid response from server", result.error);
-  }
-  return result.data;
-}
-async function getStripeStatus() {
-  const appClient = getAppClient();
-  let response;
-  try {
-    response = await appClient.get("payments/stripe/status", {
-      timeout: 60000
-    });
-  } catch (error48) {
-    throw await ApiError.fromHttpError(error48, "checking Stripe integration status");
-  }
-  const result = StripeStatusResponseSchema.safeParse(await response.json());
-  if (!result.success) {
-    throw new SchemaValidationError("Invalid response from server", result.error);
-  }
-  return result.data;
-}
-async function removeStripe() {
-  const appClient = getAppClient();
-  let response;
-  try {
-    response = await appClient.delete("payments/stripe", {
-      timeout: 60000
-    });
-  } catch (error48) {
-    throw await ApiError.fromHttpError(error48, "removing Stripe integration");
-  }
-  const result = RemoveStripeResponseSchema.safeParse(await response.json());
-  if (!result.success) {
-    throw new SchemaValidationError("Invalid response from server", result.error);
-  }
-  return result.data;
-}
 // src/core/resources/connector/config.ts
 import { join as join4 } from "node:path";
 import { isDeepStrictEqual as isDeepStrictEqual2 } from "node:util";
@@ -237835,7 +237763,7 @@ async function readAllConnectors(connectorsDir) {
 async function writeConnectors(connectorsDir, remoteConnectors) {
   const entries = await readConnectorFiles(connectorsDir);
   const typeToEntry = buildTypeToEntryMap(entries);
-  const newTypes = new Set(remoteConnectors.map((c) => c.type));
+  const newTypes = new Set(remoteConnectors.map((c) => c.integrationType));
   const deleted = [];
   for (const [type, entry] of typeToEntry) {
     if (!newTypes.has(type)) {
@@ -237845,105 +237773,22 @@ async function writeConnectors(connectorsDir, remoteConnectors) {
   }
   const written = [];
   for (const connector of remoteConnectors) {
-    const existing = typeToEntry.get(connector.type);
-    if (existing && isDeepStrictEqual2(existing.data, connector)) {
+    const existing = typeToEntry.get(connector.integrationType);
+    const localConnector = {
+      type: connector.integrationType,
+      scopes: connector.scopes
+    };
+    if (existing && isDeepStrictEqual2(existing.data, localConnector)) {
       continue;
     }
-    const filePath = existing?.filePath ?? join4(connectorsDir, `${connector.type}.${CONFIG_FILE_EXTENSION}`);
-    await writeJsonFile(filePath, connector);
-    written.push(connector.type);
+    const filePath = existing?.filePath ?? join4(connectorsDir, `${connector.integrationType}.${CONFIG_FILE_EXTENSION}`);
+    await writeJsonFile(filePath, localConnector);
+    written.push(connector.integrationType);
   }
   return { written, deleted };
 }
-// src/core/resources/connector/stripe.ts
-async function syncStripeConnector(localStripe) {
-  const remoteStatus = await fetchStripeRemoteStatus();
-  if (remoteStatus === "error") {
-    return localStripe ? stripeError("Failed to check Stripe integration status") : null;
-  }
-  const isRemoteInstalled = remoteStatus.stripeMode !== null;
-  const needsInstall = localStripe && !isRemoteInstalled;
-  const alreadySynced = localStripe && isRemoteInstalled;
-  const needsRemoval = !localStripe && isRemoteInstalled;
-  if (needsInstall) {
-    return handleStripeInstall();
-  }
-  if (alreadySynced) {
-    return stripeSynced();
-  }
-  if (needsRemoval) {
-    return handleStripeRemoval();
-  }
-  return null;
-}
-async function isStripeInstalled() {
-  const status = await getStripeStatus();
-  return status.stripeMode !== null;
-}
-async function fetchStripeRemoteStatus() {
-  try {
-    return await getStripeStatus();
-  } catch {
-    return "error";
-  }
-}
-async function handleStripeInstall() {
-  try {
-    const result = await installStripe();
-    return stripeProvisioned(result.claimUrl ?? undefined);
-  } catch (err) {
-    return stripeError(err instanceof Error ? err.message : String(err));
-  }
-}
-async function handleStripeRemoval() {
-  try {
-    await removeStripe();
-    return stripeRemoved();
-  } catch (err) {
-    return stripeError(err instanceof Error ? err.message : String(err));
-  }
-}
-function stripeSynced() {
-  return { type: STRIPE_CONNECTOR_TYPE, action: "synced" };
-}
-function stripeProvisioned(claimUrl) {
-  return { type: STRIPE_CONNECTOR_TYPE, action: "provisioned", claimUrl };
-}
-function stripeRemoved() {
-  return { type: STRIPE_CONNECTOR_TYPE, action: "removed" };
-}
-function stripeError(error48) {
-  return { type: STRIPE_CONNECTOR_TYPE, action: "error", error: error48 };
-}
-
-// src/core/resources/connector/pull.ts
-async function pullAllConnectors() {
-  const [oauthResponse, stripeInstalled] = await Promise.all([
-    listConnectors(),
-    isStripeInstalled()
-  ]);
-  const connectors = oauthResponse.integrations.map((i) => ({
-    type: i.integrationType,
-    scopes: i.scopes
-  }));
-  if (stripeInstalled) {
-    connectors.push({ type: STRIPE_CONNECTOR_TYPE, scopes: [] });
-  }
-  return connectors;
-}
 // src/core/resources/connector/push.ts
 async function pushConnectors(connectors) {
-  const stripeConnector = connectors.find((c) => c.type === STRIPE_CONNECTOR_TYPE);
-  const oauthConnectors = connectors.filter((c) => c.type !== STRIPE_CONNECTOR_TYPE);
-  const oauthResults = await syncOAuthConnectors(oauthConnectors);
-  const stripeResult = await syncStripeConnector(stripeConnector);
-  const results = [...oauthResults];
-  if (stripeResult) {
-    results.push(stripeResult);
-  }
-  return { results };
-}
-async function syncOAuthConnectors(connectors) {
   const results = [];
   const upstream = await listConnectors();
   const localTypes = new Set(connectors.map((c) => c.type));
@@ -237976,7 +237821,7 @@ async function syncOAuthConnectors(connectors) {
       }
     }
   }
-  return results;
+  return { results };
 }
 function getConnectorSyncResult(type, response) {
   if (response.error === "different_user") {
@@ -238445,7 +238290,6 @@ async function pushFunctions(functions) {
 }
 // src/core/resources/function/pull.ts
 import { join as join6 } from "node:path";
-import { isDeepStrictEqual as isDeepStrictEqual3 } from "node:util";
 async function writeFunctions(functionsDir, functions) {
   const written = [];
   const skipped = [];
@@ -238481,7 +238325,9 @@ async function isFunctionUnchanged(functionDir, fn) {
     if (localConfig.entry !== fn.entry) {
       return false;
     }
-    if (!isDeepStrictEqual3(localConfig.automations ?? [], fn.automations)) {
+    const localAuto = JSON.stringify(localConfig.automations ?? []);
+    const remoteAuto = JSON.stringify(fn.automations);
+    if (localAuto !== remoteAuto) {
       return false;
     }
   } catch {
@@ -246591,10 +246437,6 @@ function getDashboardUrl(projectId) {
   const id = projectId ?? getAppConfig().id;
   return `${getBase44ApiUrl()}/apps/${id}/editor/workspace/overview`;
 }
-function getConnectorsUrl(projectId) {
-  const id = projectId ?? getAppConfig().id;
-  return `${getBase44ApiUrl()}/apps/${id}/editor/workspace/app-connections`;
-}
 // src/cli/utils/yaml.ts
 var import_lodash = __toESM(require_lodash(), 1);
 
@@ -246790,13 +246632,13 @@ async function pullConnectorsAction() {
   const configDir = dirname8(project2.configPath);
   const connectorsDir = join12(configDir, project2.connectorsDir);
   const remoteConnectors = await runTask("Fetching connectors from Base44", async () => {
-    return await pullAllConnectors();
+    return await listConnectors();
   }, {
     successMessage: "Connectors fetched successfully",
     errorMessage: "Failed to fetch connectors"
   });
   const { written, deleted } = await runTask("Syncing connector files", async () => {
-    return await writeConnectors(connectorsDir, remoteConnectors);
+    return await writeConnectors(connectorsDir, remoteConnectors.integrations);
   }, {
     successMessage: "Connector files synced successfully",
     errorMessage: "Failed to sync connector files"
@@ -246811,7 +246653,7 @@ async function pullConnectorsAction() {
     R2.info("All connectors are already up to date");
   }
   return {
-    outroMessage: `Pulled ${remoteConnectors.length} connectors to ${connectorsDir}`
+    outroMessage: `Pulled ${remoteConnectors.integrations.length} connectors to ${connectorsDir}`
   };
 }
 function getConnectorsPullCommand(context) {
@@ -247430,7 +247272,7 @@ var open_default = open;
 var POLL_INTERVAL_MS = 2000;
 var POLL_TIMEOUT_MS = 2 * 60 * 1000;
 function filterPendingOAuth(results) {
-  return results.filter((r) => r.action === "needs_oauth" && !!r.connectionId);
+  return results.filter((r) => r.action === "needs_oauth" && !!r.redirectUrl && !!r.connectionId);
 }
 async function runOAuthFlowWithSkip(connector2) {
   await open_default(connector2.redirectUrl);
@@ -247448,10 +247290,6 @@ async function runOAuthFlowWithSkip(connector2) {
         finalStatus = "SKIPPED";
         return true;
       }
-      if (!connector2.connectionId) {
-        finalStatus = "FAILED";
-        return true;
-      }
       const response = await getOAuthStatus(connector2.type, connector2.connectionId);
       finalStatus = response.status;
       return response.status !== "PENDING";
@@ -247514,49 +247352,32 @@ async function promptOAuthFlows(pending, options) {
 function printSummary(results, oauthOutcomes) {
   const synced = [];
   const added = [];
-  let provisioned;
   const removed = [];
   const skipped = [];
   const failed = [];
   for (const r of results) {
-    switch (r.action) {
-      case "provisioned":
-        provisioned = r;
-        break;
-      case "synced":
-        synced.push(r.type);
-        break;
-      case "removed":
-        removed.push(r.type);
-        break;
-      case "error":
-        failed.push({ type: r.type, error: r.error });
-        break;
-      case "needs_oauth": {
-        const oauthStatus = oauthOutcomes.get(r.type);
-        if (oauthStatus === "ACTIVE") {
-          added.push(r.type);
-        } else if (oauthStatus === "SKIPPED") {
-          skipped.push(r.type);
-        } else if (oauthStatus === "PENDING") {
-          failed.push({ type: r.type, error: "authorization timed out" });
-        } else if (oauthStatus === "FAILED") {
-          failed.push({ type: r.type, error: "authorization failed" });
-        } else {
-          failed.push({ type: r.type, error: "needs authorization" });
-        }
-        break;
+    const oauthStatus = oauthOutcomes.get(r.type);
+    if (r.action === "synced") {
+      synced.push(r.type);
+    } else if (r.action === "removed") {
+      removed.push(r.type);
+    } else if (r.action === "error") {
+      failed.push({ type: r.type, error: r.error });
+    } else if (r.action === "needs_oauth") {
+      if (oauthStatus === "ACTIVE") {
+        added.push(r.type);
+      } else if (oauthStatus === "SKIPPED") {
+        skipped.push(r.type);
+      } else if (oauthStatus === "PENDING") {
+        failed.push({ type: r.type, error: "authorization timed out" });
+      } else if (oauthStatus === "FAILED") {
+        failed.push({ type: r.type, error: "authorization failed" });
+      } else {
+        failed.push({ type: r.type, error: "needs authorization" });
       }
     }
   }
   R2.info(theme.styles.bold("Summary:"));
-  if (provisioned) {
-    R2.success("Stripe sandbox provisioned");
-    if (provisioned.claimUrl) {
-      R2.info(`  Claim your Stripe sandbox: ${theme.colors.links(provisioned.claimUrl)}`);
-    }
-    R2.info(`  Connectors dashboard: ${theme.colors.links(getConnectorsUrl())}`);
-  }
   if (synced.length > 0) {
     R2.success(`Synced: ${synced.join(", ")}`);
   }
@@ -247570,7 +247391,7 @@ function printSummary(results, oauthOutcomes) {
     R2.warn(`Skipped: ${skipped.join(", ")}`);
   }
   for (const r of failed) {
-    R2.error(`Failed: ${r.type} - ${r.error}`);
+    R2.error(`Failed: ${r.type}${r.error ? ` - ${r.error}` : ""}`);
   }
 }
 async function pushConnectorsAction(isNonInteractive) {
@@ -247967,11 +247788,15 @@ ${summaryLines.join(`
     successMessage: theme.colors.base44Orange("Deployment completed"),
     errorMessage: "Deployment failed"
   });
-  const connectorResults = result.connectorResults ?? [];
-  await handleOAuthConnectors(connectorResults, options);
-  const stripeResult = connectorResults.find((r) => r.type === "stripe");
-  if (stripeResult?.action === "provisioned") {
-    printStripeResult(stripeResult);
+  const needsOAuth = filterPendingOAuth(result.connectorResults ?? []);
+  if (needsOAuth.length > 0) {
+    const oauthOutcomes = await promptOAuthFlows(needsOAuth, {
+      skipPrompt: options.yes || options.isNonInteractive
+    });
+    const allAuthorized = oauthOutcomes.size > 0 && [...oauthOutcomes.values()].every((s) => s === "ACTIVE");
+    if (!allAuthorized) {
+      R2.info("Some connectors still require authorization. Run 'base44 connectors push' or open the links above in your browser.");
+    }
   }
   R2.message(`${theme.styles.header("Dashboard")}: ${theme.colors.links(getDashboardUrl())}`);
   if (result.appUrl) {
@@ -247987,25 +247812,6 @@ function getDeployCommand2(context) {
     }), { requireAuth: true }, context);
   });
 }
-async function handleOAuthConnectors(connectorResults, options) {
-  const needsOAuth = filterPendingOAuth(connectorResults);
-  if (needsOAuth.length === 0)
-    return;
-  const oauthOutcomes = await promptOAuthFlows(needsOAuth, {
-    skipPrompt: options.yes || options.isNonInteractive
-  });
-  const allAuthorized = oauthOutcomes.size > 0 && [...oauthOutcomes.values()].every((s) => s === "ACTIVE");
-  if (!allAuthorized) {
-    R2.info("Some connectors still require authorization. Run 'base44 connectors push' or open the links above in your browser.");
-  }
-}
-function printStripeResult(r) {
-  R2.success("Stripe sandbox provisioned");
-  if (r.claimUrl) {
-    R2.info(`  Claim your Stripe sandbox: ${theme.colors.links(r.claimUrl)}`);
-  }
-  R2.info(`  Connectors dashboard: ${theme.colors.links(getConnectorsUrl())}`);
-}
 
 // src/cli/commands/project/link.ts
 function validateNonInteractiveFlags2(command) {
@@ -255523,4 +255329,4 @@ export {
   CLIExitError
 };
 
-//# debugId=0427AEEF5EF1A0DD64756E2164756E21
+//# debugId=AC227C160FCE9CC164756E2164756E21