@base44-preview/cli 0.0.25-pr.104.089a20e → 0.0.25-pr.104.a8520b5

package/dist/index.js

@@ -8038,6 +8038,19 @@ var AuthValidationError = class extends Error {
 		this.name = "AuthValidationError";
 	}
 };
+var ConnectorApiError = class extends Error {
+	constructor(message, cause) {
+		super(message);
+		this.cause = cause;
+		this.name = "ConnectorApiError";
+	}
+};
+var ConnectorValidationError = class extends Error {
+	constructor(message) {
+		super(message);
+		this.name = "ConnectorValidationError";
+	}
+};
 
 //#endregion
 //#region src/core/consts.ts
@@ -30793,7 +30806,7 @@ function getAppClient() {
 
 //#endregion
 //#region src/core/clients/schemas.ts
-const ApiErrorSchema = object({
+const ApiErrorSchema$1 = object({
 	error_type: string().optional(),
 	message: union([string(), record(string(), unknown())]).optional(),
 	detail: union([
@@ -39278,13 +39291,7 @@ const InitiateResponseSchema = object({
 	already_authorized: boolean().nullish(),
 	other_user_email: string().nullish(),
 	error: string().nullish()
-}).transform((data) => ({
-	redirectUrl: data.redirect_url,
-	connectionId: data.connection_id,
-	alreadyAuthorized: data.already_authorized,
-	otherUserEmail: data.other_user_email,
-	error: data.error
-}));
+});
 /**
 * Response from GET /api/apps/{app_id}/external-auth/status
 */
@@ -39322,6 +39329,13 @@ const ConnectorSchema = object({
 * Response from GET /api/apps/{app_id}/external-auth/list
 */
 const ListResponseSchema = object({ integrations: array(ConnectorSchema) });
+/**
+* Generic API error response
+*/
+const ApiErrorSchema = object({
+	error: string(),
+	detail: string().nullish()
+});
 
 //#endregion
 //#region src/core/connectors/api.ts
@@ -39330,45 +39344,92 @@ const ListResponseSchema = object({ integrations: array(ConnectorSchema) });
 * Returns a redirect URL to open in the browser.
 */
 async function initiateOAuth(integrationType, scopes = null) {
-	const json = await (await getAppClient().post("external-auth/initiate", { json: {
-		integration_type: integrationType,
-		scopes
-	} })).json();
-	return InitiateResponseSchema.parse(json);
+	const response = await getAppClient().post("external-auth/initiate", {
+		json: {
+			integration_type: integrationType,
+			scopes
+		},
+		throwHttpErrors: false
+	});
+	const json = await response.json();
+	if (!response.ok) {
+		const errorResult = ApiErrorSchema.safeParse(json);
+		if (errorResult.success) throw new ConnectorApiError(errorResult.data.error);
+		throw new ConnectorApiError(`Failed to initiate OAuth: ${response.status} ${response.statusText}`);
+	}
+	const result = InitiateResponseSchema.safeParse(json);
+	if (!result.success) throw new ConnectorValidationError(`Invalid initiate response from server: ${result.error.message}`);
+	return result.data;
 }
 /**
 * Checks the status of an OAuth connection attempt.
 */
 async function checkOAuthStatus(integrationType, connectionId) {
-	const json = await (await getAppClient().get("external-auth/status", { searchParams: {
-		integration_type: integrationType,
-		connection_id: connectionId
-	} })).json();
-	return StatusResponseSchema.parse(json);
+	const response = await getAppClient().get("external-auth/status", {
+		searchParams: {
+			integration_type: integrationType,
+			connection_id: connectionId
+		},
+		throwHttpErrors: false
+	});
+	const json = await response.json();
+	if (!response.ok) {
+		const errorResult = ApiErrorSchema.safeParse(json);
+		if (errorResult.success) throw new ConnectorApiError(errorResult.data.error);
+		throw new ConnectorApiError(`Failed to check OAuth status: ${response.status} ${response.statusText}`);
+	}
+	const result = StatusResponseSchema.safeParse(json);
+	if (!result.success) throw new ConnectorValidationError(`Invalid status response from server: ${result.error.message}`);
+	return result.data;
 }
 /**
 * Lists all connected integrations for the current app.
 */
 async function listConnectors() {
-	const json = await (await getAppClient().get("external-auth/list")).json();
-	return ListResponseSchema.parse(json).integrations;
+	const response = await getAppClient().get("external-auth/list", { throwHttpErrors: false });
+	const json = await response.json();
+	if (!response.ok) {
+		const errorResult = ApiErrorSchema.safeParse(json);
+		if (errorResult.success) throw new ConnectorApiError(errorResult.data.error);
+		throw new ConnectorApiError(`Failed to list connectors: ${response.status} ${response.statusText}`);
+	}
+	const result = ListResponseSchema.safeParse(json);
+	if (!result.success) throw new ConnectorValidationError(`Invalid list response from server: ${result.error.message}`);
+	return result.data.integrations;
 }
 /**
 * Disconnects (soft delete) a connector integration.
 */
 async function disconnectConnector(integrationType) {
-	await getAppClient().delete(`external-auth/integrations/${integrationType}`);
+	const response = await getAppClient().delete(`external-auth/integrations/${integrationType}`, { throwHttpErrors: false });
+	if (!response.ok) {
+		const json = await response.json();
+		const errorResult = ApiErrorSchema.safeParse(json);
+		if (errorResult.success) throw new ConnectorApiError(errorResult.data.error);
+		throw new ConnectorApiError(`Failed to disconnect connector: ${response.status} ${response.statusText}`);
+	}
 }
 /**
 * Removes (hard delete) a connector integration.
 * This permanently removes the connector and cannot be undone.
 */
 async function removeConnector(integrationType) {
-	await getAppClient().delete(`external-auth/integrations/${integrationType}/remove`);
+	const response = await getAppClient().delete(`external-auth/integrations/${integrationType}/remove`, { throwHttpErrors: false });
+	if (!response.ok) {
+		const json = await response.json();
+		const errorResult = ApiErrorSchema.safeParse(json);
+		if (errorResult.success) throw new ConnectorApiError(errorResult.data.error);
+		throw new ConnectorApiError(`Failed to remove connector: ${response.status} ${response.statusText}`);
+	}
 }
 
 //#endregion
-//#region src/core/connectors/consts.ts
+//#region src/core/connectors/constants.ts
+/**
+* OAuth polling configuration
+*/
+const OAUTH_POLL_INTERVAL_MS = 2e3;
+const OAUTH_POLL_TIMEOUT_MS = 300 * 1e3;
 /**
 * Supported OAuth connector integrations.
 * Based on apper/backend/app/external_auth/models/constants.py
@@ -39408,13 +39469,12 @@ function isValidIntegration(type) {
 	return SUPPORTED_INTEGRATIONS.includes(type);
 }
 function getIntegrationDisplayName(type) {
-	return INTEGRATION_DISPLAY_NAMES[type] ?? type;
+	if (isValidIntegration(type)) return INTEGRATION_DISPLAY_NAMES[type];
+	return type;
 }
 
 //#endregion
-//#region src/cli/commands/connectors/utils.ts
-const OAUTH_POLL_INTERVAL_MS = 2e3;
-const OAUTH_POLL_TIMEOUT_MS = 300 * 1e3;
+//#region src/core/connectors/oauth.ts
 /**
 * Polls for OAuth completion status.
 * Returns when status becomes ACTIVE or FAILED, or times out.
@@ -39454,24 +39514,22 @@ async function waitForOAuthCompletion(integrationType, connectionId, options) {
 		};
 	}
 }
-/**
-* Asserts that a string is a valid integration type, throwing if not.
-*/
-function assertValidIntegrationType(type, supportedIntegrations) {
-	if (!supportedIntegrations.includes(type)) {
-		const supportedList = supportedIntegrations.join(", ");
-		throw new Error(`Unsupported connector: ${type}\nSupported connectors: ${supportedList}`);
-	}
-}
 
 //#endregion
 //#region src/cli/commands/connectors/add.ts
+function validateIntegrationType(type) {
+	if (!isValidIntegration(type)) {
+		const supportedList = SUPPORTED_INTEGRATIONS.join(", ");
+		throw new Error(`Unsupported connector: ${type}\nSupported connectors: ${supportedList}`);
+	}
+	return type;
+}
 async function promptForIntegrationType() {
 	const selected = await ve({
 		message: "Select an integration to connect:",
-		options: Object.entries(INTEGRATION_DISPLAY_NAMES).map(([type, displayName]) => ({
+		options: SUPPORTED_INTEGRATIONS.map((type) => ({
 			value: type,
-			label: displayName
+			label: getIntegrationDisplayName(type)
 		}))
 	});
 	if (pD(selected)) {
@@ -39489,11 +39547,7 @@ async function pollForOAuthCompletion(integrationType, connectionId) {
 	});
 }
 async function addConnector(integrationType) {
-	let selectedType;
-	if (integrationType) {
-		assertValidIntegrationType(integrationType, SUPPORTED_INTEGRATIONS);
-		selectedType = integrationType;
-	} else selectedType = await promptForIntegrationType();
+	const selectedType = integrationType ? validateIntegrationType(integrationType) : await promptForIntegrationType();
 	const displayName = getIntegrationDisplayName(selectedType);
 	const initiateResponse = await runTask(`Initiating ${displayName} connection...`, async () => {
 		return await initiateOAuth(selectedType);
@@ -39501,11 +39555,11 @@ async function addConnector(integrationType) {
 		successMessage: `${displayName} OAuth initiated`,
 		errorMessage: `Failed to initiate ${displayName} connection`
 	});
-	if (initiateResponse.alreadyAuthorized) return { outroMessage: `Already connected to ${theme.styles.bold(displayName)}` };
-	if (initiateResponse.error === "different_user" && initiateResponse.otherUserEmail) throw new Error(`This app is already connected to ${displayName} by ${initiateResponse.otherUserEmail}`);
-	if (!initiateResponse.redirectUrl || !initiateResponse.connectionId) throw new Error("Invalid response from server: missing redirect URL or connection ID");
-	M.info(`Please authorize ${displayName} at:\n${theme.colors.links(initiateResponse.redirectUrl)}`);
-	const result = await pollForOAuthCompletion(selectedType, initiateResponse.connectionId);
+	if (initiateResponse.already_authorized) return { outroMessage: `Already connected to ${theme.styles.bold(displayName)}` };
+	if (initiateResponse.error === "different_user" && initiateResponse.other_user_email) throw new Error(`This app is already connected to ${displayName} by ${initiateResponse.other_user_email}`);
+	if (!initiateResponse.redirect_url || !initiateResponse.connection_id) throw new Error("Invalid response from server: missing redirect URL or connection ID");
+	M.info(`Please authorize ${displayName} at:\n${theme.colors.links(initiateResponse.redirect_url)}`);
+	const result = await pollForOAuthCompletion(selectedType, initiateResponse.connection_id);
 	if (!result.success) throw new Error(result.error || "Authorization failed");
 	const accountInfo = result.accountEmail ? ` as ${theme.styles.bold(result.accountEmail)}` : "";
 	return { outroMessage: `Successfully connected to ${theme.styles.bold(displayName)}${accountInfo}` };
@@ -39561,7 +39615,10 @@ async function removeConnectorCommand(integrationType, options = {}) {
 	const displayName = selectedConnector.displayName;
 	const accountInfo = selectedConnector.accountEmail ? ` (${selectedConnector.accountEmail})` : "";
 	if (!options.yes) {
-		const shouldRemove = await ye({ message: `${isHardDelete ? "Permanently remove" : "Remove"} ${displayName}${accountInfo}?` });
+		const shouldRemove = await ye({
+			message: `${isHardDelete ? "Permanently remove" : "Remove"} ${displayName}${accountInfo}?`,
+			initialValue: false
+		});
 		if (pD(shouldRemove) || !shouldRemove) {
 			xe("Operation cancelled.");
 			process.exit(0);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@base44-preview/cli",
-  "version": "0.0.25-pr.104.089a20e",
+  "version": "0.0.25-pr.104.a8520b5",
   "description": "Base44 CLI - Unified interface for managing Base44 applications",
   "type": "module",
   "bin": {