@unito/integration-cli 0.56.0 → 0.56.1

package/dist/integrationGenerator/integrationBoilerplate/.nvmrc

@@ -1 +1 @@
-lts/hydrogen
+lts/iron

package/dist/integrationGenerator/integrationBoilerplate/Dockerfile

@@ -4,7 +4,7 @@
 # Build
 #
 
-FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/node:18-alpine as build
+FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/node:20-alpine as build
 
 WORKDIR /build
 
@@ -19,7 +19,7 @@ RUN npm run compile
 # Runtime
 #
 
-FROM --platform=$TARGETPLATFORM public.ecr.aws/docker/library/node:18-alpine as runtime
+FROM --platform=$TARGETPLATFORM public.ecr.aws/docker/library/node:20-alpine as runtime
 
 WORKDIR /app
 

package/dist/integrationGenerator/integrationBoilerplate/integrationBoilerplate/.nvmrc

@@ -1 +1 @@
-lts/hydrogen
+lts/iron

package/dist/integrationGenerator/integrationBoilerplate/integrationBoilerplate/Dockerfile

@@ -4,7 +4,7 @@
 # Build
 #
 
-FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/node:18-alpine as build
+FROM --platform=$BUILDPLATFORM public.ecr.aws/docker/library/node:20-alpine as build
 
 WORKDIR /build
 
@@ -19,7 +19,7 @@ RUN npm run compile
 # Runtime
 #
 
-FROM --platform=$TARGETPLATFORM public.ecr.aws/docker/library/node:18-alpine as runtime
+FROM --platform=$TARGETPLATFORM public.ecr.aws/docker/library/node:20-alpine as runtime
 
 WORKDIR /app
 

package/dist/integrationGenerator/integrationBoilerplate/integrationBoilerplate/package.json

@@ -17,7 +17,7 @@
     "email": "hello@unito.io"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "license": "LicenseRef-LICENSE",
   "dependencies": {
@@ -28,7 +28,7 @@
   "devDependencies": {
     "@types/express": "4.x",
     "@types/mocha": "10.x",
-    "@types/node": "18.x",
+    "@types/node": "20.x",
     "@types/uuid": "9.x",
     "@typescript-eslint/eslint-plugin": "5.x",
     "@typescript-eslint/parser": "5.x",

package/dist/integrationGenerator/integrationBoilerplate/integrationBoilerplate/src/middlewares/additionalLoggingContext.ts

@@ -10,7 +10,7 @@ export const extractAdditionalLoggingContext = (req: express.Request, res: expre
     try {
       additionalLoggingContext = JSON.parse(additionalLoggingContextHeader);
     } catch (error) {
-      logger.warn(`Failed parsing header X-Unito-Additional-Logging-Context: ${additionalLoggingContext}`);
+      logger.warn(`Failed parsing header X-Unito-Additional-Logging-Context: ${additionalLoggingContextHeader}`);
     }
   }
 

package/dist/integrationGenerator/integrationBoilerplate/package.json

@@ -17,7 +17,7 @@
     "email": "hello@unito.io"
   },
   "engines": {
-    "node": ">=18.0.0"
+    "node": ">=20.0.0"
   },
   "license": "LicenseRef-LICENSE",
   "dependencies": {
@@ -28,7 +28,7 @@
   "devDependencies": {
     "@types/express": "4.x",
     "@types/mocha": "10.x",
-    "@types/node": "18.x",
+    "@types/node": "20.x",
     "@types/uuid": "9.x",
     "@typescript-eslint/eslint-plugin": "5.x",
     "@typescript-eslint/parser": "5.x",

package/dist/integrationGenerator/integrationBoilerplate/src/middlewares/additionalLoggingContext.ts

@@ -10,7 +10,7 @@ export const extractAdditionalLoggingContext = (req: express.Request, res: expre
     try {
       additionalLoggingContext = JSON.parse(additionalLoggingContextHeader);
     } catch (error) {
-      logger.warn(`Failed parsing header X-Unito-Additional-Logging-Context: ${additionalLoggingContext}`);
+      logger.warn(`Failed parsing header X-Unito-Additional-Logging-Context: ${additionalLoggingContextHeader}`);
     }
   }
 

package/dist/src/commands/activity.js

@@ -55,10 +55,19 @@ class Activity extends baseCommand_1.BaseCommand {
         IntegrationsPlatform.setApiKey(apiKey);
         IntegrationsPlatform.setEnvironment(environment);
         core_1.ux.action.start('Finding the integration');
-        const integration = await IntegrationsPlatform.getIntegrationByName(integrationConfiguration.name);
-        if (!integration) {
-            core_1.ux.log(chalk_1.default.redBright(`Integration not found! You can only retrieve activity for existing integrations.`));
-            this.exit(-1);
+        let integration;
+        try {
+            integration = await IntegrationsPlatform.getIntegrationByName(integrationConfiguration.name);
+        }
+        catch (error) {
+            if (error instanceof IntegrationsPlatform.HttpError && error.status === 403) {
+                core_1.ux.log(chalk_1.default.redBright(`Access Denied! You do not have access to this integration.`));
+                this.exit(-1);
+            }
+            else {
+                core_1.ux.log(chalk_1.default.redBright(`Integration not found! You can only retrieve activity for existing integrations.`));
+                this.exit(-1);
+            }
         }
         core_1.ux.action.stop();
         core_1.ux.action.start('Retrieving activity');

package/dist/src/commands/dev.js

@@ -63,15 +63,21 @@ class Dev extends baseCommand_1.BaseCommand {
         // Resolve the configuration.
         const environment = flags.environment ?? GlobalConfiguration.Environment.Production;
         const configuration = await (0, configuration_1.getConfiguration)(environment, flags['config-path']);
-        const credentialPayload = await (0, decryption_1.decryptTestAccountCredentials)(configuration, environment, configuration_1.CredentialScope.DEVELOPMENT, this.config.configDir);
+        let credentials = configuration.testAccounts?.[configuration_1.CredentialScope.DEVELOPMENT];
+        if (credentials) {
+            ({ entries: credentials } = await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, credentials));
+        }
+        let secrets = {};
         // Decrypt secrets, if necessary.
-        const secrets = await (0, decryption_1.decryptSecrets)(configuration, environment, this.config.configDir);
+        if (configuration.secrets) {
+            secrets = await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, configuration.secrets);
+        }
         // Launch the debugger.
         const commandArguments = [
             `${process.env.NODE_MODULES_FOLDER}/@unito/integration-debugger/dist/src/index.js`,
             '--integration-url=http://localhost:9200',
             `--spawn-process=npm run dev`,
-            `--credential-payload=${JSON.stringify(credentialPayload)}`,
+            `--credential-payload=${JSON.stringify(credentials)}`,
             `--secrets-payload=${JSON.stringify(secrets)}`,
         ];
         if (configuration.graphRelativeUrl) {

package/dist/src/commands/invite.js

@@ -56,10 +56,19 @@ class Invite extends baseCommand_1.BaseCommand {
             },
         ]);
         core_1.ux.action.start('Finding the integration');
-        const integration = await IntegrationsPlatform.getIntegrationByName(integrationConfiguration.name);
-        if (!integration) {
-            core_1.ux.log(chalk_1.default.redBright(`Integration not found! You can only invite users to a published integration.`));
-            this.exit(-1);
+        let integration;
+        try {
+            integration = await IntegrationsPlatform.getIntegrationByName(integrationConfiguration.name);
+        }
+        catch (error) {
+            if (error instanceof IntegrationsPlatform.HttpError && error.status === 403) {
+                core_1.ux.log(chalk_1.default.redBright(`Access Denied! You do not have access to this integration.`));
+                this.exit(-1);
+            }
+            else {
+                core_1.ux.log(chalk_1.default.redBright(`Integration not found! You can only invite users to a published integration.`));
+                this.exit(-1);
+            }
         }
         core_1.ux.action.stop();
         core_1.ux.action.start('Inviting user');

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

@@ -1,9 +1,14 @@
 import { Command } from '@oclif/core';
+import { Environment } from '../resources/globalConfiguration';
 export default class Oauth2 extends Command {
+    static summary: string;
     static description: string;
     static examples: string[];
     static flags: {
-        accountName: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces/parser").CustomOptions>;
+        '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>;
+        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>;
     };
     catch(error: Error): Promise<void>;
     run(): Promise<void>;

package/dist/src/commands/oauth2.js

@@ -2,18 +2,43 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
-const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const configuration_1 = require("../resources/configuration");
 const Oauth2Helper = tslib_1.__importStar(require("../services/oauth2Helper"));
+const IntegrationsPlatform = tslib_1.__importStar(require("../services/integrationsPlatform"));
 const configurationTypes_1 = require("../configurationTypes");
 const errors_1 = require("../errors");
 const globalConfiguration_1 = require("../resources/globalConfiguration");
+const decryption_1 = require("../resources/decryption");
 class Oauth2 extends core_1.Command {
-    static description = 'Perform an OAuth2 workflow locally';
+    static summary = 'Perform an OAuth2 workflow locally';
+    static description = 'The Oauth2 command allows you to perform an OAuth2 workflow locally, either to create a new test account or to refresh an existing one.';
     static examples = ['<%= config.bin %> <%= command.id %>'];
     static flags = {
-        accountName: core_1.Flags.string({ description: 'Name of the account used to perfom oauth2 actions' }),
+        'test-account': core_1.Flags.string({
+            description: 'Test account to use.',
+            options: Object.values(configuration_1.CredentialScope),
+            default: configuration_1.CredentialScope.DEVELOPMENT,
+        }),
+        environment: core_1.Flags.custom({
+            description: 'the environment of the platform',
+            options: Object.values(globalConfiguration_1.Environment),
+            default: globalConfiguration_1.Environment.Production,
+        })(),
+        reauth: core_1.Flags.boolean({
+            description: 'triggers a new oauth2 flow to collect credentials and overwrite the current one',
+            default: false,
+        }),
+        'config-path': core_1.Flags.string({
+            summary: 'relative path to a custom ".unito.json" file',
+            description: `Use a custom configuration file instead of the default '.unito.json' or other environment specific
+      ones.
+
+      If you want to force the CLI to use a specific configuration file, you can use this flag to specify the relative
+      path from your integration's root folder (with a leading '/').
+
+      Usage: <%= config.bin %> <%= command.id %> --config-path=/myCustomConfig.json`,
+        }),
     };
     async catch(error) {
         /* istanbul ignore if */
@@ -24,74 +49,52 @@ class Oauth2 extends core_1.Command {
     }
     async run() {
         const { flags } = await this.parse(Oauth2);
-        const accountName = flags.accountName ?? 'development';
-        // Might want to expose Environment flag, but for now we'll default to Production
-        const configuration = await (0, configuration_1.getConfiguration)(globalConfiguration_1.Environment.Production);
-        let oauth2 = configuration.authorizations?.find(authorization => authorization.method === configurationTypes_1.Method.OAUTH2 && authorization.name === accountName && authorization.development)?.oauth2;
+        const testAccount = flags['test-account'] ?? 'development';
+        const environment = flags.environment ?? globalConfiguration_1.Environment.Production;
+        const configuration = await (0, configuration_1.getConfiguration)(environment, flags['config-path']);
+        // First check for development oauth2 authorization scheme
+        let oauth2 = configuration.authorizations?.find(authorization => authorization.method === configurationTypes_1.Method.OAUTH2 && authorization.development)?.oauth2;
+        // Try for any oauth2 authorization scheme if there was no development one
         if (!oauth2) {
-            const { oauth2Information } = await inquirer_1.default.prompt([
-                {
-                    name: 'oauth2Information',
-                    type: 'editor',
-                    message: `${chalk_1.default.yellowBright('OAuth2 credentials')} that will be used to authenticate to the API`,
-                    validate: (value) => {
-                        try {
-                            JSON.parse(value);
-                        }
-                        catch (e) {
-                            return false;
-                        }
-                        return true;
-                    },
-                    default: JSON.stringify({
-                        clientId: '',
-                        clientSecret: '',
-                        tokenUrl: '',
-                        authorizationUrl: '',
-                        scopes: [{ name: '', help: '' }],
-                        requestContentType: 'application/x-www-form-urlencoded',
-                        responseContentType: 'application/json',
-                        grantType: 'authorization_code',
-                    }, null, 2),
-                },
-            ]);
-            oauth2 = JSON.parse(oauth2Information);
-            if (!configuration.authorizations) {
-                configuration.authorizations = [];
-            }
-            configuration.authorizations.push({
-                name: 'development',
-                method: configurationTypes_1.Method.OAUTH2,
-                development: true,
-                oauth2,
-            });
-            core_1.ux.action.start('Saving configuration');
-            await (0, configuration_1.writeConfiguration)(configuration);
-            core_1.ux.action.stop();
+            oauth2 = configuration.authorizations?.find(authorization => authorization.method === configurationTypes_1.Method.OAUTH2)?.oauth2;
         }
         if (!oauth2) {
-            throw new Error('No oauth2 information found');
+            throw new errors_1.MissingAuth2AuthorizationError();
         }
-        const account = accountName === 'development' ? configuration.testAccounts?.development : configuration.testAccounts?.compliance;
+        // Decrypt any encrypted oauth2 fields (mainly clientSecret)
+        oauth2 = (await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, oauth2)).entries;
+        const account = testAccount === 'development' ? configuration.testAccounts?.development : configuration.testAccounts?.compliance;
         let credentials;
-        if (Object.keys(account || {}).length === 0) {
-            core_1.ux.action.start(`Starting Oauth2 flow for account: ${accountName}`);
+        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.stop();
         }
         else {
             if (!account?.refreshToken) {
-                core_1.ux.log('No refresh token found, aborting refresh token flow');
+                core_1.ux.log(chalk_1.default.redBright('No refresh token found, nothing to do.'));
+                return;
             }
-            core_1.ux.action.start(`Refreshing test account ${accountName}`);
-            credentials = await Oauth2Helper.updateToken({ ...oauth2, refreshToken: account?.refreshToken });
+            const decryptionResult = await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, account);
+            core_1.ux.action.start(`Refreshing test account ${testAccount}`);
+            credentials = await Oauth2Helper.updateToken({
+                ...oauth2,
+                refreshToken: decryptionResult.entries?.refreshToken,
+            });
+            // If provider response doesn't contain a new refresh token, use the one we already have
             if (!credentials.refreshToken) {
                 credentials.refreshToken = account?.refreshToken;
             }
+            if (decryptionResult.decryptedKeys.includes('accessToken')) {
+                credentials.accessToken = (await IntegrationsPlatform.encryptData(configuration.name, credentials.accessToken)).encryptedData;
+            }
+            if (decryptionResult.decryptedKeys.includes('refreshToken')) {
+                credentials.refreshToken = (await IntegrationsPlatform.encryptData(configuration.name, credentials.refreshToken)).encryptedData;
+            }
             core_1.ux.action.stop();
         }
-        core_1.ux.action.start(`Saving credentials for account: ${accountName}`);
-        await (0, configuration_1.writeTestAccount)(configuration, credentials, accountName);
+        core_1.ux.action.start(`Saving credentials for account: ${testAccount}`);
+        await (0, configuration_1.writeTestAccount)(configuration, credentials, testAccount);
         core_1.ux.action.stop();
         return;
     }

package/dist/src/commands/publish.js

@@ -144,8 +144,19 @@ class Publish extends baseCommand_1.BaseCommand {
         });
     }
     async updateRegistry(integrationConfiguration) {
-        const integrations = await IntegrationsPlatform.getIntegrations();
-        const existing = integrations.find(integration => integration.name === integrationConfiguration.name);
+        let existing;
+        try {
+            existing = await IntegrationsPlatform.getIntegrationByName(integrationConfiguration.name);
+        }
+        catch (error) {
+            if (error instanceof IntegrationsPlatform.HttpError && error.status === 403) {
+                core_1.ux.log(chalk_1.default.redBright(`Access Denied! You do not have access to this integration.`));
+                this.exit(-1);
+            }
+            else {
+                existing = undefined;
+            }
+        }
         // Create or update the integration.
         let updated;
         for (const authorization of integrationConfiguration.authorizations ?? []) {

package/dist/src/commands/test.js

@@ -92,14 +92,20 @@ class Test extends baseCommand_1.BaseCommand {
         let credentialPayload = flags['credential-payload'];
         // Default to test account's credentials if none are specifically provided
         if (credentialPayload === null || credentialPayload === undefined) {
-            const decryptedCredentials = await (0, decryption_1.decryptTestAccountCredentials)(configuration, environment, flags['test-account'], this.config.configDir);
-            credentialPayload = JSON.stringify(decryptedCredentials);
+            let credentials = configuration.testAccounts?.[flags['test-account']];
+            if (credentials) {
+                ({ entries: credentials } = await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, credentials));
+            }
+            credentialPayload = JSON.stringify(credentials);
         }
         if (!credentialPayload || credentialPayload === '{}') {
             throw new errors_1.MissingCredentialsError();
         }
+        let secrets = {};
         // Decrypt secrets, if necessary.
-        const secrets = await (0, decryption_1.decryptSecrets)(configuration, environment, this.config.configDir);
+        if (configuration.secrets) {
+            secrets = await (0, decryption_1.decryptEntries)(configuration.name, environment, this.config.configDir, configuration.secrets);
+        }
         // Launch the tests.
         const commandArguments = [
             `${process.env.NODE_MODULES_FOLDER}/@unito/integration-debugger/dist/src/index.js`,

package/dist/src/errors.d.ts

@@ -15,6 +15,8 @@ export declare class InvalidRequestContentTypeError extends Error {
 }
 export declare class MissingCredentialsError extends Error {
 }
+export declare class MissingAuth2AuthorizationError extends Error {
+}
 export declare class FileSizeExceeded extends Error {
 }
 export declare class MissingApiKey extends Error {

package/dist/src/errors.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleError = exports.ConfigurationInvalid = exports.EntryDecryptionError = exports.DecryptionAuthenticationError = exports.AuthenticationFailed = exports.MissingApiKey = exports.FileSizeExceeded = exports.MissingCredentialsError = exports.InvalidRequestContentTypeError = exports.FailedToRetrieveAccessTokenError = exports.NoRefreshTokenError = exports.MissingEnvironmentVariableError = exports.ConfigurationMalformed = exports.NoConfigurationFileError = exports.NoIntegrationFoundError = void 0;
+exports.handleError = exports.ConfigurationInvalid = exports.EntryDecryptionError = exports.DecryptionAuthenticationError = exports.AuthenticationFailed = exports.MissingApiKey = exports.FileSizeExceeded = exports.MissingAuth2AuthorizationError = exports.MissingCredentialsError = exports.InvalidRequestContentTypeError = exports.FailedToRetrieveAccessTokenError = exports.NoRefreshTokenError = exports.MissingEnvironmentVariableError = exports.ConfigurationMalformed = exports.NoConfigurationFileError = exports.NoIntegrationFoundError = void 0;
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
@@ -32,6 +32,9 @@ exports.InvalidRequestContentTypeError = InvalidRequestContentTypeError;
 class MissingCredentialsError extends Error {
 }
 exports.MissingCredentialsError = MissingCredentialsError;
+class MissingAuth2AuthorizationError extends Error {
+}
+exports.MissingAuth2AuthorizationError = MissingAuth2AuthorizationError;
 class FileSizeExceeded extends Error {
 }
 exports.FileSizeExceeded = FileSizeExceeded;
@@ -154,6 +157,13 @@ function handleError(command, error) {
         command.logToStderr(`Make sure they were encrypted by the same environement (Currently targeting: ${error.environment}).`);
         handled = true;
     }
+    else if (error instanceof MissingAuth2AuthorizationError) {
+        command.logToStderr();
+        command.logToStderr(chalk_1.default.redBright(`No Oauth2 authorization found in your configuration file`));
+        // TODO: Update link once the documentation is made available publicly
+        command.logToStderr('See https://staging-dev.unito.io/docs/integrations/configuration/authorizations#oauth-2 for more information on how to configure Oauth2');
+        handled = true;
+    }
     return handled;
 }
 exports.handleError = handleError;

package/dist/src/resources/configuration.d.ts

@@ -23,7 +23,7 @@ export declare function getConfiguration(environment: Environment, customConfigP
 /**
  * Write the configuration to the default configuration file.
  */
-export declare function writeConfiguration(configuration: Configuration): Promise<void>;
+export declare function writeConfiguration(configuration: Configuration, environment?: Environment, customConfigPath?: string): Promise<void>;
 export declare function writeTestAccount(configuration: Configuration, account: {
     accessToken: string;
     refreshToken?: string;

package/dist/src/resources/configuration.js

@@ -88,10 +88,13 @@ exports.getConfiguration = getConfiguration;
 /**
  * Write the configuration to the default configuration file.
  */
-async function writeConfiguration(configuration) {
+async function writeConfiguration(configuration, environment = globalConfiguration_1.Environment.Production, customConfigPath) {
     (0, integrations_1.validateIsIntegrationDirectory)();
     await validateConfiguration(configuration);
-    await fs.promises.writeFile(getConfigurationPath(globalConfiguration_1.Environment.Production), JSON.stringify(configuration, null, 2));
+    const configurationPath = customConfigPath
+        ? `${process.cwd()}${customConfigPath.startsWith('/') ? customConfigPath : `/${customConfigPath}`}`
+        : getConfigurationPath(environment);
+    await fs.promises.writeFile(configurationPath, JSON.stringify(configuration, null, 2));
 }
 exports.writeConfiguration = writeConfiguration;
 async function writeTestAccount(configuration, account, accountName) {

package/dist/src/resources/decryption.d.ts

@@ -1,5 +1,11 @@
-import { Configuration } from '../configurationTypes';
 import * as GlobalConfiguration from './globalConfiguration';
-import { CredentialScope } from './configuration';
-export declare function decryptTestAccountCredentials(configuration: Configuration, environment: GlobalConfiguration.Environment, testAccount: CredentialScope, configDir: string): Promise<Record<string, unknown>>;
-export declare function decryptSecrets(configuration: Configuration, environment: GlobalConfiguration.Environment, configDir: string): Promise<Record<string, unknown>>;
+/**
+ * Object returned when decrypting
+ *
+ * Allows the caller to know which keys were decrypted to reencrypt them later as needed
+ */
+export type DecryptionResult = {
+    decryptedKeys: string[];
+    entries: Record<string, unknown>;
+};
+export declare function decryptEntries(configurationName: string, environment: GlobalConfiguration.Environment, configDir: string, entries: Record<string, unknown>, fieldName?: string): Promise<DecryptionResult>;

package/dist/src/resources/decryption.js

@@ -1,62 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.decryptSecrets = exports.decryptTestAccountCredentials = void 0;
+exports.decryptEntries = void 0;
 const tslib_1 = require("tslib");
 const errors_1 = require("../errors");
 const GlobalConfiguration = tslib_1.__importStar(require("./globalConfiguration"));
 const integrationsPlatform_1 = require("./integrationsPlatform");
 const configuration_1 = require("./configuration");
 const integrationsPlatform_2 = require("../services/integrationsPlatform");
-async function decryptTestAccountCredentials(configuration, environment, testAccount, configDir) {
-    const credentials = configuration.testAccounts?.[testAccount];
-    if (!credentials) {
-        return {};
-    }
-    // Get encrypted credential entries
-    const encryptedEntries = Object.entries(credentials).filter((entry) => typeof entry[1] === 'string' && entry[1].startsWith(configuration_1.ENCRYPTION_PREFIX));
+async function decryptEntries(configurationName, environment, configDir, entries, fieldName = 'entries') {
+    // Get encrypted entries
+    const encryptedEntries = Object.entries(entries).filter((entry) => typeof entry[1] === 'string' && entry[1].startsWith(configuration_1.ENCRYPTION_PREFIX));
     if (!encryptedEntries.length) {
-        return credentials;
-    }
-    // Copy credentials to avoid mutating the configuration.
-    const decryptedCredentials = structuredClone(credentials);
-    const globalConfiguration = await GlobalConfiguration.read(configDir);
-    try {
-        await (0, integrationsPlatform_1.validateAuthenticated)(globalConfiguration, environment);
-    }
-    catch (err) {
-        throw new errors_1.DecryptionAuthenticationError('credentials');
-    }
-    for (const [key, encryptedCredential] of encryptedEntries) {
-        try {
-            decryptedCredentials[key] = (await (0, integrationsPlatform_2.decryptData)(configuration.name, encryptedCredential)).decryptedData;
-        }
-        catch (err) {
-            throw new errors_1.EntryDecryptionError(key, encryptedCredential, environment);
-        }
-    }
-    return decryptedCredentials;
-}
-exports.decryptTestAccountCredentials = decryptTestAccountCredentials;
-async function decryptSecrets(configuration, environment, configDir) {
-    if (!Object.entries(configuration.secrets ?? {}).length) {
-        return {};
+        return { decryptedKeys: [], entries };
     }
     const globalConfiguration = await GlobalConfiguration.read(configDir);
     try {
         await (0, integrationsPlatform_1.validateAuthenticated)(globalConfiguration, environment);
     }
     catch (err) {
-        throw new errors_1.DecryptionAuthenticationError('secrets');
+        throw new errors_1.DecryptionAuthenticationError(fieldName);
     }
-    const decryptedSecrets = {};
-    for (const [key, encryptedSecret] of Object.entries(configuration.secrets ?? {})) {
+    // Copy credentials to avoid mutating the configuration.
+    const decryptedEntries = structuredClone(entries);
+    for (const [key, encryptedEntry] of encryptedEntries) {
         try {
-            decryptedSecrets[key] = (await (0, integrationsPlatform_2.decryptData)(configuration.name, encryptedSecret)).decryptedData;
+            decryptedEntries[key] = (await (0, integrationsPlatform_2.decryptData)(configurationName, encryptedEntry)).decryptedData;
         }
         catch (err) {
-            throw new errors_1.EntryDecryptionError(key, encryptedSecret, environment);
+            throw new errors_1.EntryDecryptionError(key, encryptedEntry, environment);
         }
     }
-    return decryptedSecrets;
+    return { decryptedKeys: encryptedEntries.map(([key]) => key), entries: decryptedEntries };
 }
-exports.decryptSecrets = decryptSecrets;
+exports.decryptEntries = decryptEntries;

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

@@ -27,7 +27,7 @@ export declare function reencryptData(integrationName: string, encryptedData: st
     encryptedData: string;
 }>;
 export declare function getIntegration(integrationId: number): Promise<Integration>;
-export declare function getIntegrationByName(integrationName: string): Promise<Integration | null>;
+export declare function getIntegrationByName(integrationName: string): Promise<Integration>;
 export declare function getIntegrations(): Promise<IntegrationSummary[]>;
 export declare function publishIntegration(archivePath: string): Promise<Integration>;
 export declare function createIntegration(configuration: Configuration): Promise<Integration>;

package/dist/src/services/integrationsPlatform.js

@@ -62,14 +62,7 @@ async function getIntegration(integrationId) {
 }
 exports.getIntegration = getIntegration;
 async function getIntegrationByName(integrationName) {
-    let integration;
-    try {
-        integration = await integrations_platform_client_1.default.getIntegrationByName(integrationName);
-    }
-    catch {
-        return null;
-    }
-    return integration;
+    return integrations_platform_client_1.default.getIntegrationByName(integrationName);
 }
 exports.getIntegrationByName = getIntegrationByName;
 async function getIntegrations() {

package/dist/test/commands/activity.test.js

@@ -53,7 +53,9 @@ describe('activity', () => {
     });
     test_1.test
         .stdout()
-        .stub(IntegrationsPlatform, 'getIntegrationByName', () => undefined)
+        .stub(IntegrationsPlatform, 'getIntegrationByName', () => {
+        throw new Error();
+    })
         .command(['activity'])
         .catch(error => {
         (0, test_1.expect)(error.message).to.equal('EEXIT: -1');

package/dist/test/commands/invite.test.js

@@ -47,7 +47,9 @@ describe('invite', () => {
     test_1.test
         .stdout()
         .stub(GlobalConfiguration, 'read', () => ({ email: 'foo@bar.com' }))
-        .stub(IntegrationsPlatform, 'getIntegrationByName', () => undefined)
+        .stub(IntegrationsPlatform, 'getIntegrationByName', () => {
+        throw new Error();
+    })
         .command(['invite'])
         .catch(error => {
         (0, test_1.expect)(error.message).to.equal('EEXIT: -1');

package/dist/test/commands/oauth2.test.js

@@ -7,12 +7,13 @@ const sinon = tslib_1.__importStar(require("sinon"));
 const inquirer_1 = tslib_1.__importDefault(require("inquirer"));
 const Configuration = tslib_1.__importStar(require("../../src/resources/configuration"));
 const oauth2Service = tslib_1.__importStar(require("../../src/services/oauth2Helper"));
+const IntegrationsPlatform = tslib_1.__importStar(require("../../src/services/integrationsPlatform"));
+const decryptionResource = tslib_1.__importStar(require("../../src/resources/decryption"));
 const configurationTypes_1 = require("../../src/configurationTypes");
 describe('oauth2', () => {
     const INTEGRATION_NAME = 'myintegration';
     const sandbox = sinon.createSandbox();
     let getConfigurationsStub;
-    let writeConfigurationStub;
     let writeTestAccountStub;
     let performOAuth2FlowStub;
     let updateTokenStub;
@@ -30,7 +31,7 @@ describe('oauth2', () => {
         name: INTEGRATION_NAME,
         authorizations: [
             {
-                name: 'development',
+                name: 'MyAuthorization',
                 method: configurationTypes_1.Method.OAUTH2,
                 oauth2: oauth2Information,
             },
@@ -48,7 +49,6 @@ describe('oauth2', () => {
         sandbox.stub(inquirer_1.default, 'prompt').resolves({
             oauth2Information: JSON.stringify(oauth2Information),
         });
-        writeConfigurationStub = sandbox.stub(Configuration, 'writeConfiguration');
         writeTestAccountStub = sandbox.stub(Configuration, 'writeTestAccount');
         performOAuth2FlowStub = sandbox.stub(oauth2Service, 'performOAuth2Flow');
         performOAuth2FlowStub.resolves(credentials);
@@ -63,16 +63,48 @@ describe('oauth2', () => {
         ...baseConfiguration,
         authorizations: [],
     }))
-        .command(['oauth2', '--accountName', 'development'])
-        .it("asks for authentication information when it's not setup in the configuration file", () => {
-        (0, test_1.expect)(writeConfigurationStub.getCall(0)?.firstArg).to.deep.equal({
-            ...baseConfiguration,
-            authorizations: [{ oauth2: oauth2Information, name: 'development', method: 'oauth2', development: true }],
-        });
+        .command(['oauth2', '--test-account', 'development'])
+        .exit(-1)
+        .it("Errors out if no oauth2 authorization scheme is found in the integration's configuration");
+    test_1.test
+        .stdout()
+        .do(() => getConfigurationsStub.returns({
+        ...baseConfiguration,
+        authorizations: [
+            ...(baseConfiguration.authorizations ?? []),
+            {
+                name: 'Development Authorization',
+                method: configurationTypes_1.Method.OAUTH2,
+                oauth2: { ...oauth2Information, clientId: 'devClientID' },
+                development: true,
+            },
+        ],
+    }))
+        .command(['oauth2', '--test-account', 'development'])
+        .it('prioritize development authorization', () => {
+        (0, test_1.expect)(performOAuth2FlowStub.getCalls().length).to.equal(1);
+        (0, test_1.expect)(performOAuth2FlowStub.getCall(0).args).to.deep.equal([{ ...oauth2Information, clientId: 'devClientID' }]);
+        (0, test_1.expect)(updateTokenStub.getCalls().length).to.equal(0);
+        (0, test_1.expect)(writeTestAccountStub.getCall(0).args).to.deep.equal([
+            {
+                ...baseConfiguration,
+                authorizations: [
+                    ...(baseConfiguration.authorizations ?? []),
+                    {
+                        name: 'Development Authorization',
+                        method: configurationTypes_1.Method.OAUTH2,
+                        oauth2: { ...oauth2Information, clientId: 'devClientID' },
+                        development: true,
+                    },
+                ],
+            },
+            credentials,
+            'development',
+        ]);
     });
     test_1.test
         .stdout()
-        .command(['oauth2', '--accountName', 'development'])
+        .command(['oauth2', '--test-account', 'development'])
         .it('performs the oauth flow when there is no test accounts and the auth information are setup', () => {
         (0, test_1.expect)(performOAuth2FlowStub.getCalls().length).to.equal(1);
         (0, test_1.expect)(updateTokenStub.getCalls().length).to.equal(0);
@@ -86,7 +118,53 @@ describe('oauth2', () => {
             development: credentials,
         },
     }))
-        .command(['oauth2', '--accountName', 'development'])
+        .command(['oauth2', '--test-account', 'development', '--reauth'])
+        .it('performs the oauth flow when there is a test accounts, the auth information are setup and --reauth flag is present', () => {
+        (0, test_1.expect)(performOAuth2FlowStub.getCalls().length).to.equal(1);
+        (0, test_1.expect)(updateTokenStub.getCalls().length).to.equal(0);
+        (0, test_1.expect)(writeTestAccountStub.getCall(0).args).to.deep.equal([
+            {
+                ...baseConfiguration,
+                testAccounts: {
+                    development: credentials,
+                },
+            },
+            credentials,
+            'development',
+        ]);
+    });
+    test_1.test
+        .stdout()
+        .do(() => getConfigurationsStub.returns({
+        ...baseConfiguration,
+        testAccounts: {
+            development: { something: 'something' },
+        },
+    }))
+        .command(['oauth2', '--test-account', 'compliance'])
+        .it('performs the oauth flow when the requested test account is not setup', () => {
+        (0, test_1.expect)(performOAuth2FlowStub.getCalls().length).to.equal(1);
+        (0, test_1.expect)(updateTokenStub.getCalls().length).to.equal(0);
+        (0, test_1.expect)(writeTestAccountStub.getCall(0).args).to.deep.equal([
+            {
+                ...baseConfiguration,
+                testAccounts: {
+                    development: { something: 'something' },
+                },
+            },
+            credentials,
+            'compliance',
+        ]);
+    });
+    test_1.test
+        .stdout()
+        .do(() => getConfigurationsStub.returns({
+        ...baseConfiguration,
+        testAccounts: {
+            development: credentials,
+        },
+    }))
+        .command(['oauth2', '--test-account', 'development'])
         .it('refresh the token when there is an existing test accounts and the auth information are setup', () => {
         (0, test_1.expect)(performOAuth2FlowStub.getCalls().length).to.equal(0);
         (0, test_1.expect)(updateTokenStub.getCalls().length).to.equal(1);
@@ -101,4 +179,70 @@ describe('oauth2', () => {
             'development',
         ]);
     });
+    test_1.test
+        .stdout()
+        .do(() => {
+        getConfigurationsStub.returns({
+            ...baseConfiguration,
+            authorizations: [
+                {
+                    name: 'Authorization',
+                    method: configurationTypes_1.Method.OAUTH2,
+                    oauth2: { ...oauth2Information, clientSecret: `${Configuration.ENCRYPTION_PREFIX}devClientID` },
+                },
+            ],
+            testAccounts: {
+                development: {
+                    accessToken: `${Configuration.ENCRYPTION_PREFIX}devAccessToken`,
+                    refreshToken: `${Configuration.ENCRYPTION_PREFIX}devRefreshToken`,
+                },
+            },
+        });
+        sandbox
+            .stub(decryptionResource, 'decryptEntries')
+            .onFirstCall()
+            .resolves({ decryptedKeys: ['clientSecret'], entries: { ...oauth2Information, clientSecret: 'devClientID' } })
+            .onSecondCall()
+            .resolves({
+            decryptedKeys: ['accessToken', 'refreshToken'],
+            entries: {
+                accessToken: 'devAccessToken',
+                refreshToken: 'devRefreshToken',
+            },
+        });
+        sandbox
+            .stub(IntegrationsPlatform, 'encryptData')
+            .onFirstCall()
+            .resolves({ encryptedData: `${Configuration.ENCRYPTION_PREFIX}encryptedAccessToken` })
+            .onSecondCall()
+            .resolves({ encryptedData: `${Configuration.ENCRYPTION_PREFIX}encryptedRefreshToken` });
+    })
+        .command(['oauth2', '--test-account', 'development'])
+        .it('decrypt oauth2 authorization entries and test-account', () => {
+        (0, test_1.expect)(performOAuth2FlowStub.getCalls().length).to.equal(0);
+        (0, test_1.expect)(updateTokenStub.getCalls().length).to.equal(1);
+        (0, test_1.expect)(writeTestAccountStub.getCall(0).args).to.deep.equal([
+            {
+                ...baseConfiguration,
+                authorizations: [
+                    {
+                        name: 'Authorization',
+                        method: configurationTypes_1.Method.OAUTH2,
+                        oauth2: { ...oauth2Information, clientSecret: `${Configuration.ENCRYPTION_PREFIX}devClientID` },
+                    },
+                ],
+                testAccounts: {
+                    development: {
+                        accessToken: `${Configuration.ENCRYPTION_PREFIX}devAccessToken`,
+                        refreshToken: `${Configuration.ENCRYPTION_PREFIX}devRefreshToken`,
+                    },
+                },
+            },
+            {
+                accessToken: `${Configuration.ENCRYPTION_PREFIX}encryptedAccessToken`,
+                refreshToken: `${Configuration.ENCRYPTION_PREFIX}encryptedRefreshToken`,
+            },
+            'development',
+        ]);
+    });
 });

package/dist/test/commands/publish.test.js

@@ -55,7 +55,7 @@ describe('Publish', () => {
         (0, test_1.expect)(customPath).to.be.undefined;
         return { name: 'a' };
     })
-        .stub(IntegrationsPlatform, 'getIntegrations', () => [])
+        .stub(IntegrationsPlatform, 'getIntegrationByName', () => undefined)
         .stub(FileSystem, 'getFileBuffer', () => Promise.resolve(Buffer.from('')))
         .command(['publish'])
         .it('publish the integration - default', ctx => {
@@ -72,7 +72,7 @@ describe('Publish', () => {
         (0, test_1.expect)(customPath).to.equal('/custom-config.json');
         return { name: 'a' };
     })
-        .stub(IntegrationsPlatform, 'getIntegrations', () => [])
+        .stub(IntegrationsPlatform, 'getIntegrationByName', () => undefined)
         .stub(FileSystem, 'getFileBuffer', () => Promise.resolve(Buffer.from('')))
         .command(['publish', '--config-path', '/custom-config.json'])
         .it('publish the integration with custom config - default', ctx => {
@@ -89,7 +89,7 @@ describe('Publish', () => {
         (0, test_1.expect)(customPath).to.be.undefined;
         return { name: 'a' };
     })
-        .stub(IntegrationsPlatform, 'getIntegrations', () => [])
+        .stub(IntegrationsPlatform, 'getIntegrationByName', () => undefined)
         .stub(FileSystem, 'getFileBuffer', () => Promise.resolve(Buffer.from('')))
         .command(['publish', '--environment', 'local'])
         .it('publish the integration - local', ctx => {
@@ -108,7 +108,7 @@ describe('Publish', () => {
         return { name: 'a' };
     })
         .stub(IntegrationConfiguration, 'writeConfiguration', () => Promise)
-        .stub(IntegrationsPlatform, 'getIntegrations', () => [])
+        .stub(IntegrationsPlatform, 'getIntegrationByName', () => undefined)
         .stub(FileSystem, 'getFileBuffer', () => Promise.resolve(Buffer.from('')))
         .command(['publish', '--environment', 'local'])
         .it('publish the integration using .unito.local.json - local', ctx => {
@@ -126,7 +126,7 @@ describe('Publish', () => {
         (0, test_1.expect)(customPath).to.be.undefined;
         return { name: 'a' };
     })
-        .stub(IntegrationsPlatform, 'getIntegrations', () => [])
+        .stub(IntegrationsPlatform, 'getIntegrationByName', () => undefined)
         .stub(FileSystem, 'getFileBuffer', () => Promise.resolve(Buffer.from('')))
         .command(['publish', '--environment', 'staging'])
         .it('publish the integration - staging', ctx => {
@@ -145,7 +145,7 @@ describe('Publish', () => {
         return {};
     })
         .stub(IntegrationConfiguration, 'writeConfiguration', () => Promise)
-        .stub(IntegrationsPlatform, 'getIntegrations', () => [])
+        .stub(IntegrationsPlatform, 'getIntegrationByName', () => undefined)
         .stub(FileSystem, 'getFileBuffer', () => Promise.resolve(Buffer.from('')))
         .command(['publish', '--environment', 'staging'])
         .it('publish the integration using .unito.staging.json - staging', ctx => {
@@ -163,7 +163,7 @@ describe('Publish', () => {
         (0, test_1.expect)(customPath).to.equal('/my-awesome-config.json');
         return { name: 'a' };
     })
-        .stub(IntegrationsPlatform, 'getIntegrations', () => [])
+        .stub(IntegrationsPlatform, 'getIntegrationByName', () => undefined)
         .stub(FileSystem, 'getFileBuffer', () => Promise.resolve(Buffer.from('')))
         .command(['publish', '--config-path', '/my-awesome-config.json'])
         .it('publish the integration using custom configuration', ctx => {
@@ -173,7 +173,7 @@ describe('Publish', () => {
         .stdout()
         .stub(GlobalConfiguration, 'read', () => ({ apiKey: 'foo' }))
         .stub(IntegrationConfiguration, 'getConfiguration', () => ({}))
-        .stub(IntegrationsPlatform, 'getIntegrations', () => [])
+        .stub(IntegrationsPlatform, 'getIntegrationByName', () => undefined)
         .stub(FileSystem, 'getFileBuffer', () => Promise.resolve(Buffer.from('')))
         .stub(inquirer_1.default, 'prompt', () => Promise.resolve({ proceed: false }))
         .command(['publish', '--registry-only'])
@@ -186,7 +186,7 @@ describe('Publish', () => {
         .stdout()
         .stub(GlobalConfiguration, 'read', () => ({ apiKey: 'foo' }))
         .stub(IntegrationConfiguration, 'getConfiguration', () => ({}))
-        .stub(IntegrationsPlatform, 'getIntegrations', () => [])
+        .stub(IntegrationsPlatform, 'getIntegration', () => undefined)
         .stub(FileSystem, 'getFileBuffer', () => Promise.resolve(Buffer.from('')))
         .stub(inquirer_1.default, 'prompt', () => Promise.resolve({ proceed: false }))
         .command(['publish', '--registry-only', '--force'])
@@ -198,7 +198,7 @@ describe('Publish', () => {
         .stdout()
         .stub(GlobalConfiguration, 'read', () => ({ apiKey: 'foo' }))
         .stub(IntegrationConfiguration, 'getConfiguration', () => ({}))
-        .stub(IntegrationsPlatform, 'getIntegrations', () => [])
+        .stub(IntegrationsPlatform, 'getIntegration', () => undefined)
         .stub(FileSystem, 'getFileBuffer', () => Promise.resolve(Buffer.from('')))
         .stub(inquirer_1.default, 'prompt', () => Promise.resolve({ proceed: true }))
         .command(['publish', '--registry-only'])
@@ -210,7 +210,7 @@ describe('Publish', () => {
         .stdout()
         .stub(GlobalConfiguration, 'read', () => ({ apiKey: 'foo' }))
         .stub(IntegrationConfiguration, 'getConfiguration', () => ({ name: 'a' }))
-        .stub(IntegrationsPlatform, 'getIntegrations', () => [{ name: 'a' }])
+        .stub(IntegrationsPlatform, 'getIntegrationByName', () => ({ name: 'a' }))
         .stub(FileSystem, 'getFileBuffer', () => Promise.resolve(Buffer.from('')))
         .stub(inquirer_1.default, 'prompt', () => Promise.resolve({ proceed: true }))
         .command(['publish', '--registry-only'])
@@ -225,7 +225,7 @@ describe('Publish', () => {
         .stub(IntegrationConfiguration, 'getConfiguration', () => ({
         authorizations: [{ type: 'custom', development: true }, { type: 'oauth2' }],
     }))
-        .stub(IntegrationsPlatform, 'getIntegrations', () => [])
+        .stub(IntegrationsPlatform, 'getIntegrationByName', () => undefined)
         // eslint-disable-next-line
         // @ts-ignore typing doesn't work here, for some reason.
         .stub(IntegrationsPlatform, 'createIntegration', (config) => config)
@@ -240,7 +240,7 @@ describe('Publish', () => {
         .stdout()
         .stub(GlobalConfiguration, 'read', () => ({ apiKey: 'foo' }))
         .stub(IntegrationConfiguration, 'getConfiguration', () => ({ name: 'foo' }))
-        .stub(IntegrationsPlatform, 'getIntegrations', () => [])
+        .stub(IntegrationsPlatform, 'getIntegrationByName', () => undefined)
         .stub(FileSystem, 'getFileBuffer', () => Promise.resolve(Buffer.from('')))
         .command(['publish', '--preview'])
         .it('preview the integration', ctx => {
@@ -250,7 +250,7 @@ describe('Publish', () => {
         .stdout()
         .stub(GlobalConfiguration, 'read', () => ({ apiKey: 'foo' }))
         .stub(IntegrationConfiguration, 'getConfiguration', () => ({ name: 'foo', ui: { displayName: 'Foo' } }))
-        .stub(IntegrationsPlatform, 'getIntegrations', () => [])
+        .stub(IntegrationsPlatform, 'getIntegrationByName', () => undefined)
         // eslint-disable-next-line
         // @ts-ignore typing doesn't work here, for some reason.
         .stub(IntegrationConfiguration, 'writeConfiguration', configuration => {
@@ -281,7 +281,7 @@ describe('Publish', () => {
         .stdout()
         .stub(GlobalConfiguration, 'read', () => ({ apiKey: 'foo' }))
         .stub(IntegrationConfiguration, 'getConfiguration', () => ({}))
-        .stub(IntegrationsPlatform, 'getIntegrations', () => [])
+        .stub(IntegrationsPlatform, 'getIntegrationByName', () => undefined)
         .stub(FileSystem, 'getFileBuffer', () => Promise.resolve(Buffer.from('')))
         .command(['publish', '--live-preview'])
         .it('live-preview the integration', ctx => {
@@ -291,7 +291,7 @@ describe('Publish', () => {
         .stdout()
         .stub(GlobalConfiguration, 'read', () => ({ apiKey: 'foo' }))
         .stub(IntegrationConfiguration, 'getConfiguration', () => ({ ui: { displayName: 'Foo' } }))
-        .stub(IntegrationsPlatform, 'getIntegrations', () => [])
+        .stub(IntegrationsPlatform, 'getIntegrationByName', () => undefined)
         // eslint-disable-next-line
         // @ts-ignore typing doesn't work here, for some reason.
         .stub(IntegrationsPlatform, 'createIntegration', (config) => config)
@@ -304,7 +304,7 @@ describe('Publish', () => {
         .stderr()
         .stub(GlobalConfiguration, 'read', () => ({}))
         .stub(IntegrationConfiguration, 'getConfiguration', () => ({}))
-        .stub(IntegrationsPlatform, 'getIntegrations', () => [])
+        .stub(IntegrationsPlatform, 'getIntegrationByName', () => undefined)
         .stub(FileSystem, 'getFileBuffer', () => Promise.resolve(Buffer.from('')))
         .command(['publish'])
         .exit(-1)
@@ -333,7 +333,7 @@ describe('Publish', () => {
         authorizations: [{ name: 'oauth2', oauth2: { clientSecret: 'unito-secret-' } }],
         secrets: { secret1: 'unito-secret-', invalidSecret: 'Should never happen anyway' },
     }))
-        .stub(IntegrationsPlatform, 'getIntegrations', () => [])
+        .stub(IntegrationsPlatform, 'getIntegrationByName', () => undefined)
         .stub(FileSystem, 'getFileBuffer', () => Promise.resolve(Buffer.from('')))
         .command(['publish', '--preview'])
         .it('reencrypts the clientSecret on preview', ctx => {
@@ -349,7 +349,7 @@ describe('Publish', () => {
         authorizations: [{ name: 'oauth2', oauth2: { clientSecret: 'unito-secret-' } }],
         secrets: { secret1: 'unito-secret-', invalidSecret: 'Should never happen anyway' },
     }))
-        .stub(IntegrationsPlatform, 'getIntegrations', () => [])
+        .stub(IntegrationsPlatform, 'getIntegrationByName', () => undefined)
         .stub(FileSystem, 'getFileBuffer', () => Promise.resolve(Buffer.from('')))
         .command(['publish', '--live-preview'])
         .it('reencrypts the clientSecret on live-preview', ctx => {
@@ -364,7 +364,7 @@ describe('Publish', () => {
         name: 'myIntegration',
         authorizations: [{ name: 'oauth2', oauth2: { clientSecret: 'toto' } }],
     }))
-        .stub(IntegrationsPlatform, 'getIntegrations', () => [])
+        .stub(IntegrationsPlatform, 'getIntegrationByName', () => undefined)
         .stub(FileSystem, 'getFileBuffer', () => Promise.resolve(Buffer.from('')))
         .command(['publish', '--live-preview'])
         .it('skips reencryption', ctx => {
@@ -381,7 +381,7 @@ describe('Publish', () => {
             },
         ],
     }))
-        .stub(IntegrationsPlatform, 'getIntegrations', () => [])
+        .stub(IntegrationsPlatform, 'getIntegrationByName', () => undefined)
         .stub(FileSystem, 'getFileBuffer', () => Promise.resolve(Buffer.from('foo')))
         .stub(inquirer_1.default, 'prompt', () => Promise.resolve({ proceed: true }))
         .command(['publish', '--registry-only'])
@@ -400,7 +400,7 @@ describe('Publish', () => {
             },
         ],
     }))
-        .stub(IntegrationsPlatform, 'getIntegrations', () => [])
+        .stub(IntegrationsPlatform, 'getIntegrationByName', () => undefined)
         .stub(FileSystem, 'getFileBuffer', () => Promise.reject())
         .stub(inquirer_1.default, 'prompt', () => Promise.resolve({ proceed: true }))
         .command(['publish', '--registry-only'])
@@ -418,7 +418,7 @@ describe('Publish', () => {
             },
         ],
     }))
-        .stub(IntegrationsPlatform, 'getIntegrations', () => [])
+        .stub(IntegrationsPlatform, 'getIntegrationByName', () => undefined)
         .stub(FileSystem, 'getFileBuffer', () => null)
         .stub(inquirer_1.default, 'prompt', () => Promise.resolve({ proceed: true }))
         .command(['publish', '--registry-only'])

package/dist/test/resources/decryption.test.js

@@ -8,7 +8,7 @@ const IntegrationsPlatform = tslib_1.__importStar(require("../../src/services/in
 const GlobalConfiguration = tslib_1.__importStar(require("../../src/resources/globalConfiguration"));
 const configuration_1 = require("../../src/resources/configuration");
 const decryptionHelper = tslib_1.__importStar(require("../../src/resources/decryption"));
-describe('decryptionHelper', () => {
+describe('decryption helper', () => {
     const configuration = {
         name: 'a',
         baseUrl: 'b',
@@ -34,35 +34,44 @@ describe('decryptionHelper', () => {
     afterEach(() => {
         sinon_1.default.restore();
     });
-    describe('decryptCredentials', () => {
-        it('support unencrypted credentials', async () => {
-            const decryptedCredentials = await decryptionHelper.decryptTestAccountCredentials(configuration, GlobalConfiguration.Environment.Local, configuration_1.CredentialScope.DEVELOPMENT, '/path/to/config');
-            (0, chai_1.expect)(decryptedCredentials).to.deep.equal({
+    describe('decryptEntries', () => {
+        it('support unencrypted entries', async () => {
+            const decryptionResult = await decryptionHelper.decryptEntries(configuration.name, GlobalConfiguration.Environment.Local, '/path/to/config', {
+                accessToken: 'developmentToken',
+                accessToken1: 'developmentToken1',
+            });
+            (0, chai_1.expect)(decryptionResult.decryptedKeys).to.deep.equal([]);
+            (0, chai_1.expect)(decryptionResult.entries).to.deep.equal({
+                accessToken1: 'developmentToken1',
                 accessToken: 'developmentToken',
             });
         });
-        it('support encrypted credentials', async () => {
-            const decryptedCredentials = await decryptionHelper.decryptTestAccountCredentials(configuration, GlobalConfiguration.Environment.Local, configuration_1.CredentialScope.COMPLIANCE, '/path/to/config');
-            (0, chai_1.expect)(decryptedCredentials).to.deep.equal({
+        it('support mixed encrypted and not encrypted entries', async () => {
+            const decryptionResult = await decryptionHelper.decryptEntries(configuration.name, GlobalConfiguration.Environment.Local, '/path/to/config', {
+                accessToken: 'token',
+                encryptedToken: `${configuration_1.ENCRYPTION_PREFIX}decrypt-me`,
+            });
+            (0, chai_1.expect)(decryptionResult.decryptedKeys).to.deep.equal(['encryptedToken']);
+            (0, chai_1.expect)(decryptionResult.entries).to.deep.equal({
                 accessToken: 'token',
                 encryptedToken: `decrypted-me`,
             });
         });
-    });
-    describe('decryptSecrets', () => {
-        it('support encrypted secrets', async () => {
-            const decryptedSecrets = await decryptionHelper.decryptSecrets(configuration, GlobalConfiguration.Environment.Local, '/path/to/config');
-            (0, chai_1.expect)(decryptedSecrets).to.deep.equal({
+        it('support multiple encrypted entries', async () => {
+            const decryptionResult = await decryptionHelper.decryptEntries(configuration.name, GlobalConfiguration.Environment.Local, '/path/to/config', {
+                encryptedSecret1: `${configuration_1.ENCRYPTION_PREFIX}decrypt-me`,
+                encryptedSecret2: `${configuration_1.ENCRYPTION_PREFIX}decrypt-me`,
+            });
+            (0, chai_1.expect)(decryptionResult.decryptedKeys).to.deep.equal(['encryptedSecret1', 'encryptedSecret2']);
+            (0, chai_1.expect)(decryptionResult.entries).to.deep.equal({
                 encryptedSecret1: 'decrypted-me',
                 encryptedSecret2: 'decrypted-me',
             });
         });
-        it('support empty secrets', async () => {
-            const decryptedSecrets = await decryptionHelper.decryptSecrets({
-                ...configuration,
-                secrets: {},
-            }, GlobalConfiguration.Environment.Local, '/path/to/config');
-            (0, chai_1.expect)(decryptedSecrets).to.deep.equal({});
+        it('support empty object', async () => {
+            const decryptionResult = await decryptionHelper.decryptEntries(configuration.name, GlobalConfiguration.Environment.Local, '/path/to/config', {});
+            (0, chai_1.expect)(decryptionResult.decryptedKeys).to.deep.equal([]);
+            (0, chai_1.expect)(decryptionResult.entries).to.deep.equal({});
         });
     });
 });

package/dist/test/services/integrationsPlatform.test.js

@@ -70,10 +70,6 @@ describe('integrations platform', function () {
         sinon.stub(integrations_platform_client_1.default, 'getIntegrationByName').resolves(integration);
         (0, chai_1.expect)(await IntegrationsPlatform.getIntegrationByName('foo')).to.deep.equal(integration);
     });
-    it('getIntegrationByName - error', async function () {
-        sinon.stub(integrations_platform_client_1.default, 'getIntegrationByName').throws();
-        (0, chai_1.expect)(await IntegrationsPlatform.getIntegrationByName('foo')).to.deep.equal(null);
-    });
     it('getIntegrations', async function () {
         sinon.stub(integrations_platform_client_1.default, 'getIntegrations').resolves({ total: 1, data: [integrationSummary] });
         (0, chai_1.expect)(await IntegrationsPlatform.getIntegrations()).to.deep.equal([integrationSummary]);

package/oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.56.0",
+  "version": "0.56.1",
   "commands": {
     "activity": {
       "id": "activity",
@@ -201,7 +201,8 @@
     },
     "oauth2": {
       "id": "oauth2",
-      "description": "Perform an OAuth2 workflow locally",
+      "summary": "Perform an OAuth2 workflow locally",
+      "description": "The Oauth2 command allows you to perform an OAuth2 workflow locally, either to create a new test account or to refresh an existing one.",
       "strict": true,
       "pluginName": "@unito/integration-cli",
       "pluginAlias": "@unito/integration-cli",
@@ -211,10 +212,40 @@
         "<%= config.bin %> <%= command.id %>"
       ],
       "flags": {
-        "accountName": {
-          "name": "accountName",
+        "test-account": {
+          "name": "test-account",
+          "type": "option",
+          "description": "Test account to use.",
+          "multiple": false,
+          "options": [
+            "development",
+            "compliance"
+          ],
+          "default": "development"
+        },
+        "environment": {
+          "name": "environment",
+          "type": "option",
+          "description": "the environment of the platform",
+          "multiple": false,
+          "options": [
+            "local",
+            "staging",
+            "production"
+          ],
+          "default": "production"
+        },
+        "reauth": {
+          "name": "reauth",
+          "type": "boolean",
+          "description": "triggers a new oauth2 flow to collect credentials and overwrite the current one",
+          "allowNo": false
+        },
+        "config-path": {
+          "name": "config-path",
           "type": "option",
-          "description": "Name of the account used to perfom oauth2 actions",
+          "summary": "relative path to a custom \".unito.json\" file",
+          "description": "Use a custom configuration file instead of the default '.unito.json' or other environment specific\n      ones.\n\n      If you want to force the CLI to use a specific configuration file, you can use this flag to specify the relative\n      path from your integration's root folder (with a leading '/').\n\n      Usage: <%= config.bin %> <%= command.id %> --config-path=/myCustomConfig.json",
           "multiple": false
         }
       },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unito/integration-cli",
-  "version": "0.56.0",
+  "version": "0.56.1",
   "description": "Integration CLI",
   "bin": {
     "integration-cli": "./bin/run"
@@ -25,7 +25,7 @@
     "compile:watch": "tsc --build -w",
     "test": "mocha $(find test -name '*.test.ts') $(find integrationGenerator/test -name '*.test.ts')",
     "test:debug": "mocha test/**/*.test.ts integrationGenerator/test/**/*.test.ts --inspect-brk",
-    "ci:test": "nyc npm run test"
+    "ci:test": "c8 npm run test"
   },
   "files": [
     "/bin",
@@ -67,11 +67,11 @@
     "@types/node": "18.x",
     "@types/openurl": "1.x",
     "@types/tmp": "0.x",
+    "c8": "9.x",
     "chai": "4.x",
     "chai-as-promised": "7.x",
     "json-schema-to-typescript": "13.x",
     "mocha": "10.x",
-    "nyc": "15.x",
     "oclif": "3.x",
     "shx": "0.x",
     "sinon": "16.x",