Fixes

Author: kasuvy

package.json

@@ -51,6 +51,7 @@
     "promise-limit": "^2.7.0",
     "semver": "^7.7.3",
     "serialize-error": "^12.0.0",
+    "tmp": "^0.2.5",
     "uuid": "^13.0.0"
   },
   "devDependencies": {
@@ -78,7 +79,6 @@
     "mustache": "^4.2.0",
     "nock": "^14.0.10",
     "testdouble": "^3.20.2",
-    "tmp": "^0.2.5",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3"
   },

src/commands/auth/login.ts

@@ -94,18 +94,18 @@ Once authenticated, the account's current team is set to its configured default
 			}
 
 			if (authMethod === 'Client Certificate' && !flags['secret-file']) {
-				flags['secret-file'] = await input({
+				flags['secret-file'] = (await input({
 					message: 'Path to the PEM formatted private key:',
-					validate: s => (s ? true : 'Please enter the path to your PEM formatted private key file')
-				});
+					validate: s => (s?.trim() ? true : 'Please enter the path to your PEM formatted private key file')
+				})).trim();
 			}
 			this.log('');
 		}
 
 		const sdk = await initSDK({
 			clientId: flags['client-id'],
 			clientSecret: flags['client-secret'],
-			secretFile: flags['secret-file'],
+			secretFile: flags['secret-file']?.trim(),
 			env: config.get('env')
 		});
 		let account;

src/commands/config/profile/create.ts

@@ -98,6 +98,14 @@ export default class ConfigProfileCreate extends Command {
 			}
 		};
 
+		if (profile.auth) {
+			for (const key of [ 'baseUrl', 'platformUrl', 'engageUrl', 'region' ] as const) {
+				if (typeof profile.auth[key] === 'string') {
+					profile.auth[key] = profile.auth[key].trim();
+				}
+			}
+		}
+
 		const exists = config.has(`profiles.${profileName}`);
 		if (exists) {
 			return this.error(`Profile "${profileName}" already exists.`);
@@ -115,7 +123,7 @@ export default class ConfigProfileCreate extends Command {
 
 function urlValidate(input: string): boolean {
 	try {
-		new URL(input);
+		new URL(input.trim());
 		return true;
 	} catch {
 		return false;

src/commands/engage/completion.ts

@@ -0,0 +1,18 @@
+import Command from '../../lib/command.js';
+import { highlight } from '../../lib/logger.js';
+
+export default class EngageCompletion extends Command {
+	static override summary = 'Set autocompletion for Axway CLI commands.';
+
+	static override aliases = [ 'central:completion' ];
+
+	static override description = `Autocompletion is provided by the Axway CLI autocomplete command.
+Run ${highlight('"axway autocomplete"')} to install and set up autocompletion.`;
+
+	async run(): Promise<any> {
+		this.log('Autocompletion is managed by the Axway CLI autocomplete command.\n');
+		this.log('To set up autocompletion, run:\n');
+		this.log(`  ${highlight('axway autocomplete')}\n`);
+		this.log('Follow the instructions to setup autocompletion.');
+	}
+}

src/commands/engage/get.ts

@@ -113,13 +113,13 @@ export default class EngageGet extends Command {
 			let teamGuid: string | undefined;
 			if (flags.team) {
 				const match = teams?.teams?.find((t: PlatformTeam) =>
-					t.guid.toLowerCase() === flags.team.toLowerCase()
-					|| t.name.toLowerCase() === flags.team.toLowerCase()
+					t?.guid.toLowerCase() === flags.team.toLowerCase()
+					|| t?.name.toLowerCase() === flags.team.toLowerCase()
 				);
 				if (!match) {
 					throw new Error(`Unable to find team "${flags.team}" in the "${account.org.name}" organization`);
 				}
-				teamGuid = match.metadata.guid;
+				teamGuid = match?.guid;
 			}
 
 			// Warn if both simple and advanced query params were provided.

src/commands/engage/index.ts

@@ -22,10 +22,6 @@ Run ${highlight('"<%= config.bin %> auth login"')} to authenticate.`;
 			command: '<%= config.bin %> <%= command.id %> completion',
 			description: 'Output shell completion code'
 		},
-		{
-			command: '<%= config.bin %> <%= command.id %> config',
-			description: 'Configure Engage CLI settings'
-		},
 		{
 			command: '<%= config.bin %> <%= command.id %> create',
 			description: 'Create one or more resources from a file or stdin'

src/hooks/init/init.ts

@@ -24,7 +24,11 @@ const hook: Hook.Init = async function (opts) {
 		return this.error(err);
 	}
 
-	if (config.get('update.check') === false || opts.argv.includes('--no-banner') || opts.argv.includes('--json')) {
+	const hasStructuredOutput = opts.argv.some((arg, i) =>
+		(arg === '-o' || arg === '--output') && (opts.argv[i + 1] === 'json' || opts.argv[i + 1] === 'yaml')
+	);
+
+	if (config.get('update.check') === false || opts.argv.includes('--no-banner') || opts.argv.includes('--json') || hasStructuredOutput) {
 		log('Skipping update check');
 	} else {
 		// Trigger the update check fetch and let it continue asynchronously while the command runs
@@ -38,12 +42,14 @@ const hook: Hook.Init = async function (opts) {
 	}
 
 	const command = opts.config.commands.find(cmd => cmd.id === opts.id);
+
 	// Include the banner if not disabled
 	if (config.get('banner.enabled') !== false
 		// Not opted-out
 		&& !opts.argv.includes('--no-banner')
-		// Not requesting JSON output
+		// Not requesting JSON output (oclif built-in or engage -o/--output flag)
 		&& !opts.argv.includes('--json')
+		&& !hasStructuredOutput
 		// And for commands that do not have it disabled (other than for help output)
 		&& (command?.enableBanner !== false || opts.argv.includes('--help'))
 	) {

src/lib/engage/clients-external/apiserverclient.ts

@@ -71,16 +71,16 @@ export class ApiServerClient {
 		this.forceGetAuthInfo = forceGetAuthInfo;
 		this.basePath = basePath;
 		if (baseUrl) {
-			this._baseUrl = baseUrl + (basePath || BasePaths.ApiServer);
+			this._baseUrl = baseUrl.replace(/\/$/, '') + (basePath || BasePaths.ApiServer);
 		}
 	}
 
 	private async initializeDataService() {
+		const config = await loadConfig();
 		if (this._baseUrl === undefined) {
-			const config = await loadConfig();
 			const envBaseUrl = process.env.AXWAY_CENTRAL_BASE_URL || config.get('auth.engageUrl');
 			if (envBaseUrl) {
-				this._baseUrl = envBaseUrl + (this.basePath || BasePaths.ApiServer);
+				this._baseUrl = envBaseUrl.replace(/\/$/, '') + (this.basePath || BasePaths.ApiServer);
 			} else {
 				const regionKey = String(
 					this.region || this.account?.org?.region || Regions.US
@@ -94,6 +94,10 @@ export class ApiServerClient {
 				this._baseUrl = prodBaseUrl + (this.basePath || BasePaths.ApiServer);
 			}
 		}
+		if (config.profile && config.get('engage.authToken')) {
+			return dataService({ account: this.account, baseUrl: this._baseUrl, authToken: config.get('engage.authToken') });
+		}
+
 		return dataService({ account: this.account, baseUrl: this._baseUrl });
 	}
 

src/lib/request.ts

@@ -288,11 +288,13 @@ const updateRequestError = (err: Error) => {
 export const dataService = async ({
 	account,
 	baseUrl = '',
+	authToken = ''
 }: {
 	account?: Account;
 	baseUrl?: string;
+	authToken?: string;
 }): Promise<DataServiceMethods> => {
-	const token = account.auth?.tokens?.access_token;
+	const token = authToken ? authToken : account?.auth?.tokens?.access_token;
 	if (!token) {
 		throw new Error('Invalid/expired account');
 	}