@boltic/cli 1.0.37 → 1.0.39

package/api/integration.js

@@ -3,6 +3,7 @@ import FormData from "form-data";
 import fs from "fs";
 import https from "https";
 import { handleError } from "../helper/error.js";
+import { getSecret } from "../helper/secure-storage.js";
 import { logApi } from "../helper/verbose.js";
 
 const getHttpsAgentForUrl = (baseUrl) => {
@@ -16,14 +17,39 @@ const getHttpsAgentForUrl = (baseUrl) => {
 		) {
 			return new https.Agent({ rejectUnauthorized: false });
 		}
-	} catch (_) {
+	} catch {
 		// ignore URL parse errors and fall back to default agent
 	}
 	return undefined;
 };
 
-const getIntegrationGroups = async (apiUrl, accountId, token, session) => {
-	if (!token || !session || !accountId) {
+const buildAuthHeaders = async (token, session) => {
+	const pat = await getSecret("pat");
+
+	// If PAT exists, prefer PAT-based auth and do not send bearer/session
+	if (pat && pat.trim()) {
+		return {
+			"x-boltic-token": pat.trim(),
+		};
+	}
+
+	// Fallback to existing Bearer + Cookie auth
+	const headers = {};
+	if (token) {
+		headers.Authorization = `Bearer ${token}`;
+	}
+	if (session) {
+		headers.Cookie = session;
+	}
+	return headers;
+};
+
+const ensureAuthenticatedOrExit = async (accountId, token, session) => {
+	const pat = await getSecret("pat");
+	const hasPatAuth = pat && pat.trim() && accountId;
+	const hasSessionAuth = token && session && accountId;
+
+	if (!hasPatAuth && !hasSessionAuth) {
 		console.error(
 			"\x1b[31mError:\x1b[0m Authentication credentials are required."
 		);
@@ -31,7 +57,12 @@ const getIntegrationGroups = async (apiUrl, accountId, token, session) => {
 		console.log("\x1b[32m$ boltic login\x1b[0m\n");
 		process.exit(1); // Exit the CLI with an error code
 	}
+};
+
+const getIntegrationGroups = async (apiUrl, accountId, token, session) => {
 	try {
+		await ensureAuthenticatedOrExit(accountId, token, session);
+		const authHeaders = await buildAuthHeaders(token, session);
 		const axiosOptions = {
 			method: "get",
 			url: `${apiUrl}/service/panel/automation/v1.0/${accountId}/integration-groups`,
@@ -41,8 +72,7 @@ const getIntegrationGroups = async (apiUrl, accountId, token, session) => {
 			},
 			headers: {
 				"Content-Type": "application/json",
-				Authorization: `Bearer ${token}`,
-				Cookie: session,
+				...authHeaders,
 			},
 			httpsAgent: getHttpsAgentForUrl(apiUrl),
 		};
@@ -56,15 +86,9 @@ const getIntegrationGroups = async (apiUrl, accountId, token, session) => {
 };
 
 const listAllIntegrations = async (apiUrl, token, accountId, session) => {
-	if (!token || !session || !accountId) {
-		console.error(
-			"\x1b[31mError:\x1b[0m Authentication credentials are required."
-		);
-		console.log("\n🔹 Please log in first using:");
-		console.log("\x1b[32m$ boltic login\x1b[0m\n");
-		process.exit(1); // Exit the CLI with an error code
-	}
 	try {
+		await ensureAuthenticatedOrExit(accountId, token, session);
+		const authHeaders = await buildAuthHeaders(token, session);
 		const axiosOptions = {
 			method: "get",
 			url: `${apiUrl}/service/panel/automation/v1.0/${accountId}/integrations`,
@@ -74,8 +98,7 @@ const listAllIntegrations = async (apiUrl, token, accountId, session) => {
 			},
 			headers: {
 				"Content-Type": "application/json",
-				Authorization: `Bearer ${token}`,
-				Cookie: session,
+				...authHeaders,
 			},
 			httpsAgent: getHttpsAgentForUrl(apiUrl),
 		};
@@ -95,23 +118,16 @@ const saveIntegration = async (
 	session,
 	integration
 ) => {
-	if (!token || !session || !accountId) {
-		console.error(
-			"\x1b[31mError:\x1b[0m Authentication credentials are required."
-		);
-		console.log("\n🔹 Please log in first using:");
-		console.log("\x1b[32m$ boltic login\x1b[0m\n");
-		process.exit(1); // Exit the CLI with an error code
-	}
 	try {
+		await ensureAuthenticatedOrExit(accountId, token, session);
+		const authHeaders = await buildAuthHeaders(token, session);
 		const response = await axios({
 			method: "post",
 			url: `${apiUrl}/service/panel/automation/v1.0/${accountId}/integrations`,
 			data: integration,
 			headers: {
 				"Content-Type": "application/json",
-				Authorization: `Bearer ${token}`,
-				Cookie: session,
+				...authHeaders,
 			},
 			httpsAgent: getHttpsAgentForUrl(apiUrl),
 		});
@@ -122,24 +138,17 @@ const saveIntegration = async (
 };
 
 const editIntegration = async (apiUrl, token, accountId, session, payload) => {
-	if (!token || !session || !accountId) {
-		console.error(
-			"\x1b[31mError:\x1b[0m Authentication credentials are required."
-		);
-		console.log("\n🔹 Please log in first using:");
-		console.log("\x1b[32m$ boltic login\x1b[0m\n");
-		process.exit(1); // Exit the CLI with an error code
-	}
 	const { id } = payload;
 	try {
+		await ensureAuthenticatedOrExit(accountId, token, session);
+		const authHeaders = await buildAuthHeaders(token, session);
 		const response = await axios({
 			method: "post",
 			url: `${apiUrl}/service/panel/automation/v1.0/${accountId}/integrations/${id}/edit`,
 			data: payload,
 			headers: {
 				"Content-Type": "application/json",
-				Authorization: `Bearer ${token}`,
-				Cookie: session,
+				...authHeaders,
 			},
 			httpsAgent: getHttpsAgentForUrl(apiUrl),
 		});
@@ -157,15 +166,9 @@ const updateIntegration = async (
 	session,
 	integration
 ) => {
-	if (!token || !session || !accountId) {
-		console.error(
-			"\x1b[31mError:\x1b[0m Authentication credentials are required."
-		);
-		console.log("\n🔹 Please log in first using:");
-		console.log("\x1b[32m$ boltic login\x1b[0m\n");
-		process.exit(1); // Exit the CLI with an error code
-	}
 	try {
+		await ensureAuthenticatedOrExit(accountId, token, session);
+		const authHeaders = await buildAuthHeaders(token, session);
 		const { id, ...rest } = integration;
 		const response = await axios({
 			method: "patch",
@@ -173,8 +176,7 @@ const updateIntegration = async (
 			data: rest,
 			headers: {
 				"Content-Type": "application/json",
-				Authorization: `Bearer ${token}`,
-				Cookie: session,
+				...authHeaders,
 			},
 			httpsAgent: getHttpsAgentForUrl(apiUrl),
 		});
@@ -191,23 +193,15 @@ const getIntegrationById = async (
 	session,
 	integrationId
 ) => {
-	if (!token || !session || !accountId) {
-		console.error(
-			"\x1b[31mError:\x1b[0m Authentication credentials are required."
-		);
-		console.log("\n🔹 Please log in first using:");
-		console.log("\x1b[32m$ boltic login\x1b[0m\n");
-		process.exit(1); // Exit the CLI with an error code
-	}
-
 	try {
+		await ensureAuthenticatedOrExit(accountId, token, session);
+		const authHeaders = await buildAuthHeaders(token, session);
 		const response = await axios({
 			method: "get",
 			url: `${apiUrl}/service/panel/automation/v1.0/${accountId}/integrations/${integrationId}`,
 			headers: {
 				"Content-Type": "application/json",
-				Authorization: `Bearer ${token}`,
-				Cookie: session,
+				...authHeaders,
 			},
 			httpsAgent: getHttpsAgentForUrl(apiUrl),
 		});
@@ -224,23 +218,15 @@ const getAuthenticationByIntegrationId = async (
 	session,
 	integrationId
 ) => {
-	if (!token || !session || !accountId) {
-		console.error(
-			"\x1b[31mError:\x1b[0m Authentication credentials are required."
-		);
-		console.log("\n🔹 Please log in first using:");
-		console.log("\x1b[32m$ boltic login\x1b[0m\n");
-		process.exit(1); // Exit the CLI with an error code
-	}
-
 	try {
+		await ensureAuthenticatedOrExit(accountId, token, session);
+		const authHeaders = await buildAuthHeaders(token, session);
 		const response = await axios({
 			method: "get",
 			url: `${apiUrl}/service/panel/automation/v1.0/${accountId}integrations/${integrationId}/authentication`,
 			headers: {
 				"Content-Type": "application/json",
-				Authorization: `Bearer ${token}`,
-				Cookie: session,
+				...authHeaders,
 			},
 			httpsAgent: getHttpsAgentForUrl(apiUrl),
 		});
@@ -290,22 +276,15 @@ const getConfigurationByIntegrationId = async (
 	accountId,
 	integrationId
 ) => {
-	if (!token || !session || !accountId) {
-		console.error(
-			"\x1b[31mError:\x1b[0m Authentication credentials are required."
-		);
-		console.log("\n🔹 Please log in first using:");
-		console.log("\x1b[32m$ boltic login\x1b[0m\n");
-		process.exit(1); // Exit the CLI with an error code
-	}
 	try {
+		await ensureAuthenticatedOrExit(accountId, token, session);
+		const authHeaders = await buildAuthHeaders(token, session);
 		const response = await axios({
 			method: "get",
 			url: `${apiUrl}/service/panel/automation/v1.0/${accountId}integrations/${integrationId}/configuration`,
 			headers: {
 				"Content-Type": "application/json",
-				Authorization: `Bearer ${token}`,
-				Cookie: session,
+				...authHeaders,
 			},
 			httpsAgent: getHttpsAgentForUrl(apiUrl),
 		});
@@ -322,23 +301,16 @@ const syncIntegration = async (
 	session,
 	integration
 ) => {
-	if (!token || !session || !accountId) {
-		console.error(
-			"\x1b[31mError:\x1b[0m Authentication credentials are required."
-		);
-		console.log("\n🔹 Please log in first using:");
-		console.log("\x1b[32m$ boltic login\x1b[0m\n");
-		process.exit(1); // Exit the CLI with an error code
-	}
 	try {
+		await ensureAuthenticatedOrExit(accountId, token, session);
+		const authHeaders = await buildAuthHeaders(token, session);
 		const response = await axios({
 			method: "post",
 			url: `${apiUrl}/service/panel/automation/v1.0/${accountId}/integrations/${integration.integration_id}/deploy`,
 			data: integration,
 			headers: {
 				"Content-Type": "application/json",
-				Authorization: `Bearer ${token}`,
-				Cookie: session,
+				...authHeaders,
 			},
 			httpsAgent: getHttpsAgentForUrl(apiUrl),
 		});
@@ -355,15 +327,8 @@ const sendIntegrationForReview = async (
 	session,
 	integration
 ) => {
-	if (!token || !session || !accountId) {
-		console.error(
-			"\x1b[31mError:\x1b[0m Authentication credentials are required."
-		);
-		console.log("\n🔹 Please log in first using:");
-		console.log("\x1b[32m$ boltic login\x1b[0m\n");
-		process.exit(1); // Exit the CLI with an error code
-	}
 	try {
+		await ensureAuthenticatedOrExit(accountId, token, session);
 		const response = await axios({
 			method: "post",
 			url: `${apiUrl}/service/panel/automation/v1.0/${accountId}/integration-reviews`,
@@ -383,24 +348,16 @@ const sendIntegrationForReview = async (
 
 const purgeCache = async (apiUrl, token, accountId, session, integration) => {
 	const { integration_id } = integration;
-	if (!token || !session || !accountId) {
-		console.error(
-			"\x1b[31mError:\x1b[0m Authentication credentials are required."
-		);
-		console.log("\n🔹 Please log in first using:");
-		console.log("\x1b[32m$ boltic login\x1b[0m\n");
-		process.exit(1); // Exit the CLI with an error code
-	}
-
 	try {
+		await ensureAuthenticatedOrExit(accountId, token, session);
+		const authHeaders = await buildAuthHeaders(token, session);
 		const response = await axios({
 			method: "post",
 			url: `${apiUrl}/service/panel/automation/v1.0/${accountId}/integrations/${integration_id}/cache`,
 			data: {},
 			headers: {
 				"Content-Type": "application/json",
-				Authorization: `Bearer ${token}`,
-				Cookie: session,
+				...authHeaders,
 			},
 			httpsAgent: getHttpsAgentForUrl(apiUrl),
 		});
@@ -411,22 +368,15 @@ const purgeCache = async (apiUrl, token, accountId, session, integration) => {
 };
 
 const pullIntegration = async (apiUrl, token, accountId, session, id) => {
-	if (!token || !session || !accountId) {
-		console.error(
-			"\x1b[31mError:\x1b[0m Authentication credentials are required."
-		);
-		console.log("\n🔹 Please log in first using:");
-		console.log("\x1b[32m$ boltic login\x1b[0m\n");
-		process.exit(1); // Exit the CLI with an error code
-	}
 	try {
+		await ensureAuthenticatedOrExit(accountId, token, session);
+		const authHeaders = await buildAuthHeaders(token, session);
 		const response = await axios({
 			method: "get",
 			url: `${apiUrl}/service/panel/automation/v1.0/${accountId}/integrations/${id}/pull`,
 			headers: {
 				"Content-Type": "application/json",
-				Authorization: `Bearer ${token}`,
-				Cookie: session,
+				...authHeaders,
 			},
 			httpsAgent: getHttpsAgentForUrl(apiUrl),
 		});
@@ -444,20 +394,13 @@ const uploadFileToCloud = async (
 	session,
 	filePath
 ) => {
-	if (!token || !session || !accountId) {
-		console.error(
-			"\x1b[31mError:\x1b[0m Authentication credentials are required."
-		);
-		console.log("\n🔹 Please log in first using:");
-		console.log("\x1b[32m$ boltic login\x1b[0m\n");
-		process.exit(1);
-	}
-
 	if (!fs.existsSync(filePath)) {
 		throw new Error("File does not exist: " + filePath);
 	}
 
 	try {
+		await ensureAuthenticatedOrExit(accountId, token, session);
+		const authHeaders = await buildAuthHeaders(token, session);
 		const form = new FormData();
 		form.append("files", fs.createReadStream(filePath));
 
@@ -467,8 +410,7 @@ const uploadFileToCloud = async (
 			{
 				headers: {
 					...form.getHeaders(),
-					Authorization: `Bearer ${token}`,
-					Cookie: session,
+					...authHeaders,
 				},
 				httpsAgent: getHttpsAgentForUrl(apiUrl),
 			}

package/cli.js

@@ -16,8 +16,75 @@ const createCLI = (consoleUrl, apiUrl, serviceName, env) => {
 	const commands = {
 		login: {
 			description: "Authenticate the user and save access token",
-			action: async () =>
-				await AuthCommands.handleLogin(consoleUrl, apiUrl, env),
+			action: async (args) => {
+				// Support PAT-based login via flags, e.g.:
+				//   boltic login --pat XXXXX --account_id YYYYYY
+				//   boltic login --pat=XXXXX --account-id=YYYYYY
+				let patFromArg;
+				let accountIdFromArg;
+				let hasPatFlag = false;
+				let hasAccountIdFlag = false;
+
+				for (let i = 0; i < args.length; i++) {
+					const arg = args[i];
+
+					if (arg === "--pat") {
+						hasPatFlag = true;
+						if (
+							i + 1 < args.length &&
+							!args[i + 1].startsWith("--")
+						) {
+							patFromArg = args[i + 1];
+							i++;
+						}
+						continue;
+					}
+
+					if (arg === "--account_id" || arg === "--account-id") {
+						hasAccountIdFlag = true;
+						if (
+							i + 1 < args.length &&
+							!args[i + 1].startsWith("--")
+						) {
+							accountIdFromArg = args[i + 1];
+							i++;
+						}
+						continue;
+					}
+
+					if (arg.startsWith("--pat=")) {
+						hasPatFlag = true;
+						patFromArg = arg.split("=")[1];
+						continue;
+					}
+
+					if (
+						arg.startsWith("--account_id=") ||
+						arg.startsWith("--account-id=")
+					) {
+						hasAccountIdFlag = true;
+						accountIdFromArg = arg.split("=")[1];
+						continue;
+					}
+				}
+
+				// If any PAT-related flag is present, delegate to PAT login handler.
+				// `handlePatLogin` will decide whether to prompt based on which values are provided.
+				if (
+					hasPatFlag ||
+					hasAccountIdFlag ||
+					patFromArg ||
+					accountIdFromArg
+				) {
+					await AuthCommands.handlePatLogin(
+						patFromArg,
+						accountIdFromArg
+					);
+					return;
+				}
+
+				await AuthCommands.handleLogin(consoleUrl, apiUrl, env);
+			},
 		},
 		integration: {
 			description: "Manage integrations (create, list)",

package/commands/login.js

@@ -1,5 +1,6 @@
 import chalk from "chalk";
 import open from "open";
+import readline from "readline";
 import { v4 as uuidv4 } from "uuid";
 import { getCliBearerToken, getCliSession } from "../api/login.js";
 import { getCurrentEnv } from "../helper/env.js";
@@ -28,9 +29,73 @@ const execute = async (args) => {
 		return;
 	}
 
+	// Special handling for `boltic login` to support PAT-based login via flags:
+	//   boltic login --pat XXXXX --account_id YYYYYY
+	if (subCommand === "login") {
+		const options = args.slice(1);
+		let patFromArg;
+		let accountIdFromArg;
+
+		for (let i = 0; i < options.length; i++) {
+			const arg = options[i];
+
+			if (arg === "--pat" && i + 1 < options.length) {
+				patFromArg = options[i + 1];
+				i++;
+				continue;
+			}
+
+			if (
+				(arg === "--account_id" || arg === "--account-id") &&
+				i + 1 < options.length
+			) {
+				accountIdFromArg = options[i + 1];
+				i++;
+				continue;
+			}
+
+			if (arg.startsWith("--pat=")) {
+				patFromArg = arg.split("=")[1];
+				continue;
+			}
+
+			if (
+				arg.startsWith("--account_id=") ||
+				arg.startsWith("--account-id=")
+			) {
+				accountIdFromArg = arg.split("=")[1];
+				continue;
+			}
+		}
+
+		// If PAT flags are provided, use PAT-based login. Otherwise, fall back to browser-based login.
+		if (patFromArg || accountIdFromArg) {
+			await handlePatLogin(patFromArg, accountIdFromArg);
+			return;
+		}
+
+		await handleLogin();
+		return;
+	}
+
 	await commands[subCommand].action(args.slice(1));
 };
 
+// Prompt user for input from the terminal
+async function askQuestion(query) {
+	const rl = readline.createInterface({
+		input: process.stdin,
+		output: process.stdout,
+	});
+
+	return new Promise((resolve) => {
+		rl.question(query, (answer) => {
+			rl.close();
+			resolve(answer);
+		});
+	});
+}
+
 // Show available login commands
 function showHelp() {
 	console.log(chalk.cyan("\nLogin Commands:\n"));
@@ -161,6 +226,67 @@ async function handleLogin() {
 	);
 }
 
+// Handle PAT-based login command
+async function handlePatLogin(patFromArg, accountIdFromArg) {
+	let pat = patFromArg && patFromArg.trim();
+	let accountId = accountIdFromArg && accountIdFromArg.trim();
+
+	// If both values are provided via CLI flags, do not prompt at all.
+	if (pat && accountId) {
+		try {
+			await storeSecret("pat", pat);
+			await storeSecret("account_id", accountId);
+			console.log(
+				chalk.green(
+					"\n✅ PAT token and Account ID stored securely. They will be used for future organization-related requests.\n"
+				)
+			);
+		} catch (error) {
+			console.error(
+				chalk.red(
+					`\n❌ Failed to store PAT credentials: ${error.message || error}\n`
+				)
+			);
+		}
+		return;
+	}
+
+	if (!pat) {
+		console.log(chalk.cyan("\n🔐 Personal Access Token (PAT) login\n"));
+		pat = (await askQuestion("Enter your PAT token: ")).trim();
+	}
+
+	if (!pat) {
+		console.log(chalk.red("\n❌ PAT token cannot be empty.\n"));
+		return;
+	}
+
+	if (!accountId) {
+		accountId = (await askQuestion("Enter your Account ID: ")).trim();
+	}
+
+	if (!accountId) {
+		console.log(chalk.red("\n❌ Account ID cannot be empty.\n"));
+		return;
+	}
+
+	try {
+		await storeSecret("pat", pat);
+		await storeSecret("account_id", accountId);
+		console.log(
+			chalk.green(
+				"\n✅ PAT token and Account ID stored securely. They will be used for future organization-related requests.\n"
+			)
+		);
+	} catch (error) {
+		console.error(
+			chalk.red(
+				`\n❌ Failed to store PAT credentials: ${error.message || error}\n`
+			)
+		);
+	}
+}
+
 // Handle logout command
 async function handleLogout() {
 	await deleteAllSecrets();
@@ -170,4 +296,4 @@ async function handleLogout() {
 	);
 }
 
-export default { execute, handleLogin, handleLogout };
+export default { execute, handleLogin, handlePatLogin, handleLogout };

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@boltic/cli",
-	"version": "1.0.37",
+	"version": "1.0.39",
 	"description": "A powerful CLI tool for managing Boltic Workflow integrations - create, sync, test, and publish integrations with ease",
 	"main": "index.js",
 	"bin": {

package/utils/integration.js

@@ -218,6 +218,17 @@ async function getSvgFilePath() {
 	if (pickedFile && fs.existsSync(pickedFile)) {
 		return pickedFile;
 	}
+
+	// Fallback: ask user to manually input the SVG path
+	const manualPath = await input({
+		message: "Enter the path to your SVG icon file:",
+	});
+
+	if (!manualPath || !fs.existsSync(manualPath)) {
+		return null;
+	}
+
+	return manualPath;
 }
 
 export { getSvgFilePath, pickSvgFile };