@base44-preview/cli 0.0.30-pr.211.a31cce0 → 0.0.30-pr.211.e650aac

package/dist/cli/index.js

@@ -162253,13 +162253,13 @@ async function deployAll(projectData) {
   await entityResource.push(entities);
   await functionResource.push(functions);
   await agentResource.push(agents);
-  await connectorResource.push(connectors);
+  const { results: connectorResults } = await pushConnectors(connectors);
   if (project.site?.outputDirectory) {
     const outputDir = resolve(project.root, project.site.outputDirectory);
     const { appUrl } = await deploySite(outputDir);
-    return { appUrl };
+    return { appUrl, connectorResults };
   }
-  return {};
+  return { connectorResults };
 }
 // src/core/clients/base44-client.ts
 var retriedRequests = new WeakSet;
@@ -169889,10 +169889,48 @@ function getWhoamiCommand(context) {
   });
 }
 
-// src/cli/commands/connectors/push.ts
-function isPendingOAuth(r2) {
-  return r2.action === "needs_oauth" && !!r2.redirectUrl && !!r2.connectionId;
+// src/cli/commands/connectors/oauth-prompt.ts
+function filterPendingOAuth(results) {
+  return results.filter((r2) => r2.action === "needs_oauth" && !!r2.redirectUrl && !!r2.connectionId);
+}
+async function promptOAuthFlows(pending, options) {
+  const outcomes = new Map;
+  if (pending.length === 0) {
+    return outcomes;
+  }
+  M2.info("");
+  M2.warn(`${pending.length} connector(s) require authorization in your browser:`);
+  for (const connector2 of pending) {
+    M2.info(`  ${connector2.type}: ${theme.styles.dim(connector2.redirectUrl)}`);
+  }
+  if (options?.skipPrompt) {
+    return outcomes;
+  }
+  const shouldAuth = await ye({
+    message: "Open browser to authorize now?"
+  });
+  if (pD(shouldAuth) || !shouldAuth) {
+    return outcomes;
+  }
+  for (const connector2 of pending) {
+    M2.info(`
+Opening browser for ${connector2.type}...`);
+    const oauthResult = await runTask(`Waiting for ${connector2.type} authorization...`, async () => {
+      return await runOAuthFlow({
+        type: connector2.type,
+        redirectUrl: connector2.redirectUrl,
+        connectionId: connector2.connectionId
+      });
+    }, {
+      successMessage: `${connector2.type} authorization complete`,
+      errorMessage: `${connector2.type} authorization failed`
+    });
+    outcomes.set(connector2.type, oauthResult.status);
+  }
+  return outcomes;
 }
+
+// src/cli/commands/connectors/push.ts
 function printSummary(results, oauthOutcomes) {
   const synced = [];
   const added = [];
@@ -169944,42 +169982,14 @@ async function pushConnectorsAction() {
   const { results } = await runTask("Pushing connectors to Base44", async () => {
     return await pushConnectors(connectors);
   });
-  const oauthOutcomes = new Map;
-  const needsOAuth = results.filter(isPendingOAuth);
+  const needsOAuth = filterPendingOAuth(results);
   let outroMessage = "Connectors pushed to Base44";
-  if (needsOAuth.length > 0) {
-    M2.info("");
-    M2.warn(`${needsOAuth.length} connector(s) require authorization in your browser:`);
-    for (const connector2 of needsOAuth) {
-      M2.info(`  ${connector2.type}: ${theme.styles.dim(connector2.redirectUrl)}`);
-    }
+  const oauthOutcomes = await promptOAuthFlows(needsOAuth, {
+    skipPrompt: !!process.env.CI
+  });
+  if (needsOAuth.length > 0 && oauthOutcomes.size === 0) {
     const pending = needsOAuth.map((c3) => c3.type).join(", ");
-    if (process.env.CI) {
-      outroMessage = `Skipped OAuth in CI. Pending: ${pending}. Run 'base44 connectors push' locally to authorize.`;
-    } else {
-      const shouldAuth = await ye({
-        message: "Open browser to authorize now?"
-      });
-      if (pD(shouldAuth) || !shouldAuth) {
-        outroMessage = `Authorization skipped. Pending: ${pending}. Run 'base44 connectors push' again to complete.`;
-      } else {
-        for (const connector2 of needsOAuth) {
-          M2.info(`
-Opening browser for ${connector2.type}...`);
-          const oauthResult = await runTask(`Waiting for ${connector2.type} authorization...`, async () => {
-            return await runOAuthFlow({
-              type: connector2.type,
-              redirectUrl: connector2.redirectUrl,
-              connectionId: connector2.connectionId
-            });
-          }, {
-            successMessage: `${connector2.type} authorization complete`,
-            errorMessage: `${connector2.type} authorization failed`
-          });
-          oauthOutcomes.set(connector2.type, oauthResult.status);
-        }
-      }
-    }
+    outroMessage = process.env.CI ? `Skipped OAuth in CI. Pending: ${pending}. Run 'base44 connectors push' locally or open the links above to authorize.` : `Authorization skipped. Pending: ${pending}. Run 'base44 connectors push' or open the links above to authorize.`;
   }
   printSummary(results, oauthOutcomes);
   return { outroMessage };
@@ -170308,6 +170318,16 @@ ${summaryLines.join(`
     successMessage: theme.colors.base44Orange("Deployment completed"),
     errorMessage: "Deployment failed"
   });
+  const needsOAuth = filterPendingOAuth(result.connectorResults ?? []);
+  if (needsOAuth.length > 0) {
+    const oauthOutcomes = await promptOAuthFlows(needsOAuth, {
+      skipPrompt: options.yes || !!process.env.CI
+    });
+    if (oauthOutcomes.size === 0) {
+      const pending = needsOAuth.map((c3) => c3.type).join(", ");
+      M2.info(`Pending: ${pending}. To authorize, run 'base44 connectors push' or open the links above in your browser.`);
+    }
+  }
   M2.message(`${theme.styles.header("Dashboard")}: ${theme.colors.links(getDashboardUrl())}`);
   if (result.appUrl) {
     M2.message(`${theme.styles.header("App URL")}: ${theme.colors.links(result.appUrl)}`);
@@ -174937,4 +174957,4 @@ export {
   CLIExitError
 };
 
-//# debugId=B111445572F1B3F064756E2164756E21
+//# debugId=72DEAA651CDAA06664756E2164756E21