@unito/integration-cli 0.57.0 → 0.57.2

package/dist/integrationGenerator/test/resources/integration.test.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
-const chai_1 = require("chai");
+const strict_1 = tslib_1.__importDefault(require("node:assert/strict"));
 const path = tslib_1.__importStar(require("path"));
 const sinon = tslib_1.__importStar(require("sinon"));
 const tmp_1 = tslib_1.__importDefault(require("tmp"));
@@ -19,7 +19,6 @@ describe('Integration Resource Generation', () => {
         });
         afterEach(async () => {
             await fs_1.default.promises.rm(tempDir, { recursive: true });
-            sinon.restore();
         });
         it('should not create a new integration directory if it already exists', async () => {
             const existingIntegrationName = 'existingIntegration';
@@ -28,24 +27,24 @@ describe('Integration Resource Generation', () => {
                 await Integration.generateIntegrationSkeleton(existingIntegrationName, tempDir);
             }
             catch (e) {
-                (0, chai_1.expect)(e).to.eql(new Error(`Integration already exists with this name: ${existingIntegrationName}`));
+                (0, strict_1.default)(e.message.includes('already exists with this name'));
             }
         });
         it('should create a new integration directory if it does not exist', async () => {
             const integrationName = 'NewIntegration';
             const result = await Integration.generateIntegrationSkeleton(integrationName, tempDir);
-            (0, chai_1.expect)(result).equal(path.join(tempDir, integrationName.toLowerCase()));
-            (0, chai_1.expect)(fs_1.default.existsSync(result)).to.be.true;
+            strict_1.default.equal(result, path.join(tempDir, integrationName.toLowerCase()));
+            (0, strict_1.default)(fs_1.default.existsSync(result));
             const expectedFiles = await fs_1.default.promises.readdir(boilerplatePath);
             expectedFiles.push('.npmrc');
             const createdFiles = await fs_1.default.promises.readdir(result);
-            (0, chai_1.expect)(createdFiles).to.deep.eq(expectedFiles.sort());
-            createdFiles.forEach(createdField => (0, chai_1.expect)(expectedFiles.includes(createdField)));
+            strict_1.default.deepEqual(createdFiles, expectedFiles.sort());
+            createdFiles.forEach(createdField => (0, strict_1.default)(expectedFiles.includes(createdField)));
         });
         it('generates an .npmrc file', async () => {
             const result = await Integration.generateIntegrationSkeleton('foo', tempDir);
             const npmrc = await fs_1.default.promises.readFile(`${result}/.npmrc`, 'utf-8');
-            (0, chai_1.expect)(npmrc).to.include('//npm.pkg.github.com/:_authToken=${UNITO_GITHUB_PKG_TOKEN}');
+            (0, strict_1.default)(npmrc.includes('//npm.pkg.github.com/:_authToken=${UNITO_GITHUB_PKG_TOKEN}'));
         });
     });
 });

package/dist/src/commands/activity.d.ts

@@ -4,8 +4,8 @@ export default class Activity extends BaseCommand<typeof Activity> {
     static description: string;
     static examples: string[];
     static flags: {
-        number: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        environment: import("@oclif/core/lib/interfaces").OptionFlag<GlobalConfiguration.Environment | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        number: import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        environment: import("@oclif/core/lib/interfaces").OptionFlag<GlobalConfiguration.Environment, import("@oclif/core/lib/interfaces").CustomOptions>;
         follow: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     catch(error: Error): Promise<void>;

package/dist/src/commands/activity.js

@@ -61,7 +61,7 @@ class Activity extends baseCommand_1.BaseCommand {
         // Setup the platform client.
         IntegrationsPlatform.setApiKey(apiKey);
         IntegrationsPlatform.setEnvironment(environment);
-        core_1.ux.action.start('Finding the integration');
+        core_1.ux.action.start('Finding the integration', undefined, { stdout: true });
         let integration;
         try {
             integration = await IntegrationsPlatform.getIntegrationByName(integrationConfiguration.name);
@@ -77,7 +77,7 @@ class Activity extends baseCommand_1.BaseCommand {
             }
         }
         core_1.ux.action.stop();
-        core_1.ux.action.start('Retrieving activity');
+        core_1.ux.action.start('Retrieving activity', undefined, { stdout: true });
         let lastEventDate;
         // eslint-disable-next-line no-constant-condition
         while (true) {

package/dist/src/commands/dev.d.ts

@@ -5,11 +5,11 @@ export default class Dev extends BaseCommand<typeof Dev> {
     static examples: string[];
     catch(error: Error): Promise<void>;
     static flags: {
-        environment: import("@oclif/core/lib/interfaces").OptionFlag<GlobalConfiguration.Environment | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        environment: import("@oclif/core/lib/interfaces").OptionFlag<GlobalConfiguration.Environment, import("@oclif/core/lib/interfaces").CustomOptions>;
         verbose: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        crawlMode: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        checks: import("@oclif/core/lib/interfaces").OptionFlag<string[], import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        'config-path': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        crawlMode: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        checks: import("@oclif/core/lib/interfaces").OptionFlag<string[], import("@oclif/core/lib/interfaces").CustomOptions>;
+        'config-path': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/dist/src/commands/dev.js

@@ -65,12 +65,13 @@ class Dev extends baseCommand_1.BaseCommand {
         const configuration = await (0, configuration_1.getConfiguration)(environment, flags['config-path']);
         let credentials = configuration.testAccounts?.[configuration_1.CredentialScope.DEVELOPMENT];
         if (credentials) {
-            ({ entries: credentials } = await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, credentials));
+            credentials = (await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, credentials)).entries;
         }
         let secrets = {};
         // Decrypt secrets, if necessary.
         if (configuration.secrets) {
-            secrets = await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, configuration.secrets);
+            secrets = (await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, configuration.secrets))
+                .entries;
         }
         // Launch the debugger.
         const commandArguments = [

package/dist/src/commands/encrypt.d.ts

@@ -4,7 +4,7 @@ export default class Encrypt extends BaseCommand<typeof Encrypt> {
     static description: string;
     static examples: string[];
     static flags: {
-        environment: import("@oclif/core/lib/interfaces").OptionFlag<GlobalConfiguration.Environment | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        environment: import("@oclif/core/lib/interfaces").OptionFlag<GlobalConfiguration.Environment, import("@oclif/core/lib/interfaces").CustomOptions>;
     };
     catch(error: Error): Promise<void>;
     run(): Promise<void>;

package/dist/src/commands/encrypt.js

@@ -41,7 +41,7 @@ class Encrypt extends baseCommand_1.BaseCommand {
             message: 'Enter text to encrypt',
             type: 'input',
         });
-        core_1.ux.action.start('Encrypting data');
+        core_1.ux.action.start('Encrypting data', undefined, { stdout: true });
         const { encryptedData } = await IntegrationsPlatform.encryptData(integrationConfiguration.name, data);
         core_1.ux.action.stop();
         core_1.ux.log(`Encrypted Data: ${chalk_1.default.greenBright(encryptedData)}`);

package/dist/src/commands/init.d.ts

@@ -3,7 +3,7 @@ export default class Init extends BaseCommand<typeof Init> {
     static description: string;
     static examples: string[];
     static flags: {
-        name: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        name: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
     };
     catch(error: Error): Promise<void>;
     run(): Promise<void>;

package/dist/src/commands/init.js

@@ -40,7 +40,7 @@ class Init extends baseCommand_1.BaseCommand {
                         .replace(/[^a-z0-9_-]*/g, ''),
                 },
             ])).name;
-        core_1.ux.action.start('\nInitializing integration');
+        core_1.ux.action.start('\nInitializing integration', undefined, { stdout: true });
         const generatedPath = await integrationGenerator_1.Resources.Integration.generateIntegrationSkeleton(name, process.cwd());
         process.chdir(generatedPath);
         await Configuration.writeConfiguration({ name });

package/dist/src/commands/invite.d.ts

@@ -4,7 +4,7 @@ export default class Invite extends BaseCommand<typeof Invite> {
     static description: string;
     static examples: string[];
     static flags: {
-        environment: import("@oclif/core/lib/interfaces").OptionFlag<GlobalConfiguration.Environment | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        environment: import("@oclif/core/lib/interfaces").OptionFlag<GlobalConfiguration.Environment, import("@oclif/core/lib/interfaces").CustomOptions>;
     };
     catch(error: Error): Promise<void>;
     run(): Promise<void>;

package/dist/src/commands/invite.js

@@ -55,7 +55,7 @@ class Invite extends baseCommand_1.BaseCommand {
                 type: 'input',
             },
         ]);
-        core_1.ux.action.start('Finding the integration');
+        core_1.ux.action.start('Finding the integration', undefined, { stdout: true });
         let integration;
         try {
             integration = await IntegrationsPlatform.getIntegrationByName(integrationConfiguration.name);
@@ -71,7 +71,7 @@ class Invite extends baseCommand_1.BaseCommand {
             }
         }
         core_1.ux.action.stop();
-        core_1.ux.action.start('Inviting user');
+        core_1.ux.action.start('Inviting user', undefined, { stdout: true });
         await IntegrationsPlatform.inviteUserToIntegration(integration.id, email);
         core_1.ux.action.stop();
         core_1.ux.log(`User successfully added! They should now be able to update and publish this integration.`);

package/dist/src/commands/login.d.ts

@@ -4,7 +4,7 @@ export default class Login extends BaseCommand<typeof Login> {
     static description: string;
     static examples: string[];
     static flags: {
-        environment: import("@oclif/core/lib/interfaces").OptionFlag<GlobalConfiguration.Environment | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        environment: import("@oclif/core/lib/interfaces").OptionFlag<GlobalConfiguration.Environment, import("@oclif/core/lib/interfaces").CustomOptions>;
     };
     catch(error: Error): Promise<void>;
     run(): Promise<void>;

package/dist/src/commands/login.js

@@ -46,7 +46,7 @@ class Login extends baseCommand_1.BaseCommand {
             this.exit(-1);
         }
         // Retrieve the user's profile.
-        core_1.ux.action.start('Log in...');
+        core_1.ux.action.start('Log in...', undefined, { stdout: true });
         let profile = undefined;
         IntegrationsPlatform.setEnvironment(environment);
         IntegrationsPlatform.setApiKey(apiKey);

package/dist/src/commands/oauth2.d.ts

@@ -5,10 +5,10 @@ export default class Oauth2 extends Command {
     static description: string;
     static examples: string[];
     static flags: {
-        'test-account': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
-        environment: import("@oclif/core/lib/interfaces").OptionFlag<Environment | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'test-account': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        environment: import("@oclif/core/lib/interfaces").OptionFlag<Environment, import("@oclif/core/lib/interfaces").CustomOptions>;
         reauth: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'config-path': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'config-path': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
     };
     catch(error: Error): Promise<void>;
     run(): Promise<void>;

package/dist/src/commands/oauth2.js

@@ -66,8 +66,8 @@ class Oauth2 extends core_1.Command {
         const account = testAccount === 'development' ? configuration.testAccounts?.development : configuration.testAccounts?.compliance;
         let credentials;
         if (!account || Object.entries(account).length === 0 || flags.reauth) {
-            core_1.ux.action.start(`Starting Oauth2 flow for account: ${testAccount}`);
-            credentials = await Oauth2Helper.performOAuth2Flow(oauth2);
+            core_1.ux.action.start(`Starting Oauth2 flow for account: ${testAccount}`, undefined, { stdout: true });
+            credentials = await Oauth2Helper.performOAuth2Flow(oauth2, environment);
             core_1.ux.action.stop();
         }
         else {
@@ -76,7 +76,7 @@ class Oauth2 extends core_1.Command {
                 return;
             }
             const decryptionResult = await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, account);
-            core_1.ux.action.start(`Refreshing test account ${testAccount}`);
+            core_1.ux.action.start(`Refreshing test account ${testAccount}`, undefined, { stdout: true });
             credentials = await Oauth2Helper.updateToken({
                 ...oauth2,
                 refreshToken: decryptionResult.entries?.refreshToken,
@@ -93,7 +93,7 @@ class Oauth2 extends core_1.Command {
             }
             core_1.ux.action.stop();
         }
-        core_1.ux.action.start(`Saving credentials for account: ${testAccount}`);
+        core_1.ux.action.start(`Saving credentials for account: ${testAccount}`, undefined, { stdout: true });
         await (0, configuration_1.writeTestAccount)(configuration, credentials, testAccount);
         core_1.ux.action.stop();
         return;

package/dist/src/commands/publish.d.ts

@@ -4,11 +4,11 @@ export default class Publish extends BaseCommand<typeof Publish> {
     static description: string;
     static examples: string[];
     static flags: {
-        environment: import("@oclif/core/lib/interfaces").OptionFlag<GlobalConfiguration.Environment | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        environment: import("@oclif/core/lib/interfaces").OptionFlag<GlobalConfiguration.Environment, import("@oclif/core/lib/interfaces").CustomOptions>;
         'registry-only': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         preview: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         'live-preview': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'config-path': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        'config-path': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         force: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     catch(error: Error): Promise<void>;

package/dist/src/commands/publish.js

@@ -113,7 +113,7 @@ class Publish extends baseCommand_1.BaseCommand {
     }
     async livePreviewIntegration(integrationConfiguration) {
         // Get the profile.
-        core_1.ux.action.start('Get profile');
+        core_1.ux.action.start('Get profile', undefined, { stdout: true });
         const profile = await IntegrationsPlatform.getProfile();
         core_1.ux.action.stop();
         // Generate a new name.
@@ -131,7 +131,7 @@ class Publish extends baseCommand_1.BaseCommand {
             ].join(' - ');
         }
         // Start ngrok & update the base url.
-        core_1.ux.action.start('Starting ngrok');
+        core_1.ux.action.start('Starting ngrok', undefined, { stdout: true });
         updatedConfiguration.baseUrl = await ngrok_1.default.connect(9200);
         core_1.ux.action.stop();
         // Update the registry.
@@ -164,11 +164,11 @@ class Publish extends baseCommand_1.BaseCommand {
             authorization.instructionsMarkdown = await this.getInstructionsMarkdown(authorization.name);
         }
         if (existing) {
-            core_1.ux.action.start('Integration found. Updating');
+            core_1.ux.action.start('Integration found. Updating', undefined, { stdout: true });
             updated = await IntegrationsPlatform.updateIntegration(existing.id, integrationConfiguration);
         }
         else {
-            core_1.ux.action.start('Integration not found. Creating');
+            core_1.ux.action.start('Integration not found. Creating', undefined, { stdout: true });
             updated = await IntegrationsPlatform.createIntegration(integrationConfiguration);
         }
         core_1.ux.action.stop();
@@ -189,7 +189,7 @@ class Publish extends baseCommand_1.BaseCommand {
     }
     copyAndMoveToTmpDir() {
         // Copy integration in tmp folder.
-        core_1.ux.action.start('Packaging');
+        core_1.ux.action.start('Packaging', undefined, { stdout: true });
         const archivePath = this.archiveIntegration();
         const tmpDir = tmp_1.default.dirSync();
         child_process_1.default.execSync(`unzip ${archivePath} -d ${tmpDir.name}`);
@@ -199,14 +199,14 @@ class Publish extends baseCommand_1.BaseCommand {
     }
     async previewIntegration(integrationConfiguration) {
         // Get the profile.
-        core_1.ux.action.start('Get profile');
+        core_1.ux.action.start('Get profile', undefined, { stdout: true });
         const profile = await IntegrationsPlatform.getProfile();
         core_1.ux.action.stop();
         // Generate a new name.
         const newName = `${integrationConfiguration.name}-preview-${this.hashEmail(profile.email)}`;
         // Update the secrets.
         const updatedConfiguration = await this.generateNewSecrets(integrationConfiguration, newName);
-        core_1.ux.action.start('Creating preview');
+        core_1.ux.action.start('Creating preview', undefined, { stdout: true });
         // Update the name.
         updatedConfiguration.name = newName;
         // Update the display name.
@@ -225,20 +225,20 @@ class Publish extends baseCommand_1.BaseCommand {
     }
     async publishIntegration(integrationConfiguration) {
         // Packaging the integration.
-        core_1.ux.action.start('Packaging');
+        core_1.ux.action.start('Packaging', undefined, { stdout: true });
         // Write the final configuration on disk.
         await IntegrationConfiguration.writeConfiguration(integrationConfiguration);
         const archivePath = this.archiveIntegration();
         core_1.ux.action.stop();
         // Publish the integration.
-        core_1.ux.action.start('Publishing');
+        core_1.ux.action.start('Publishing', undefined, { stdout: true });
         await IntegrationsPlatform.publishIntegration(archivePath);
         core_1.ux.action.stop();
         // Summary of the operation.
         core_1.ux.log('');
         core_1.ux.log(['Your integration', gradient.fruit(integrationConfiguration.name), 'is being published.'].join(' '));
-        core_1.ux.log(chalk_1.default.yellowBright("Note that if the code of your integration did not change, it won't be republished."));
-        core_1.ux.log(chalk_1.default.blueBright(`You can follow the publishing of ${gradient.fruit(integrationConfiguration.name)} by running the command ${chalk_1.default.yellowBright('integration-cli activity --follow')}.`));
+        core_1.ux.log("Note that if the code of your integration did not change, it won't be republished.");
+        core_1.ux.log(chalk_1.default.blueBright(`To follow the publication, execute ${chalk_1.default.yellowBright('integration-cli activity --follow')}.`));
     }
     indent(paragraph, tabs = 1) {
         return paragraph
@@ -258,7 +258,7 @@ class Publish extends baseCommand_1.BaseCommand {
         return crypto_1.default.createHash('shake256', { outputLength: 2 }).update(email).digest('hex');
     }
     async generateNewSecrets(integrationConfiguration, newIntegrationName) {
-        core_1.ux.action.start(`Reencrypting with name ${newIntegrationName}`);
+        core_1.ux.action.start(`Reencrypting with name ${newIntegrationName}`, undefined, { stdout: true });
         const updatedConfiguration = JSON.parse(JSON.stringify(integrationConfiguration)); // deep copy.
         for (const authorization of updatedConfiguration.authorizations ?? []) {
             /* istanbul ignore if */

package/dist/src/commands/test.js

@@ -80,7 +80,7 @@ class Test extends baseCommand_1.BaseCommand {
         (0, integrations_1.validateIsIntegrationDirectory)();
         const { flags } = await this.parse(Test);
         // Install NPM dependencies.
-        core_1.ux.action.start('Installing NPM dependencies');
+        core_1.ux.action.start('Installing NPM dependencies', undefined, { stdout: true });
         child_process_1.default.execSync('npm install', {
             env: { ...process.env, NODE_ENV: 'development' },
             stdio: ['ignore', 'ignore', 'inherit'],
@@ -94,14 +94,16 @@ class Test extends baseCommand_1.BaseCommand {
         if (credentialPayload === null || credentialPayload === undefined) {
             let credentials = configuration.testAccounts?.[flags['test-account']];
             if (credentials) {
-                ({ entries: credentials } = await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, credentials));
+                credentials = (await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, credentials))
+                    .entries;
             }
             credentialPayload = JSON.stringify(credentials);
         }
         let secrets = {};
         // Decrypt secrets, if necessary.
         if (configuration.secrets) {
-            secrets = await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, configuration.secrets);
+            secrets = (await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, configuration.secrets))
+                .entries;
         }
         // Launch the tests.
         const commandArguments = [

package/dist/src/commands/upgrade.js

@@ -26,7 +26,7 @@ class Upgrade extends baseCommand_1.BaseCommand {
         //
         // Current version
         //
-        core_1.ux.action.start('Checking the current version');
+        core_1.ux.action.start('Checking the current version', undefined, { stdout: true });
         const currentVersion = child_process_1.default
             .execSync(`npm list ${npmOptions} --depth 0 | grep ${packageName} | sed "s/.*@\\([^@]*\\)$/\\1/"`, execOptions)
             .toString()
@@ -35,7 +35,7 @@ class Upgrade extends baseCommand_1.BaseCommand {
         //
         // Next version
         //
-        core_1.ux.action.start('Checking the available version');
+        core_1.ux.action.start('Checking the available version', undefined, { stdout: true });
         const newVersion = child_process_1.default
             .execSync(`npm show ${npmOptions} ${packageName} version`, execOptions)
             .toString()
@@ -51,7 +51,7 @@ class Upgrade extends baseCommand_1.BaseCommand {
         //
         // Validate / Upgrade the package globally.
         //
-        core_1.ux.action.start(`${latestVersion ? 'Validating' : 'Upgrading'} the package`);
+        core_1.ux.action.start(`${latestVersion ? 'Validating' : 'Upgrading'} the package`, undefined, { stdout: true });
         // To make sure we have a clean version of the CLI, with updated packages, we force the re-installation.
         child_process_1.default.execSync(`npm install --force ${npmOptions} ${packageName}`, {
             ...execOptions,

package/dist/src/oauth2Helper/oauth2Helper.d.ts

@@ -1,7 +1,9 @@
 import * as openUrl from 'openurl';
 import { Oauth2Response, Oauth2Payload } from './types';
+import { Environment } from '../resources/globalConfiguration';
 export declare const open: typeof openUrl;
 declare class OAuth2Helper {
+    private environment;
     private server;
     private clientId;
     private clientSecret;
@@ -24,7 +26,7 @@ declare class OAuth2Helper {
      * @param scopes The scopes required for the OAuth authorization.
      * @param providerTokenUrl The URL for the token endpoint of the provider.
      */
-    constructor(authorizationInfo: Oauth2Payload);
+    constructor(authorizationInfo: Oauth2Payload, environment?: Environment);
     /**
      * Handles the authorization request and redirects the user to the provider's authorization page.
      * @param req The express Request object.
@@ -49,7 +51,7 @@ declare class OAuth2Helper {
      * Starts the Express server for handling OAuth callbacks.
      * @returns The URL of the server.
      */
-    startServer(): string;
+    startServer(): Promise<string>;
     /**
      * Stops the Express server.
      */

package/dist/src/oauth2Helper/oauth2Helper.js

@@ -5,11 +5,15 @@ const tslib_1 = require("tslib");
 const express_1 = tslib_1.__importDefault(require("express"));
 const cors_1 = tslib_1.__importDefault(require("cors"));
 const openUrl = tslib_1.__importStar(require("openurl"));
+const ngrok_1 = tslib_1.__importDefault(require("ngrok"));
+const IntegrationsPlatformClient = tslib_1.__importStar(require("../services/integrationsPlatform"));
 const configurationTypes_1 = require("../configurationTypes");
 const errors_1 = require("../errors");
+const globalConfiguration_1 = require("../resources/globalConfiguration");
 // It allows to stub openUrl library in the test
 exports.open = openUrl;
 class OAuth2Helper {
+    environment;
     server = null;
     clientId;
     clientSecret;
@@ -32,7 +36,7 @@ class OAuth2Helper {
      * @param scopes The scopes required for the OAuth authorization.
      * @param providerTokenUrl The URL for the token endpoint of the provider.
      */
-    constructor(authorizationInfo) {
+    constructor(authorizationInfo, environment = globalConfiguration_1.Environment.Production) {
         const { clientId, clientSecret, authorizationUrl, scopes, tokenUrl, grantType, requestContentType, responseContentType, refreshToken, refreshRequestParameters, tokenRequestParameters, } = authorizationInfo;
         this.startServer = this.startServer.bind(this);
         this.stopServer = this.stopServer.bind(this);
@@ -50,6 +54,7 @@ class OAuth2Helper {
         this.refreshToken = refreshToken;
         this.tokenRequestParameters = tokenRequestParameters;
         this.refreshRequestParameters = refreshRequestParameters;
+        this.environment = environment;
     }
     /**
      * Handles the authorization request and redirects the user to the provider's authorization page.
@@ -66,14 +71,18 @@ class OAuth2Helper {
         if (this.clientId) {
             params.set('client_id', this.clientId);
         }
-        params.set('redirect_uri', `${this.serverUrl}/credentials/new/oauth2/callback`);
+        params.set('redirect_uri', `${IntegrationsPlatformClient.Servers[this.environment]}/credentials/new/oauth2/callback-cli`);
+        const state = Buffer.from(JSON.stringify({
+            cliCallbackUrl: `${this.serverUrl}/credentials/new/oauth2/callback`,
+        })).toString('base64');
+        params.set('state', state);
         if (this.scopes) {
             params.set('scope', this.scopes.join(' '));
         }
         params.set('response_type', 'code');
         authUrl.search = params.toString();
         exports.open.open(authUrl.toString());
-        res.json();
+        res.sendStatus(200);
     }
     /**
      * Handles the callback request from the provider and stores the authorization code.
@@ -81,9 +90,16 @@ class OAuth2Helper {
      * @param res The express Response object.
      */
     async handleCallback(req, res) {
-        const { code } = req.query;
-        this.code = code;
-        res.json();
+        try {
+            const { code } = req.body.query;
+            this.code = code;
+        }
+        catch (error) {
+            // If we do not receive a code, set it 'error' to let the command know that the callback failed
+            console.error('Error during OAuth2 callback', error);
+            this.code = 'error';
+        }
+        res.sendStatus(200);
     }
     encodeBody(bodyData, contentType) {
         switch (contentType) {
@@ -102,10 +118,13 @@ class OAuth2Helper {
         if (!Object.values(configurationTypes_1.RequestContentType).includes(this.requestContentType)) {
             res.status(400).json({ error: `Request content type not supported: ${this.requestContentType}` });
         }
+        if (this.code === 'error') {
+            throw new errors_1.FailedToRetrieveAccessTokenError('Error during OAuth2 callback - aborting');
+        }
         const bodyData = {
             code: this.code,
             grant_type: this.grantType,
-            redirect_uri: `${this.serverUrl}/credentials/new/oauth2/callback`,
+            redirect_uri: `${IntegrationsPlatformClient.Servers[this.environment]}/credentials/new/oauth2/callback-cli`,
         };
         if (this.clientId) {
             bodyData.client_id = this.clientId;
@@ -184,20 +203,21 @@ class OAuth2Helper {
      * @returns The URL of the server.
      */
     /* istanbul ignore next */
-    startServer() {
+    async startServer() {
         const app = (0, express_1.default)();
         const PORT = process.env.OAUTH2_PORT ?? 9002;
+        this.serverUrl = await ngrok_1.default.connect(Number(PORT));
         app.use((0, cors_1.default)({ credentials: true, origin: true }));
-        app.get('/health', (req, res) => {
+        app.use(express_1.default.json());
+        app.get('/health', (_req, res) => {
             res.send('pong');
         });
         app.get('/credentials/new/oauth2/authorize', this.handleAuthorize);
-        app.get('/credentials/new/oauth2/callback', this.handleCallback);
+        app.post('/credentials/new/oauth2/callback', this.handleCallback);
         app.get('/credentials/new/oauth2/token', this.handleToken);
         this.server = app.listen(PORT, () => {
             console.log(`Listening at port ${PORT}`);
         });
-        this.serverUrl = `http://localhost:${PORT}`;
         return this.serverUrl;
     }
     /**

package/dist/src/services/oauth2Helper.d.ts

@@ -1,3 +1,4 @@
 import { Oauth2Response, Oauth2Payload } from '../oauth2Helper/types';
-export declare function performOAuth2Flow(applicationCredentials: Oauth2Payload): Promise<Oauth2Response>;
+import { Environment } from '../resources/globalConfiguration';
+export declare function performOAuth2Flow(applicationCredentials: Oauth2Payload, environment?: Environment): Promise<Oauth2Response>;
 export declare function updateToken(applicationCredentials: Oauth2Payload): Promise<Oauth2Response>;

package/dist/src/services/oauth2Helper.js

@@ -4,9 +4,10 @@ exports.updateToken = exports.performOAuth2Flow = void 0;
 const tslib_1 = require("tslib");
 const oauth2Helper_1 = tslib_1.__importDefault(require("../oauth2Helper/oauth2Helper"));
 const errors_1 = require("../errors");
-async function performOAuth2Flow(applicationCredentials) {
-    const oauthHelper = new oauth2Helper_1.default(applicationCredentials);
-    const serverUrl = oauthHelper.startServer();
+const globalConfiguration_1 = require("../resources/globalConfiguration");
+async function performOAuth2Flow(applicationCredentials, environment = globalConfiguration_1.Environment.Production) {
+    const oauthHelper = new oauth2Helper_1.default(applicationCredentials, environment);
+    const serverUrl = await oauthHelper.startServer();
     const healthCheck = await fetch(`${serverUrl}/health`);
     if (healthCheck.status !== 200) {
         throw new Error('OAuthServer did not start');